Add GraphicsTypes.h to libgraphics_la_SOURCES

[lyx.git] / src / lyxfont.h

diff --git a/src/lyxfont.h b/src/lyxfont.h
index 6a716b88c15c2669ad116ebf1caab7067ead81ce..28611e542959c8c43975f61d828896d3244615a3 100644 (file)
--- a/src/lyxfont.h
+++ b/src/lyxfont.h
@@ -20,10 +20,10 @@
 
 #include "LString.h"
 #include "LColor.h"
-#include "language.h"
 
 class LyXLex;
 class BufferParams;
+class Language;
 
 
 ///
@@ -45,9 +45,25 @@ public:
                ///
                SYMBOL_FAMILY,
                ///
+               CMR_FAMILY,
+               ///
+               CMSY_FAMILY,
+               ///
+               CMM_FAMILY,
+               ///
+               CMEX_FAMILY,
+               ///
+               MSA_FAMILY,
+               ///
+               MSB_FAMILY,
+               ///
+               EUFRAK_FAMILY,
+               ///
                INHERIT_FAMILY,
                ///
-               IGNORE_FAMILY
+               IGNORE_FAMILY,
+               ///
+               NUM_FAMILIES = INHERIT_FAMILY
        };
 
        ///
@@ -186,9 +202,6 @@ public:
        ///
        FONT_MISC_STATE noun() const;
 
-       ///
-       FONT_MISC_STATE latex() const;
-
        ///
        FONT_MISC_STATE number() const;
 
@@ -203,6 +216,9 @@ public:
 
        ///
        bool isVisibleRightToLeft() const;
+
+       ///
+       bool isSymbolFont() const;
        
        ///
        LyXFont & setFamily(LyXFont::FONT_FAMILY f);
@@ -219,8 +235,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 +271,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 +280,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 +292,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 +324,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 +350,6 @@ private:
                ///
                FONT_MISC_STATE noun;
                ///
-               FONT_MISC_STATE latex;
-               ///
                FONT_MISC_STATE number;
        };
 
@@ -364,12 +381,6 @@ LyXFont::FONT_SHAPE LyXFont::shape() const
 }
 
 
-inline
-LyXFont::LyXFont()
-       : bits(sane), lang(default_language)
-{}
-
-
 inline
 LyXFont::FONT_FAMILY LyXFont::family() const 
 {
@@ -405,6 +416,22 @@ LyXFont::FONT_MISC_STATE LyXFont::noun() const
 }
 
 
+inline
+bool LyXFont::isSymbolFont() const
+{
+       switch (family()) {
+       case LyXFont::SYMBOL_FAMILY:
+       case LyXFont::CMSY_FAMILY:
+       case LyXFont::CMM_FAMILY:
+       case LyXFont::CMEX_FAMILY:
+       case LyXFont::MSA_FAMILY:
+       case LyXFont::MSB_FAMILY:
+               return true;
+       default:
+               return false;
+       }
+}
+
 ///
 std::ostream & operator<<(std::ostream &, LyXFont::FONT_MISC_STATE);