Compile fix.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 5ca9092a4a15706860ef762d7ce92399be836dfe..8e512ceea9b9850018b6c0ccf7d0a36386c562c0 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -362,8 +362,7 @@ Change const & Paragraph::lookupChange(pos_type pos) const
 }
 
 
-void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
-               pos_type end)
+void Paragraph::acceptChanges(pos_type start, pos_type end)
 {
        LASSERT(start >= 0 && start <= size(), /**/);
        LASSERT(end > start && end <= size() + 1, /**/);
@@ -373,14 +372,14 @@ void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
                        case Change::UNCHANGED:
                                // accept changes in nested inset
                                if (Inset * inset = getInset(pos))
-                                       inset->acceptChanges(bparams);
+                                       inset->acceptChanges();
                                break;
 
                        case Change::INSERTED:
                                d->changes_.set(Change(Change::UNCHANGED), pos);
                                // also accept changes in nested inset
                                if (Inset * inset = getInset(pos))
-                                       inset->acceptChanges(bparams);
+                                       inset->acceptChanges();
                                break;
 
                        case Change::DELETED:
@@ -398,8 +397,7 @@ void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
 }
 
 
-void Paragraph::rejectChanges(BufferParams const & bparams,
-               pos_type start, pos_type end)
+void Paragraph::rejectChanges(pos_type start, pos_type end)
 {
        LASSERT(start >= 0 && start <= size(), /**/);
        LASSERT(end > start && end <= size() + 1, /**/);
@@ -409,7 +407,7 @@ void Paragraph::rejectChanges(BufferParams const & bparams,
                        case Change::UNCHANGED:
                                // reject changes in nested inset
                                if (Inset * inset = getInset(pos))
-                                               inset->rejectChanges(bparams);
+                                               inset->rejectChanges();
                                break;
 
                        case Change::INSERTED:
@@ -560,7 +558,8 @@ int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c,
                // the encoding supports the combination
                os << latex2 << latex1;
                return latex1.length() + latex2.length();
-       } else if (runparams.local_font->language()->lang() == "polutonikogreek") {
+       } else if (runparams.local_font &&
+                  runparams.local_font->language()->lang() == "polutonikogreek") {
                // polutonikogreek only works without the brackets
                os << latex1 << latex2;
                return latex1.length() + latex2.length();
@@ -774,10 +773,11 @@ void Paragraph::Private::latexInset(
        bool close = false;
        odocstream::pos_type const len = os.tellp();
 
-       if (inset->forceLTR() 
+       if (inset->forceLTR()
            && running_font.isRightToLeft()
-               // ERT is an exception, it should be output with no decorations at all
-               && inset->lyxCode() != ERT_CODE) {
+           // ERT is an exception, it should be output with no
+           // decorations at all
+           && inset->lyxCode() != ERT_CODE) {
                if (running_font.language()->lang() == "farsi")
                        os << "\\beginL{}";
                else
@@ -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
@@ -2196,6 +2201,8 @@ bool Paragraph::emptyTag() const
        for (pos_type i = 0; i < size(); ++i) {
                if (Inset const * inset = getInset(i)) {
                        InsetCode lyx_code = inset->lyxCode();
+                       // FIXME testing like that is wrong. What is
+                       // the intent?
                        if (lyx_code != TOC_CODE &&
                            lyx_code != INCLUDE_CODE &&
                            lyx_code != GRAPHICS_CODE &&
@@ -2494,8 +2501,7 @@ bool Paragraph::isRTL(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->rightToLeft()
-               && ownerCode() != ERT_CODE
-               && ownerCode() != LISTINGS_CODE;
+               && !inInset().getLayout().forceLTR();
 }