fix #1073

[lyx.git] / src / mathed / math_support.C

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 272fe1766c60bfb710e31883d44cf454702d6dd9..a893da51ce5fd494cb69b6dcde57d8f827e2ebd1 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -1,6 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include <config.h>
 
@@ -9,12 +6,12 @@
 #include "math_cursor.h"
 #include "math_inset.h"
 #include "math_parser.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 #include "debug.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "dimension.h"
 
 #include <map>
@@ -398,12 +395,12 @@ int mathed_string_width(LyXFont const & font, string const & s)
 }
 
 
-void mathed_draw_deco(MathPainterInfo & pi, int x, int y, int w, int h,
+void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
        const string & name)
 {
        if (name == ".") {
                pi.pain.line(x + w/2, y, x + w/2, y + h,
-                         LColor::mathcursor, Painter::line_onoffdash);
+                         LColor::cursor, Painter::line_onoffdash);
                return;
        }
 
@@ -468,7 +465,7 @@ void mathed_draw_deco(MathPainterInfo & pi, int x, int y, int w, int h,
 }
 
 
-void mathed_draw_framebox(MathPainterInfo & pi, int x, int y, MathInset const * p)
+void mathed_draw_framebox(PainterInfo & pi, int x, int y, MathInset const * p)
 {
        if (mathcursor && mathcursor->isInside(p))
                pi.pain.rectangle(x, y - p->ascent(), p->width(), p->height(),
@@ -477,14 +474,14 @@ void mathed_draw_framebox(MathPainterInfo & pi, int x, int y, MathInset const *
 
 
 // In the future maybe we use a better fonts renderer
-void drawStr(MathPainterInfo & pi, LyXFont const & font,
+void drawStr(PainterInfo & pi, LyXFont const & font,
        int x, int y, string const & str)
 {
        pi.pain.text(x, y, str, font);
 }
 
 
-void drawStrRed(MathPainterInfo & pi, int x, int y, string const & str)
+void drawStrRed(PainterInfo & pi, int x, int y, string const & str)
 {
        LyXFont f = pi.base.font;
        f.setColor(LColor::latex);
@@ -492,15 +489,15 @@ void drawStrRed(MathPainterInfo & pi, int x, int y, string const & str)
 }
 
 
-void drawStrBlack(MathPainterInfo & 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);
 }
 
 
-void drawChar(MathPainterInfo & pi, LyXFont const & font, int x, int y, char c)
+void drawChar(PainterInfo & pi, LyXFont const & font, int x, int y, char c)
 {
        pi.pain.text(x, y, c, font);
 }
@@ -530,54 +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},
-       {"cmex",   LyXFont::CMEX_FAMILY, inh_series, inh_shape, LColor::math},
-       {"cmm",    LyXFont::CMM_FAMILY, inh_series, inh_shape, LColor::math},
-       {"cmr",    LyXFont::CMR_FAMILY, inh_series, inh_shape, LColor::math},
-       {"cmsy",   LyXFont::CMSY_FAMILY, inh_series, inh_shape, LColor::math},
-       {"eufrak", LyXFont::EUFRAK_FAMILY, inh_series, inh_shape, LColor::math},
-       {"msa",    LyXFont::MSA_FAMILY, inh_series, inh_shape, LColor::math},
-       {"msb",    LyXFont::MSB_FAMILY, inh_series, inh_shape, LColor::math},
-       {"wasy",   LyXFont::WASY_FAMILY, inh_series, inh_shape, LColor::math},
-       {"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}
 };