]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
* languages: use nb_NO instead of no_NO for norwegian (bug 2850).
[lyx.git] / src / lyxfont.C
index 67c9241ffe37ef7086c8c3444030157a146f9474..ab6dc162b972f10288627e660324043ddb31018f 100644 (file)
@@ -1,34 +1,43 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file src/lyxfont.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author André Pönitz
+ * \author Dekel Tsur
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
-#include <clocale>
-#include <cctype>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
-
-#include "gettext.h"
 #include "lyxfont.h"
+
+#include "bufferparams.h" // stateText
 #include "debug.h"
-#include "lyxrc.h"
-#include "lyxlex.h"
+#include "gettext.h"
 #include "language.h"
-#include "frontends/font_loader.h"
+#include "LColor.h"
+#include "lyxlex.h"
+#include "lyxrc.h"
+
 #include "support/lstrings.h"
-#include "bufferparams.h" // stateText
 
-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;
@@ -41,8 +50,8 @@ using std::strlen;
 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_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   N_("Inherit"), N_("Ignore") };
 
 char const * GUISeriesNames[4] =
@@ -66,7 +75,7 @@ char const * GUIMiscNames[5] =
 //
 char const * LyXFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
 { "roman", "sans", "typewriter", "symbol",
-  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak",
+  "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
   "default", "error" };
 
 char const * LyXSeriesNames[4] =
@@ -139,23 +148,18 @@ LyXFont::FontBits LyXFont::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.number == number;
-}
-
-
-bool LyXFont::FontBits::operator!=(LyXFont::FontBits const & fb1) const
+bool operator==(LyXFont::FontBits const & lhs,
+               LyXFont::FontBits const & rhs)
 {
-       return !(fb1 == *this);
+       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;
 }
 
 
@@ -165,11 +169,7 @@ LyXFont::LyXFont()
 
 
 LyXFont::LyXFont(LyXFont::FONT_INIT1)
-#ifndef INHERIT_LANGUAGE
        : bits(inherit), lang(default_language)
-#else
-       : bits(inherit), lang(inherit_language)
-#endif
 {}
 
 
