X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=3b5e883d23ebe492690d6efdac707c37bd1cda4b;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=8ddc66ad54080466f2492fc8822ff531945c3619;hpb=5c3d9a254640468e40b2d30467a26222c91d856d;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 8ddc66ad54..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"
-#include "support/std_sstream.h"
 
-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] =
@@ -196,11 +198,6 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
 {}
 
 
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-	return bits.underbar;
-}
-
 
 LColor_color LyXFont::color() const
 {
@@ -208,27 +205,15 @@ LColor_color LyXFont::color() const
 }
 
 
-Language const * LyXFont::language() const
-{
-	return lang;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::number() const
-{
-	return bits.number;
-}
-
-
 bool LyXFont::isRightToLeft() const
 {
-	return lang->RightToLeft();
+	return lang->rightToLeft();
 }
 
 
 bool LyXFont::isVisibleRightToLeft() const
 {
-	return (lang->RightToLeft() &&
+	return (lang->rightToLeft() &&
 		number() != ON);
 }
 
@@ -469,30 +454,30 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
 		return *this;
 	}
 
-	if (bits.family == INHERIT_FAMILY) {
+	if (bits.family == INHERIT_FAMILY)
 		bits.family = tmplt.bits.family;
-	}
-	if (bits.series == INHERIT_SERIES) {
+
+	if (bits.series == INHERIT_SERIES)
 		bits.series = tmplt.bits.series;
-	}
-	if (bits.shape == INHERIT_SHAPE) {
+
+	if (bits.shape == INHERIT_SHAPE)
 		bits.shape = tmplt.bits.shape;
-	}
-	if (bits.size == INHERIT_SIZE) {
+
+	if (bits.size == INHERIT_SIZE)
 		bits.size = tmplt.bits.size;
-	}
-	if (bits.emph == INHERIT) {
+
+	if (bits.emph == INHERIT)
 		bits.emph = tmplt.bits.emph;
-	}
-	if (bits.underbar == INHERIT) {
+
+	if (bits.underbar == INHERIT)
 		bits.underbar = tmplt.bits.underbar;
-	}
-	if (bits.noun == INHERIT) {
+
+	if (bits.noun == INHERIT)
 		bits.noun = tmplt.bits.noun;
-	}
-	if (bits.color == LColor::inherit) {
+
+	if (bits.color == LColor::inherit)
 		bits.color = tmplt.bits.color;
-	}
+
 	return *this;
 }
 
@@ -508,10 +493,9 @@ 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 << _(GUIFamilyNames[family()]) << ", ";
 	if (series() != INHERIT_SERIES)
@@ -523,17 +507,22 @@ string const LyXFont::stateText(BufferParams * params) const
 	if (color() != LColor::inherit)
 		os << lcolor.getGUIName(color()) << ", ";
 	if (emph() != INHERIT)
-		os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
+		os << bformat(_("Emphasis %1$s, "),
+		              _(GUIMiscNames[emph()]));
 	if (underbar() != INHERIT)
-		os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
+		os << bformat(_("Underline %1$s, "),
+		              _(GUIMiscNames[underbar()]));
 	if (noun() != INHERIT)
-		os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
+		os << bformat(_("Noun %1$s, "),
+		              _(GUIMiscNames[noun()]));
 	if (bits == inherit)
 		os << _("Default") << ", ";
 	if (!params || (language() != params->language))
-		os << bformat(_("Language: %1$s, "), _(language()->display()));
+		os << bformat(_("Language: %1$s, "),
+		              _(language()->display()));
 	if (number() != OFF)
-		os << bformat(_("  Number %1$s"), _(GUIMiscNames[number()]));
+		os << bformat(_("  Number %1$s"),
+		              _(GUIMiscNames[number()]));
 	return rtrim(os.str(), ", ");
 }
 
@@ -544,7 +533,8 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 	string const s = ascii_lowercase(fam);
 
 	int i = 0;
-	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+	while (LyXFamilyNames[i] != s &&
+	       LyXFamilyNames[i] != string("error"))
 		++i;
 	if (s == LyXFamilyNames[i])
 		setFamily(LyXFont::FONT_FAMILY(i));
@@ -561,7 +551,8 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 	string const s = ascii_lowercase(ser);
 
 	int i = 0;
-	while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
+	while (LyXSeriesNames[i] != s &&
+	       LyXSeriesNames[i] != string("error")) ++i;
 	if (s == LyXSeriesNames[i]) {
 		setSeries(LyXFont::FONT_SERIES(i));
 	} else
@@ -577,10 +568,11 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 	string const s = ascii_lowercase(sha);
 
 	int i = 0;
-	while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
-	if (s == LyXShapeNames[i]) {
+	while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
+			++i;
+	if (s == LyXShapeNames[i])
 		setShape(LyXFont::FONT_SHAPE(i));
-	} else
+	else
 		lyxerr << "LyXFont::setLyXShape: Unknown shape `"
 		       << s << '\'' << endl;
 	return *this;
