Simplify Changers interface

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

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index c4f1207b88ee026bd30df7220d5d4dc237799a75..52442b225b84a149a51900c2111ca45153d1b76b 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -15,7 +15,6 @@
 #include "InsetMathChar.h"
 #include "InsetMathColor.h"
 #include "InsetMathFrac.h"
-#include "InsetMathGrid.h"
 #include "InsetMathNest.h"
 #include "InsetMathScript.h"
 #include "MathExtern.h"
@@ -109,7 +108,7 @@ namespace {
        size_t firstRelOp(MathData const & ar)
        {
                for (MathData::const_iterator it = ar.begin(); it != ar.end(); ++it)
-                       if ((*it)->isMathRel())
+                       if ((*it)->mathClass() == MC_REL)
                                return it - ar.begin();
                return ar.size();
        }
@@ -121,6 +120,37 @@ namespace {
        }
 
 
+       // writes a preamble for underlined or struck out math display
+       void writeMathdisplayPreamble(WriteStream & os)
+       {
+               if (os.strikeoutMath()) {
+                       if (os.ulemCmd() == WriteStream::UNDERLINE)
+                               os << "\\raisebox{-\\belowdisplayshortskip}{"
+                                     "\\lyxmathsout{\\parbox[b]{\\columnwidth}{";
+                       else
+                               os << "\\lyxmathsout{\\parbox{\\columnwidth}{";
+               } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+                       os << "\\raisebox{-\\belowdisplayshortskip}{"
+                             "\\parbox[b]{\\columnwidth}{";
+               else if (os.ulemCmd() == WriteStream::STRIKEOUT)
+                       os << "\\parbox{\\columnwidth}{";
+       }
+
+
+       // writes a postamble for underlined or struck out math display
+       void writeMathdisplayPostamble(WriteStream & os)
+       {
+               if (os.strikeoutMath()) {
+                       if (os.ulemCmd() == WriteStream::UNDERLINE)
+                               os << "}";
+                       os << "}}\\\\\n";
+               } else if (os.ulemCmd() == WriteStream::UNDERLINE)
+                       os << "}}\\\\\n";
+               else if (os.ulemCmd() == WriteStream::STRIKEOUT)
+                       os << "}\\\\\n";
+       }
+
+
 } // end anon namespace
 
 
@@ -490,9 +520,9 @@ void InsetMathHull::metrics(MetricsInfo & mi, Dimension & dim) const
                return;
        }
 
-       // FIXME: Changing the same object repeatedly is inefficient.
        Changer dummy1 = mi.base.changeFontSet(standardFont());
