X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.C;h=0c783cb148bad8df1807953eb39bfb8ba778e03a;hb=bd659b25fb6e2df5d02273ee1ce4699aa5723e2e;hp=6bd290ead5297b2775c6a730e738d061a4540b8b;hpb=a040c0bc6f017d0591bbc7ad1aa590589dbc40ff;p=lyx.git

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 6bd290ead5..0c783cb148 100644
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -3,8 +3,8 @@
  * 
  *           LyX, The Document Processor
  * 	 
- *	    Copyright (C) 1995 Matthias Ettrich
- *          Copyright (C) 1995-1999 The LyX Team.
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
@@ -22,95 +22,144 @@
 #include "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
-#include "lyxdraw.h"
 #include "FontLoader.h"
 #include "support/lstrings.h"
+#include "bufferparams.h" // stateText
 
-extern LyXRC * lyxrc;
-
-// The global fontloader
-FontLoader fontloader;
+using std::ostream;
+using std::endl;
 
 //
 // Names for the GUI
 //
 
-string const GUIFamilyNames[6] = 
+static
+char const * GUIFamilyNames[6] = 
 { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
-    N_("Ignore") };
-  
-string const GUISeriesNames[4] = 
+  N_("Ignore") };
+
+static
+char const * GUISeriesNames[4] = 
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-string const GUIShapeNames[6] = 
+static
+char const * GUIShapeNames[6] = 
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
-    N_("Ignore") };
+  N_("Ignore") };
 
-string const GUISizeNames[14] = 
+static
+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_("Inherit"), N_("Ignore") };
  
-string const lGUISizeNames[15] = 
-{ 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"), string() };
- 
-string const GUIMiscNames[5] = 
+static
+char const * GUIMiscNames[5] = 
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
-string const GUIColorNames[13] = 
-{ N_("None"), N_("Black"), N_("White"), N_("Red"), N_("Green"), N_("Blue"),
-    N_("Cyan"), N_("Magenta"), 
-  N_("Yellow"), N_("Math"), N_("Inset"), N_("Inherit"), N_("Ignore") };
- 
+
 //
 // Strings used to read and write .lyx format files
 //
-string const LyXFamilyNames[6] = 
+static
+char const * LyXFamilyNames[6] = 
 { "roman", "sans", "typewriter", "symbol", "default", "error" };
- 
-string const LyXSeriesNames[4] = 
+
+static
+char const * LyXSeriesNames[4] = 
 { "medium", "bold", "default", "error" };
- 
-string const LyXShapeNames[6] = 
+
+static
+char const * LyXShapeNames[6] = 
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
- 
-string const LyXSizeNames[14] = 
+
+static
+char const * LyXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant", 
   "increase-error", "decrease-error", "default", "error" };
 
-string const LyXMiscNames[12] = 
+static
+char const * LyXMiscNames[5] = 
 { "off", "on", "toggle", "default", "error" };
 
-string const LyXColorNames[13] = 
-{ "none", "black", "white", "red", "green", "blue", "cyan", "magenta", 
-  "yellow", "matherror", "inseterror", "default", "error" };
-
 //
 // Strings used to write LaTeX files
 //
-
-string const LaTeXFamilyNames[6] = 
+static
+char const * LaTeXFamilyNames[6] = 
 { "textrm", "textsf", "texttt", "error1", "error2", "error3" };
- 
-string const LaTeXSeriesNames[4] = 
+
+static
+char const * LaTeXSeriesNames[4] = 
 { "textmd", "textbf", "error4", "error5" };
- 
-string const LaTeXShapeNames[6] = 
+
+static
+char const * LaTeXShapeNames[6] = 
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
- 
-string const LaTeXSizeNames[14] = 
+
+static
+char const * LaTeXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
   "Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
