]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
more funcs to lowerchar, adjust
[lyx.git] / src / lyxfont.C
index 6cd7f8f8169afe455fa63d270b8f08803e976d64..1875b15061c28e007b3de195a4fad4fc640f6e39 100644 (file)
@@ -4,18 +4,18 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 #include <clocale>
+#include <cctype>
 
 #ifdef __GNUG__
-#pragma implementation "lyxfont.h"
+#pragma implementation
 #endif
 
-#include <cctype>
 
 #include "gettext.h"
 #include "lyxfont.h"
 #include "lyxlex.h"
 #include "FontLoader.h"
 #include "support/lstrings.h"
+#include "bufferparams.h" // stateText
 
 using std::ostream;
 using std::endl;
 
+#ifndef CXX_GLOBAL_CSTD
+using std::strlen;
+#endif
+
+
 //
 // Names for the GUI
 //
 
-static
+namespace {
+
 char const * GUIFamilyNames[6] = 
 { N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"), N_("Inherit"),
   N_("Ignore") };
 
-static
 char const * GUISeriesNames[4] = 
 { N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
 
-static
 char const * GUIShapeNames[6] = 
 { N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
   N_("Ignore") };
 
-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") };
  
-static
 char const * GUIMiscNames[5] = 
 { N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
 
@@ -60,49 +63,43 @@ char const * GUIMiscNames[5] =
 //
 // Strings used to read and write .lyx format files
 //
-static
 char const * LyXFamilyNames[6] = 
 { "roman", "sans", "typewriter", "symbol", "default", "error" };
 
-static
 char const * LyXSeriesNames[4] = 
 { "medium", "bold", "default", "error" };
 
-static
 char const * LyXShapeNames[6] = 
 { "up", "italic", "slanted", "smallcaps", "default", "error" };
 
-static
 char const * LyXSizeNames[14] = 
 { "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
   "larger", "largest", "huge", "giant", 
   "increase-error", "decrease-error", "default", "error" };
 
-static
 char const * LyXMiscNames[5] = 
 { "off", "on", "toggle", "default", "error" };
 
 //
 // Strings used to write LaTeX files
 //
-static
 char const * LaTeXFamilyNames[6] = 
 { "textrm", "textsf", "texttt", "error1", "error2", "error3" };
 
-static
 char const * LaTeXSeriesNames[4] = 
 { "textmd", "textbf", "error4", "error5" };
 
-static
 char const * LaTeXShapeNames[6] = 
 { "textup", "textit", "textsl", "textsc", "error6", "error7" };
 
-static
 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 +111,7 @@ LyXFont::FontBits LyXFont::sane = {
        OFF,
        OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::inherit = {
        INHERIT_FAMILY,
        INHERIT_SERIES,
@@ -123,8 +121,9 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT,
        INHERIT,
        INHERIT,
-       INHERIT };
+       OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::ignore = {
        IGNORE_FAMILY,
        IGNORE_SERIES,
@@ -139,15 +138,15 @@ LyXFont::FontBits LyXFont::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;
+       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.number == number;
 }
 
 
@@ -157,6 +156,143 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 }
 
 
+LyXFont::LyXFont(LyXFont::FONT_INIT1)
+       : bits(inherit), lang(inherit_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)
+{}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::underbar() const
+{
+       return bits.underbar;
+}
+
+
+LColor::color LyXFont::color() const 
+{
+       return bits.color;
+}
+
+
+Language const * LyXFont::language() const 
+{
+       return lang;
+}
+
+
+LyXFont::FONT_MISC_STATE LyXFont::number() const 
+{
+       return bits.number;
+}
+
+
+bool LyXFont::isRightToLeft() const 
+{
+       return lang->RightToLeft();
+}
+
+
+bool LyXFont::isVisibleRightToLeft() const 
+{
+       return (lang->RightToLeft() &&
+               number() != ON);
+}
+
+
+LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+{
+       bits.family = f;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
+{
+       bits.series = s;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
+{
+       bits.shape = s;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
+{
+       bits.size = s;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+{
+       bits.emph = e;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+{
+       bits.underbar = u;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+{
+       bits.noun = n;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setColor(LColor::color c)
+{
+       bits.color = c;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setLanguage(Language const * l)
+{
+       lang = l;
+       return *this;
+}
+
+
+LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+{
+       bits.number = n;
+       return *this;
+}
+
+
 /// Decreases font size by one
 LyXFont & LyXFont::decSize() 
 {
@@ -191,7 +327,7 @@ LyXFont & LyXFont::decSize()
 /// Increases font size by one
 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;
@@ -241,10 +377,9 @@ LyXFont::FONT_MISC_STATE LyXFont::setMisc(FONT_MISC_STATE newfont,
 
 
 /// Updates font settings according to request
-void LyXFont::update(LyXFont const & newfont,
-                    Language const * document_language, bool toggleall)
+void LyXFont::update(LyXFont const & newfont, 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());
@@ -267,7 +402,7 @@ void LyXFont::update(LyXFont const & newfont,
                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 +413,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 +420,12 @@ 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);
-               else
-                       setLanguage(newfont.language());
+       
+       setNumber(setMisc(newfont.number(), number()));
+       if (newfont.language() == language() && toggleall)
+               setLanguage(inherit_language);
+       else if (newfont.language() != ignore_language)
+               setLanguage(newfont.language());
 
        if (newfont.color() == color() && toggleall)
                setColor(LColor::inherit); // toggle 'back'
@@ -322,16 +451,26 @@ 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);
+       if (language() == tmplt.language())
+               setLanguage(inherit_language);
 }
 
 
 /// Realize font from a template
-LyXFont & LyXFont::realize(LyXFont const & tmplt)
+LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
 {
+       if (language() == inherit_language) {
+               if (tmplt.language() == inherit_language ||
+                       tmplt.language() == ignore_language ||
+                       tmplt.language() == default_language)
+               {
+                       setLanguage(deflang);
+               } else {
+                       setLanguage(tmplt.language());
+               }
+       }
        if (bits == inherit) {
                bits = tmplt.bits;
                return *this;
@@ -358,13 +497,9 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
        if (bits.noun == INHERIT) {
                bits.noun = tmplt.bits.noun;
        }
-       if (bits.latex == INHERIT) {
-               bits.latex = tmplt.bits.latex;
-       }
        if (bits.color == LColor::inherit) {
                bits.color = tmplt.bits.color;
        }
-
        return *this;
 }
 
@@ -375,20 +510,16 @@ 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 && 
-               color() != LColor::inherit);
+               noun() != INHERIT &&
+               color() != LColor::inherit &&
+               language() != inherit_language);
 }
 
 
 /// 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 ost;
        if (family() != INHERIT_FAMILY)
                ost << _(GUIFamilyNames[family()]) << ", ";
        if (series() != INHERIT_SERIES)
@@ -407,21 +538,14 @@ string LyXFont::stateText() const
                    << _(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)
+       if (bits == inherit)
                ost << _("Default") << ", ";
-       ost << _("Language: ") << _(language()->display.c_str());
-#ifdef HAVE_SSTREAM
+       if (!params || (language() != params->language))
+               ost << _("Language: ") << _(language()->display()) << ", ";
+       if (number() != OFF)
+               ost << _("  Number ") << _(GUIMiscNames[number()]);
+
        string buf(ost.str().c_str());
-#else
-       ost << '\0';
-       string buf(ost.str());
-#endif
        buf = strip(buf, ' ');
        buf = strip(buf, ',');
        return buf;
@@ -431,7 +555,7 @@ string LyXFont::stateText() const
 // Set family according to lyx format string
 LyXFont & LyXFont::setLyXFamily(string const & fam)
 {
-       string s = lowercase(fam);
+       string const s = lowercase(fam);
 
        int i = 0;
        while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error") ++i;
@@ -447,7 +571,7 @@ 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 = lowercase(ser);
 
        int i = 0;
        while (s != LyXSeriesNames[i] && LyXSeriesNames[i] != "error") ++i;
@@ -463,7 +587,7 @@ 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 = lowercase(sha);
 
        int i = 0;
        while (s != LyXShapeNames[i] && LyXShapeNames[i] != "error") ++i;
@@ -479,7 +603,7 @@ 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 = lowercase(siz);
        int i = 0;
        while (s != LyXSizeNames[i] && LyXSizeNames[i] != "error") ++i;
        if (s == LyXSizeNames[i]) {
@@ -494,7 +618,7 @@ 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 = lowercase(siz);
        int i = 0;
        while (s != LyXMiscNames[i] && LyXMiscNames[i] != "error") ++i;
        if (s == LyXMiscNames[i])
@@ -513,20 +637,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 +650,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 = lowercase(lex.getString());
 
                if (tok.empty()) {
                        continue;
@@ -548,54 +660,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 = 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,7 +707,8 @@ 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,
+                              Language const * doclang, ostream & os) const
 {
        os << "\n";
        if (orgfont.family() != family()) {
@@ -624,6 +726,9 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
        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()) {
@@ -643,28 +748,19 @@ 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";
+               // 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";
+               if (language() == inherit_language)
+                       os << "\\lang " << doclang->lang() << "\n";
+               else if (language())
+                       os << "\\lang " << language()->lang() << "\n";
                else
                        os << "\\lang unknown\n";
        }
@@ -679,27 +775,31 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        int count = 0;
        bool env = false;
 
-       if (language() != base.language() && language() != prev.language()) {
+       if (language()->babel() != base.language()->babel() &&
+           language()->babel() != prev.language()->babel()) {
                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);
+                       string const tmp =
+                               subst(lyxrc.language_command_local,
+                                     "$$lang", language()->babel());
                        os << 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);
        
@@ -724,7 +824,7 @@ 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())
                   << "}{";
@@ -766,23 +866,18 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 // Returns number of chars written
 // This one corresponds to latexWriteStartChanges(). (Asger)
 int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
-                                 LyXFont const & next) const
+                                  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)
 
+
        if (f.family() != INHERIT_FAMILY) {
                os << '}';
                ++count;
@@ -798,7 +893,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,14 +921,23 @@ 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
 {
-       if (latex() == ON)
-               return LColor::latex;
        if (color() == LColor::none)
                return LColor::foreground;
        return color();
@@ -857,14 +961,6 @@ LyXFont::FONT_SHAPE LyXFont::realShape() 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);