-       Changer dummy2 = mi.base.changeStyle(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       Changer dummy2 = mi.base.font.changeStyle(display() ? LM_ST_DISPLAY
+                                                           : LM_ST_TEXT);
 
        // let the cells adjust themselves
        InsetMathGrid::metrics(mi, dim);
@@ -563,15 +593,15 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
        BufferView const * const bv = pi.base.bv;
        Dimension const dim = dimension(*bv);
 
-       if (type_ == hullRegexp) {
-               pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
-                       dim.width() - 2, dim.height() - 2, Color_regexpframe);
-       }
+       if (type_ == hullRegexp)
+               pi.pain.rectangle(x + 2, y - dim.ascent() + 1,
+                                 dim.width() - 3, dim.height() - 2, Color_regexpframe);
 
        if (previewState(bv)) {
                // Do not draw change tracking cue if taken care of by RowPainter
                // already.
-               Changer dummy = make_change(pi.change_, Change(), !canPaintChange(*bv));
+               Changer dummy = !canPaintChange(*bv) ? make_change(pi.change_, Change())
+                       : Changer();
                if (previewTooSmall(dim)) {
                        // we have an extra frame
                        preview_->draw(pi, x + ERROR_FRAME_WIDTH, y);
@@ -586,9 +616,11 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
        ColorCode color = pi.selected && lyxrc.use_system_colors
                                ? Color_selectiontext : standardColor();
        bool const really_change_color = pi.base.font.color() == Color_none;
-       Changer dummy0 = pi.base.font.changeColor(color, really_change_color);
+       Changer dummy0 = really_change_color ? pi.base.font.changeColor(color)
+               : Changer();
        Changer dummy1 = pi.base.changeFontSet(standardFont());
-       Changer dummy2 = pi.base.changeStyle(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       Changer dummy2 = pi.base.font.changeStyle(display() ? LM_ST_DISPLAY
+                                                           : LM_ST_TEXT);
 
        InsetMathGrid::draw(pi, x + 1, y);
 
@@ -899,6 +931,29 @@ bool InsetMathHull::ams() const
 }
 
 
+bool InsetMathHull::outerDisplay() const
+{
+       switch (type_) {
+       case hullEquation:
+       case hullEqnArray:
+       case hullAlign:
+       case hullFlAlign:
+       case hullGather:
+       case hullMultline:
+               return true;
+       case hullNone:
+       case hullSimple:
+       case hullAlignAt:
+       case hullXAlignAt:
+       case hullXXAlignAt:
+       case hullUnknown:
+       case hullRegexp:
+               break;
+       }
+       return false;
+}
+
+
 Inset::DisplayType InsetMathHull::display() const
 {
        switch (type_) {
@@ -956,14 +1011,17 @@ void InsetMathHull::validate(LaTeXFeatures & features) const
 
                if (type_ == hullRegexp) {
                        features.require("color");
-                       string frcol = lcolor.getLaTeXName(Color_regexpframe);
-                       string bgcol = "white";
+                       docstring frcol = from_utf8(lcolor.getLaTeXName(Color_regexpframe));
+                       docstring bgcol = from_ascii("white");
                        features.addPreambleSnippet(
-                               string("\\newcommand{\\regexp}[1]{\\fcolorbox{")
-                               + frcol + string("}{")
-                               + bgcol + string("}{\\ensuremath{\\mathtt{#1}}}}"));
+                               "\\newcommand{\\regexp}[1]{\\fcolorbox{"
+                               + frcol + "}{"
+                               + bgcol + "}{\\ensuremath{\\mathtt{#1}}}}");
                        features.addPreambleSnippet(
-                               string("\\newcommand{\\endregexp}{}"));
+                               from_ascii("\\newcommand{\\endregexp}{}"));
+               } else if (outerDisplay() && features.inDeletedInset()
+                          && !features.mustProvide("ct-dvipost")) {
+                               features.require("ct-tikz-math-sout");
                }
 
                // Validation is necessary only if not using AMS math.
@@ -995,6 +1053,8 @@ void InsetMathHull::header_write(WriteStream & os) const
                break;
 
        case hullSimple:
+               if (os.ulemCmd())
+                       os << "\\mbox{";
                os << '$';
                os.startOuterRow();
                if (cell(0).empty())
@@ -1002,6 +1062,7 @@ void InsetMathHull::header_write(WriteStream & os) const
                break;
 
        case hullEquation:
+               writeMathdisplayPreamble(os);
                os << "\n";
                os.startOuterRow();
                if (n)
@@ -1015,6 +1076,7 @@ void InsetMathHull::header_write(WriteStream & os) const
        case hullFlAlign:
        case hullGather:
        case hullMultline:
+               writeMathdisplayPreamble(os);
                os << "\n";
                os.startOuterRow();
                os << "\\begin{" << hullName(type_) << star(n) << "}\n";
@@ -1059,6 +1121,8 @@ void InsetMathHull::footer_write(WriteStream & os) const
 
        case hullSimple:
                os << '$';
+               if (os.ulemCmd())
+                       os << "}";
                break;
 
        case hullEquation:
@@ -1068,15 +1132,22 @@ void InsetMathHull::footer_write(WriteStream & os) const
                        os << "\\end{equation" << star(n) << "}\n";
                else
                        os << "\\]\n";
+               writeMathdisplayPostamble(os);
                break;
 
        case hullEqnArray:
        case hullAlign:
        case hullFlAlign:
-       case hullAlignAt:
-       case hullXAlignAt:
        case hullGather:
        case hullMultline:
+               os << "\n";
+               os.startOuterRow();
+               os << "\\end{" << hullName(type_) << star(n) << "}\n";
+               writeMathdisplayPostamble(os);
+               break;
+
+       case hullAlignAt:
+       case hullXAlignAt:
                os << "\n";
                os.startOuterRow();
                os << "\\end{" << hullName(type_) << star(n) << "}\n";