X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfont.h;h=17b2359b11a0217262fd774c19e269f87863c828;hb=5091380d6bad1686800e384ed1bbb03836a15aab;hp=3cb1edd795f79042cb6fd6766691007d4c1362de;hpb=9548351ef8ceaa1c779267e4eeccd3a0d83a0374;p=lyx.git diff --git a/src/lyxfont.h b/src/lyxfont.h index 3cb1edd795..17b2359b11 100644 --- a/src/lyxfont.h +++ b/src/lyxfont.h @@ -59,6 +59,8 @@ public: /// EUFRAK_FAMILY, /// + WASY_FAMILY, + /// INHERIT_FAMILY, /// IGNORE_FAMILY, @@ -280,11 +282,7 @@ 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; @@ -292,12 +290,7 @@ 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 @@ -425,6 +418,7 @@ bool LyXFont::isSymbolFont() const case LyXFont::CMEX_FAMILY: case LyXFont::MSA_FAMILY: case LyXFont::MSB_FAMILY: + case LyXFont::WASY_FAMILY: return true; default: return false;