Move <QTimer> from TocWidget.h

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index bdda5d012b83ff6ba1a3fe2548d6529851d08f7c..d69fa55bb539459b0760adc24d19724a6da75ec3 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -66,6 +66,7 @@
 #include "support/textutils.h"
 #include "output_docbook.h"
 
+#include <algorithm>
 #include <atomic>
 #include <sstream>
 #include <vector>
@@ -1103,7 +1104,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
                // add location information and throw again.
                e.par_id = id_;
                e.pos = i;
-               throw(e);
+               throw;
        }
 
        if (close)
@@ -2878,7 +2879,7 @@ void Paragraph::latex(BufferParams const & bparams,
                                        // add location information and throw again.
                                        e.par_id = id();
                                        e.pos = i;
-                                       throw(e);
+                                       throw;
                                }
                        }
                }
@@ -3358,6 +3359,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
        // 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.
        for (pos_type i = initial; i < size(); ++i) {
                // Don't show deleted material in the output.
@@ -3399,6 +3404,13 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
                        for (; cit != cen; ++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 sen = tagsToOpen.end();
                        for (; sit != sen; ++sit)
@@ -3419,7 +3431,10 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
                        }
                } else {
                        char_type c = getUChar(buf.masterBuffer()->params(), runparams, i);
-                       *xs << c;
+                       if (lyx::isSpace(c) && !ignore_fonts)
+                               delayedChars.push_back(c);
+                       else
+                               *xs << c;
                }
                font_old = font.fontInfo();
        }
@@ -3430,7 +3445,13 @@ std::vector<docstring> Paragraph::simpleDocBookOnePar(Buffer const & buf,
        if (!ignore_fonts)
                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)
                *xs << xml::CR();
 
@@ -4348,10 +4369,8 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos,
                }
 
                int erasePos = pos - changes.size();
-               for (size_t i = 0; i < changes.size(); i++) {
-                       insertChar(pos, changes[i].first,
-                                  changes[i].second,
-                                  trackChanges);
+               for (auto const & change : changes) {
+                       insertChar(pos, change.first, change.second, trackChanges);
                        if (!eraseChar(erasePos, trackChanges)) {
                                ++erasePos;
                                ++pos; // advance