Script wrapper is needed with ASCII encoding

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d1197e639e360981e31a4d3b03fdb2e976912d35..5c8783b324a68a8a98fd0380bb48fcc9c3eb9994 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -891,22 +891,25 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
        }
        docstring latex2 = encoding.latexChar(c).first;
 
-       if (docstring(1, next) == latex1) {
-               // The encoding supports the combination:
-               // output as is (combining char after base char).
-               os << latex2 << latex1;
-               return latex1.length() + latex2.length();
-       }
-
        // Handle combining characters in "script" context (i.e., \textgreek and \textcyrillic)
        docstring::size_type const brace1 = latex2.find_first_of(from_ascii("{"));
        docstring::size_type const brace2 = latex2.find_last_of(from_ascii("}"));
        string script = to_ascii(latex2.substr(1, brace1 - 1));
        // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
-       // whether they are encodable or not (it only depends on the font encoding)
-       if (!runparams.isFullUnicode())
+       // whether they are encodable or not (it only depends on the font encoding),
+       // except if we are using fontspec.
+       bool scriptchar = false;
+       if (!bparams.useNonTeXFonts)
                // This will get us a script value to deal with below
-               Encodings::isKnownScriptChar(c, script);
+               scriptchar = Encodings::isKnownScriptChar(c, script);
+
+       if (!scriptchar && docstring(1, next) == latex1) {
+               // The encoding supports the combination:
+               // output as is (combining char after base char).
+               os << latex2 << latex1;
+               return latex1.length() + latex2.length();
+       }
+
        int pos = 0;
        int length = brace2;
        string fontenc;
@@ -924,7 +927,9 @@ int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams,
                length -= pos;
                latex2 = latex2.substr(pos, length);
                // We only need the script macro with non-native font encodings
-               if (Encodings::needsScriptWrapper(script, fontenc)) {
+               // and with ASCII encoding (e.g., XeTeX with TeX fonts)
+               if (Encodings::needsScriptWrapper(script, fontenc)
+                   && runparams.encoding != encodings.fromLyXName("ascii")) {
                        scriptmacro = from_ascii("\\" + script + "{");
                        cb = from_ascii("}");
                }
@@ -1017,7 +1022,10 @@ int Paragraph::Private::writeScriptChars(BufferParams const & bparams,
        int pos = 0;
        int length = brace2;
        bool closing_brace = true;
-       if (!Encodings::needsScriptWrapper(script, fontenc)) {
+       // We only need the script macro with non-native font encodings
+       // and with ASCII encoding (e.g., XeTeX with TeX fonts)
+       if (!Encodings::needsScriptWrapper(script, fontenc)
+           && runparams.encoding != encodings.fromLyXName("ascii")) {
                // Correct font encoding is being used, so we can avoid \text[greek|cyr].
                pos = brace1 + 1;
                length -= pos;
@@ -1392,8 +1400,9 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
                string fontenc;
                fontenc = running_font.language()->fontenc(bparams);
                // "Script chars" need to embraced in \textcyrillic and \textgreek notwithstanding
-               // whether they are encodable or not (it only depends on the font encoding)
-               if (!runparams.isFullUnicode() && Encodings::isKnownScriptChar(c, script)) {
+               // whether they are encodable or not (it only depends on the font encoding),
+               // except if we are using fontspec.
+               if (!bparams.useNonTeXFonts && Encodings::isKnownScriptChar(c, script)) {
                        docstring const wrapper = from_ascii("\\" + script + "{");
                        docstring ltx = latex.first;
                        if (!prefixIs(ltx, wrapper))
@@ -2369,6 +2378,9 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        string const begin_tag = "\\begin";
        InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
+       // RTL in classic (PDF)LaTeX (without the Bidi package)
+       bool const rtl_classic = owner_->getParLanguage(bparams)->rightToLeft()
+               && !runparams.use_polyglossia;
 
        switch (curAlign) {
        case LYX_ALIGN_NONE:
@@ -2378,16 +2390,18 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_DECIMAL:
                break;
        case LYX_ALIGN_LEFT: {
-               if (!owner_->getParLanguage(bparams)->rightToLeft())
-                       corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
-               else
+               if (rtl_classic)
+                       // Classic (PDF)LaTeX switches the left/right logic in RTL mode
                        corrected_env(os, begin_tag, "flushright", code, lastpar, column);
+               else
+                       corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
                break;
        } case LYX_ALIGN_RIGHT: {
-               if (!owner_->getParLanguage(bparams)->rightToLeft())
-                       corrected_env(os, begin_tag, "flushright", code, lastpar, column);
-               else
+               if (rtl_classic)
+                       // Classic (PDF)LaTeX switches the left/right logic in RTL mode
                        corrected_env(os, begin_tag, "flushleft", code, lastpar, column);
+               else
+                       corrected_env(os, begin_tag, "flushright", code, lastpar, column);
                break;
        } case LYX_ALIGN_CENTER: {
                corrected_env(os, begin_tag, "center", code, lastpar, column);
@@ -2427,6 +2441,9 @@ bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        string const end_tag = "\\par\\end";
        InsetCode code = ownerCode();
        bool const lastpar = runparams.isLastPar;
+       // RTL in classic (PDF)LaTeX (without the Bidi package)
+       bool const rtl_classic = owner_->getParLanguage(bparams)->rightToLeft()
+               && !runparams.use_polyglossia;
 
        switch (curAlign) {
        case LYX_ALIGN_NONE:
@@ -2436,16 +2453,18 @@ bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_DECIMAL:
                break;
        case LYX_ALIGN_LEFT: {
-               if (!owner_->getParLanguage(bparams)->rightToLeft())
-                       output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
-               else
+               if (rtl_classic)
+                       // Classic (PDF)LaTeX switches the left/right logic in RTL mode
                        output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
+               else
+                       output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
                break;
        } case LYX_ALIGN_RIGHT: {
-               if (!owner_->getParLanguage(bparams)->rightToLeft())
-                       output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
-               else
+               if (rtl_classic)
+                       // Classic (PDF)LaTeX switches the left/right logic in RTL mode
                        output = corrected_env(os, end_tag, "flushleft", code, lastpar, col);
+               else
+                       output = corrected_env(os, end_tag, "flushright", code, lastpar, col);
                break;
        } case LYX_ALIGN_CENTER: {
                corrected_env(os, end_tag, "center", code, lastpar, col);
@@ -3409,7 +3428,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                } else {
                        char_type c = getUChar(buf.masterBuffer()->params(),
                                               runparams, i);
-                       if (c == ' ' && style.free_spacing)
+                       if (c == ' ' && (style.free_spacing || runparams.free_spacing))
                                xs << XHTMLStream::ESCAPE_NONE << "&nbsp;";
                        else
                                xs << c;