Extracted from r14281

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 6fefc131c90a3bfcc7854db223b1dee84928e91a..4168907ed94e02ed4fe8a7229848c8ec5a2bd032 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -204,21 +204,15 @@ LColor_color LyXFont::color() const
 }
 
 
-Language const * LyXFont::language() const
-{
-       return lang;
-}
-
-
 bool LyXFont::isRightToLeft() const
 {
-       return lang->RightToLeft();
+       return lang->rightToLeft();
 }
 
 
 bool LyXFont::isVisibleRightToLeft() const
 {
-       return (lang->RightToLeft() &&
+       return (lang->rightToLeft() &&
                number() != ON);
 }
 
@@ -732,7 +726,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
@@ -917,23 +912,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);