@@ -592,7 +584,8 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 {
 	string const s = ascii_lowercase(siz);
 	int i = 0;
-	while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
+	while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
+		++i;
 	if (s == LyXSizeNames[i]) {
 		setSize(LyXFont::FONT_SIZE(i));
 	} else
@@ -607,7 +600,8 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
 	string const s = ascii_lowercase(siz);
 	int i = 0;
-	while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
+	while (LyXMiscNames[i] != s &&
+	       LyXMiscNames[i] != string("error")) ++i;
 	if (s == LyXMiscNames[i])
 		return FONT_MISC_STATE(i);
 	lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `"
@@ -698,34 +692,28 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 			      ostream & os) const
 {
 	os << "\n";
-	if (orgfont.family() != family()) {
-		os << "\\family " << LyXFamilyNames[family()] << " \n";
-	}
-	if (orgfont.series() != series()) {
-		os << "\\series " << LyXSeriesNames[series()] << " \n";
-	}
-	if (orgfont.shape() != shape()) {
-		os << "\\shape " << LyXShapeNames[shape()] << " \n";
-	}
-	if (orgfont.size() != size()) {
-		os << "\\size " << LyXSizeNames[size()] << " \n";
-	}
-	if (orgfont.emph() != emph()) {
-		os << "\\emph " << LyXMiscNames[emph()] << " \n";
-	}
-	if (orgfont.number() != number()) {
-		os << "\\numeric " << LyXMiscNames[number()] << " \n";
-	}
+	if (orgfont.family() != family())
+		os << "\\family " << LyXFamilyNames[family()] << "\n";
+	if (orgfont.series() != series())
+		os << "\\series " << LyXSeriesNames[series()] << "\n";
+	if (orgfont.shape() != shape())
+		os << "\\shape " << LyXShapeNames[shape()] << "\n";
+	if (orgfont.size() != size())
+		os << "\\size " << LyXSizeNames[size()] << "\n";
+	if (orgfont.emph() != emph())
+		os << "\\emph " << LyXMiscNames[emph()] << "\n";
+	if (orgfont.number() != number())
+		os << "\\numeric " << LyXMiscNames[number()] << "\n";
 	if (orgfont.underbar() != underbar()) {
 		// This is only for backwards compatibility
 		switch (underbar()) {
-		case OFF:	os << "\\bar no \n"; break;
-		case ON:        os << "\\bar under \n"; break;
+		case OFF:	os << "\\bar no\n"; break;
+		case ON:        os << "\\bar under\n"; break;
 		case TOGGLE:	lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"TOGGLE should not appear here!"
 				       << endl;
 		break;
-		case INHERIT:   os << "\\bar default \n"; break;
+		case INHERIT:   os << "\\bar default\n"; break;
 		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"IGNORE should not appear here!"
 				       << endl;
@@ -733,17 +721,12 @@ 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";
+		os << "\\noun " << LyXMiscNames[noun()] << "\n";
 	}
-	if (orgfont.language() != language()) {
+	if (orgfont.color() != color())
+		os << "\\color " << lcolor.getLyXName(color()) << '\n';
+	if (orgfont.language() != language() &&
+	    language() != latex_language) {
 		if (language())
 			os << "\\lang " << language()->lang() << "\n";
 		else
@@ -754,12 +737,14 @@ 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(ostream & os, LyXFont const & base,
-				    LyXFont const & prev) const
+int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
+                                    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()) {
@@ -774,7 +759,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 			string const tmp =
 				subst(lyxrc.language_command_local,
 				      "$$lang", language()->babel());
-			os << tmp;
+			os << from_ascii(tmp);
 			count += tmp.length();
 		}
 	}
@@ -811,7 +796,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 	}
 	if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
 		os << "\\textcolor{"
-		   << 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
@@ -850,8 +835,9 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 /// Writes ending block of LaTeX needed to close use of this font
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
-int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
-				  LyXFont const & next) const
+int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
+                                  LyXFont const & next,
+                                  BufferParams const & bparams) const
 {
 	int count = 0;
 	bool env = false;
@@ -915,6 +901,8 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 		os << '}';
 		++count;
 	}
+	count += switchEncoding(os, bparams, *(language()->encoding()),
+	                        *(next.language()->encoding()));
 
 	return count;
 }
@@ -928,23 +916,6 @@ LColor_color LyXFont::realColor() const
 }
 
 
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
-{
-	register FONT_SHAPE s = shape();
-
-	if (emph() == ON) {
-		if (s == UP_SHAPE)
-			s = ITALIC_SHAPE;
-		else
-			s = UP_SHAPE;
-	}
-	if (noun() == ON)
-		s = SMALLCAPS_SHAPE;
-	return s;
-}
-
-
 ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
 {
 	return os << int(fms);
@@ -965,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