- 
-string const LaTeXColorNames[13] = 
-{ "none", "black", "white", "red", "green", "blue", "cyan", "magenta", 
-  "yellow", "error12", "error13", "error14", "error15" };
+
+
+LyXFont::FontBits LyXFont::sane = {
+	ROMAN_FAMILY,
+	MEDIUM_SERIES,
+	UP_SHAPE,
+	SIZE_NORMAL,
+	LColor::none,
+	OFF,
+	OFF,
+	OFF,
+	OFF };
+
+LyXFont::FontBits LyXFont::inherit = {
+	INHERIT_FAMILY,
+	INHERIT_SERIES,
+	INHERIT_SHAPE,
+	INHERIT_SIZE,
+	LColor::inherit,
+	INHERIT,
+	INHERIT,
+	INHERIT,
+	INHERIT };
+
+LyXFont::FontBits LyXFont::ignore = {
+	IGNORE_FAMILY,
+	IGNORE_SERIES,
+	IGNORE_SHAPE,
+	IGNORE_SIZE,
+	LColor::ignore,
+	IGNORE,
+	IGNORE,
+	IGNORE,
+	IGNORE };
+
+
+bool LyXFont::FontBits::operator==(LyXFont::FontBits const & fb1) const
+{
+			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;
+}
+
+
+bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
+{
+	return !(fb1 == *this);
+}
+
 
 /// Decreases font size by one
-LyXFont& LyXFont::decSize() 
+LyXFont & LyXFont::decSize() 
 {
 	switch (size()) {
 	case SIZE_HUGER:        setSize(SIZE_HUGE);     break;
@@ -136,12 +185,12 @@ LyXFont& LyXFont::decSize()
 		lyxerr <<"Can't LyXFont::decSize on IGNORE_SIZE" << endl;
 		break;
 	}
-	return (*this);
+	return *this;
 }
 
 
 /// Increases font size by one
-LyXFont& LyXFont::incSize() 
+LyXFont & LyXFont::incSize() 
 {
 	switch(size()) {
 	case SIZE_HUGER:	break;
@@ -167,7 +216,7 @@ LyXFont& LyXFont::incSize()
 		lyxerr <<"Can't LyXFont::incSize on IGNORE_SIZE" << endl;
 		break;
 	}
-	return (*this);
+	return *this;
 }
 
 
@@ -193,12 +242,13 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 
 
 /// Updates font settings according to request
-void LyXFont::update(LyXFont const & newfont, bool toggleall)
+void LyXFont::update(LyXFont const & newfont,
+		     Language const * document_language, bool toggleall)
 {
 	if(newfont.family() == family() && toggleall)
-	  setFamily(INHERIT_FAMILY); // toggle 'back'
+		setFamily(INHERIT_FAMILY); // toggle 'back'
 	else if (newfont.family() != IGNORE_FAMILY)
-	  setFamily(newfont.family());
+		setFamily(newfont.family());
 	// else it's IGNORE_SHAPE
 
 	// "Old" behaviour: "Setting" bold will toggle bold on/off.
@@ -219,9 +269,9 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall)
 	}
 
 	if(newfont.shape() == shape() && toggleall)
-	  setShape(INHERIT_SHAPE); // toggle 'back'
+		setShape(INHERIT_SHAPE); // toggle 'back'
 	else if (newfont.shape() != IGNORE_SHAPE)
-	  setShape(newfont.shape());
+		setShape(newfont.shape());
 	// else it's IGNORE_SHAPE
 
 	if (newfont.size() != IGNORE_SIZE) {
@@ -240,10 +290,19 @@ void LyXFont::update(LyXFont const & newfont, bool toggleall)
 	setNoun(setMisc(newfont.noun(), noun()));
 	setLatex(setMisc(newfont.latex(), latex()));
 
-	if(newfont.color() == color() && toggleall)
-	  setColor(INHERIT_COLOR); // toggle 'back'
-	else if (newfont.color() != IGNORE_COLOR)
-	  setColor(newfont.color());
+	setNumber(setMisc(newfont.number(), number()));
+	if (newfont.language() == language() && toggleall)
+		if (language() == document_language)
+			setLanguage(default_language);
+		else
+			setLanguage(document_language);
+	else if (newfont.language() != ignore_language)
+		setLanguage(newfont.language());
+
+	if (newfont.color() == color() && toggleall)
+		setColor(LColor::inherit); // toggle 'back'
+	else if (newfont.color() != LColor::ignore)
+		setColor(newfont.color());
 }
 
 
@@ -267,64 +326,46 @@ void LyXFont::reduce(LyXFont const & tmplt)
 	if (latex() == tmplt.latex())
 		setLatex(INHERIT);
 	if (color() == tmplt.color())
