]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
fix typo that put too many include paths for most people
[lyx.git] / src / lyxfont.C
index fa54c547b5ae2fbb59bb53b5519684f2765e2367..3a3b3f845bdefded459e4defed53862e6a48347d 100644 (file)
@@ -1,27 +1,28 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           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 "debug.h"
 #include "lyxrc.h"
 #include "lyxlex.h"
+#include "language.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
-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",
+  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",
+  "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,
@@ -115,6 +114,7 @@ LyXFont::FontBits LyXFont::sane = {
        OFF,
        OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::inherit = {
        INHERIT_FAMILY,
        INHERIT_SERIES,
@@ -124,8 +124,9 @@ LyXFont::FontBits LyXFont::inherit = {
        INHERIT,
        INHERIT,
        INHERIT,
-       INHERIT };
+       OFF };
 
+// Initialize static member
 LyXFont::FontBits LyXFont::ignore = {
        IGNORE_FAMILY,
        IGNORE_SERIES,
@@ -140,15 +141,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;
 }
 
 
@@ -158,8 +159,154 @@ bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
 }
 
 
+LyXFont::LyXFont()
+       : bits(sane), lang(default_language)
+{}
+
+
+LyXFont::LyXFont(LyXFont::FONT_INIT1)
+#ifndef INHERIT_LANGUAGE
+       : bits(inherit), lang(default_language)
+#else
+       : bits(inherit), lang(inherit_language)
+#endif
+{}
+
+
+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() 
+LyXFont & LyXFont::decSize()
 {
        switch (size()) {
        case SIZE_HUGER:        setSize(SIZE_HUGE);     break;
@@ -190,7 +337,7 @@ LyXFont & LyXFont::decSize()
 
 
 /// Increases font size by one
-LyXFont & LyXFont::incSize() 
+LyXFont & LyXFont::incSize()
 {
        switch (size()) {
        case SIZE_HUGER:        break;
@@ -221,7 +368,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) {
@@ -236,14 +383,15 @@ 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)
                setFamily(INHERIT_FAMILY); // toggle 'back'
@@ -264,7 +412,7 @@ void LyXFont::update(LyXFont const & newfont,
        case INHERIT_SERIES:
                setSeries(newfont.series());
                break;
-       case IGNORE_SERIES: 
+       case IGNORE_SERIES:
                break;
        }
 
@@ -279,8 +427,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());
        }
@@ -288,14 +434,17 @@ 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()));
 
        setNumber(setMisc(newfont.number(), number()));
        if (newfont.language() == language() && toggleall)
                if (language() == document_language)
                        setLanguage(default_language);
                else
+#ifndef INHERIT_LANGUAGE
                        setLanguage(document_language);
+#else
+                       setLanguage(inherit_language);
+#endif
        else if (newfont.language() != ignore_language)
                setLanguage(newfont.language());
 
@@ -323,21 +472,39 @@ 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);
+#ifdef INHERIT_LANGUAGE
+       if (language() == tmplt.language())
+               setLanguage(inherit_language);
+#endif
 }
 
 
 /// Realize font from a template
+#ifndef INHERIT_LANGUAGE
 LyXFont & LyXFont::realize(LyXFont const & tmplt)
+#else
+LyXFont & LyXFont::realize(LyXFont const & tmplt, Language const * deflang)
+#endif
 {
+#ifdef INHERIT_LANGUAGE
+       if (language() == inherit_language) {
+               if (tmplt.language() == inherit_language ||
+                       tmplt.language() == ignore_language ||
+                       tmplt.language() == default_language)
+               {
+                       setLanguage(deflang);
+               } else {
+                       setLanguage(tmplt.language());
+               }
+       }
+#endif
        if (bits == inherit) {
                bits = tmplt.bits;
                return *this;
        }
-       
+
        if (bits.family == INHERIT_FAMILY) {
                bits.family = tmplt.bits.family;
        }
@@ -359,13 +526,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,8 +538,11 @@ 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 &&
+#ifdef INHERIT_LANGUAGE
+               language() != inherit_language &&
+#endif
                color() != LColor::inherit);
 }
 
@@ -384,7 +550,7 @@ bool LyXFont::resolved() const
 /// Build GUI description of font state
 string const LyXFont::stateText(BufferParams * params) const
 {
-       std::ostringstream ost;
+       ostringstream ost;
        if (family() != INHERIT_FAMILY)
                ost << _(GUIFamilyNames[family()]) << ", ";
        if (series() != INHERIT_SERIES)
@@ -403,8 +569,6 @@ string const LyXFont::stateText(BufferParams * params) const
                    << _(GUIMiscNames[underbar()]) << ", ";
        if (noun() != INHERIT)
                ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
-       if (latex() != INHERIT)
-               ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
        if (bits == inherit)
                ost << _("Default") << ", ";
        if (!params || (language() != params->language))
@@ -422,7 +586,7 @@ string const LyXFont::stateText(BufferParams * params) 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;
@@ -438,7 +602,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;
@@ -454,7 +618,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;
@@ -470,7 +634,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]) {
@@ -485,7 +649,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])
@@ -504,18 +668,6 @@ LyXFont & LyXFont::setLyXColor(string const & col)
 }
 
 
-/// Sets size after GUI name
-LyXFont & LyXFont::setGUISize(string const & siz)
-{
-       // 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 const LyXFont::latexSize() const
 {
@@ -529,9 +681,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;
@@ -539,54 +691,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;
@@ -597,7 +738,11 @@ 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,
+#ifdef INHERIT_LANGUAGE
+                             Language const * doclang,
+#endif
+                             ostream & os) const
 {
        os << "\n";
        if (orgfont.family() != family()) {
@@ -637,22 +782,6 @@ 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()) {
                // To make us file compatible with older
                // lyx versions we emit "default" instead
@@ -662,7 +791,13 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont, ostream & os) const
                os << "\\color " << col_str << "\n";
        }
        if (orgfont.language() != language()) {
+#ifndef INHERIT_LANGUAGE
                if (language())
+#else
+               if (language() == inherit_language)
+                       os << "\\lang " << doclang->lang() << "\n";
+               else if (language())
+#endif
                        os << "\\lang " << language()->lang() << "\n";
                else
                        os << "\\lang unknown\n";
@@ -689,8 +824,8 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
                                count += 3;
                        }
                } else {
-                       string tmp = '{' + 
-                               subst(lyxrc.language_command_begin,
+                       string const tmp =
+                               subst(lyxrc.language_command_local,
                                      "$$lang", language()->babel());
                        os << tmp;
                        count += tmp.length();
@@ -705,7 +840,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
 
        LyXFont f = *this;
        f.reduce(base);
-       
+
        if (f.family() != INHERIT_FAMILY) {
                os << '\\'
                   << LaTeXFamilyNames[f.family()]
@@ -841,8 +976,6 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 
 LColor::color LyXFont::realColor() const
 {
-       if (latex() == ON)
-               return LColor::latex;
        if (color() == LColor::none)
                return LColor::foreground;
        return color();
@@ -866,14 +999,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);