Preserve \inputencoding value when switching to non-TeX fonts.

[lyx.git] / src / mathed / MathRow.cpp

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index c2b1a00a430d8b9c435a023cf9365ba6affea090..7c5b9456ac2097d34e8496cf87ee9d4174a15ebb 100644 (file)
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -79,7 +79,7 @@ void afterMetricsMarkers(MetricsInfo const & , MathRow::Element & e,
                break;
        case InsetMath::BOX_MARKER:
                FontInfo font;
-               font.setSize(FONT_SIZE_TINY);
+               font.setSize(TINY_SIZE);
                Dimension namedim;
                mathed_string_dim(font, e.inset->name(), namedim);
                int const namewid = 1 + namedim.wid + 1;
@@ -109,7 +109,7 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element const & e,
        if (e.marker == InsetMath::BOX_MARKER) {
                // draw header and rectangle around
                FontInfo font;
-               font.setSize(FONT_SIZE_TINY);
+               font.setSize(TINY_SIZE);
                font.setColor(Color_mathmacrolabel);
                Dimension namedim;
                mathed_string_dim(font, e.inset->name(), namedim);
@@ -234,10 +234,8 @@ int MathRow::after(int i) const
 }
 
 
-bool MathRow::metrics(MetricsInfo & mi, Dimension & dim)
+void MathRow::metrics(MetricsInfo & mi, Dimension & dim)
 {
-       bool has_caret = false;
-
        dim.wid = 0;
        // In order to compute the dimension of macros and their
        // arguments, it is necessary to keep track of them.
@@ -262,10 +260,8 @@ bool MathRow::metrics(MetricsInfo & mi, Dimension & dim)
                                d.wid = e.before + e.after;
                                e.inset->beforeMetrics();
                        }
-                       if (e.ar) {
+                       if (e.ar)
                                dim_arrays.push_back(make_pair(e.ar, Dimension()));
-                               has_caret |= e.ar->hasCaret(mi.base.bv);
-                       }
                        break;
                case END:
                        if (e.inset) {
@@ -314,7 +310,6 @@ bool MathRow::metrics(MetricsInfo & mi, Dimension & dim)
                dim.wid += mathed_string_width(font, e.compl_text);
        }
        LATTEST(dim_insets.empty() && dim_arrays.empty());
-       return has_caret;
 }
 
 
@@ -381,12 +376,14 @@ void MathRow::draw(PainterInfo & pi, int x, int const y) const
 
                if (!s1.empty()) {
                        f.setColor(Color_inlinecompletion);
-                       pi.pain.text(x, y, s1, f);
+                       // offset the text by e.after to make sure that the
+                       // spacing is after the completion, not before.
+                       pi.pain.text(x - e.after, y, s1, f);
                        x += mathed_string_width(f, s1);
                }
                if (!s2.empty()) {
                        f.setColor(Color_nonunique_inlinecompletion);
-                       pi.pain.text(x, y, s2, f);
+                       pi.pain.text(x - e.after, y, s2, f);
                        x += mathed_string_width(f, s2);
                }
        }