X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=46cba97231dfea6949b0cb8875f2e54b1894cd5f;hb=3dfe917a4ed504de29ac18028936d02f856c92b1;hp=f3f3b0e2a10e254091a4d67052432ddd99615a4e;hpb=bd3dcea835d11af58eae6dde8d459c8fa56138e7;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index f3f3b0e2a1..46cba97231 100644
--- 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(), ", ");
 }
@@ -275,7 +275,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 
 	// polyglossia or babel?
 	if (runparams.use_polyglossia
-	    && language()->polyglossia() != base.language()->polyglossia()
+	    && language()->lang() != base.language()->lang()
 	    && language() != prev.language()) {
 		if (!language()->polyglossia().empty()) {
 			string tmp = "\\text" + language()->polyglossia();
@@ -438,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,
@@ -531,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;