]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfont.C
Fix event loop to no longer eat CPU
[lyx.git] / src / lyxfont.C
index 4dfe32f3208e48927d0f7fd7cb6488794d884ba3..d7559ca0842c92ddcfae15c05d5d1a790f16c0c7 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * \file lyxfont.C
+ * \file src/lyxfont.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -26,7 +26,7 @@
 
 #include "support/lstrings.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
 using lyx::support::ascii_lowercase;
 using lyx::support::bformat;
@@ -34,7 +34,7 @@ using lyx::support::rtrim;
 using lyx::support::subst;
 
 using std::endl;
-
+using std::string;
 using std::ostream;
 using std::ostringstream;
 
@@ -197,30 +197,13 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
 {}
 
 
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-       return bits.underbar;
-}
 
-
-EnumLColor LyXFont::color() const
+LColor_color LyXFont::color() const
 {
        return LColor::color(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();
@@ -276,7 +259,7 @@ void LyXFont::setNoun(LyXFont::FONT_MISC_STATE n)
 }
 
 
-void LyXFont::setColor(EnumLColor c)
+void LyXFont::setColor(LColor_color c)
 {
        bits.color = int(c);
 }
@@ -470,30 +453,30 @@ LyXFont & LyXFont::realize(LyXFont const & tmplt)
                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;
 }
 
@@ -545,7 +528,8 @@ LyXFont & LyXFont::setLyXFamily(string const & fam)
        string const s = ascii_lowercase(fam);
 
        int i = 0;
-       while (s != LyXFamilyNames[i] && LyXFamilyNames[i] != "error")
+       while (LyXFamilyNames[i] != s &&
+              LyXFamilyNames[i] != string("error"))
                ++i;
        if (s == LyXFamilyNames[i])
                setFamily(LyXFont::FONT_FAMILY(i));
@@ -562,7 +546,8 @@ LyXFont & LyXFont::setLyXSeries(string const & 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
@@ -578,10 +563,11 @@ LyXFont & LyXFont::setLyXShape(string const & 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;
@@ -593,7 +579,8 @@ LyXFont & LyXFont::setLyXSize(string const & 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
@@ -608,7 +595,8 @@ LyXFont::FONT_MISC_STATE LyXFont::setLyXMisc(string const & 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 `"
@@ -699,34 +687,28 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
                              ostream & os) const
 {
        os << "\n";
-       if (orgfont.family() != family()) {
-               os << "\\family " << LyXFamilyNames[family()] << " \n";
-       }
-       if (orgfont.series() != series()) {
-               os << "\\series " << LyXSeriesNames[series()] << " \n";
-       }
-       if (orgfont.shape() != shape()) {
-               os << "\\shape " << LyXShapeNames[shape()] << " \n";
-       }
-       if (orgfont.size() != size()) {
-               os << "\\size " << LyXSizeNames[size()] << " \n";
-       }
-       if (orgfont.emph() != emph()) {
-               os << "\\emph " << LyXMiscNames[emph()] << " \n";
-       }
-       if (orgfont.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;
@@ -734,7 +716,7 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
                }
        }
        if (orgfont.noun() != noun()) {
-               os << "\\noun " << LyXMiscNames[noun()] << " \n";
+               os << "\\noun " << LyXMiscNames[noun()] << "\n";
        }
        if (orgfont.color() != color()) {
                // To make us file compatible with older
@@ -921,7 +903,7 @@ int LyXFont::latexWriteEndChanges(ostream & os, LyXFont const & base,
 }
 
 
-EnumLColor LyXFont::realColor() const
+LColor_color LyXFont::realColor() const
 {
        if (color() == LColor::none)
                return LColor::foreground;
@@ -929,24 +911,23 @@ EnumLColor 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);
 }