X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=3b5e883d23ebe492690d6efdac707c37bd1cda4b;hb=056550b31135c3812825c86719c4ceb7054910b5;hp=2ab85fd7b5f7e24ae88e404ad6243b8ee58102b7;hpb=8b67659646c6850377cb9f44a2a0a22c0e80840c;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 2ab85fd7b5..3b5e883d23 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -23,19 +23,21 @@
 #include "LColor.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
+#include "output_latex.h"
 
 #include "support/lstrings.h"
 
-using lyx::odocstream;
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::rtrim;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::ascii_lowercase;
+using support::bformat;
+using support::rtrim;
+using support::subst;
 
 using std::endl;
 using std::string;
 using std::ostream;
-using std::ostringstream;
 
 #ifndef CXX_GLOBAL_CSTD
 using std::strlen;
@@ -49,7 +51,7 @@ namespace {
 
 char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] =
@@ -73,7 +75,7 @@ char const * GUIMiscNames[5] =
 //
 char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   "default", "error" };
 
 char const * LyXSeriesNames[4] =
@@ -491,37 +493,36 @@ bool LyXFont::resolved() const
 }
 
 
-/// Build GUI description of font state
-string const LyXFont::stateText(BufferParams * params) const
+docstring const LyXFont::stateText(BufferParams * params) const
 {
-	ostringstream os;
+	odocstringstream os;
 	if (family() != INHERIT_FAMILY)
-		os << lyx::to_utf8(_(GUIFamilyNames[family()])) << ", ";
+		os << _(GUIFamilyNames[family()]) << ", ";
 	if (series() != INHERIT_SERIES)
-		os << lyx::to_utf8(_(GUISeriesNames[series()])) << ", ";
+		os << _(GUISeriesNames[series()]) << ", ";
 	if (shape() != INHERIT_SHAPE)
-		os << lyx::to_utf8(_(GUIShapeNames[shape()])) << ", ";
+		os << _(GUIShapeNames[shape()]) << ", ";
 	if (size() != INHERIT_SIZE)
-		os << lyx::to_utf8(_(GUISizeNames[size()])) << ", ";
+		os << _(GUISizeNames[size()]) << ", ";
 	if (color() != LColor::inherit)
 		os << lcolor.getGUIName(color()) << ", ";
 	if (emph() != INHERIT)
-		os << lyx::to_utf8(bformat(_("Emphasis %1$s, "),
-			      _(GUIMiscNames[emph()])));
+		os << bformat(_("Emphasis %1$s, "),
+		              _(GUIMiscNames[emph()]));
 	if (underbar() != INHERIT)
-		os << lyx::to_utf8(bformat(_("Underline %1$s, "),
-			      _(GUIMiscNames[underbar()])));
+		os << bformat(_("Underline %1$s, "),
+		              _(GUIMiscNames[underbar()]));
 	if (noun() != INHERIT)
-		os << lyx::to_utf8(bformat(_("Noun %1$s, "),
-			      _(GUIMiscNames[noun()])));
+		os << bformat(_("Noun %1$s, "),
+		              _(GUIMiscNames[noun()]));
 	if (bits == inherit)
-		os << lyx::to_utf8(_("Default")) << ", ";
+		os << _("Default") << ", ";
 	if (!params || (language() != params->language))
-		os << lyx::to_utf8(bformat(_("Language: %1$s, "),
-			      _(language()->display())));
+		os << bformat(_("Language: %1$s, "),
+		              _(language()->display()));
 	if (number() != OFF)
-		os << lyx::to_utf8(bformat(_("  Number %1$s"),
-				_(GUIMiscNames[number()])));
+		os << bformat(_("  Number %1$s"),
+		              _(GUIMiscNames[number()]));
 	return rtrim(os.str(), ", ");
 }
 
@@ -722,14 +723,8 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 	if (orgfont.noun() != noun()) {
 		os << "\\noun " << LyXMiscNames[noun()] << "\n";
 	}
-	if (orgfont.color() != color()) {
-		// To make us file compatible with older
-		// lyx versions we emit "default" instead
-		// of "inherit"
-		string col_str(lcolor.getLyXName(color()));
-		if (col_str == "inherit") col_str = "default";
-		os << "\\color " << col_str << "\n";
-	}
+	if (orgfont.color() != color())
+		os << "\\color " << lcolor.getLyXName(color()) << '\n';
 	if (orgfont.language() != language() &&
 	    language() != latex_language) {
 		if (language())
@@ -743,11 +738,13 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
 int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
-				    LyXFont const & prev) const
+                                    LyXFont const & prev,
+                                    BufferParams const & bparams) const
 {
-	int count = 0;
 	bool env = false;
 
+	int count = switchEncoding(os, bparams, *(prev.language()->encoding()),
+	                           *(language()->encoding()));
 	if (language()->babel() != base.language()->babel() &&
 	    language() != prev.language()) {
 		if (isRightToLeft() != prev.isRightToLeft()) {
@@ -762,7 +759,7 @@ int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
 			string const tmp =
 				subst(lyxrc.language_command_local,
 				      "$$lang", language()->babel());
-			os << lyx::from_ascii(tmp);
+			os << from_ascii(tmp);
 			count += tmp.length();
 		}
 	}
@@ -799,7 +796,7 @@ int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
 	}
 	if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
 		os << "\\textcolor{"
-		   << lyx::from_ascii(lcolor.getLaTeXName(f.color()))
+		   << from_ascii(lcolor.getLaTeXName(f.color()))
 		   << "}{";
 		count += lcolor.getLaTeXName(f.color()).length() + 13;
 		env = true; //We have opened a new environment
@@ -839,7 +836,8 @@ int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
 int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
-				  LyXFont const & next) const
+                                  LyXFont const & next,
+                                  BufferParams const & bparams) const
 {
 	int count = 0;
 	bool env = false;
@@ -903,6 +901,8 @@ int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
 		os << '}';
 		++count;
 	}
+	count += switchEncoding(os, bparams, *(language()->encoding()),
+	                        *(next.language()->encoding()));
 
 	return count;
 }
@@ -936,3 +936,6 @@ std::ostream & operator<<(std::ostream & os, LyXFont const & font)
 		<< " number " << font.bits.number
 		<< " lang: " << (font.lang ? font.lang->lang() : 0);
 }
+
+
+} // namespace lyx