anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

black->foreground

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6799 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-04-14 14:56:49 +00:00
parent 21f9037c77
commit e969b0ce22
1 changed files with 81 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/mathed/math_support.C
View File

@ -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) void drawStrBlack(PainterInfo & pi, int x, int y, string const & str)
{ {
LyXFont f = pi.base.font; LyXFont f = pi.base.font;
f.setColor(LColor::black); f.setColor(LColor::foreground);
pi.pain.text(x, y, str, f); 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 // mathnormal should be the first, otherwise the fallback further down
// does not work // does not work
fontinfo fontinfos[] = { fontinfo fontinfos[] = {
{"mathnormal", // math fonts
inh_family, LyXFont::MEDIUM_SERIES, LyXFont::UP_SHAPE, LColor::math}, {"mathnormal", inh_family, LyXFont::MEDIUM_SERIES,
{"mathbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::math}, LyXFont::UP_SHAPE, LColor::math},
{"mathcal",LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::math}, {"mathbf", inh_family, LyXFont::BOLD_SERIES,
{"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::math}, inh_shape, LColor::math},
{"mathrm", LyXFont::ROMAN_FAMILY, inh_series, inh_shape, LColor::math}, {"mathcal", LyXFont::CMSY_FAMILY, inh_series,
{"mathsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::math}, inh_shape, LColor::math},
{"mathbb", LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::math}, {"mathfrak", LyXFont::EUFRAK_FAMILY, inh_series,
{"mathtt", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::math}, inh_shape, LColor::math},
{"cmex", LyXFont::CMEX_FAMILY, inh_series, inh_shape, LColor::none}, {"mathrm", LyXFont::ROMAN_FAMILY, inh_series,
{"cmm", LyXFont::CMM_FAMILY, inh_series, inh_shape, LColor::none}, inh_shape, LColor::math},
{"cmr", LyXFont::CMR_FAMILY, inh_series, inh_shape, LColor::none}, {"mathsf", LyXFont::SANS_FAMILY, inh_series,
{"cmsy", LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::none}, inh_shape, LColor::math},
{"eufrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::none}, {"mathbb", LyXFont::MSB_FAMILY, inh_series,
{"msa", LyXFont::MSA_FAMILY, inh_series, inh_shape, LColor::none}, inh_shape, LColor::math},
{"msb", LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::none}, {"mathtt", LyXFont::TYPEWRITER_FAMILY, inh_series,
{"wasy", LyXFont::WASY_FAMILY, inh_series, inh_shape, LColor::none}, inh_shape, LColor::math},
{"text", inh_family, inh_series, inh_shape, LColor::black}, {"cmex", LyXFont::CMEX_FAMILY, inh_series,
{"textbf", inh_family, LyXFont::BOLD_SERIES, inh_shape, LColor::black}, inh_shape, LColor::none},
{"textit", inh_family, inh_series, LyXFont::ITALIC_SHAPE, LColor::black}, {"cmm", LyXFont::CMM_FAMILY, inh_series,
{"textmd", inh_family, LyXFont::MEDIUM_SERIES, inh_shape, LColor::black}, inh_shape, LColor::none},
{"textnormal", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black}, {"cmr", LyXFont::CMR_FAMILY, inh_series,
{"textrm", LyXFont::ROMAN_FAMILY, inh_series,LyXFont::UP_SHAPE,LColor::black}, inh_shape, LColor::none},
{"textsc", inh_family, inh_series, LyXFont::SMALLCAPS_SHAPE, LColor::black}, {"cmsy", LyXFont::CMSY_FAMILY, inh_series,
{"textsf", LyXFont::SANS_FAMILY, inh_series, inh_shape, LColor::black}, inh_shape, LColor::none},
{"textsl", inh_family, inh_series, LyXFont::SLANTED_SHAPE, LColor::black}, {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series,
{"texttt", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::black}, inh_shape, LColor::none},
{"textup", inh_family, inh_series, LyXFont::UP_SHAPE, LColor::black}, {"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 // TIPA support
{"textipa", inh_family, inh_series, inh_shape, LColor::black}, {"textipa", inh_family, inh_series,
inh_shape, LColor::foreground},
{"lyxtex", inh_family, inh_series, inh_shape, LColor::latex}, // LyX internal usage
{"lyxert", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::latex}, {"lyxtex", inh_family, inh_series,
{"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series, inh_shape, LColor::math}, inh_shape, LColor::latex},
{"lyxboldsymbol", {"lyxert", LyXFont::TYPEWRITER_FAMILY, inh_series,
LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES, inh_shape, LColor::math}, inh_shape, LColor::latex},
{"lyxitsymbol", LyXFont::SYMBOL_FAMILY, {"lyxsymbol", LyXFont::SYMBOL_FAMILY, inh_series,
inh_series, LyXFont::ITALIC_SHAPE, LColor::math}, inh_shape, LColor::math},
{"lyxblacktext", LyXFont::ROMAN_FAMILY, {"lyxboldsymbol", LyXFont::SYMBOL_FAMILY, LyXFont::BOLD_SERIES,
LyXFont::MEDIUM_SERIES, LyXFont::UP_SHAPE, LColor::black}, inh_shape, LColor::math},
{"lyxnochange", inh_family, inh_series, inh_shape, LColor::black}, {"lyxitsymbol", LyXFont::SYMBOL_FAMILY, inh_series,
LyXFont::ITALIC_SHAPE, LColor::math},
{"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES, {"lyxblacktext", LyXFont::ROMAN_FAMILY, LyXFont::MEDIUM_SERIES,
LyXFont::UP_SHAPE, LColor::math}, LyXFont::UP_SHAPE, LColor::foreground},
{"lyxfakecal", LyXFont::SANS_FAMILY, LyXFont::MEDIUM_SERIES, {"lyxnochange", inh_family, inh_series,
LyXFont::ITALIC_SHAPE, LColor::math}, inh_shape, LColor::foreground},
{"lyxfakefrak", LyXFont::ROMAN_FAMILY, LyXFont::BOLD_SERIES, {"lyxfakebb", LyXFont::TYPEWRITER_FAMILY, LyXFont::BOLD_SERIES,
LyXFont::ITALIC_SHAPE, LColor::math} 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}
}; };