Compile fix.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index b7f7d49c3ab826f2a9ccbe7a2b14d3cd14de0bd6..8e512ceea9b9850018b6c0ccf7d0a36386c562c0 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1194,7 +1194,7 @@ void Paragraph::write(ostream & os, BufferParams const & bparams,
        for (pos_type i = 0; i <= size(); ++i) {
 
                Change const change = lookupChange(i);
-               Changes::lyxMarkChange(os, column, running_change, change);
+               Changes::lyxMarkChange(os, bparams, column, running_change, change);
                running_change = change;
 
                if (i == size())
@@ -2081,9 +2081,14 @@ bool Paragraph::latex(BufferParams const & bparams,
                        running_font = font;
                        open_font = true;
                        docstring fontchange = ods.str();
+                       // check whether the fontchange ends with a \\textcolor
+                       // modifier and the text starts with a space (bug 4473)
+                       docstring const last_modifier = rsplit(fontchange, '\\');
+                       if (prefixIs(last_modifier, from_ascii("textcolor")) && c == ' ')
+                               os << fontchange << from_ascii("{}");
                        // check if the fontchange ends with a trailing blank
                        // (like "\small " (see bug 3382)
-                       if (suffixIs(fontchange, ' ') && c == ' ')
+                       else if (suffixIs(fontchange, ' ') && c == ' ')
                                os << fontchange.substr(0, fontchange.size() - 1) 
                                   << from_ascii("{}");
                        else