-		setColor(INHERIT_COLOR);
+		setColor(LColor::inherit);
 }
 
 
 /// Realize font from a template
-// This one is not pretty, but it's extremely fast (Asger)
 LyXFont & LyXFont::realize(LyXFont const & tmplt)
 {
 	if (bits == inherit) {
 		bits = tmplt.bits;
 		return *this;
 	}
-
-	if ((bits & (Fam_Mask<<Fam_Pos)) == (ui32(INHERIT_FAMILY)<<Fam_Pos))
-	{
-		bits &= ~(Fam_Mask << Fam_Pos);
-		bits |= (tmplt.bits & Fam_Mask << Fam_Pos);
+	
+	if (bits.family == INHERIT_FAMILY) {
+		bits.family = tmplt.bits.family;
 	}
-	if ((bits & (Ser_Mask<<Ser_Pos)) == (ui32(INHERIT_SERIES)<<Ser_Pos))
-	{
-		bits &= ~(Ser_Mask << Ser_Pos);
-		bits |= (tmplt.bits & Ser_Mask << Ser_Pos);
+	if (bits.series == INHERIT_SERIES) {
+		bits.series = tmplt.bits.series;
 	}
-	if ((bits & (Sha_Mask << Sha_Pos)) == ui32(INHERIT_SHAPE) << Sha_Pos)
-	{
-		bits &= ~(Sha_Mask << Sha_Pos);
-		bits |= (tmplt.bits & Sha_Mask << Sha_Pos);
+	if (bits.shape == INHERIT_SHAPE) {
+		bits.shape = tmplt.bits.shape;
 	}
-	if ((bits & (Siz_Mask << Siz_Pos)) == ui32(INHERIT_SIZE) << Siz_Pos)
-	{
-		bits &= ~(Siz_Mask << Siz_Pos);
-		bits |= (tmplt.bits & Siz_Mask << Siz_Pos);
+	if (bits.size == INHERIT_SIZE) {
+		bits.size = tmplt.bits.size;
 	}
-	if ((bits & (Misc_Mask << Emp_Pos)) == ui32(INHERIT) << Emp_Pos)
-	{
-		bits &= ~(Misc_Mask << Emp_Pos);
-		bits |= (tmplt.bits & Misc_Mask << Emp_Pos);
+	if (bits.emph == INHERIT) {
+		bits.emph = tmplt.bits.emph;
 	}
-	if ((bits & (Misc_Mask << Und_Pos)) == ui32(INHERIT) << Und_Pos)
-	{
-		bits &= ~(Misc_Mask << Und_Pos);
-		bits |= (tmplt.bits & Misc_Mask << Und_Pos);
+	if (bits.underbar == INHERIT) {
+		bits.underbar = tmplt.bits.underbar;
 	}
-	if ((bits & (Misc_Mask << Nou_Pos)) == ui32(INHERIT) << Nou_Pos)
-	{
-		bits &= ~(Misc_Mask << Nou_Pos);
-		bits |= (tmplt.bits & Misc_Mask << Nou_Pos);
+	if (bits.noun == INHERIT) {
+		bits.noun = tmplt.bits.noun;
 	}
-	if ((bits & (Misc_Mask << Lat_Pos)) == ui32(INHERIT) << Lat_Pos)
-	{
-		bits &= ~(Misc_Mask << Lat_Pos);
-		bits |= (tmplt.bits & Misc_Mask << Lat_Pos);
+	if (bits.latex == INHERIT) {
+		bits.latex = tmplt.bits.latex;
 	}
-	if ((bits & (Col_Mask << Col_Pos)) == ui32(INHERIT_COLOR) << Col_Pos)
-	{
-		bits &= ~(Col_Mask << Col_Pos);
-		bits |= (tmplt.bits & Col_Mask << Col_Pos);
+	if (bits.color == LColor::inherit) {
+		bits.color = tmplt.bits.color;
 	}
+
 	return *this;
 }
 
@@ -336,34 +377,42 @@ bool LyXFont::resolved() const
 		shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
 		emph() != INHERIT && underbar() != INHERIT && 
 		noun() != INHERIT && latex() != INHERIT && 
-		color() != INHERIT_COLOR);
+		color() != LColor::inherit);
 }
 
+
 /// Build GUI description of font state
-string LyXFont::stateText() const
+string const LyXFont::stateText(BufferParams * params) const
 {
-	string buf;
+	std::ostringstream ost;
 	if (family() != INHERIT_FAMILY)
-		buf += string(_(GUIFamilyNames[family()].c_str())) + ", ";
+		ost << _(GUIFamilyNames[family()]) << ", ";
 	if (series() != INHERIT_SERIES)
-		buf += string(_(GUISeriesNames[series()].c_str())) + ", ";
+		ost << _(GUISeriesNames[series()]) << ", ";
 	if (shape() != INHERIT_SHAPE)
-		buf += string(_(GUIShapeNames[shape()].c_str())) + ", ";
+		ost << _(GUIShapeNames[shape()]) << ", ";
 	if (size() != INHERIT_SIZE)
-		buf += string(_(GUISizeNames[size()].c_str())) + ", ";
-	if (color() != INHERIT_COLOR)
-		buf += string(_(GUIColorNames[color()].c_str())) + ", ";
- 
+		ost << _(GUISizeNames[size()]) << ", ";
+	if (color() != LColor::inherit)
+		ost << lcolor.getGUIName(color()) << ", ";
 	if (emph() != INHERIT)
-		buf += string(_("Emphasis ")) + _(GUIMiscNames[emph()].c_str()) + ", ";
+		ost << _("Emphasis ")
+		    << _(GUIMiscNames[emph()]) << ", ";
 	if (underbar() != INHERIT)
-		buf += string(_("Underline ")) + _(GUIMiscNames[underbar()].c_str()) + ", ";
+		ost << _("Underline ")
+		    << _(GUIMiscNames[underbar()]) << ", ";
 	if (noun() != INHERIT)
-		buf += string(_("Noun ")) + _(GUIMiscNames[noun()].c_str()) + ", ";
+		ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
 	if (latex() != INHERIT)
-		buf += string(_("Latex ")) + _(GUIMiscNames[latex()].c_str()) + ", ";
-	if (buf.empty())
-		buf = _("Default");
+		ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
+	if (bits == inherit)
+		ost << _("Default") << ", ";
+	if (!params || (language() != params->language))
+		ost << _("Language: ") << _(language()->display().c_str()) << ", ";
+	if (number() != OFF)
+		ost << _("  Number ") << _(GUIMiscNames[number()]);
+
+	string buf(ost.str().c_str());
 	buf = strip(buf, ' ');
 	buf = strip(buf, ',');
 	return buf;
@@ -371,73 +420,74 @@ string LyXFont::stateText() const
 
 
 // Set family according to lyx format string
-LyXFont& LyXFont::setLyXFamily(string const & fam)
+LyXFont & LyXFont::setLyXFamily(string const & fam)
 {
 	string s = lowercase(fam);
 
-	int i= 0;
-	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") i++;
+	int i = 0;
+	while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
 	if (s == LyXFamilyNames[i]) {
 		setFamily(LyXFont::FONT_FAMILY(i));
 	} else
 		lyxerr << "LyXFont::setLyXFamily: Unknown family `"
 		       << s << '\'' << endl;
-	return (*this);
+	return *this;
 }
 
 
 // Set series according to lyx format string
-LyXFont& LyXFont::setLyXSeries(string const & ser)
+LyXFont & LyXFont::setLyXSeries(string const & ser)
 {
 	string s = lowercase(ser);
 
-	int i= 0;
-	while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") i++;
+	int i = 0;
+	while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
 	if (s == LyXSeriesNames[i]) {
 		setSeries(LyXFont::FONT_SERIES(i));
 	} else
 		lyxerr << "LyXFont::setLyXSeries: Unknown series `"
 		       << s << '\'' << endl;
-	return (*this);
+	return *this;
 }
 
 
 // Set shape according to lyx format string
-LyXFont& LyXFont::setLyXShape(string const & sha)
+LyXFont & LyXFont::setLyXShape(string const & sha)
 {
 	string s = lowercase(sha);
 
-	int i= 0;
-	while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") i++;
+	int i = 0;
+	while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
 	if (s == LyXShapeNames[i]) {
 		setShape(LyXFont::FONT_SHAPE(i));
 	} else
 		lyxerr << "LyXFont::setLyXShape: Unknown shape `"
 		       << s << '\'' << endl;
-	return (*this);
+	return *this;
 }
 
 
 // Set size according to lyx format string
-LyXFont& LyXFont::setLyXSize(string const & siz)
+LyXFont & LyXFont::setLyXSize(string const & siz)
 {
 	string s = lowercase(siz);
-	int i= 0;
-	while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") i++;
+	int i = 0;
+	while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
 	if (s == LyXSizeNames[i]) {
 		setSize(LyXFont::FONT_SIZE(i));
 	} else
 		lyxerr << "LyXFont::setLyXSize: Unknown size `"
 		       << s << '\'' << endl;
-	return (*this);
+	return *this;
 }
 
+
 // Set size according to lyx format string
 LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 {
 	string s = lowercase(siz);
-	int i= 0;
-	while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") i++;
+	int i = 0;
+	while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
 	if (s == LyXMiscNames[i])
 		return FONT_MISC_STATE(i);
 	lyxerr << "LyXFont::setLyXMisc: Unknown misc flag `"
@@ -445,40 +495,29 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & siz)
 	return OFF;
 }
 
+
 /// Sets color after LyX text format
-LyXFont& LyXFont::setLyXColor(string const & col)
+LyXFont & LyXFont::setLyXColor(string const & col)
 {
-	string s = lowercase(col);
-	int i= 0;
-	while (s != LyXColorNames[i] && LyXColorNames[i] != "error") i++;
-	if (s == LyXColorNames[i]) {
-		setColor(LyXFont::FONT_COLOR(i));
-	} else
-		lyxerr << "LyXFont::setLyXColor: Unknown Color `"
-		       << s << '\'' << endl;
-	return (*this);
+	setColor(lcolor.getFromLyXName(col));
+	return *this;
 }
 
 
 /// Sets size after GUI name
-LyXFont& LyXFont::setGUISize(string const & siz)
+LyXFont & LyXFont::setGUISize(string const & siz)
 {
-	string s = lowercase(siz);
-	int i= 0;
-	while (!lGUISizeNames[i].empty() &&
-	       s != _(lGUISizeNames[i].c_str()))
-	  i++;
-	if (s == _(lGUISizeNames[i].c_str())) {
-		setSize(LyXFont::FONT_SIZE(i));
-	} else
-		lyxerr << "LyXFont::setGUISize: Unknown Size `"
-		       << s << '\'' << endl;
-	return (*this);
+	// CHECK 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()];
 }
@@ -558,145 +597,169 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 
 
 /// Writes the changes from this font to orgfont in .lyx format in file
-void LyXFont::lyxWriteChanges(LyXFont const & orgfont, FILE * file) const
+void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
 {
-	fprintf(file, "\n");
+	os << "\n";
 	if (orgfont.family() != family()) {
-		fprintf(file, "\\family %s \n",
-			LyXFamilyNames[family()].c_str());
+		os << "\\family " << LyXFamilyNames[family()] << " \n";
 	}
 	if (orgfont.series() != series()) {
-		fprintf(file, "\\series %s \n",
-			LyXSeriesNames[series()].c_str());
+		os << "\\series " << LyXSeriesNames[series()] << " \n";
 	}
 	if (orgfont.shape() != shape()) {
-		fprintf(file, "\\shape %s \n", LyXShapeNames[shape()].c_str());
+		os << "\\shape " << LyXShapeNames[shape()] << " \n";
 	}
 	if (orgfont.size() != size()) {
-		fprintf(file, "\\size %s \n", LyXSizeNames[size()].c_str());
+		os << "\\size " << LyXSizeNames[size()] << " \n";
 	}
 	if (orgfont.emph() != emph()) {
-		fprintf(file, "\\emph %s \n", LyXMiscNames[emph()].c_str());
+		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:	fprintf(file, "\\bar no \n"); break;
-		case ON:        fprintf(file, "\\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:   fprintf(file, "\\bar default \n"); break;
+		break;
+		case INHERIT:   os << "\\bar default \n"; break;
 		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"IGNORE should not appear here!"
 				       << endl;
-				break;
+		break;
 		}
 	}
 	if (orgfont.noun() != noun()) {
-		fprintf(file, "\\noun %s \n", LyXMiscNames[noun()].c_str());
+		os << "\\noun " << LyXMiscNames[noun()] << " \n";
 	}
 	if (orgfont.latex() != latex()) {
 		// This is only for backwards compatibility
 		switch (latex()) {
-		case OFF:	fprintf(file, "\\latex no_latex \n"); break;
-		case ON:        fprintf(file, "\\latex latex \n"); break;
+		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:   fprintf(file, "\\latex default \n"); break;
+		break;
+		case INHERIT:   os << "\\latex default \n"; break;
 		case IGNORE:    lyxerr << "LyXFont::lyxWriteFontChanges: "
 					"IGNORE should not appear here!"
 				       << endl;
-				break;
+		break;
 		}
 	}
 	if (orgfont.color() != color()) {
-		fprintf(file, "\\color %s\n", LyXColorNames[color()].c_str());
+		// 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.language() != language()) {
+		if (language())
+			os << "\\lang " << language()->lang() << "\n";
+		else
+			os << "\\lang unknown\n";
 	}
 }
 
 
 /// Writes the head of the LaTeX needed to impose this font
 // Returns number of chars written.
-int LyXFont::latexWriteStartChanges(FILE * file, LyXFont const & base) const
+int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
+				    LyXFont const & prev) const
 {
-	string font;
-	int count = latexWriteStartChanges(font, base);
-	fprintf(file, "%s", font.c_str());
-	return count;
-}
+	int count = 0;
+	bool env = false;
 
+	if (language()->babel() != base.language()->babel() &&
+	    language()->babel() != prev.language()->babel()) {
+		if (isRightToLeft() != prev.isRightToLeft()) {
+			if (isRightToLeft()) {
+				os << "\\R{";
+				count += 3;
+			} else {
+				os << "\\L{";
+				count += 3;
+			}
+		} else {
+			string tmp = '{' + 
+				subst(lyxrc.language_command_begin,
+				      "$$lang", language()->babel());
+			os << tmp;
+			count += tmp.length();
+		}
+	}
+
+	if (number() == ON && prev.number() != ON &&
+	    language()->lang() == "hebrew") {
+		os << "{\\beginL ";
+		count += 9;
+	}
 
-/// Writes the head of the LaTeX needed to impose this font
-// Returns number of chars written.
-int LyXFont::latexWriteStartChanges(string & file, LyXFont const & base) const
-{
 	LyXFont f = *this;
 	f.reduce(base);
 	
-	if (f.bits == inherit)
-		return 0;
-	
-	int count = 0;
-	bool env = false;
-	
 	if (f.family() != INHERIT_FAMILY) {
-		file += '\\';
-		file += LaTeXFamilyNames[f.family()];
-		file += '{';
-		count += LaTeXFamilyNames[f.family()].length() + 2;
+		os << '\\'
+		   << LaTeXFamilyNames[f.family()]
+		   << '{';
+		count += strlen(LaTeXFamilyNames[f.family()]) + 2;
 		env = true; //We have opened a new environment
 	}
 	if (f.series() != INHERIT_SERIES) {
-		file += '\\';
-		file += LaTeXSeriesNames[f.series()];
-		file += '{';
-		count += LaTeXSeriesNames[f.series()].length() + 2;
+		os << '\\'
+		   << LaTeXSeriesNames[f.series()]
+		   << '{';
+		count += strlen(LaTeXSeriesNames[f.series()]) + 2;
 		env = true; //We have opened a new environment
 	}
 	if (f.shape() != INHERIT_SHAPE) {
-		file += '\\';
-		file += LaTeXShapeNames[f.shape()];
-		file += '{';
-		count += LaTeXShapeNames[f.shape()].length() + 2;
+		os << '\\'
+		   << LaTeXShapeNames[f.shape()]
+		   << '{';
+		count += strlen(LaTeXShapeNames[f.shape()]) + 2;
 		env = true; //We have opened a new environment
 	}
-	if (f.color() != INHERIT_COLOR) {
-		file += "\\textcolor{";
-		file += LaTeXColorNames[f.color()];
-		file += "}{";
-		count += LaTeXColorNames[f.color()].length() + 13;
+	if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
+		os << "\\textcolor{"
+		   << lcolor.getLaTeXName(f.color())
+		   << "}{";
+		count += lcolor.getLaTeXName(f.color()).length() + 13;
 		env = true; //We have opened a new environment
 	}
 	if (f.emph() == ON) {
-		file += "\\emph{";
+		os << "\\emph{";
 		count += 6;
 		env = true; //We have opened a new environment
 	}
 	if (f.underbar() == ON) {
-		file += "\\underbar{";
+		os << "\\underbar{";
 		count += 10;
 		env = true; //We have opened a new environment
 	}
 	// \noun{} is a LyX special macro
 	if (f.noun() == ON) {
-		file += "\\noun{";
+		os << "\\noun{";
 		count += 8;
 		env = true; //We have opened a new environment
 	}
 	if (f.size() != INHERIT_SIZE) {
 		// If we didn't open an environment above, we open one here
 		if (!env) {
-			file += '{';
-			count++;
+			os << '{';
+			++count;
 		}
-		file += '\\';
-		file += LaTeXSizeNames[f.size()];
-		file += ' ';
-		count += LaTeXSizeNames[f.size()].length() + 2;
+		os << '\\'
+		   << LaTeXSizeNames[f.size()]
+		   << ' ';
+		count += strlen(LaTeXSizeNames[f.size()]) + 2;
 	}
 	return count;
 }
@@ -705,78 +768,87 @@ int LyXFont::latexWriteStartChanges(string & file, LyXFont const & base) const
 /// 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(FILE * file, LyXFont const & base) const
+int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
+				  LyXFont const & next) const
 {
-	string ending;
-	int count = latexWriteEndChanges(ending, base);
-	fprintf(file, "%s", ending.c_str());
-	return count;
-}
-
+	int count = 0;
+	bool env = false;
 
-/// 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(string & file, LyXFont const & base) const
-{
 	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)
 
-	if (f.bits == inherit)
-		return 0;
-	
-	int count = 0;
-	bool env = false;
+
 	if (f.family() != INHERIT_FAMILY) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.series() != INHERIT_SERIES) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.shape() != INHERIT_SHAPE) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
-	if (f.color() != INHERIT_COLOR) {
-		file += '}';
+	if (f.color() != LColor::inherit && f.color() != LColor::ignore) {
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.emph() == ON) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.underbar() == ON) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.noun() == ON) {
-		file += '}';
+		os << '}';
 		++count;
 		env = true; // Size change need not bother about closing env.
 	}
 	if (f.size() != INHERIT_SIZE) {
 		// We only have to close if only size changed
 		if (!env) {
-			file += '}';
+			os << '}';
 			++count;
 		}
 	}
-	
+
+	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
+{
+	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
 {
@@ -794,184 +866,14 @@ LyXFont::FONT_SHAPE LyXFont::realShape() const
 }
 
 
-GC LyXFont::getGC() const
-{
-	GC gc;
-	if (latex() == ON)
-		gc = ::getGC(gc_latex);
-	else {
-		if (color() == NONE)
-			gc = ::getGC(gc_copy);
-		else if (color() == MATH)
-			gc = ::getGC(gc_math);
-		else if (color() == INSET)
-			gc = ::getGC(gc_foot);
-		else
-			gc = ::GetColorGC(color());
-	}
-
-	XSetFont(fl_display, gc, getXFontstruct()->fid);
-	return gc;
-}
-
-
-XFontStruct* LyXFont::getXFontstruct() const
-{
-	return fontloader.load(family(), series(), realShape(), size());
-}
-
-
-int LyXFont::maxAscent() const
-{
-	return getXFontstruct()->ascent;
-}
-
-
-int LyXFont::maxDescent() const
-{
-	return getXFontstruct()->descent;
-}
-
-
-int LyXFont::ascent(char c) const
-{
-	XFontStruct *finfo = getXFontstruct();
-	if (finfo->per_char
-	    && c >= static_cast<char>(finfo->min_char_or_byte2)
-	    && c <= static_cast<char>(finfo->max_char_or_byte2)) {
-		unsigned int index = c - finfo->min_char_or_byte2;
-		return finfo->per_char[index].ascent;
-	} else
-		return finfo->ascent;
-}
-
-
-int LyXFont::descent(char c) const
-{
-	XFontStruct *finfo = getXFontstruct();
-	if (finfo->per_char
-	    && c >= static_cast<char>(finfo->min_char_or_byte2)
-	    && c <= static_cast<char>(finfo->max_char_or_byte2)) {
-		unsigned int index = c - finfo->min_char_or_byte2;
-		return finfo->per_char[index].descent;
-	} else
-		return finfo->descent;
-}
-
-
-// Specialized after profiling. (Asger)
-int LyXFont::width(char c) const
-{
-	if (realShape() != LyXFont::SMALLCAPS_SHAPE){
-		return XTextWidth(getXFontstruct(), &c, 1);
-	} else {
-		return textWidth(&c, 1);
-	}
-}
-
-
-int LyXFont::textWidth(char const *s, int n) const
-{
-	if (realShape() != LyXFont::SMALLCAPS_SHAPE){
-		return XTextWidth(getXFontstruct(), s, n);
-	} else {
-		// emulate smallcaps since X doesn't support this
-		unsigned int result = 0;
-		char c;
-		LyXFont smallfont = *this;
-		smallfont.decSize();
-		smallfont.decSize();
-		smallfont.setShape(LyXFont::UP_SHAPE);
-		for (int i= 0; i < n; i++){
-			c = s[i];
-			if (islower(c)){
-				c = toupper(c);
-				result += XTextWidth(smallfont.getXFontstruct(), &c, 1);
-			} else {
-				result += XTextWidth(getXFontstruct(), &c, 1);
-			}
-		}
-		return result;
-	}
-}
-
-
-int LyXFont::stringWidth(string const & s) const
-{
-	if (s.empty()) return 0;
-	return textWidth(s.c_str(), s.length());
-}
-
-int LyXFont::signedStringWidth(string const & s) const
-{
-	if (s.empty()) return 0;
-	if (s.c_str()[0] == '-')
-	  return -textWidth(s.c_str()+1, s.length()-1);
-	else
-	  return textWidth(s.c_str(), s.length());
-}
-
-
-int LyXFont::drawText(char const* s, int n, Pixmap pm, 
-		       int baseline, int x) const
-{
-	if (realShape() != LyXFont::SMALLCAPS_SHAPE) {
-		XDrawString(fl_display,
-			    pm,
-			    getGC(),
-			    x, baseline,
-			    s, n);
-		XFlush(fl_display);
-		return XTextWidth(getXFontstruct(), s, n);
-
-	} else {
-		// emulate smallcaps since X doesn't support this
-		int i;
-		char c;
-		int sx = x;
-		LyXFont smallfont = *this;
-		smallfont.decSize();
-		smallfont.decSize();
-		smallfont.setShape(LyXFont::UP_SHAPE);
-		for (i= 0; i < n; i++){
-			c = s[i];
-			if (islower(c)){
-				c = toupper(c);
-				XDrawString(fl_display,
-					    pm,
-					    smallfont.getGC(),
-					    x, baseline,
-					    &c, 1);
-				x += XTextWidth(smallfont.getXFontstruct(), &c, 1);
-				XFlush(fl_display);
-			} else {
-				XDrawString(fl_display,
-					    pm,
-					    getGC(),
-					    x, baseline,
-					    &c, 1);
-				x += XTextWidth(getXFontstruct(), &c, 1);
-				XFlush(fl_display);
-			}
-		}
-		return x - sx;
-	}
-}
-
-
-int LyXFont::drawString(string const &s, Pixmap pm, int baseline, int x) const
-{
-	return drawText(s.c_str(), s.length(), pm, baseline, x);
-}
-
-
-bool LyXFont::equalExceptLatex(LyXFont const &f) const 
+bool LyXFont::equalExceptLatex(LyXFont const & f) const 
 {
 	LyXFont f1 = *this;
 	f1.setLatex(f.latex());
 	return f1 == f;
 }
 
+
 ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
 {
 	return o << int(fms);