From e969b0ce22afd6762d7dfd3b4526350266ee0cc1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Mon, 14 Apr 2003 14:56:49 +0000 Subject: [PATCH] black->foreground git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6799 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/math_support.C | 130 ++++++++++++++++++++++++-------------- 1 file changed, 82 insertions(+), 48 deletions(-) diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 4694964c07..2deec75f1d 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -492,7 +492,7 @@ void drawStrRed(PainterInfo & pi, int x, int y, string const & str) void drawStrBlack(PainterInfo & pi, int x, int y, string const & str) { LyXFont f = pi.base.font; - f.setColor(LColor::black); + f.setColor(LColor::foreground); pi.pain.text(x, y, str, f); } @@ -527,55 +527,89 @@ LyXFont::FONT_SHAPE const inh_shape = LyXFont::INHERIT_SHAPE; // mathnormal should be the first, otherwise the fallback further down // does not work fontinfo fontinfos[] = { - {"mathnormal", - inh_family, LyXFont::MEDIUM_SERIES, LyXFont::UP_SHAPE, LColor::math}, - {"mathbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::math}, - {"mathcal",LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::math}, - {"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::math}, - {"mathrm", LyXFont::ROMAN_FAMILY, inh_series, inh_shape, LColor::math}, - {"mathsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::math}, - {"mathbb", LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::math}, - {"mathtt", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::math}, - {"cmex", LyXFont::CMEX_FAMILY, inh_series, inh_shape, LColor::none}, - {"cmm", LyXFont::CMM_FAMILY, inh_series, inh_shape, LColor::none}, - {"cmr", LyXFont::CMR_FAMILY, inh_series, inh_shape, LColor::none}, - {"cmsy", LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::none}, - {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::none}, - {"msa", LyXFont::MSA_FAMILY, inh_series, inh_shape, LColor::none}, - {"msb", LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::none}, - {"wasy", LyXFont::WASY_FAMILY, inh_series, inh_shape, LColor::none}, - {"text", inh_family, inh_series, inh_shape, LColor::black}, - {"textbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::black}, - {"textit", inh_family, inh_series, LyXFont::ITALIC_SHAPE, LColor::black}, - {"textmd", inh_family, LyXFont::MEDIUM_SERIES, inh_shape, LColor::black}, - {"textnormal", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black}, - {"textrm", LyXFont::ROMAN_FAMILY, inh_series,LyXFont::UP_SHAPE,LColor::black}, - {"textsc", inh_family, inh_series, LyXFont::SMALLCAPS_SHAPE, LColor::black}, - {"textsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::black}, - {"textsl", inh_family, inh_series, LyXFont::SLANTED_SHAPE, LColor::black}, - {"texttt", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::black}, - {"textup", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black}, + // math fonts + {"mathnormal", inh_family, LyXFont::MEDIUM_SERIES, + LyXFont::UP_SHAPE, LColor::math}, + {"mathbf", inh_family, LyXFont::BOLD_SERIES, + inh_shape, LColor::math}, + {"mathcal", LyXFont::CMSY_FAMILY, inh_series, + inh_shape, LColor::math}, + {"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series, + inh_shape, LColor::math}, + {"mathrm", LyXFont::ROMAN_FAMILY, inh_series, + inh_shape, LColor::math}, + {"mathsf", LyXFont::SANS_FAMILY, inh_series, + inh_shape, LColor::math}, + {"mathbb", LyXFont::MSB_FAMILY, inh_series, + inh_shape, LColor::math}, + {"mathtt", LyXFont::TYPEWRITER_FAMILY, inh_series, + inh_shape, LColor::math}, + {"cmex", LyXFont::CMEX_FAMILY, inh_series, + inh_shape, LColor::none}, + {"cmm", LyXFont::CMM_FAMILY, inh_series, + inh_shape, LColor::none}, + {"cmr", LyXFont::CMR_FAMILY, inh_series, + inh_shape, LColor::none}, + {"cmsy", LyXFont::CMSY_FAMILY, inh_series, + inh_shape, LColor::none}, + {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series, + inh_shape, LColor::none}, + {"msa", LyXFont::MSA_FAMILY, inh_series, + inh_shape, LColor::none}, + {"msb", LyXFont::MSB_FAMILY, inh_series, + inh_shape, LColor::none}, + {"wasy", LyXFont::WASY_FAMILY, inh_series, + inh_shape, LColor::none}, + + // Text fonts + {"text", inh_family, inh_series, + inh_shape, LColor::foreground}, + {"textbf", inh_family, LyXFont::BOLD_SERIES, + inh_shape, LColor::foreground}, + {"textit", inh_family, inh_series, + LyXFont::ITALIC_SHAPE, LColor::foreground}, + {"textmd", inh_family, LyXFont::MEDIUM_SERIES, + inh_shape, LColor::foreground}, + {"textnormal", inh_family, inh_series, + LyXFont::UP_SHAPE, LColor::foreground}, + {"textrm", LyXFont::ROMAN_FAMILY, + inh_series,LyXFont::UP_SHAPE,LColor::foreground}, + {"textsc", inh_family, inh_series, + LyXFont::SMALLCAPS_SHAPE, LColor::foreground}, + {"textsf", LyXFont::SANS_FAMILY, inh_series, + inh_shape, LColor::foreground}, + {"textsl", inh_family, inh_series, + LyXFont::SLANTED_SHAPE, LColor::foreground}, + {"texttt", LyXFont::TYPEWRITER_FAMILY, inh_series, + inh_shape, LColor::foreground}, + {"textup", inh_family, inh_series, + LyXFont::UP_SHAPE, LColor::foreground}, // TIPA support - {"textipa", inh_family, inh_series, inh_shape, LColor::black}, - - {"lyxtex", inh_family, inh_series, inh_shape, LColor::latex}, - {"lyxert", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::latex}, - {"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series, inh_shape, LColor::math}, - {"lyxboldsymbol", - LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES, inh_shape, LColor::math}, - {"lyxitsymbol", LyXFont::SYMBOL_FAMILY, - inh_series, LyXFont::ITALIC_SHAPE, LColor::math}, - {"lyxblacktext", LyXFont::ROMAN_FAMILY, - LyXFont::MEDIUM_SERIES, LyXFont::UP_SHAPE, LColor::black}, - {"lyxnochange", inh_family, inh_series, inh_shape, LColor::black}, - - {"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES, - LyXFont::UP_SHAPE, LColor::math}, - {"lyxfakecal", LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES, - LyXFont::ITALIC_SHAPE, LColor::math}, - {"lyxfakefrak", LyXFont::ROMAN_FAMILY, LyXFont::BOLD_SERIES, - LyXFont::ITALIC_SHAPE, LColor::math} + {"textipa", inh_family, inh_series, + inh_shape, LColor::foreground}, + + // LyX internal usage + {"lyxtex", inh_family, inh_series, + inh_shape, LColor::latex}, + {"lyxert", LyXFont::TYPEWRITER_FAMILY, inh_series, + inh_shape, LColor::latex}, + {"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series, + inh_shape, LColor::math}, + {"lyxboldsymbol", LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES, + inh_shape, LColor::math}, + {"lyxitsymbol", LyXFont::SYMBOL_FAMILY, inh_series, + LyXFont::ITALIC_SHAPE, LColor::math}, + {"lyxblacktext", LyXFont::ROMAN_FAMILY, LyXFont::MEDIUM_SERIES, + LyXFont::UP_SHAPE, LColor::foreground}, + {"lyxnochange", inh_family, inh_series, + inh_shape, LColor::foreground}, + {"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES, + LyXFont::UP_SHAPE, LColor::math}, + {"lyxfakecal", LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES, + LyXFont::ITALIC_SHAPE, LColor::math}, + {"lyxfakefrak", LyXFont::ROMAN_FAMILY, LyXFont::BOLD_SERIES, + LyXFont::ITALIC_SHAPE, LColor::math} }; -- 2.39.2