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);
}
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");
}
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;
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);
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();
}
}
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)
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;
<< '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
break;
+ case hullRegexp:
+ os << "\\regexp{";
+ break;
+
default:
os << "\\begin{unknown" << star(n) << '}';
break;
os << "\\end{" << hullName(type_) << "}\n";
break;
+ case hullRegexp:
+ os << "}";
+ break;
+
default:
os << "\\end{unknown" << star(n) << '}';
break;
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));