@@ -198,110 +198,83 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * 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
+LColor_color LyXFont::color() const
 {
-       return bits.number;
+       return LColor::color(bits.color);
 }
 
 
 bool LyXFont::isRightToLeft() const
 {
-       return lang->RightToLeft();
+       return lang->rightToLeft();
 }
 
 
 bool LyXFont::isVisibleRightToLeft() const
 {
-       return (lang->RightToLeft() &&
+       return (lang->rightToLeft() &&
                number() != ON);
 }
 
 
-LyXFont & LyXFont::setFamily(LyXFont::FONT_FAMILY f)
+void LyXFont::setFamily(LyXFont::FONT_FAMILY f)
 {
        bits.family = f;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setSeries(LyXFont::FONT_SERIES s)
+void LyXFont::setSeries(LyXFont::FONT_SERIES s)
 {
        bits.series = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setShape(LyXFont::FONT_SHAPE s)
+void LyXFont::setShape(LyXFont::FONT_SHAPE s)
 {
        bits.shape = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setSize(LyXFont::FONT_SIZE s)
+void LyXFont::setSize(LyXFont::FONT_SIZE s)
 {
        bits.size = s;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
+void LyXFont::setEmph(LyXFont::FONT_MISC_STATE e)
 {
        bits.emph = e;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
+void LyXFont::setUnderbar(LyXFont::FONT_MISC_STATE u)
 {
        bits.underbar = u;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 {
        bits.noun = n;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setColor(LColor::color c)
+void LyXFont::setColor(LColor_color c)
 {
-       bits.color = c;
-       return *this;
+       bits.color = int(c);
 }
 
 
-LyXFont & LyXFont::setLanguage(Language const * l)
+void LyXFont::setLanguage(Language const * l)
 {
        lang = l;
-       return *this;
 }
 
 
-LyXFont & LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
+void LyXFont::setNumber(LyXFont::FONT_MISC_STATE n)
 {
        bits.number = n;
-       return *this;
 }
 
 
@@ -440,11 +413,7 @@ void LyXFont::update(LyXFont const & newfont,
                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());
 
@@ -474,61 +443,41 @@ void LyXFont::reduce(LyXFont const & tmplt)
                setNoun(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) {
+       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.color == LColor::inherit) {
+
+       if (bits.color == LColor::inherit)
                bits.color = tmplt.bits.color;
-       }
+
        return *this;
 }
 
@@ -540,9 +489,6 @@ bool LyXFont::resolved() const
                shape() != INHERIT_SHAPE && size() != INHERIT_SIZE &&
                emph() != INHERIT && underbar() != INHERIT &&
                noun() != INHERIT &&
-#ifdef INHERIT_LANGUAGE
-               language() != inherit_language &&
-#endif
                color() != LColor::inherit);
 }
 
@@ -550,49 +496,50 @@ bool LyXFont::resolved() const
 /// Build GUI description of font state
 string const LyXFont::stateText(BufferParams * params) const
 {
-       ostringstream ost;
+       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()]) << ", ";
+               os << to_utf8(bformat(_("Noun %1$s, "),
+                             _(GUIMiscNames[noun()])));
        if (bits == inherit)
-               ost << _("Default") << ", ";
+               os << to_utf8(_("Default")) << ", ";
        if (!params || (language() != params->language))
-               ost << _("Language: ") << _(language()->display()) << ", ";
+               os << to_utf8(bformat(_("Language: %1$s, "),
+                             _(language()->display())));
        if (number() != OFF)
-               ost << _("  Number ") << _(GUIMiscNames[number()]);
-
-       string buf(ost.str().c_str());
-       buf = strip(buf, ' ');
-       buf = strip(buf, ',');
-       return buf;
+               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 const 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;
@@ -602,10 +549,11 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
 // Set series according to lyx format string
 LyXFont & LyXFont::setLyXSeries(string const & ser)
 {
-       string const 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
@@ -618,13 +566,14 @@ LyXFont & LyXFont::setLyXSeries(string const & ser)
 // Set shape according to lyx format string
 LyXFont & LyXFont::setLyXShape(string const & sha)
 {
-       string const 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;
@@ -634,9 +583,10 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
 // Set size according to lyx format string
 LyXFont & LyXFont::setLyXSize(string const & siz)
 {
-       string const 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
@@ -649,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 const 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 `"
@@ -683,7 +634,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
        bool finished = false;
        while (!finished && lex.isOK() && !error) {
                lex.next();
-               string const tok = lowercase(lex.getString());
+               string const tok = ascii_lowercase(lex.getString());
 
                if (tok.empty()) {
                        continue;
@@ -707,7 +658,7 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
                        setLyXSize(ttok);
                } else if (tok == "misc") {
                        lex.next();
-                       string const ttok = lowercase(lex.getString());
+                       string const ttok = ascii_lowercase(lex.getString());
 
                        if (ttok == "no_bar") {
                                setUnderbar(OFF);
@@ -739,40 +690,31 @@ LyXFont & LyXFont::lyxRead(LyXLex & lex)
 
 /// Writes the changes from this font to orgfont in .lyx format in file
 void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
-#ifdef INHERIT_LANGUAGE
-                             Language const * doclang,
-#endif
                              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.number() != number()) {
-               os << "\\numeric " << LyXMiscNames[number()] << " \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;
@@ -780,24 +722,13 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
                }
        }
        if (orgfont.noun() != noun()) {
-               os << "\\noun " << LyXMiscNames[noun()] << " \n";
-       }
-       if (orgfont.color() != color()) {
-               // 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";
+               os << "\\noun " << LyXMiscNames[noun()] << "\n";
        }
-       if (orgfont.language() != language()) {
-#ifndef INHERIT_LANGUAGE
+       if (orgfont.color() != color())
+               os << "\\color " << lcolor.getLyXName(color()) << '\n';
+       if (orgfont.language() != language() &&
+           language() != latex_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";
@@ -807,7 +738,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
 
 /// 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;
@@ -827,7 +758,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
                        string const tmp =
                                subst(lyxrc.language_command_local,
                                      "$$lang", language()->babel());
-                       os << tmp;
+                       os << from_ascii(tmp);
                        count += tmp.length();
                }
        }
@@ -864,7 +795,7 @@ int LyXFont::latexWriteStartChanges(ostream & os, LyXFont const & base,
        }
        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
@@ -882,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) {
@@ -903,18 +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;
 
-       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 << '}';
@@ -966,7 +896,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
        }
 
        if (language() != base.language() && language() != next.language()) {
-               os << "}";
+               os << '}';
                ++count;
        }
 
@@ -974,7 +904,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 }
 
 
-LColor::color LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
        if (color() == LColor::none)
                return LColor::foreground;
@@ -982,24 +912,26 @@ LColor::color LyXFont::realColor() const
 }
 
 
-// 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);
 }
 
 
-ostream & operator<<(ostream & o, LyXFont::FONT_MISC_STATE fms)
+std::ostream & operator<<(std::ostream & os, LyXFont const & font)
 {
-       return o << int(fms);
+       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);
 }
+
+
+} // namespace lyx