X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFontInfo.cpp;h=9f21bcc3d38e9c070c7433cd730d6d3b9fab93da;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=4740cc1564b0940c034b09768bd710b59234f408;hpb=2b1515a9368a25d4f54471ebaf0557305b7baa18;p=lyx.git diff --git a/src/FontInfo.cpp b/src/FontInfo.cpp index 4740cc1564..9f21bcc3d3 100644 --- a/src/FontInfo.cpp +++ b/src/FontInfo.cpp @@ -14,8 +14,9 @@ #include -#include "ColorSet.h" #include "FontInfo.h" + +#include "ColorSet.h" #include "Lexer.h" #include "LyXRC.h" @@ -24,7 +25,6 @@ #include "support/docstring.h" #include "support/gettext.h" #include "support/lstrings.h" -#include "support/RefChanger.h" #include #include @@ -41,7 +41,7 @@ namespace lyx { char const * GUIFamilyNames[NUM_FAMILIES + 2 /* default & error */] = { N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"), - "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "ds", "eufrak", "rsfs", "stmry", "wasy", "esint", N_("Inherit"), N_("Ignore") }; char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] = @@ -65,7 +65,7 @@ char const * GUIMiscNames[5] = // char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] = { "roman", "sans", "typewriter", "symbol", - "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry", + "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "ds", "eufrak", "rsfs", "stmry", "wasy", "esint", "default", "error" }; char const * LyXSeriesNames[NUM_SERIES + 2 /* default & error */] = @@ -326,27 +326,27 @@ FontInfo & FontInfo::realize(FontInfo const & tmplt) Changer FontInfo::changeColor(ColorCode const color) { - return make_change(color_, color); + return changeVar(color_, color); } Changer FontInfo::changeShape(FontShape const shape) { - return make_change(shape_, shape); + return changeVar(shape_, shape); } Changer FontInfo::changeStyle(MathStyle const new_style) { - return make_change(style_, new_style); + return changeVar(style_, new_style); } -Changer FontInfo::change(FontInfo font, bool realiz) +Changer FontInfo::change(FontInfo font, bool realize) { - if (realiz) + if (realize) font.realize(*this); - return make_change(*this, font); + return changeVar(*this, font); } @@ -493,6 +493,7 @@ string getFamilyCSS(FontFamily const & f) case CMEX_FAMILY: case MSA_FAMILY: case MSB_FAMILY: + case DS_FAMILY: case EUFRAK_FAMILY: case RSFS_FAMILY: case STMARY_FAMILY: