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

Extend the otexstream class to also report about paragraph breaks.

Browse Source 
The new method afterParbreak() returns true if a blank line was just
output and we are at the beginning of the next line, false otherwise.
This commit is contained in:
Enrico Forestieri 2014-05-18 22:46:33 +02:00
parent 10d5897327
commit ee9ff6cb0c
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/support/docstream.cpp
View File

@ -414,12 +414,9 @@ void otexstream::put(char_type const & c)
protectspace_ = false; protectspace_ = false;
} }
os_.put(c); os_.put(c);
lastchar_ = c; lastChar(c);
if (c == '\n') { if (c == '\n')
texrow_.newline(); texrow_.newline();
canbreakline_ = false;
} else
canbreakline_ = true;
} }
@ -432,7 +429,6 @@ otexstream & operator<<(otexstream & ots, BreakLine)
if (ots.canBreakLine()) { if (ots.canBreakLine()) {
ots.os().put('\n'); ots.os().put('\n');
ots.lastChar('\n'); ots.lastChar('\n');
ots.canBreakLine(false);
ots.texrow().newline(); ots.texrow().newline();
} }
ots.protectSpace(false); ots.protectSpace(false);
@ -445,7 +441,6 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
if (ots.canBreakLine()) { if (ots.canBreakLine()) {
ots.os() << "%\n"; ots.os() << "%\n";
ots.lastChar('\n'); ots.lastChar('\n');
ots.canBreakLine(false);
ots.texrow().newline(); ots.texrow().newline();
} }
ots.protectSpace(false); ots.protectSpace(false);
@ -503,9 +498,10 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
} else } else
ots.os() << s; ots.os() << s;
if (len > 1)
ots.canBreakLine(s[len - 2] != '\n');
ots.lastChar(s[len - 1]); ots.lastChar(s[len - 1]);
ots.texrow().newlines(count(s.begin(), s.end(), '\n')); ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
ots.canBreakLine(s[len - 1] != '\n');
return ots; return ots;
} }
@ -535,7 +531,6 @@ otexstream & operator<<(otexstream & ots, char c)
ots.lastChar(c); ots.lastChar(c);
if (c == '\n') if (c == '\n')
ots.texrow().newline(); ots.texrow().newline();
ots.canBreakLine(c != '\n');
return ots; return ots;
} }
@ -545,7 +540,6 @@ otexstream & operator<<(otexstream & ots, Type value)
{ {
ots.os() << value; ots.os() << value;
ots.lastChar(0); ots.lastChar(0);
ots.canBreakLine(true);
ots.protectSpace(false); ots.protectSpace(false);
return ots; return ots;
} }

18
src/support/docstream.h
View File

@ -90,15 +90,16 @@ typedef odocstream & (*odocstream_manip)(odocstream &);
they were iomanip's to ensure that the next output will start at the 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, beginning of a line. Using "breakln", a '\n' char will be output if needed,
while using "safebreakln", "%\n" will be output if needed. while using "safebreakln", "%\n" will be output if needed.
The class also records the last output character. The class also records the last output character and can tell whether
a paragraph break was just output.
*/ */
class otexstream { class otexstream {
public: public:
/// ///
otexstream(odocstream & os, TexRow & texrow) otexstream(odocstream & os, TexRow & texrow)
: os_(os), texrow_(texrow), : os_(os), texrow_(texrow), canbreakline_(false),
canbreakline_(false), protectspace_(false), lastchar_(0) {} protectspace_(false), parbreak_(true), lastchar_(0) {}
/// ///
odocstream & os() { return os_; } odocstream & os() { return os_; }
/// ///
@ -114,9 +115,16 @@ public:
/// ///
bool protectSpace() const { return protectspace_; } bool protectSpace() const { return protectspace_; }
/// ///
void lastChar(char_type const & c) { lastchar_ = c; } void lastChar(char_type const & c)
{
parbreak_ = (!canbreakline_ && c == '\n');
canbreakline_ = (c != '\n');
lastchar_ = c;
}
/// ///
char_type lastChar() const { return lastchar_; } char_type lastChar() const { return lastchar_; }
///
bool afterParbreak() const { return parbreak_; }
private: private:
/// ///
odocstream & os_; odocstream & os_;
@ -127,6 +135,8 @@ private:
/// ///
bool protectspace_; bool protectspace_;
/// ///
bool parbreak_;
///
char_type lastchar_; char_type lastchar_;
}; };