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

Fix bug #253 (Incorrect protection of closing quotation marks)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39420 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-08-05 11:23:00 +00:00
parent a255f19ca7
commit 2de1163efc
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/insets/InsetQuotes.cpp
View File

@ -287,8 +287,11 @@ void InsetQuotes::latex(otexstream & os, OutputParams const & runparams) const
} }
// Always guard against unfortunate ligatures (!` ?`) // Always guard against unfortunate ligatures (!` ?`)
if (prefixIs(qstr, "`")) if (prefixIs(qstr, "`")) {
qstr.insert(0, "{}"); char_type const lastchar = os.lastChar();
if (lastchar == '!' || lastchar == '?')
qstr.insert(0, "{}");
}
os << from_ascii(qstr); os << from_ascii(qstr);
} }

11
src/support/docstream.cpp
View File

@ -411,6 +411,7 @@ void otexstream::put(char_type const & c)
protectspace_ = false; protectspace_ = false;
} }
os_.put(c); os_.put(c);
lastchar_ = c;
if (c == '\n') { if (c == '\n') {
texrow_.newline(); texrow_.newline();
canbreakline_ = false; canbreakline_ = false;
@ -427,6 +428,7 @@ otexstream & operator<<(otexstream & ots, BreakLine)
{ {
if (ots.canBreakLine()) { if (ots.canBreakLine()) {
ots.os().put('\n'); ots.os().put('\n');
ots.lastChar('\n');
ots.canBreakLine(false); ots.canBreakLine(false);
ots.texrow().newline(); ots.texrow().newline();
} }
@ -439,6 +441,7 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
{ {
if (ots.canBreakLine()) { if (ots.canBreakLine()) {
ots.os() << "%\n"; ots.os() << "%\n";
ots.lastChar('\n');
ots.canBreakLine(false); ots.canBreakLine(false);
ots.texrow().newline(); ots.texrow().newline();
} }
@ -450,8 +453,10 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
otexstream & operator<<(otexstream & ots, odocstream_manip pf) otexstream & operator<<(otexstream & ots, odocstream_manip pf)
{ {
ots.os() << pf; ots.os() << pf;
if (pf == static_cast<odocstream_manip>(endl)) if (pf == static_cast<odocstream_manip>(endl)) {
ots.lastChar('\n');
ots.texrow().newline(); ots.texrow().newline();
}
return ots; return ots;
} }
@ -470,6 +475,7 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
ots.protectSpace(false); ots.protectSpace(false);
} }
ots.os() << s; ots.os() << s;
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'); ots.canBreakLine(s[len - 1] != '\n');
return ots; return ots;
@ -490,6 +496,7 @@ otexstream & operator<<(otexstream & ots, char const * s)
ots.protectSpace(false); ots.protectSpace(false);
} }
ots.os() << s; ots.os() << s;
ots.lastChar(s[len - 1]);
ots.texrow().newlines(count(s, s + len, '\n')); ots.texrow().newlines(count(s, s + len, '\n'));
ots.canBreakLine(s[len - 1] != '\n'); ots.canBreakLine(s[len - 1] != '\n');
return ots; return ots;
@ -504,6 +511,7 @@ otexstream & operator<<(otexstream & ots, char c)
ots.protectSpace(false); ots.protectSpace(false);
} }
ots.os() << c; ots.os() << c;
ots.lastChar(c);
if (c == '\n') if (c == '\n')
ots.texrow().newline(); ots.texrow().newline();
ots.canBreakLine(c != '\n'); ots.canBreakLine(c != '\n');
@ -515,6 +523,7 @@ template <typename Type>
otexstream & operator<<(otexstream & ots, Type value) otexstream & operator<<(otexstream & ots, Type value)
{ {
ots.os() << value; ots.os() << value;
ots.lastChar(0);
ots.canBreakLine(true); ots.canBreakLine(true);
ots.protectSpace(false); ots.protectSpace(false);
return ots; return ots;

9
src/support/docstream.h
View File

@ -93,6 +93,7 @@ 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.
*/ */
class otexstream { class otexstream {
@ -100,7 +101,7 @@ public:
/// ///
otexstream(odocstream & os, TexRow & texrow) otexstream(odocstream & os, TexRow & texrow)
: os_(os), texrow_(texrow), : os_(os), texrow_(texrow),
canbreakline_(false), protectspace_(false) {} canbreakline_(false), protectspace_(false), lastchar_(0) {}
/// ///
odocstream & os() { return os_; } odocstream & os() { return os_; }
/// ///
@ -115,6 +116,10 @@ public:
void protectSpace(bool protectspace) { protectspace_ = protectspace; } void protectSpace(bool protectspace) { protectspace_ = protectspace; }
/// ///
bool protectSpace() const { return protectspace_; } bool protectSpace() const { return protectspace_; }
///
void lastChar(char_type const & c) { lastchar_ = c; }
///
char_type lastChar() const { return lastchar_; }
private: private:
/// ///
odocstream & os_; odocstream & os_;
@ -124,6 +129,8 @@ private:
bool canbreakline_; bool canbreakline_;
/// ///
bool protectspace_; bool protectspace_;
///
char_type lastchar_;
}; };
/// Helper structs for breaking a line /// Helper structs for breaking a line