cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 6416713986ec2acf17785e508873608a6ba96c5e..cebd9954fb60071e7f9e088e45fd510c69e37006 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -197,11 +197,6 @@ LyXFont::LyXFont(LyXFont::FONT_INIT3, Language const * l)
 {}
 
 
-LyXFont::FONT_MISC_STATE LyXFont::underbar() const
-{
-       return bits.underbar;
-}
-
 
 LColor_color LyXFont::color() const
 {
@@ -209,27 +204,15 @@ LColor_color LyXFont::color() const
 }
 
 
-Language const * LyXFont::language() const
-{
-       return lang;
-}
-
-
-LyXFont::FONT_MISC_STATE LyXFont::number() const
-{
-       return bits.number;
-}
-
-
 bool LyXFont::isRightToLeft() const
 {
-       return lang->RightToLeft();
+       return lang->rightToLeft();
 }
 
 
 bool LyXFont::isVisibleRightToLeft() const
 {
-       return (lang->RightToLeft() &&
+       return (lang->rightToLeft() &&
                number() != ON);
 }
 
@@ -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;
 }
 
@@ -514,27 +497,32 @@ string const LyXFont::stateText(BufferParams * params) const
 {
        ostringstream os;
        if (family() != INHERIT_FAMILY)
-               os << _(GUIFamilyNames[family()]) << ", ";
+               os << lyx::to_utf8(_(GUIFamilyNames[family()])) << ", ";
        if (series() != INHERIT_SERIES)
-               os << _(GUISeriesNames[series()]) << ", ";
+               os << lyx::to_utf8(_(GUISeriesNames[series()])) << ", ";
        if (shape() != INHERIT_SHAPE)
-               os << _(GUIShapeNames[shape()]) << ", ";
+               os << lyx::to_utf8(_(GUIShapeNames[shape()])) << ", ";
        if (size() != INHERIT_SIZE)
-               os << _(GUISizeNames[size()]) << ", ";
+               os << lyx::to_utf8(_(GUISizeNames[size()])) << ", ";
        if (color() != LColor::inherit)
                os << lcolor.getGUIName(color()) << ", ";
        if (emph() != INHERIT)
-               os << bformat(_("Emphasis %1$s, "), _(GUIMiscNames[emph()]));
+               os << lyx::to_utf8(bformat(_("Emphasis %1$s, "),
+                             _(GUIMiscNames[emph()])));
        if (underbar() != INHERIT)
-               os << bformat(_("Underline %1$s, "), _(GUIMiscNames[underbar()]));
+               os << lyx::to_utf8(bformat(_("Underline %1$s, "),
+                             _(GUIMiscNames[underbar()])));
        if (noun() != INHERIT)
-               os << bformat(_("Noun %1$s, "), _(GUIMiscNames[noun()]));
+               os << lyx::to_utf8(bformat(_("Noun %1$s, "),
+                             _(GUIMiscNames[noun()])));
        if (bits == inherit)
-               os << _("Default") << ", ";
+               os << lyx::to_utf8(_("Default")) << ", ";
        if (!params || (language() != params->language))
-               os << bformat(_("Language: %1$s, "), _(language()->display()));
+               os << lyx::to_utf8(bformat(_("Language: %1$s, "),
+                             _(language()->display())));
        if (number() != OFF)
-               os << bformat(_("  Number %1$s"), _(GUIMiscNames[number()]));
+               os << lyx::to_utf8(bformat(_("  Number %1$s"),
+                               _(GUIMiscNames[number()])));
        return rtrim(os.str(), ", ");
 }
 
@@ -580,11 +568,11 @@ LyXFont & LyXFont::setLyXShape(string const & sha)
        string const s = ascii_lowercase(sha);
 
        int i = 0;
-       while (LyXShapeNames[i] != s &&
-              LyXShapeNames[i] != string("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;
@@ -596,8 +584,8 @@ LyXFont & LyXFont::setLyXSize(string const & siz)
 {
        string const s = ascii_lowercase(siz);
        int i = 0;
-       while (LyXSizeNames[i] != s &&
-              LyXSizeNames[i] != string("error")) ++i;
+       while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
+               ++i;
        if (s == LyXSizeNames[i]) {
                setSize(LyXFont::FONT_SIZE(i));
        } else
@@ -704,24 +692,18 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
                              ostream & os) const
 {
        os << "\n";
-       if (orgfont.family() != family()) {
+       if (orgfont.family() != family())
                os << "\\family " << LyXFamilyNames[family()] << "\n";
-       }
-       if (orgfont.series() != series()) {
+       if (orgfont.series() != series())
                os << "\\series " << LyXSeriesNames[series()] << "\n";
-       }
-       if (orgfont.shape() != shape()) {
+       if (orgfont.shape() != shape())
                os << "\\shape " << LyXShapeNames[shape()] << "\n";
-       }
-       if (orgfont.size() != size()) {
+       if (orgfont.size() != size())
                os << "\\size " << LyXSizeNames[size()] << "\n";
-       }
-       if (orgfont.emph() != emph()) {
+       if (orgfont.emph() != emph())
                os << "\\emph " << LyXMiscNames[emph()] << "\n";
-       }
-       if (orgfont.number() != number()) {
+       if (orgfont.number() != number())
                os << "\\numeric " << LyXMiscNames[number()] << "\n";
-       }
        if (orgfont.underbar() != underbar()) {
                // This is only for backwards compatibility
                switch (underbar()) {
@@ -749,7 +731,8 @@ void LyXFont::lyxWriteChanges(LyXFont const & orgfont,
                if (col_str == "inherit") col_str = "default";
                os << "\\color " << col_str << "\n";
        }
-       if (orgfont.language() != language()) {
+       if (orgfont.language() != language() &&
+           language() != latex_language) {
                if (language())
                        os << "\\lang " << language()->lang() << "\n";
                else
@@ -934,23 +917,6 @@ LColor_color LyXFont::realColor() const
 }
 
 
-// Convert logical attributes to concrete shape attribute
-LyXFont::FONT_SHAPE LyXFont::realShape() const
-{
-       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;
-}
-
-
 ostream & operator<<(ostream & os, LyXFont::FONT_MISC_STATE fms)
 {
        return os << int(fms);