Set correctly the spacing between atoms in MathData

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 7e8b3f4f2bcc2e9d8200b14305a0a848adb0460c..9124f0ab05c94f3e848c898966379939594bd87a 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -25,6 +25,7 @@
 #include "LyXRC.h"
 #include "output_latex.h"
 #include "OutputParams.h"
+#include "texstream.h"
 
 #include "support/lassert.h"
 #include "support/convert.h"
@@ -286,6 +287,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                        tmp += "{";
                        os << from_ascii(tmp);
                        count += tmp.length();
+                       pushPolyglossiaLang(language()->polyglossia(), true);
                } else if (language()->encoding()->package() != Encoding::CJK) {
                        os << '{';
                        count += 1;
@@ -341,10 +343,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
        // the numbers are written Left-to-Right. ArabTeX package
        // reorders the number automatically but the packages used
        // for Hebrew and Farsi (Arabi) do not.
-       if (bits_.number() == FONT_ON && prev.fontInfo().number() != FONT_ON
-               && (language()->lang() == "hebrew"
-                       || language()->lang() == "farsi" 
-                       || language()->lang() == "arabic_arabi")) {
+       if (!runparams.pass_thru && bits_.number() == FONT_ON
+           && prev.fontInfo().number() != FONT_ON
+           && (language()->lang() == "hebrew"
+               || language()->lang() == "farsi" 
+               || language()->lang() == "arabic_arabi")) {
                os << "{\\beginL ";
                count += 9;
        }
@@ -519,10 +522,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
        // the numbers are written Left-to-Right. ArabTeX package
        // reorders the number automatically but the packages used
        // for Hebrew and Farsi (Arabi) do not.
-       if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON
-               && (language()->lang() == "hebrew"
-                       || language()->lang() == "farsi"
-                       || language()->lang() == "arabic_arabi")) {
+       if (!runparams.pass_thru && bits_.number() == FONT_ON
+           && next.fontInfo().number() != FONT_ON
+           && (language()->lang() == "hebrew"
+               || language()->lang() == "farsi"
+               || language()->lang() == "arabic_arabi")) {
                os << "\\endL}";
                count += 6;
        }
@@ -544,6 +548,8 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
            && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
+               if (runparams.use_polyglossia)
+                       popPolyglossiaLang();
        }
 
        return count;
@@ -695,6 +701,19 @@ void Font::validate(LaTeXFeatures & features) const
                case Color_latex:
                case Color_notelabel:
                        break;
+               case Color_brown:
+               case Color_darkgray:
+               case Color_gray:
+               case Color_lightgray:
+               case Color_lime:
+               case Color_olive:
+               case Color_orange:
+               case Color_pink:
+               case Color_purple:
+               case Color_teal:
+               case Color_violet:
+                       features.require("xcolor");
+                       break;
                default:
                        features.require("color");
                        LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));