outstanding changes

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index ccfe7e54669e563c7a0c4451d59dbdc3cac6cf17..034d4e484f42141876b69ef21e297b334f05ebbb 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -26,8 +26,6 @@ class LyXLex;
 class BufferParams;
 
 
-#define NO_LATEX 1
-
 ///
 class LyXFont {
 public:
@@ -188,10 +186,6 @@ public:
        ///
        FONT_MISC_STATE noun() const;
 
-#ifndef NO_LATEX
-       ///
-       FONT_MISC_STATE latex() const;
-#endif
        ///
        FONT_MISC_STATE number() const;
 
@@ -221,10 +215,6 @@ public:
        LyXFont & setUnderbar(LyXFont::FONT_MISC_STATE u);
        ///
        LyXFont & setNoun(LyXFont::FONT_MISC_STATE n);
-#ifndef NO_LATEX
-       ///
-       LyXFont & setLatex(LyXFont::FONT_MISC_STATE l);
-#endif
        ///
        LyXFont & setNumber(LyXFont::FONT_MISC_STATE n);
        ///
@@ -262,15 +252,20 @@ 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, bool toggleall = false);
+       void update(LyXFont const & newfont,
+                   Language const * default_lang,
+                   bool toggleall = false);
  
        /** Reduce font to fall back to template where possible.
            Equal fields are reduced to INHERIT */
        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;
  
@@ -278,8 +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
@@ -306,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:
@@ -334,10 +330,6 @@ private:
                FONT_MISC_STATE underbar;
                ///
                FONT_MISC_STATE noun;
-#ifndef NO_LATEX
-               ///
-               FONT_MISC_STATE latex;
-#endif
                ///
                FONT_MISC_STATE number;
        };