Avoid too much verbosity.

[lyx.git] / src / Font.cpp

diff --git a/src/Font.cpp b/src/Font.cpp
index bf99b3e6582e5158719afdc5102f19d5818b0438..46cba97231dfea6949b0cb8875f2e54b1894cd5f 100644 (file)
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -189,7 +189,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(), ", ");
 }
@@ -274,7 +274,9 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
        int count = 0;
 
        // polyglossia or babel?
-       if (runparams.use_polyglossia) {
+       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())
@@ -436,7 +438,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,
@@ -529,7 +531,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;