Added new FINISED states FINISHED_RIGHT, FINISHED_UP, FINISHED_DOWN.

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 6a716b88c15c2669ad116ebf1caab7067ead81ce..034d4e484f42141876b69ef21e297b334f05ebbb 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -186,9 +186,6 @@ public:
        ///
        FONT_MISC_STATE noun() const;
 
-       ///
-       FONT_MISC_STATE latex() const;
-
        ///
        FONT_MISC_STATE number() const;
 
@@ -219,8 +216,6 @@ public:
        ///
        LyXFont & setNoun(LyXFont::FONT_MISC_STATE n);
        ///
-       LyXFont & setLatex(LyXFont::FONT_MISC_STATE l);
-       ///
        LyXFont & setNumber(LyXFont::FONT_MISC_STATE n);
        ///
        LyXFont & setColor(LColor::color c);
@@ -257,7 +252,7 @@ public:
            a INHERIT_FAMILY was asked for.  This is necessary for the
            toggle-user-defined-style button on the toolbar.
        */
-       void update(LyXFont const & newfont, 
+       void update(LyXFont const & newfont,
                    Language const * default_lang,
                    bool toggleall = false);
  
@@ -266,8 +261,11 @@ public:
        void reduce(LyXFont const & tmplt);
  
        /// Realize font from a template (INHERIT are realized)
+#ifndef INHERIT_LANGUAGE
        LyXFont & realize(LyXFont const & tmplt);
-
+#else
+       LyXFont & realize(LyXFont const & tmplt, Language const * language);
+#endif
        /// Is a given font fully resolved?
        bool resolved() const;
  
@@ -275,7 +273,12 @@ public:
        LyXFont & lyxRead(LyXLex &);
  
        /// Writes the changes from this font to orgfont in .lyx format in file
+#ifndef INHERIT_LANGUAGE
        void lyxWriteChanges(LyXFont const & orgfont, std::ostream &) const;
+#else
+       void lyxWriteChanges(LyXFont const & orgfont, Language const * doclang,
+                            std::ostream &) const;
+#endif
 
        /** Writes the head of the LaTeX needed to change to this font.
            Writes to string, the head of the LaTeX needed to change
@@ -302,9 +305,6 @@ public:
        friend
        bool operator==(LyXFont const & font1, LyXFont const & font2);
 
-       /// compares two fonts, ignoring the setting of the Latex part.
-       bool equalExceptLatex(LyXFont const &) const;
-
        /// Converts logical attributes to concrete shape attribute
        LyXFont::FONT_SHAPE realShape() const;
 private:
@@ -331,8 +331,6 @@ private:
                ///
                FONT_MISC_STATE noun;
                ///
-               FONT_MISC_STATE latex;
-               ///
                FONT_MISC_STATE number;
        };