From 7b47d3f10e8fdbf64bd486ddd7c6ad9974fb6cc1 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 29 Apr 2003 13:09:38 +0000 Subject: [PATCH] draw text-mode in math using foreground color, not black git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@6880 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 6 ++++++ src/mathed/math_support.C | 30 +++++++++++++++--------------- status.13x | 13 +++++++++++-- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 31204741c0..0ce5c59f84 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,9 @@ +2003-04-28 Jean-Marc Lasgouttes + + * math_support.C (drawStrBlack): + (fontinfos): use LColor::foreground instead of LColor::black for + normal text + 2003-03-04 Jean-Marc Lasgouttes * math_braceinset.C (metrics): fix computation of descent diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C index 0079e46a14..ee52d4e08d 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/math_support.C @@ -495,7 +495,7 @@ void drawStrRed(MathPainterInfo & pi, int x, int y, string const & str) void drawStrBlack(MathPainterInfo & 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); } @@ -547,20 +547,20 @@ fontinfo fontinfos[] = { {"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}, + {"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}, + {"textipa", inh_family, inh_series, inh_shape, LColor::foreground}, {"lyxtex", inh_family, inh_series, inh_shape, LColor::latex}, {"lyxert", LyXFont::TYPEWRITER_FAMILY, inh_series, inh_shape, LColor::latex}, @@ -570,8 +570,8 @@ fontinfo fontinfos[] = { {"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}, + 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}, diff --git a/status.13x b/status.13x index 161e94fea1..7d5b8481fb 100644 --- a/status.13x +++ b/status.13x @@ -36,9 +36,9 @@ What's new - add support for the hspell spell-checker for hebrew [Qt only] -- [xforms only] add support for scalable tabfolders and for 'native' tooltips +- add support for scalable tabfolders and for 'native' tooltips in browser widgets. You must recompile against xforms 1.0.2 or greater - to enable these new features. + to enable these new features [xforms only] - update dutch, finnish, german, polish [bug #1002], romanian, russian and spanish interface localisation. Add support for nynorsk. Fix @@ -58,6 +58,9 @@ What's new - fix duplicate keyboard accelerator in the paragraph dialog [Qt only] +- in the include dialog, make "show preview" activate the OK button + [Qt only] + - fix display of bullet pixmaps in document dialog [bug #908, Qt 3.1.1 only] - fix loading of included files that are under revision control @@ -72,9 +75,15 @@ What's new - fix reading of subcaptions in files from LyX 1.1.6 or older +- add a converter from grace (.agr) files to PPM, in order to display + them in xforms frontend + - fix support for \framebox macro in mathed: the argument is handled as text, and a second optional argument is now supported +- text-mode parts of math equations are now drawn in foreground color + instead of being hardcoded to black + - add support for macro \bmod in mathed - add macro \Pr in the list of selectable functions of the math panel