Fix MSVC warning

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index de6d28d7d752b1b90ebb2cb33539ba36afd3dae2..8e512ceea9b9850018b6c0ccf7d0a36386c562c0 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -95,7 +95,7 @@ public:
        /// Output the surrogate pair formed by \p c and \p next to \p os.
        /// \return the number of characters written.
        int latexSurrogatePair(odocstream & os, char_type c, char_type next,
-                              Encoding const &);
+                              OutputParams const &);
 
        /// Output a space in appropriate formatting (or a surrogate pair
        /// if the next character is a combining character).
@@ -542,7 +542,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
 
 
 int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c,
-               char_type next, Encoding const & encoding)
+               char_type next, OutputParams const & runparams)
 {
        // Writing next here may circumvent a possible font change between
        // c and next. Since next is only output if it forms a surrogate pair
@@ -551,12 +551,18 @@ int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c,
        // hopefully impossible to input.
        // FIXME: change tracking
        // Is this correct WRT change tracking?
+       Encoding const & encoding = *(runparams.encoding);
        docstring const latex1 = encoding.latexChar(next);
        docstring const latex2 = encoding.latexChar(c);
        if (docstring(1, next) == latex1) {
                // the encoding supports the combination
                os << latex2 << latex1;
                return latex1.length() + latex2.length();
+       } 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();
        } else
                os << latex1 << '{' << latex2 << '}';
        return latex1.length() + latex2.length() + 2;
@@ -576,9 +582,8 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams,
        if (i + 1 < int(text_.size())) {
                char_type next = text_[i + 1];
                if (Encodings::isCombiningChar(next)) {
-                       Encoding const & encoding = *(runparams.encoding);
                        // This space has an accent, so we must always output it.
-                       column += latexSurrogatePair(os, ' ', next, encoding) - 1;
+                       column += latexSurrogatePair(os, ' ', next, runparams) - 1;
                        return true;
                }
        }
@@ -768,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
@@ -960,7 +966,7 @@ void Paragraph::Private::latexSpecialChar(
                if (i + 1 < int(text_.size())) {
                        char_type next = text_[i + 1];
                        if (Encodings::isCombiningChar(next)) {
-                               column += latexSurrogatePair(os, c, next, encoding) - 1;
+                               column += latexSurrogatePair(os, c, next, runparams) - 1;
                                ++i;
                                break;
                        }
@@ -1188,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())
@@ -2075,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
@@ -2190,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 &&
@@ -2488,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();
 }