X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=a6580fda216f3fd51ad175f6dd3061f4f60c7409;hb=02d2e4aa3279b872c9786718dab4f95fd44e900a;hp=b8a6a295310078972e99ed1dd9354eeb3574aa91;hpb=57dc817581faf54babaf3db0c602bac205dc6855;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index b8a6a29531..a6580fda21 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -49,33 +49,10 @@ 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
-//
+extern char const * GUIMiscNames[5];
 
 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", "rsfs", "stmry",
-  "wasy", "esint", N_("Inherit"), N_("Ignore") };
-
-char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] =
-{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-
-char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] =
-{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
-  N_("Ignore") };
-
-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") };
-
-char const * GUIMiscNames[5] =
-{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
-
 //
 // Strings used to write LaTeX files
 //
@@ -143,57 +120,17 @@ void Font::update(Font const & newfont,
 }
 
 
-docstring const stateText(FontInfo const & f)
+docstring const Font::stateText(BufferParams * params, bool const terse) const
 {
 	odocstringstream os;
-	if (f.family() != INHERIT_FAMILY)
-		os << _(GUIFamilyNames[f.family()]) << ", ";
-	if (f.series() != INHERIT_SERIES)
-		os << _(GUISeriesNames[f.series()]) << ", ";
-	if (f.shape() != INHERIT_SHAPE)
-		os << _(GUIShapeNames[f.shape()]) << ", ";
-	if (f.size() != FONT_SIZE_INHERIT)
-		os << _(GUISizeNames[f.size()]) << ", ";
-	if (f.color() != Color_inherit)
-		os << lcolor.getGUIName(f.color()) << ", ";
-	// FIXME: uncomment this when we support background.
-	//if (f.background() != Color_inherit)
-	//	os << lcolor.getGUIName(f.background()) << ", ";
-	if (f.emph() != FONT_INHERIT)
-		os << bformat(_("Emphasis %1$s, "),
-			      _(GUIMiscNames[f.emph()]));
-	if (f.underbar() != FONT_INHERIT)
-		os << bformat(_("Underline %1$s, "),
-			      _(GUIMiscNames[f.underbar()]));
-	if (f.strikeout() != FONT_INHERIT)
-		os << bformat(_("Strike out %1$s, "),
-			      _(GUIMiscNames[f.strikeout()]));
-	if (f.xout() != FONT_INHERIT)
-		os << bformat(_("Cross out %1$s, "),
-			      _(GUIMiscNames[f.xout()]));
-	if (f.uuline() != FONT_INHERIT)
-		os << bformat(_("Double underline %1$s, "),
-			      _(GUIMiscNames[f.uuline()]));
-	if (f.uwave() != FONT_INHERIT)
-		os << bformat(_("Wavy underline %1$s, "),
-			      _(GUIMiscNames[f.uwave()]));
-	if (f.noun() != FONT_INHERIT)
-		os << bformat(_("Noun %1$s, "),
-			      _(GUIMiscNames[f.noun()]));
-	if (f == inherit_font)
-		os << _("Default") << ", ";
-
-	return os.str();
-}
-
-
-docstring const Font::stateText(BufferParams * params) const
-{
-	odocstringstream os;
-	os << lyx::stateText(bits_);
-	if (!params || (language() != params->language))
+	os << bits_.stateText(terse);
+	if ((!params || (language() != params->language))
+	    && (!terse || language() != ignore_language)) {
+		// reset_language is a null pointer!
 		os << bformat(_("Language: %1$s, "),
-			      _(language()->display()));
+			      (language() == reset_language) ? _("Default")
+							     : _(language()->display()));
+	}
 	if (bits_.number() != FONT_OFF)
 		os << "  " << bformat(_("Number %1$s"),
 			      _(GUIMiscNames[bits_.number()]));
@@ -221,6 +158,7 @@ void Font::lyxWriteChanges(Font const & orgfont,
 		os << "\\shape " << LyXShapeNames[bits_.shape()] << "\n";
 	if (orgfont.fontInfo().size() != bits_.size())
 		os << "\\size " << LyXSizeNames[bits_.size()] << "\n";
+	// FIXME: shall style be handled there? Probably not.
 	if (orgfont.fontInfo().emph() != bits_.emph())
 		os << "\\emph " << LyXMiscNames[bits_.emph()] << "\n";
 	if (orgfont.fontInfo().number() != bits_.number())
@@ -349,21 +287,6 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		}
 	}
 
-	// If the current language is Hebrew, Arabic, or Farsi
-	// the numbers are written Left-to-Right. ArabTeX package
-	// and bidi (polyglossia) reorder the number automatically
-	// but the packages used for Hebrew and Farsi (Arabi) do not.
-	if (!runparams.use_polyglossia
-	    && !runparams.pass_thru
-	    && bits_.number() == FONT_ON
-	    && prev.fontInfo().number() != FONT_ON
-	    && (language()->lang() == "hebrew"
-		|| language()->lang() == "farsi"
-		|| language()->lang() == "arabic_arabi")) {
-		os << "{\\beginL ";
-		count += 9;
-	}
-
 	FontInfo f = bits_;
 	f.reduce(base.bits_);
 	FontInfo p = bits_;
