Add Benjamin Piwowarski to contributors. Welcome to LyX!

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index 8cdb3f4096274459496f65da8e48dce7adcdb3d3..1a4e77464d2132ae1c790fa02781e704cdb3ee64 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -43,11 +43,11 @@ namespace lyx {
 // Strings used to read and write .lyx format files
 //
 // These are defined in FontInfo.cpp
-extern char const ** LyXFamilyNames;
-extern char const ** LyXSeriesNames;
-extern char const ** LyXShapeNames;
-extern char const ** LyXSizeNames;
-extern char const ** LyXMiscNames;
+extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
+extern char const * LyXSeriesNames[NUM_SERIES + 2];
+extern char const * LyXShapeNames[NUM_SHAPE + 2];
+extern char const * LyXSizeNames[NUM_SIZE + 4];
+extern char const * LyXMiscNames[5];
 
 //
 // Names for the GUI
@@ -57,17 +57,17 @@ namespace {
 
 char const * GUIFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
 { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
-  N_("Inherit"), N_("Ignore") };
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry",
+  "wasy", "esint", N_("Inherit"), N_("Ignore") };
 
-char const * GUISeriesNames[4] =
+char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] =
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-char const * GUIShapeNames[6] =
+char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] =
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-char const * GUISizeNames[14] =
+char const * GUISizeNames[NUM_SIZE + 4 /* increase, decrease, default & error */] =
 { N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
   N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
   N_("Inherit"), N_("Ignore") };
@@ -78,16 +78,18 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to write LaTeX files
 //
-char const * LaTeXFamilyNames[6] =
-{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
+char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
+{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
+  "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+  "error12", "error13" };
 
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesNames[NUM_SERIES + 2] =
 { "textmd", "textbf", "error4", "error5" };
 
-char const * LaTeXShapeNames[6] =
+char const * LaTeXShapeNames[NUM_SHAPE + 2] =
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-char const * LaTeXSizeNames[14] =
+char const * LaTeXSizeNames[NUM_SIZE + 4] =
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
@@ -95,7 +97,7 @@ char const * LaTeXSizeNames[14] =
 
 
 Font::Font(FontInfo bits, Language const * l)
-       : bits_(bits), lang_(l), misspelled_(false), open_encoding_(false)
+       : bits_(bits), lang_(l), open_encoding_(false)
 {
        if (!lang_)
                lang_ = default_language;
@@ -189,7 +191,7 @@ docstring const Font::stateText(BufferParams * params) const
                os << bformat(_("Language: %1$s, "),
                              _(language()->display()));
        if (bits_.number() != FONT_OFF)
-               os << bformat(_("  Number %1$s"),
+               os << "  " << bformat(_("Number %1$s"),
                              _(GUIMiscNames[bits_.number()]));
        return rtrim(os.str(), ", ");
 }
@@ -272,7 +274,20 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
        bool env = false;
 
        int count = 0;
-       if (language()->babel() != base.language()->babel() &&
+
+       // polyglossia or babel?
+       if (runparams.use_polyglossia
+           && language()->lang() != base.language()->lang()
+           && language() != prev.language()) {
+               if (!language()->polyglossia().empty()) {
+                       string tmp = "\\text" + language()->polyglossia();
+                       if (!language()->polyglossiaOpts().empty())
+                               tmp += "[" + language()->polyglossiaOpts() + "]";
+                       tmp += "{";
+                       os << from_ascii(tmp);
+                       count += tmp.length();
+               }
+       } else if (language()->babel() != base.language()->babel() &&
            language() != prev.language()) {
                if (language()->lang() == "farsi") {
                        os << "\\textFR{";
@@ -319,7 +334,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                }
        }
 
-       // When the current language is Hebrew, Arabic, or Farsi
+       // If the current language is Hebrew, Arabic, or Farsi
        // the numbers are written Left-to-Right. ArabTeX package
        // reorders the number automatically but the packages used
        // for Hebrew and Farsi (Arabi) do not.
@@ -415,7 +430,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
                }
                os << '\\'
                   << LaTeXSizeNames[f.size()]
-                  << ' ';
+                  << '{';
                count += strlen(LaTeXSizeNames[f.size()]) + 2;
        }
        return count;
@@ -425,7 +440,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
                                  OutputParams const & runparams,
                                  Font const & base,
                                  Font const & next,
@@ -500,6 +515,8 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
                        os << '}';
                        ++count;
                }
+               os << '}';
+               ++count;
        }
 
        // When the current language is Hebrew, Arabic, or Farsi
@@ -518,7 +535,7 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
                // We need to close the encoding even if it does not change
                // to do correct environment nesting
                Encoding const * const ascii = encodings.fromLyXName("ascii");
-               pair<bool, int> const c = switchEncoding(os, bparams,
+               pair<bool, int> const c = switchEncoding(os.os(), bparams,
                                runparams, *ascii);
                LASSERT(c.first, /**/);
                count += c.second;
@@ -526,8 +543,9 @@ int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
                open_encoding_ = false;
        }
 
-       if (closeLanguage &&
-                       language() != base.language() && language() != next.language()) {
+       if (closeLanguage
+           && language() != base.language() && language() != next.language()
+           && language()->encoding()->package() != Encoding::CJK) {
                os << '}';
                ++count;
        }
@@ -688,9 +706,10 @@ void Font::validate(LaTeXFeatures & features) const
 
        // FIXME: Do something for background and soul package?
 
-       if (lang_->babel() != doc_language->babel() &&
-               lang_ != ignore_language &&
-               lang_ != latex_language)
+       if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
+            || (features.useBabel() && lang_->babel() != doc_language->babel()))
+           && lang_ != ignore_language
+           && lang_ != latex_language)
        {
                features.useLanguage(lang_);
                LYXERR(Debug::LATEX, "Found language " << lang_->lang());