Move the inPixels(MetricsBase) help from Length to MetricsBase.

[features.git] / src / mathed / MathSupport.cpp

diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp
index daf437fc67fe5003a868ccac45e6d2a093cb1508..0e2dc81e7bcabfdb7f4809af1b7a25bfcc634236 100644 (file)
--- a/src/mathed/MathSupport.cpp
+++ b/src/mathed/MathSupport.cpp
@@ -495,7 +495,7 @@ public:
        }
 };
 
-static init_deco_table dummy;
+static init_deco_table dummy_deco_table;
 
 
 deco_struct const * search_deco(docstring const & name)
@@ -505,7 +505,7 @@ deco_struct const * search_deco(docstring const & name)
 }
 
 
-} // namespace anon
+} // namespace
 
 
 int mathed_font_em(FontInfo const & font)
@@ -513,6 +513,12 @@ int mathed_font_em(FontInfo const & font)
        return theFontMetrics(font).em();
 }
 
+
+int mathed_font_x_height(FontInfo const & font)
+{
+       return theFontMetrics(font).ascent('x');
+}
+
 /* The math units. Quoting TeX by Topic, p.205:
  *
  * Spacing around mathematical objects is measured in mu units. A mu
@@ -539,7 +545,7 @@ int mathed_font_em(FontInfo const & font)
 int mathed_mu(FontInfo const & font, double mu)
 {
        MetricsBase mb(nullptr, font);
-       return Length(mu, Length::MU).inPixels(mb);
+       return mb.inPixels(Length(mu, Length::MU));
 }
 
 int mathed_thinmuskip(FontInfo const & font) { return mathed_mu(font, 3.0); }
@@ -556,7 +562,7 @@ int mathed_char_width(FontInfo const & font, char_type c)
 int mathed_char_kerning(FontInfo const & font, char_type c)
 {
        frontend::FontMetrics const & fm = theFontMetrics(font);
-       return fm.rbearing(c) - fm.width(c);
+       return max(0, fm.rbearing(c) - fm.width(c));
 }
 
 
@@ -634,8 +640,8 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
                } else {
                        int xp[32];
                        int yp[32];
-                       int const n = int(d[i++]);
-                       for (int j = 0; j < n; ++j) {
+                       int const n2 = int(d[i++]);
+                       for (int j = 0; j < n2; ++j) {
                                double xx = d[i++];
                                double yy = d[i++];
 //          lyxerr << ' ' << xx << ' ' << yy << ' ';
@@ -647,7 +653,7 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h,
                                yp[j] = int(y + yy + 0.5);
                                //  lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']';
                        }
-                       pi.pain.lines(xp, yp, n, pi.base.font.color());
+                       pi.pain.lines(xp, yp, n2, pi.base.font.color());
                }
        }
 }
@@ -961,8 +967,13 @@ docstring asString(MathData const & ar)
 
 void asArray(docstring const & str, MathData & ar, Parse::flags pf)
 {
+       // If the QUIET flag is set, we are going to parse for either
+       // a paste operation or a macro definition. We try to do the
+       // right thing in all cases.
+
        bool quiet = pf & Parse::QUIET;
-       if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet))
+       bool macro = pf & Parse::MACRODEF;
+       if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet && !macro))
                mathed_parse_cell(ar, str, pf | Parse::VERBATIM);
 }