split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_support.C b/src/mathed/math_support.C
index 8d576ae111e85e8c447bea73ebaab7a3b054f514..f68869926c0ace78e64746856546e5e68f0be880 100644 (file)
--- a/src/mathed/math_support.C
+++ b/src/mathed/math_support.C
@@ -1,12 +1,12 @@
-#include <config.h>
 
-#include <map>
+#include <config.h>
 
 #include "math_support.h"
 #include "lyxfont.h"
 #include "math_cursor.h"
 #include "math_inset.h"
 #include "math_parser.h"
+#include "math_metricsinfo.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "frontends/lyx_gui.h"
@@ -14,8 +14,8 @@
 #include "commandtags.h"
 #include "dimension.h"
 
-using std::map;
-using std::endl;
+#include <map>
+
 using std::max;
 
 
@@ -305,6 +305,7 @@ named_deco_struct deco_table[] = {
        {"mathring",       ring,       0 },
 
        // Dots
+       {"dots",           hline3,     0 },
        {"ldots",          hline3,     0 },
        {"cdots",          hline3,     0 },
        {"vdots",          hline3,     1 },
@@ -317,7 +318,7 @@ named_deco_struct deco_table[] = {
 };
 
 
-map<string, deco_struct> deco_list;
+std::map<string, deco_struct> deco_list;
 
 // sort the table on startup
 struct init_deco_table {
@@ -337,7 +338,7 @@ static init_deco_table dummy;
 
 deco_struct const * search_deco(string const & name)
 {
-       map<string, deco_struct>::const_iterator p = deco_list.find(name);
+       std::map<string, deco_struct>::const_iterator p = deco_list.find(name);
        return (p == deco_list.end()) ? 0 : &(p->second);
 }
 
@@ -439,8 +440,8 @@ void mathed_draw_deco(MathPainterInfo & pi, int x, int y, int w, int h,
                                mt.transform(xx, yy);
                        mt.transform(x2, y2);
                        pi.pain.line(
-                               x + int(xx + 0.5), y + int(yy + 0.5),
-                               x + int(x2 + 0.5), y + int(y2 + 0.5),
+                               int(x + xx + 0.5), int(y + yy + 0.5),
+                               int(x + x2 + 0.5), int(y + y2 + 0.5),
                                LColor::math);
                }       else {
                        int xp[32];
@@ -449,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] = x + int(xx + 0.5);
-                               yp[j] = y + int(yy + 0.5);
-                               //  lyxerr << "P[" << j " " << xx << " " << yy << " " << x << " " << y << "]";
+                               xp[j] = int(x + xx + 0.5);
+                               yp[j] = int(y + yy + 0.5);
+                               //  lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']';
                        }
                        pi.pain.lines(xp, yp, n, LColor::math);
                }
@@ -520,26 +521,29 @@ 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 fuerther down
+// mathnormal should be the first, otherwise the fallback further down
 // does not work
 fontinfo fontinfos[] = {
-       {"mathnormal", inh_family,inh_series, LyXFont::UP_SHAPE, LColor::math},
+       {"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},
-       {"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},
@@ -556,6 +560,7 @@ fontinfo fontinfos[] = {
        {"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},
@@ -576,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;
@@ -630,7 +635,6 @@ void augmentFont(LyXFont & font, string const & name)
        static bool initialized = false;
        if (!initialized) {
                initialized = true;
-
                // fake fonts if necessary
                if (!lyx_gui::font_available(getFont("mathfrak")))
                        fakeFont("mathfrak", "lyxfakefrak");