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

DocBook: clean output when fonts span over text that ends with a space

Browse Source
This commit is contained in:
Thibaut Cuvelier 2020-10-05 16:22:58 +02:00
parent c46f3b8f31
commit 249d899298
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Paragraph.cpp
View File

@ -3358,6 +3358,10 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
auto * xs = new XMLStream(os); // XMLStream has no copy constructor: to create a new object, the only solution auto * xs = new XMLStream(os); // XMLStream has no copy constructor: to create a new object, the only solution
// is to hold a pointer to the XMLStream (xs = XMLStream(os) is not allowed once the first object is built). // is to hold a pointer to the XMLStream (xs = XMLStream(os) is not allowed once the first object is built).
// When a font tag ends with a space, output it after the closing font tag. This requires to store delayed
// characters at some point.
std::vector<char_type> delayedChars;
// Parsing main loop. // Parsing main loop.
for (pos_type i = initial; i < size(); ++i) { for (pos_type i = initial; i < size(); ++i) {
// Don't show deleted material in the output. // Don't show deleted material in the output.
@ -3399,6 +3403,13 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
for (; cit != cen; ++cit) for (; cit != cen; ++cit)
*xs << *cit; *xs << *cit;
// Deal with the delayed characters *after* closing font tags.
if (!delayedChars.empty()) {
for (char_type c: delayedChars)
*xs << c;
delayedChars.clear();
}
vector<xml::FontTag>::const_iterator sit = tagsToOpen.begin(); vector<xml::FontTag>::const_iterator sit = tagsToOpen.begin();
vector<xml::FontTag>::const_iterator sen = tagsToOpen.end(); vector<xml::FontTag>::const_iterator sen = tagsToOpen.end();
for (; sit != sen; ++sit) for (; sit != sen; ++sit)
@ -3419,7 +3430,10 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
} }
} else { } else {
char_type c = getUChar(buf.masterBuffer()->params(), runparams, i); char_type c = getUChar(buf.masterBuffer()->params(), runparams, i);
*xs << c; if (std::isspace(c) && !ignore_fonts)
delayedChars.push_back(c);
else
*xs << c;
} }
font_old = font.fontInfo(); font_old = font.fontInfo();
} }
@ -3430,7 +3444,13 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
if (!ignore_fonts) if (!ignore_fonts)
xs->closeFontTags(); xs->closeFontTags();
// In listings, new lines are very important. Avoid generating one for the last line. // Deal with the delayed characters *after* closing font tags.
if (!delayedChars.empty())
for (char_type c: delayedChars)
*xs << c;
// In listings, new lines (i.e. \n characters in the output) are very important. Avoid generating one for the
// last line to get a clean output.
if (runparams.docbook_in_listing && !is_last_par) if (runparams.docbook_in_listing && !is_last_par)
*xs << xml::CR(); *xs << xml::CR();