Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index ad3bce4fefaf9e31411b4d85c49f447fb0bbef00..15096fb9918f7426764708908ec01a8ee8279b84 100644 (file)
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -118,7 +118,8 @@ HullType hullType(docstring const & s)
        if (s == "multline")  return hullMultline;
        if (s == "gather")    return hullGather;
        if (s == "flalign")   return hullFlAlign;
-       lyxerr << "unknown hull type '" << to_utf8(s) << "'" << endl;
+       if (s == "regexp")    return hullRegexp;
+       lyxerr << "unknown hull type '" << to_utf8(s) << "'" << endl;
        return HullType(-1);
 }
 
@@ -137,7 +138,8 @@ docstring hullName(HullType type)
                case hullMultline:   return from_ascii("multline");
                case hullGather:     return from_ascii("gather");
                case hullFlAlign:    return from_ascii("flalign");
-               default:
+               case hullRegexp:     return from_ascii("regexp");
+               default:
                        lyxerr << "unknown hull type '" << type << "'" << endl;
                        return from_ascii("none");
        }
@@ -481,10 +483,10 @@ void InsetMathHull::addPreview(graphics::PreviewLoader & ploader) const
 bool InsetMathHull::notifyCursorLeaves(Cursor const & /*old*/, Cursor & cur)
 {
        if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
-               Buffer const & buffer = cur.buffer();
+               Buffer const * buffer = cur.buffer();
                docstring const snippet = latexString(*this);
-               preview_->addPreview(snippet, buffer);
-               preview_->startLoading(buffer);
+               preview_->addPreview(snippet, *buffer);
+               preview_->startLoading(*buffer);
                cur.updateFlags(Update::Force);
        }
        return false;
@@ -509,9 +511,10 @@ void InsetMathHull::label(row_type row, docstring const & label)
                        label_[row] = dummy_pointer;
                        // We need an update of the Buffer reference cache.
                        // This is achieved by updateLabels().
-                       lyx::updateLabels(buffer());
-               } else
+                       buffer().updateLabels();
+               } else {
                        label_[row]->updateCommand(label);
+               }
                return;
        }
        InsetCommandParams p(LABEL_CODE);
@@ -528,9 +531,14 @@ void InsetMathHull::numbered(row_type row, bool num)
        if (nonum_[row] && label_[row]) {
                delete label_[row];
                label_[row] = 0;
+               if (!buffer_) {
+                       // The buffer is set at the end of readInset.
+                       // When parsing the inset, buffer_ is 0.
+                       return;
+               }
                // We need an update of the Buffer reference cache.
                // This is achieved by updateLabels().
-               lyx::updateLabels(buffer());
+               buffer().updateLabels();
        }
 }
 
@@ -543,23 +551,23 @@ bool InsetMathHull::numbered(row_type row) const
 
 bool InsetMathHull::ams() const
 {
-       return
-               type_ == hullAlign ||
-               type_ == hullFlAlign ||
-               type_ == hullMultline ||
-               type_ == hullGather ||
-               type_ == hullAlignAt ||
-               type_ == hullXAlignAt ||
-               type_ == hullXXAlignAt;
+       return type_ == hullAlign
+               || type_ == hullFlAlign
+               || type_ == hullMultline
+               || type_ == hullGather
+               || type_ == hullAlignAt
+               || type_ == hullXAlignAt
+               || type_ == hullXXAlignAt;
 }
 
 
 Inset::DisplayType InsetMathHull::display() const
 {
-       return (type_ != hullSimple && type_ != hullNone) ? AlignCenter : Inline;
+       if (type_ == hullSimple || type_ == hullNone || type_ == hullRegexp)
+               return Inline;
+       return AlignCenter;
 }
 
-
 bool InsetMathHull::numberedType() const
 {
        if (type_ == hullNone)
@@ -568,6 +576,8 @@ bool InsetMathHull::numberedType() const
                return false;
        if (type_ == hullXXAlignAt)
                return false;
+       if (type_ == hullRegexp)
+               return false;
        for (row_type row = 0; row < nrows(); ++row)
                if (!nonum_[row])
                        return true;
@@ -631,6 +641,10 @@ void InsetMathHull::header_write(WriteStream & os) const
                  << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
                break;
 
+       case hullRegexp:
+               os << "\\regexp{";
+               break;
+
        default:
                os << "\\begin{unknown" << star(n) << '}';
                break;
@@ -672,6 +686,10 @@ void InsetMathHull::footer_write(WriteStream & os) const
                os << "\\end{" << hullName(type_) << "}\n";
                break;
 
+       case hullRegexp:
+               os << "}";
+               break;
+
        default:
                os << "\\end{unknown" << star(n) << '}';
                break;
@@ -1021,9 +1039,7 @@ docstring InsetMathHull::eolString(row_type row, bool emptyline, bool fragile) c
        docstring res;
        if (numberedType()) {
                if (label_[row] && !nonum_[row])
-                       res += "\\label{"
-                              + escape(label_[row]->getParam("name"))
-                              + '}';
+                       res += "\\label{" + label_[row]->getParam("name") + '}';
                if (nonum_[row] && (type_ != hullMultline))
                        res += "\\nonumber ";
        }
@@ -1336,8 +1352,9 @@ bool InsetMathHull::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_MATH_NUMBER_LINE_TOGGLE: {
                // FIXME: what is the right test, this or the one of
                // LABEL_INSERT?
-               bool const enable = (type_ == hullMultline) ?
-                       (nrows() - 1 == cur.row()) : display();
+               bool const enable = (type_ == hullMultline)
+                       ? (nrows() - 1 == cur.row())
+                       : display() != Inline;
                row_type const r = (type_ == hullMultline) ? nrows() - 1 : cur.row();
                status.setEnabled(enable);
                status.setOnOff(numbered(r));