@@ -413,6 +336,26 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		env = true; //We have opened a new environment
 	}
 	*/
+	// If the current language is Hebrew, Arabic, or Farsi
+	// the numbers are written Left-to-Right. ArabTeX package
+	// and bidi (polyglossia with XeTeX) reorder the number automatically
+	// but the packages used for Hebrew and Farsi (Arabi) do not.
+	if (!runparams.useBidiPackage()
+	    && !runparams.pass_thru
+	    && bits_.number() == FONT_ON
+	    && prev.fontInfo().number() != FONT_ON
+	    && (language()->lang() == "hebrew"
+		|| language()->lang() == "farsi"
+		|| language()->lang() == "arabic_arabi")) {
+		if (runparams.use_polyglossia) {
+			// LuaTeX/luabidi
+			os << "\\LR{";
+			count += 5;
+		} else {
+			os << "{\\beginL ";
+			count += 9;
+		}
+	}
 	if (f.emph() == FONT_ON) {
 		os << "\\emph{";
 		count += 6;
@@ -424,7 +367,7 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 6;
 		env = true; //We have opened a new environment
 	}
-	if (f.size() != FONT_SIZE_INHERIT) {
+	if (f.size() != INHERIT_SIZE) {
 		// If we didn't open an environment above, we open one here
 		if (!env) {
 			os << '{';
@@ -522,7 +465,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.size() != FONT_SIZE_INHERIT) {
+	if (f.size() != INHERIT_SIZE) {
 		// We only have to close if only size changed
 		if (!env) {
 			if (needPar && !closeLanguage) {
@@ -562,17 +505,23 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 
 	// If the current language is Hebrew, Arabic, or Farsi
 	// the numbers are written Left-to-Right. ArabTeX package
-	// and bidi (polyglossia) reorder the number automatically
+	// and bidi (polyglossia with XeTeX) reorder the number automatically
 	// but the packages used for Hebrew and Farsi (Arabi) do not.
-	if (!runparams.use_polyglossia
+	if (!runparams.useBidiPackage()
 	    && !runparams.pass_thru
 	    && bits_.number() == FONT_ON
 	    && next.fontInfo().number() != FONT_ON
 	    && (language()->lang() == "hebrew"
 		|| language()->lang() == "farsi"
 		|| language()->lang() == "arabic_arabi")) {
-		os << "\\endL}";
-		count += 6;
+		if (runparams.use_polyglossia) {
+			// LuaTeX/luabidi
+			os << "}";
+			count += 1;
+		} else {
+			os << "\\endL}";
+			count += 6;
+		}
 	}
 
 	if (open_encoding_) {
@@ -589,7 +538,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 
 	if (closeLanguage
 	    && language() != base.language() && language() != next.language()
-	    && language()->encoding()->package() != Encoding::CJK) {
+	    && (language()->encoding()->package() != Encoding::CJK)) {
 		os << '}';
 		++count;
 		bool const using_begin_end =
@@ -659,7 +608,7 @@ bool Font::fromString(string const & data, bool & toggle)
 		} else if (token == "size") {
 			int const next = lex.getInteger();
 			bits_.setSize(FontSize(next));
-
+		// FIXME: shall style be handled there? Probably not.
 		} else if (token == "emph" || token == "underbar"
 			|| token == "noun" || token == "number"
 			|| token == "uuline" || token == "uwave"
@@ -724,32 +673,32 @@ void Font::validate(LaTeXFeatures & features) const
 	if (bits_.noun() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.noun: " << bits_.noun());
 		features.require("noun");
-		LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.underbar() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.strikeout() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.xout() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.uuline() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText()));
 	}
 	if (bits_.uwave() == FONT_ON) {
 		LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
 		features.require("ulem");
-		LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+		LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText()));
 	}
 	switch (bits_.color()) {
 		case Color_none:
@@ -775,7 +724,7 @@ void Font::validate(LaTeXFeatures & features) const
 			break;
 		default:
 			features.require("color");
-			LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
+			LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText()));
 	}
 
 	// FIXME: Do something for background and soul package?
@@ -805,6 +754,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 		<< " series " << f.series()
 		<< " shape " << f.shape()
 		<< " size " << f.size()
+		<< " style " << f.style()
 		<< " color " << f.color()
 		// FIXME: uncomment this when we support background.
 		//<< " background " << f.background()
@@ -823,7 +773,7 @@ ostream & operator<<(ostream & os, FontInfo const & f)
 ostream & operator<<(ostream & os, Font const & font)
 {
 	return os << font.bits_
-		<< " lang: " << (font.lang_ ? font.lang_->lang() : 0);
+		<< " lang: " << (font.lang_ ? font.lang_->lang() : nullptr);
 }