anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Splitting otexstream into otexrowstream and otexstream.

Browse Source 
otexstream used to count lines to build a TexRow, and some other things. The new
class otexrowstream has the line counting feature of the previous otexstream
without other stuff. otexstream is now a subclass of otexrowstream that has the
same features as before.

This is preliminary work for extending the cursor<->row tracking to math.
This commit is contained in:
Guillaume Munch 2015-10-07 04:02:40 +01:00
parent e202894536
commit 44e022ad74
2 changed files with 115 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/texstream.cpp
View File

@ -29,17 +29,22 @@ using lyx::support::split;
namespace lyx {
void otexrowstream::put(char_type const & c)
{
os_.put(c);
if (c == '\n')
texrow_.newline();
}
void otexstream::put(char_type const & c)
{
if (protectspace_) {
if (!canbreakline_ && c == ' ')
os_ << "{}";
os() << "{}";
protectspace_ = false;
}
os_.put(c);
otexrowstream::put(c);
lastChar(c);
if (c == '\n')
texrow_.newline();
}
@ -50,9 +55,8 @@ SafeBreakLine safebreakln;
otexstream & operator<<(otexstream & ots, BreakLine)
{
if (ots.canBreakLine()) {
ots.os().put('\n');
ots.otexrowstream::put('\n');
ots.lastChar('\n');
ots.texrow().newline();
}
ots.protectSpace(false);
return ots;
@ -61,26 +65,43 @@ otexstream & operator<<(otexstream & ots, BreakLine)
otexstream & operator<<(otexstream & ots, SafeBreakLine)
{
otexrowstream & otrs = ots;
if (ots.canBreakLine()) {
ots.os() << "%\n";
otrs << "%\n";
ots.lastChar('\n');
ots.texrow().newline();
}
ots.protectSpace(false);
return ots;
}
otexstream & operator<<(otexstream & ots, odocstream_manip pf)
otexrowstream & operator<<(otexrowstream & ots, odocstream_manip pf)
{
ots.os() << pf;
if (pf == static_cast<odocstream_manip>(endl)) {
ots.lastChar('\n');
ots.texrow().newline();
}
return ots;
}
otexstream & operator<<(otexstream & ots, odocstream_manip pf)
{
otexrowstream & otrs = ots;
otrs << pf;
if (pf == static_cast<odocstream_manip>(endl)) {
ots.lastChar('\n');
}
return ots;
}
otexrowstream & operator<<(otexrowstream & ots, docstring const & s)
{
ots.os() << s;
ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
return ots;
}
otexstream & operator<<(otexstream & ots, docstring const & s)
{
@ -89,10 +110,10 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
// Check whether there's something to output
if (len == 0)
return ots;
otexrowstream & otrs = ots;
if (ots.protectSpace()) {
if (!ots.canBreakLine() && s[0] == ' ')
ots.os() << "{}";
otrs << "{}";
ots.protectSpace(false);
}
@ -106,7 +127,7 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
docstring s2 = split(s, s1, 0xF0000);
while (true) {
if (!s1.empty())
ots.os() << s1;
otrs << s1;
if (s2.empty())
break;
docstring enc;
@ -114,17 +135,23 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
if (!contains(s2, 0xF0001))
s2 = split(enc, s1, 0xF0000);
else {
ots.os() << setEncoding(to_ascii(enc));
otrs << setEncoding(to_ascii(enc));
s2 = split(s3, s1, 0xF0000);
}
}
} else
ots.os() << s;
otrs << s;
if (len > 1)
ots.canBreakLine(s[len - 2] != '\n');
ots.lastChar(s[len - 1]);
ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
return ots;
}
otexrowstream & operator<<(otexrowstream & ots, string const & s)
{
ots << from_utf8(s);
return ots;
}
@ -136,6 +163,13 @@ otexstream & operator<<(otexstream & ots, string const & s)
}
otexrowstream & operator<<(otexrowstream & ots, char const * s)
{
ots << from_utf8(s);
return ots;
}
otexstream & operator<<(otexstream & ots, char const * s)
{
ots << from_utf8(s);
@ -143,21 +177,36 @@ otexstream & operator<<(otexstream & ots, char const * s)
}
otexstream & operator<<(otexstream & ots, char c)
otexrowstream & operator<<(otexrowstream & ots, char c)
{
if (ots.protectSpace()) {
if (!ots.canBreakLine() && c == ' ')
ots.os() << "{}";
ots.protectSpace(false);
}
ots.os() << c;
ots.lastChar(c);
if (c == '\n')
ots.texrow().newline();
ots.put(c);
return ots;
}
otexstream & operator<<(otexstream & ots, char c)
{
ots.put(c);
return ots;
}
template <typename Type>
otexrowstream & operator<<(otexrowstream & ots, Type value)
{
ots.os() << value;
return ots;
}
template otexrowstream & operator<< <SetEnc>(otexrowstream & os, SetEnc);
template otexrowstream & operator<< <double>(otexrowstream &, double);
template otexrowstream & operator<< <int>(otexrowstream &, int);
template otexrowstream & operator<< <unsigned int>(otexrowstream &,
unsigned int);
template otexrowstream & operator<< <unsigned long>(otexrowstream &,
unsigned long);
template <typename Type>
otexstream & operator<<(otexstream & ots, Type value)
{

51
src/texstream.h
View File

@ -19,7 +19,44 @@ namespace lyx {
/** Wrapper class for odocstream.
This class is used to automatically count the lines of the exported latex
code and also to ensure that no blank lines may be inadvertently output.
code.
*/
class otexrowstream {
public:
///
otexrowstream(odocstream & os, TexRow & texrow)
: os_(os), texrow_(texrow) {}
///
odocstream & os() { return os_; }
///
TexRow & texrow() { return texrow_; }
///
void put(char_type const & c);
private:
///
odocstream & os_;
///
TexRow & texrow_;
};
///
otexrowstream & operator<<(otexrowstream &, odocstream_manip);
///
otexrowstream & operator<<(otexrowstream &, docstring const &);
///
otexrowstream & operator<<(otexrowstream &, std::string const &);
///
otexrowstream & operator<<(otexrowstream &, char const *);
///
otexrowstream & operator<<(otexrowstream &, char);
///
template <typename Type>
otexrowstream & operator<<(otexrowstream & ots, Type value);
/** Subclass for otexrowstream.
This class is used to ensure that no blank lines may be inadvertently output.
To this end, use the special variables "breakln" and "safebreakln" as if
they were iomanip's to ensure that the next output will start at the
beginning of a line. Using "breakln", a '\n' char will be output if needed,
@ -28,17 +65,13 @@ namespace lyx {
a paragraph break was just output.
*/
class otexstream {
class otexstream : public otexrowstream {
public:
///
otexstream(odocstream & os, TexRow & texrow)
: os_(os), texrow_(texrow), canbreakline_(false),
: otexrowstream(os, texrow), canbreakline_(false),
protectspace_(false), parbreak_(true), lastchar_(0) {}
///
odocstream & os() { return os_; }
///
TexRow & texrow() { return texrow_; }
///
void put(char_type const & c);
///
void canBreakLine(bool breakline) { canbreakline_ = breakline; }
@ -60,10 +93,6 @@ public:
///
bool afterParbreak() const { return parbreak_; }
private:
///
odocstream & os_;
///
TexRow & texrow_;
///
bool canbreakline_;
///