X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=28611e542959c8c43975f61d828896d3244615a3;hb=9dafe9b9a5cb12e19e0f3a1a9669d81dc140b0e3;hp=d230cfa6b4f54a252f56ef71119d9db1b0c7f059;hpb=0cf717d0c8ba3d766acb45c3adfcc0de1f3b79db;p=lyx.git diff --git a/src/lyxfont.h b/src/lyxfont.h index d230cfa6b4..28611e5429 100644 --- 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,6 +45,8 @@ public: /// SYMBOL_FAMILY, /// + CMR_FAMILY, + /// CMSY_FAMILY, /// CMM_FAMILY, @@ -55,9 +57,13 @@ public: /// MSB_FAMILY, /// + EUFRAK_FAMILY, + /// INHERIT_FAMILY, /// - IGNORE_FAMILY + IGNORE_FAMILY, + /// + NUM_FAMILIES = INHERIT_FAMILY }; /// @@ -375,12 +381,6 @@ LyXFont::FONT_SHAPE LyXFont::shape() const } -inline -LyXFont::LyXFont() - : bits(sane), lang(default_language) -{} - - inline LyXFont::FONT_FAMILY LyXFont::family() const { @@ -419,7 +419,7 @@ LyXFont::FONT_MISC_STATE LyXFont::noun() const inline bool LyXFont::isSymbolFont() const { - switch(family()) { + switch (family()) { case LyXFont::SYMBOL_FAMILY: case LyXFont::CMSY_FAMILY: case LyXFont::CMM_FAMILY: @@ -430,7 +430,6 @@ bool LyXFont::isSymbolFont() const default: return false; } - return false; } ///