Account for old versions of Pygments

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index f0814a3a3eb94103dbb8dd202a87595a3da88475..86ffcd62cd6d65df7a8ba94fcc86c2c24aefa0b8 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"
@@ -165,8 +166,11 @@ docstring const stateText(FontInfo const & f)
                os << bformat(_("Underline %1$s, "),
                              _(GUIMiscNames[f.underbar()]));
        if (f.strikeout() != FONT_INHERIT)
-               os << bformat(_("Strikeout %1$s, "),
+               os << bformat(_("Strike out %1$s, "),
                              _(GUIMiscNames[f.strikeout()]));
+       if (f.xout() != FONT_INHERIT)
+               os << bformat(_("Cross out %1$s, "),
+                             _(GUIMiscNames[f.xout()]));
        if (f.uuline() != FONT_INHERIT)
                os << bformat(_("Double underline %1$s, "),
                              _(GUIMiscNames[f.uuline()]));
@@ -240,6 +244,9 @@ void Font::lyxWriteChanges(Font const & orgfont,
        if (orgfont.fontInfo().strikeout() != bits_.strikeout()) {
                os << "\\strikeout " << LyXMiscNames[bits_.strikeout()] << "\n";
        }
+       if (orgfont.fontInfo().xout() != bits_.xout()) {
+               os << "\\xout " << LyXMiscNames[bits_.xout()] << "\n";
+       }
        if (orgfont.fontInfo().uuline() != bits_.uuline()) {
                os << "\\uuline " << LyXMiscNames[bits_.uuline()] << "\n";
        }
@@ -286,6 +293,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                        tmp += "{";
                        os << from_ascii(tmp);
                        count += tmp.length();
+                       pushLanguageName(language()->polyglossia(), true);
                } else if (language()->encoding()->package() != Encoding::CJK) {
                        os << '{';
                        count += 1;
@@ -321,6 +329,8 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                                      "$$lang", language()->babel());
                        os << from_ascii(tmp);
                        count += tmp.length();
+                       if (!lyxrc.language_command_end.empty())
+                               pushLanguageName(language()->babel(), true);
                } else if (language()->encoding()->package() != Encoding::CJK) {
                        os << '{';
                        count += 1;
@@ -341,10 +351,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;
        }
@@ -425,6 +436,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                count += 9;
                ++runparams.inulemcmd;
        }
+       if (f.xout() == FONT_ON) {
+               os << "\\xout{";
+               count += 9;
+               ++runparams.inulemcmd;
+       }
        if (f.uuline() == FONT_ON) {
                os << "\\uuline{";
                count += 11;
@@ -446,6 +462,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                                  OutputParams const & runparams,
                                  Font const & base,
                                  Font const & next,
+                                 bool & needPar,
                                  bool const & closeLanguage) const
 {
        int count = 0;
@@ -490,6 +507,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
        if (f.size() != FONT_SIZE_INHERIT) {
                // We only have to close if only size changed
                if (!env) {
+                       if (needPar && !closeLanguage) {
+                               os << "\\par";
+                               count += 4;
+                               needPar = false;
+                       }
                        os << '}';
                        ++count;
                }
@@ -504,6 +526,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                ++count;
                --runparams.inulemcmd;
        }
+       if (f.xout() == FONT_ON) {
+               os << '}';
+               ++count;
+               --runparams.inulemcmd;
+       }
        if (f.uuline() == FONT_ON) {
                os << '}';
                ++count;
@@ -519,10 +546,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 +572,11 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
            && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
+               bool const using_begin_end =
+                       runparams.use_polyglossia ||
+                               !lyxrc.language_command_end.empty();
+               if (using_begin_end)
+                       popLanguageName();
        }
 
        return count;
@@ -563,6 +596,7 @@ string Font::toString(bool const toggle) const
           << "emph " << bits_.emph() << '\n'
           << "underbar " << bits_.underbar() << '\n'
           << "strikeout " << bits_.strikeout() << '\n'
+          << "xout " << bits_.xout() << '\n'
           << "uuline " << bits_.uuline() << '\n'
           << "uwave " << bits_.uwave() << '\n'
           << "noun " << bits_.noun() << '\n'
@@ -605,10 +639,10 @@ bool Font::fromString(string const & data, bool & toggle)
                        int const next = lex.getInteger();
                        bits_.setSize(FontSize(next));
 
-               } else if (token == "emph" || token == "underbar" ||
-                          token == "noun" || token == "number" ||
-                          token == "uuline" || token == "uwave" ||
-                          token == "strikeout") {
+               } else if (token == "emph" || token == "underbar"
+                       || token == "noun" || token == "number"
+                       || token == "uuline" || token == "uwave"
+                       || token == "strikeout" || token == "xout") {
 
                        int const next = lex.getInteger();
                        FontState const misc = FontState(next);
@@ -619,6 +653,8 @@ bool Font::fromString(string const & data, bool & toggle)
                                bits_.setUnderbar(misc);
                        else if (token == "strikeout")
                                bits_.setStrikeout(misc);
+                       else if (token == "xout")
+                               bits_.setXout(misc);
                        else if (token == "uuline")
                                bits_.setUuline(misc);
                        else if (token == "uwave")
@@ -674,7 +710,12 @@ void Font::validate(LaTeXFeatures & features) const
        if (bits_.strikeout() == FONT_ON) {
                LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
                features.require("ulem");
-               LYXERR(Debug::LATEX, "Strikeout enabled. Font: " << to_utf8(stateText(0)));
+               LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0)));
+       }
+       if (bits_.xout() == FONT_ON) {
+               LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+               features.require("ulem");
+               LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText(0)));
        }
        if (bits_.uuline() == FONT_ON) {
                LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
@@ -746,6 +787,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
                << " emph " << f.emph()
                << " underbar " << f.underbar()
                << " strikeout " << f.strikeout()
+               << " xout " << f.xout()
                << " uuline " << f.uuline()
                << " uwave " << f.uwave()
                << " noun " << f.noun()