rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index cdaca8d9fc4de932729762a274a70b1ab45522cf..ee036fe9ef48fe5b657039e92d7b5c38d3545d84 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -1,8 +1,4 @@
 
-#ifdef __GNUG__
-#pragma implementation 
-#endif
-
 #include <config.h>
 
 #include "math_support.h"
@@ -15,7 +11,7 @@
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
 #include "debug.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "dimension.h"
 
 #include <map>
@@ -309,6 +305,7 @@ named_deco_struct deco_table[] = {
        {"mathring",       ring,       0 },
 
        // Dots
+       {"dots",           hline3,     0 },
        {"ldots",          hline3,     0 },
        {"cdots",          hline3,     0 },
        {"vdots",          hline3,     1 },
@@ -453,14 +450,14 @@ void mathed_draw_deco(MathPainterInfo & pi, int x, int y, int w, int h,
                        for (int j = 0; j < n; ++j) {
                                double xx = d[i++];
                                double yy = d[i++];
-//          lyxerr << " " << xx << " " << yy << " ";
+//          lyxerr << ' ' << xx << ' ' << yy << ' ';
                                if (code == 4)
                                        sqmt.transform(xx, yy);
                                else
                                        mt.transform(xx, yy);
                                xp[j] = int(x + xx + 0.5);
                                yp[j] = int(y + yy + 0.5);
-                               //  lyxerr << "P[" << j " " << xx << " " << yy << " " << x << " " << y << "]";
+                               //  lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']';
                        }
                        pi.pain.lines(xp, yp, n, LColor::math);
                }
@@ -524,7 +521,7 @@ struct fontinfo {
 
 LyXFont::FONT_FAMILY const inh_family = LyXFont::INHERIT_FAMILY;
 LyXFont::FONT_SERIES const inh_series = LyXFont::INHERIT_SERIES;
-LyXFont::FONT_SHAPE  const inh_shape  = LyXFont::INHERIT_SHAPE; 
+LyXFont::FONT_SHAPE  const inh_shape  = LyXFont::INHERIT_SHAPE;
 
 
 // mathnormal should be the first, otherwise the fallback further down
@@ -537,14 +534,16 @@ fontinfo fontinfos[] = {
        {"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},
-       {"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},
+       {"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},
@@ -582,11 +581,11 @@ fontinfo fontinfos[] = {
 
 fontinfo * lookupFont(string const & name)
 {
-       //lyxerr << "searching font '" << name << "'\n"; 
+       //lyxerr << "searching font '" << name << "'\n";
        int const n = sizeof(fontinfos) / sizeof(fontinfo);
        for (int i = 0; i < n; ++i)
                if (fontinfos[i].cmd_ == name) {
-                       //lyxerr << "found '" << i << "'\n"; 
+                       //lyxerr << "found '" << i << "'\n";
                        return fontinfos + i;
                }
        return 0;