s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.

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

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 003c3e0aaef8e2f8d743041a49bbf79394ee501e..62a28ec4c99005711f938a808d22c37a6517018d 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -22,6 +22,7 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "ColorSet.h"
 #include "CutAndPaste.h"
 #include "Encoding.h"
 #include "FuncRequest.h"
@@ -213,7 +214,7 @@ void InsetMathHull::setBuffer(Buffer & buffer)
 }
 
 
-void InsetMathHull::updateLabels(ParIterator const & it, UpdateType utype)
+void InsetMathHull::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        if (!buffer_) {
                //FIXME: buffer_ should be set at creation for this inset! Problem is
@@ -223,10 +224,10 @@ void InsetMathHull::updateLabels(ParIterator const & it, UpdateType utype)
        }
        for (size_t i = 0; i != label_.size(); ++i) {
                if (label_[i])
-                       label_[i]->updateLabels(it, utype);
+                       label_[i]->updateBuffer(it, utype);
        }
        // pass down
-       InsetMathGrid::updateLabels(it, utype);
+       InsetMathGrid::updateBuffer(it, utype);
 }
 
 
@@ -312,7 +313,18 @@ int InsetMathHull::defaultColSpace(col_type col)
 
 docstring InsetMathHull::standardFont() const
 {
-       return from_ascii(type_ == hullNone ? "lyxnochange" : "mathnormal");
+       const char *font_name;
+       switch (type_) {
+       case hullRegexp:
+               font_name = "texttt";
+               break;
+       case hullNone:
+               font_name = "lyxnochange";
+               break;
+       default:
+               font_name = "mathnormal";
+       }
+       return from_ascii(font_name);
 }
 
 
@@ -393,6 +405,11 @@ void InsetMathHull::draw(PainterInfo & pi, int x, int y) const
 {
        use_preview_ = previewState(pi.base.bv);
 
+       if (type_ == hullRegexp) {
+               Dimension const dim = dimension(*pi.base.bv);
+               pi.pain.rectangle(x + 1, y - dim.ascent() + 1,
+                       dim.width() - 2, dim.height() - 2, Color_regexpframe);
+       }
        if (use_preview_) {
                // one pixel gap in front
                preview_->draw(pi, x + 1, y);
@@ -536,9 +553,9 @@ void InsetMathHull::label(row_type row, docstring const & label)
                        delete label_[row];
                        label_[row] = dummy_pointer;
                        // We need an update of the Buffer reference cache.
-                       // This is achieved by updateLabels().
+                       // This is achieved by updateBuffer().
                        if (buffer_)
-                               buffer().updateLabels();
+                               buffer().updateBuffer();
                } else {
                        if (buffer_)
                                label_[row]->updateCommand(label);
@@ -567,8 +584,8 @@ void InsetMathHull::numbered(row_type row, bool num)
                        return;
                }
                // We need an update of the Buffer reference cache.
-               // This is achieved by updateLabels().
-               buffer().updateLabels();
+               // This is achieved by updateBuffer().
+               buffer().updateBuffer();
        }
 }
 
@@ -620,6 +637,16 @@ void InsetMathHull::validate(LaTeXFeatures & features) const
        if (ams())
                features.require("amsmath");
 
+       if (type_ == hullRegexp) {
+               features.require("color");
+               string frcol = lcolor.getLaTeXName(Color_regexpframe);
+               string bgcol = "white";
+               features.addPreambleSnippet(
+                       string("\\newcommand{\\regexp}[1]{\\fcolorbox{")
+                       + frcol + string("}{")
+                       + bgcol + string("}{\\texttt{#1}}}"));
+       }
+
        // Validation is necessary only if not using AMS math.
        // To be safe, we will always run mathedvalidate.
        //if (features.amsstyle)
@@ -672,7 +699,7 @@ void InsetMathHull::header_write(WriteStream & os) const
                break;
 
        case hullRegexp:
-               os << "\\regexp{";
+               os << "\\regexp{{{";
                break;
 
        default:
@@ -717,7 +744,7 @@ void InsetMathHull::footer_write(WriteStream & os) const
                break;
 
        case hullRegexp:
-               os << "}";
+               os << "}}}";
                break;
 
        default:
@@ -1460,10 +1487,13 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
                }
                return InsetMathGrid::getStatus(cur, cmd, status);
 
-       case LFUN_TABULAR_FEATURE: {
+       case LFUN_INSET_MODIFY: {
                istringstream is(to_utf8(cmd.argument()));
                string s;
                is >> s;
+               if (s != "tabular")
+                       return InsetMathGrid::getStatus(cur, cmd, status);
+               is >> s;
                if (!rowChangeOK()
                    && (s == "append-row"
                        || s == "delete-row"