X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=ab6dc162b972f10288627e660324043ddb31018f;hb=a617e0d978b460f5529737da1f1c73088e45a6eb;hp=563e3bb8c59249da50d2bbbe233df0328793458a;hpb=77e706c44175f3cf71473a42d5db890c77b3b7b3;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 563e3bb8c5..ab6dc162b9 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -1,108 +1,117 @@
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- * 	 
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+/**
+ * \file src/lyxfont.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author André Pönitz
+ * \author Dekel Tsur
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
-#include <clocale>
-
-#ifdef __GNUG__
-#pragma implementation "lyxfont.h"
-#endif
 
-#include <cctype>
-
-#include "gettext.h"
 #include "lyxfont.h"
+
+#include "bufferparams.h" // stateText
 #include "debug.h"
-#include "lyxrc.h"
+#include "gettext.h"
+#include "language.h"
+#include "LColor.h"
 #include "lyxlex.h"
-#include "FontLoader.h"
+#include "lyxrc.h"
+
 #include "support/lstrings.h"
 
-using std::ostream;
+
+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;
+#endif
 
 //
 // Names for the GUI
 //
 
-static
-char const * GUIFamilyNames[6] = 
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
-  N_("Ignore") };
+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", "esint",
+  N_("Inherit"), N_("Ignore") };
 
-static
-char const * GUISeriesNames[4] = 
+char const * GUISeriesNames[4] =
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-static
-char const * GUIShapeNames[6] = 
+char const * GUIShapeNames[6] =
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-static
-char const * GUISizeNames[14] = 
+char const * GUISizeNames[14] =
 { 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_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
   N_("Inherit"), N_("Ignore") };
- 
-static
-char const * GUIMiscNames[5] = 
+
+char const * GUIMiscNames[5] =
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
 
 //
 // Strings used to read and write .lyx format files
 //
-static
-char const * LyXFamilyNames[6] = 
-{ "roman", "sans", "typewriter", "symbol", "default", "error" };
+char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
+{ "roman", "sans", "typewriter", "symbol",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
+  "default", "error" };
 
-static
-char const * LyXSeriesNames[4] = 
+char const * LyXSeriesNames[4] =
 { "medium", "bold", "default", "error" };
 
-static
-char const * LyXShapeNames[6] = 
+char const * LyXShapeNames[6] =
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
 
-static
-char const * LyXSizeNames[14] = 
+char const * LyXSizeNames[14] =
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
-  "larger", "largest", "huge", "giant", 
-  "increase-error", "decrease-error", "default", "error" };
+  "larger", "largest", "huge", "giant",
+  "increase", "decrease", "default", "error" };
 
-static
-char const * LyXMiscNames[5] = 
+char const * LyXMiscNames[5] =
 { "off", "on", "toggle", "default", "error" };
 
 //
 // Strings used to write LaTeX files
 //
-static
-char const * LaTeXFamilyNames[6] = 
+char const * LaTeXFamilyNames[6] =
 { "textrm", "textsf", "texttt", "error1", "error2", "error3" };
 
-static
-char const * LaTeXSeriesNames[4] = 
+char const * LaTeXSeriesNames[4] =
 { "textmd", "textbf", "error4", "error5" };
 
-static
-char const * LaTeXShapeNames[6] = 
+char const * LaTeXShapeNames[6] =
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-static
-char const * LaTeXSizeNames[14] = 
+char const * LaTeXSizeNames[14] =
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
 
+} // namespace anon
+
 
+// Initialize static member
 LyXFont::FontBits LyXFont::sane = {
 	ROMAN_FAMILY,
 	MEDIUM_SERIES,
@@ -114,6 +123,7 @@ LyXFont::FontBits LyXFont::sane = {
 	OFF,
 	OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::inherit = {
 	INHERIT_FAMILY,
 	INHERIT_SERIES,
@@ -123,8 +133,9 @@ LyXFont::FontBits LyXFont::inherit = {
 	INHERIT,
 	INHERIT,
 	INHERIT,
-	INHERIT };
+	OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::ignore = {
 	IGNORE_FAMILY,
 	IGNORE_SERIES,
@@ -137,28 +148,138 @@ LyXFont::FontBits LyXFont::ignore = {
 	IGNORE };
 
 
-bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+		LyXFont::FontBits const & rhs)
+{
+	return lhs.family == rhs.family &&
+		lhs.series == rhs.series &&
+		lhs.shape == rhs.shape &&
+		lhs.size == rhs.size &&
+		lhs.color == rhs.color &&
+		lhs.emph == rhs.emph &&
+		lhs.underbar == rhs.underbar &&
+		lhs.noun == rhs.noun &&
+		lhs.number == rhs.number;
+}
+
+
+LyXFont::LyXFont()
+	: bits(sane), lang(default_language)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT1)
+	: bits(inherit), lang(default_language)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT2)
+	: bits(ignore), lang(ignore_language)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT3)
+	: bits(sane), lang(default_language)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT1, Language const * l)
+	: bits(inherit), lang(l)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT2, Language const * l)
+	: bits(ignore), lang(l)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
+	: bits(sane), lang(l)
+{}
+
+
+
+LColor_color LyXFont::color() const
+{
+	return LColor::color(bits.color);
+}
+
+
+bool LyXFont::isRightToLeft() const
+{
+	return lang->rightToLeft();
+}
+
+
+bool LyXFont::isVisibleRightToLeft() const
+{
+	return (lang->rightToLeft() &&
+		number() != ON);
+}
+
+
+void LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+{
+	bits.family = f;
+}
+
+
+void LyXFont::setSeries(LyXFont::FONT_SERIES s)
+{
+	bits.series = s;
+}
+
+
+void LyXFont::setShape(LyXFont::FONT_SHAPE s)
+{
+	bits.shape = s;
+}
+
+
+void LyXFont::setSize(LyXFont::FONT_SIZE s)
+{
+	bits.size = s;
+}
+
+
+void LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
 {
-			return fb1.family == family &&
-				fb1.series == series &&
-				fb1.shape == shape &&
-				fb1.size == size &&
-				fb1.color == color &&
-				fb1.emph == emph &&
-				fb1.underbar == underbar &&
-				fb1.noun == noun &&
-				fb1.latex == latex;
+	bits.emph = e;
 }
 
 
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
+void LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
 {
-	return !(fb1 == *this);
+	bits.underbar = u;
+}
+
+
+void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+{
+	bits.noun = n;
+}
+
+
+void LyXFont::setColor(LColor_color c)
+{
+	bits.color = int(c);
+}
+
+
+void LyXFont::setLanguage(Language const * l)
+{
+	lang = l;
+}
+
+
+void LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+{
+	bits.number = n;
 }
 
 
 /// Decreases font size by one
-LyXFont & LyXFont::decSize() 
+LyXFont & LyXFont::decSize()
 {
 	switch (size()) {
 	case SIZE_HUGER:        setSize(SIZE_HUGE);     break;
@@ -189,9 +310,9 @@ LyXFont & LyXFont::decSize()
 
 
 /// Increases font size by one
-LyXFont & LyXFont::incSize() 
+LyXFont & LyXFont::incSize()
 {
-	switch(size()) {
+	switch (size()) {
 	case SIZE_HUGER:	break;
 	case SIZE_HUGE:         setSize(SIZE_HUGER);    break;
 	case SIZE_LARGEST:      setSize(SIZE_HUGE);     break;
@@ -220,7 +341,7 @@ LyXFont & LyXFont::incSize()
 
 
 /// Updates a misc setting according to request
-LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont, 
+LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 					  FONT_MISC_STATE org)
 {
 	if (newfont == TOGGLE) {
@@ -235,16 +356,17 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 		}
 	} else if (newfont == IGNORE)
 		return org;
-	else 
+	else
 		return newfont;
 }
 
 
 /// Updates font settings according to request
 void LyXFont::update(LyXFont const & newfont,
-		     Language const * document_language, bool toggleall)
+		     Language const * document_language,
+		     bool toggleall)
 {
-	if(newfont.family() == family() && toggleall)
+	if (newfont.family() == family() && toggleall)
 		setFamily(INHERIT_FAMILY); // toggle 'back'
 	else if (newfont.family() != IGNORE_FAMILY)
 		setFamily(newfont.family());
@@ -263,11 +385,11 @@ void LyXFont::update(LyXFont const & newfont,
 	case INHERIT_SERIES:
 		setSeries(newfont.series());
 		break;
-	case IGNORE_SERIES: 
+	case IGNORE_SERIES:
 		break;
 	}
 
-	if(newfont.shape() == shape() && toggleall)
+	if (newfont.shape() == shape() && toggleall)
 		setShape(INHERIT_SHAPE); // toggle 'back'
 	else if (newfont.shape() != IGNORE_SHAPE)
 		setShape(newfont.shape());
@@ -278,8 +400,6 @@ void LyXFont::update(LyXFont const & newfont,
 			incSize();
 		else if (newfont.size() == DECREASE_SIZE)
 			decSize();
-		else if (newfont.size() == size() && toggleall)
-			setSize(INHERIT_SIZE); // toggle 'back'
 		else
 			setSize(newfont.size());
 	}
@@ -287,16 +407,15 @@ void LyXFont::update(LyXFont const & newfont,
 	setEmph(setMisc(newfont.emph(), emph()));
 	setUnderbar(setMisc(newfont.underbar(), underbar()));
 	setNoun(setMisc(newfont.noun(), noun()));
-	setLatex(setMisc(newfont.latex(), latex()));
-
-	if (newfont.language() != ignore_language)
-		if (language() == newfont.language())
-			if (language() == document_language)
-				setLanguage(default_language);
-			else
-				setLanguage(document_language);
+
+	setNumber(setMisc(newfont.number(), number()));
+	if (newfont.language() == language() && toggleall)
+		if (language() == document_language)
+			setLanguage(default_language);
 		else
-			setLanguage(newfont.language());
+			setLanguage(document_language);
+	else if (newfont.language() != ignore_language)
+		setLanguage(newfont.language());
 
 	if (newfont.color() == color() && toggleall)
 		setColor(LColor::inherit); // toggle 'back'
@@ -322,8 +441,6 @@ void LyXFont::reduce(LyXFont const & tmplt)
 		setUnderbar(INHERIT);
 	if (noun() == tmplt.noun())
 		setNoun(INHERIT);
-	if (latex() == tmplt.latex())
-		setLatex(INHERIT);
 	if (color() == tmplt.color())
 		setColor(LColor::inherit);
 }
@@ -336,34 +453,30 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
 		bits = tmplt.bits;
 		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.latex == INHERIT) {
-		bits.latex = tmplt.bits.latex;
-	}
-	if (bits.color == LColor::inherit) {
+
+	if (bits.color == LColor::inherit)
 		bits.color = tmplt.bits.color;
-	}
 
 	return *this;
 }
@@ -374,70 +487,59 @@ bool LyXFont::resolved() const
 {
 	return (family() != INHERIT_FAMILY && series() != INHERIT_SERIES &&
 		shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
-		emph() != INHERIT && underbar() != INHERIT && 
-		noun() != INHERIT && latex() != INHERIT && 
+		emph() != INHERIT && underbar() != INHERIT &&
+		noun() != INHERIT &&
 		color() != LColor::inherit);
 }
 
 
 /// Build GUI description of font state
-string LyXFont::stateText() const
+string const LyXFont::stateText(BufferParams * params) const
 {
-#ifdef HAVE_SSTREAM
-	std::ostringstream ost;
-#else
-	char str[1024];
-	ostrstream ost(str, 1024);
-#endif
+	ostringstream os;
 	if (family() != INHERIT_FAMILY)
-		ost << _(GUIFamilyNames[family()]) << ", ";
+		os << to_utf8(_(GUIFamilyNames[family()])) << ", ";
 	if (series() != INHERIT_SERIES)
-		ost << _(GUISeriesNames[series()]) << ", ";
+		os << to_utf8(_(GUISeriesNames[series()])) << ", ";
 	if (shape() != INHERIT_SHAPE)
-		ost << _(GUIShapeNames[shape()]) << ", ";
+		os << to_utf8(_(GUIShapeNames[shape()])) << ", ";
 	if (size() != INHERIT_SIZE)
-		ost << _(GUISizeNames[size()]) << ", ";
+		os << to_utf8(_(GUISizeNames[size()])) << ", ";
 	if (color() != LColor::inherit)
-		ost << lcolor.getGUIName(color()) << ", ";
+		os << lcolor.getGUIName(color()) << ", ";
 	if (emph() != INHERIT)
-		ost << _("Emphasis ")
-		    << _(GUIMiscNames[emph()]) << ", ";
+		os << to_utf8(bformat(_("Emphasis %1$s, "),
+			      _(GUIMiscNames[emph()])));
 	if (underbar() != INHERIT)
-		ost << _("Underline ")
-		    << _(GUIMiscNames[underbar()]) << ", ";
+		os << to_utf8(bformat(_("Underline %1$s, "),
+			      _(GUIMiscNames[underbar()])));
 	if (noun() != INHERIT)
-		ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
-	if (latex() != INHERIT)
-		ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
-	//if (buf.empty())
-	//	ost << _("Default");
-	unsigned int opos = ost.tellp();
-	lyxerr << "Opos: " << opos << endl;
-	if (opos == 0)
-		ost << _("Default") << ", ";
-	ost << _("Language: ") << _(language()->display.c_str());
-#ifdef HAVE_SSTREAM
-	string buf(ost.str().c_str());
-#else
-	ost << '\0';
-	string buf(ost.str());
-#endif
-	buf = strip(buf, ' ');
-	buf = strip(buf, ',');
-	return buf;
+		os << to_utf8(bformat(_("Noun %1$s, "),
+			      _(GUIMiscNames[noun()])));
+	if (bits == inherit)
+		os << to_utf8(_("Default")) << ", ";
+	if (!params || (language() != params->language))
+		os << to_utf8(bformat(_("Language: %1$s, "),
+			      _(language()->display())));
+	if (number() != OFF)
+		os << to_utf8(bformat(_("  Number %1$s"),
+				_(GUIMiscNames[number()])));
+	return rtrim(os.str(), ", ");
 }
 
 
 // Set family according to lyx format string
 LyXFont & LyXFont::setLyXFamily(string const & fam)
 {
-	string s = lowercase(fam);
+	string const s = ascii_lowercase(fam);
 
 	int i = 0;
-	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
-	if (s == LyXFamilyNames[i]) {
+	while (LyXFamilyNames[i] != s &&
+	       LyXFamilyNames[i] != string("error"))
+		++i;
+	if (s == LyXFamilyNames[i])
 		setFamily(LyXFont::FONT_FAMILY(i));
-	} else
+	else
 		lyxerr << "LyXFont::setLyXFamily: Unknown family `"
 		       << s << '\'' << endl;
 	return *this;
@@ -447,10 +549,11 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 // Set series according to lyx format string
 LyXFont & LyXFont::setLyXSeries(string const & ser)
 {
-	string s = lowercase(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
@@ -463,13 +566,14 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 // Set shape according to lyx format string
 LyXFont & LyXFont::setLyXShape(string const & sha)
 {
-	string s = lowercase(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;
@@ -479,9 +583,10 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 // Set size according to lyx format string
 LyXFont & LyXFont::setLyXSize(string const & siz)
 {
-	string s = lowercase(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
@@ -494,9 +599,10 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 // Set size according to lyx format string
 LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
-	string s = lowercase(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 `"
@@ -513,20 +619,8 @@ LyXFont & LyXFont::setLyXColor(string const & col)
 }
 
 
-/// Sets size after GUI name
-LyXFont & LyXFont::setGUISize(string const & siz)
-{
-#warning this might be wrong.
-	/// ??????
-	// this is how it was how it was done in the lyx repository...
-	// but this does not make sense.
-	setColor(lcolor.getFromGUIName(siz));
-	return *this;
-}
-
-
 // Returns size in latex format
-string LyXFont::latexSize() const
+string const LyXFont::latexSize() const
 {
 	return LaTeXSizeNames[size()];
 }
@@ -538,9 +632,9 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 {
 	bool error = false;
 	bool finished = false;
-	while (!finished && lex.IsOK() && !error) {
+	while (!finished && lex.isOK() && !error) {
 		lex.next();
-		string tok = lowercase(lex.GetString());
+		string const tok = ascii_lowercase(lex.getString());
 
 		if (tok.empty()) {
 			continue;
@@ -548,54 +642,43 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 			finished = true;
 		} else if (tok == "family") {
 			lex.next();
-			string tok = lex.GetString();
-			setLyXFamily(tok);
+			string const ttok = lex.getString();
+			setLyXFamily(ttok);
 		} else if (tok == "series") {
 			lex.next();
-			string tok = lex.GetString();
-			setLyXSeries(tok);
+			string const ttok = lex.getString();
+			setLyXSeries(ttok);
 		} else if (tok == "shape") {
 			lex.next();
-			string tok = lex.GetString();
-			setLyXShape(tok);
+			string const ttok = lex.getString();
+			setLyXShape(ttok);
 		} else if (tok == "size") {
 			lex.next();
-			string tok = lex.GetString();
-			setLyXSize(tok);
-		} else if (tok == "latex") {
-			lex.next();
-			string tok = lowercase(lex.GetString());
-
-			if (tok == "no_latex") {
-				setLatex(OFF);
-			} else if (tok == "latex") {
-				setLatex(ON);
-			} else {
-				lex.printError("Illegal LaTeX type`$$Token'");
-			}
+			string const ttok = lex.getString();
+			setLyXSize(ttok);
 		} else if (tok == "misc") {
 			lex.next();
-			string tok = lowercase(lex.GetString());
+			string const ttok = ascii_lowercase(lex.getString());
 
-			if (tok == "no_bar") {
+			if (ttok == "no_bar") {
 				setUnderbar(OFF);
-			} else if (tok == "no_emph") {
+			} else if (ttok == "no_emph") {
 				setEmph(OFF);
-			} else if (tok == "no_noun") {
+			} else if (ttok == "no_noun") {
 				setNoun(OFF);
-			} else if (tok == "emph") {
+			} else if (ttok == "emph") {
 				setEmph(ON);
-			} else if (tok == "underbar") {
+			} else if (ttok == "underbar") {
 				setUnderbar(ON);
-			} else if (tok == "noun") {
+			} else if (ttok == "noun") {
 				setNoun(ON);
 			} else {
 				lex.printError("Illegal misc type `$$Token´");
 			}
 		} else if (tok == "color") {
 			lex.next();
-			string tok = lex.GetString();
-			setLyXColor(tok);
+			string const ttok = lex.getString();
+			setLyXColor(ttok);
 		} else {
 			lex.printError("Unknown tag `$$Token'");
 			error = true;
@@ -606,34 +689,32 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 
 
 /// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
+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.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;
@@ -641,30 +722,14 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
 		}
 	}
 	if (orgfont.noun() != noun()) {
-		os << "\\noun " << LyXMiscNames[noun()] << " \n";
-	}
-	if (orgfont.latex() != latex()) {
-		// This is only for backwards compatibility
-		switch (latex()) {
-		case OFF:	os << "\\latex no_latex \n"; break;
-		case ON:        os << "\\latex latex \n"; break;
-		case TOGGLE:	lyxerr << "LyXFont::lyxWriteFontChanges: "
-					"TOGGLE should not appear here!"
-				       << endl;
-		break;
-		case INHERIT:   os << "\\latex default \n"; break;
-		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
-					"IGNORE should not appear here!"
-				       << endl;
-		break;
-		}
-	}
-	if (orgfont.color() != color()) {
-		os << "\\color " << lcolor.getLyXName(color()) << "\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";
+			os << "\\lang " << language()->lang() << "\n";
 		else
 			os << "\\lang unknown\n";
 	}
@@ -673,36 +738,40 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
+int LyXFont::latexWriteStartChanges(odocstream & os, LyXFont const & base,
 				    LyXFont const & prev) const
 {
 	int count = 0;
 	bool env = false;
 
-	if (language() != base.language() && language() != prev.language()) {
+	if (language()->babel() != base.language()->babel() &&
+	    language() != prev.language()) {
 		if (isRightToLeft() != prev.isRightToLeft()) {
 			if (isRightToLeft()) {
 				os << "\\R{";
 				count += 3;
-				env = true; //We have opened a new environment
 			} else {
 				os << "\\L{";
 				count += 3;
-				env = true; //We have opened a new environment
 			}
 		} else {
-			string tmp = '{' + 
-				subst(lyxrc.language_command_begin,
-				      "$$lang", language()->lang);
-			os << tmp;
+			string const tmp =
+				subst(lyxrc.language_command_local,
+				      "$$lang", language()->babel());
+			os << from_ascii(tmp);
 			count += tmp.length();
-			env = true; //We have opened a new environment
 		}
 	}
 
+	if (number() == ON && prev.number() != ON &&
+	    language()->lang() == "hebrew") {
+		os << "{\\beginL ";
+		count += 9;
+	}
+
 	LyXFont f = *this;
 	f.reduce(base);
-	
+
 	if (f.family() != INHERIT_FAMILY) {
 		os << '\\'
 		   << LaTeXFamilyNames[f.family()]
@@ -724,9 +793,9 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 		count += strlen(LaTeXShapeNames[f.shape()]) + 2;
 		env = true; //We have opened a new environment
 	}
-	if (f.color() != LColor::inherit) {
+	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
@@ -744,7 +813,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 	// \noun{} is a LyX special macro
 	if (f.noun() == ON) {
 		os << "\\noun{";
-		count += 8;
+		count += 6;
 		env = true; //We have opened a new environment
 	}
 	if (f.size() != INHERIT_SIZE) {
@@ -765,23 +834,17 @@ 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,
+int LyXFont::latexWriteEndChanges(odocstream & os, LyXFont const & base,
 				  LyXFont const & next) const
 {
 	int count = 0;
 	bool env = false;
 
-	if (language() != base.language() && language() != next.language()) {
-		os << "}";
-		++count;
-		env = true; // Size change need not bother about closing env.
-	}
-
-	LyXFont f = *this; // why do you need this?
-	f.reduce(base); // why isn't this just "reduce(base);" (Lgb)
-	// Because this function is const. Everything breaks if this
-	// method changes the font it represents. There is no speed penalty
-	// by using the temporary. (Asger)
+	// reduce the current font to changes against the base
+	// font (of the layout). We use a temporary for this to
+	// avoid changing this font instance, as that would break
+	LyXFont f = *this;
+	f.reduce(base);
 
 	if (f.family() != INHERIT_FAMILY) {
 		os << '}';
@@ -798,7 +861,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.color() != LColor::inherit) {
+	if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
 		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
@@ -826,46 +889,49 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 		}
 	}
 
+	if (number() == ON && next.number() != ON &&
+	    language()->lang() == "hebrew") {
+		os << "\\endL}";
+		count += 6;
+	}
+
+	if (language() != base.language() && language() != next.language()) {
+		os << '}';
+		++count;
+	}
+
 	return count;
 }
 
 
-LColor::color LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
-	if (latex() == ON)
-		return LColor::latex;
 	if (color() == LColor::none)
 		return LColor::foreground;
 	return color();
 }
 
 
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
+ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
 {
-	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;
+	return os << int(fms);
 }
 
 
-bool LyXFont::equalExceptLatex(LyXFont const & f) const 
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
 {
-	LyXFont f1 = *this;
-	f1.setLatex(f.latex());
-	return f1 == f;
+	return os << "font:"
+		<< " family " << font.bits.family
+		<< " series " << font.bits.series
+		<< " shape " << font.bits.shape
+		<< " size " << font.bits.size
+		<< " color " << font.bits.color
+		<< " emph " << font.bits.emph
+		<< " underbar " << font.bits.underbar
+		<< " noun " << font.bits.noun
+		<< " number " << font.bits.number
+		<< " lang: " << (font.lang ? font.lang->lang() : 0);
 }
 
 
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
-{
-	return o << int(fms);
-}
+} // namespace lyx