Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index 954538e4e9c056c6dd3f58c14239ea1d097088b6..30909f2ed72d6317ce7b7dc5d3b30d3315e8a8e2 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -34,6 +34,7 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Lexer.h"
+#include "TocBackend.h"
 
 #include "frontends/Painter.h"
 
@@ -425,26 +426,20 @@ MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & name, int n
 }
 
 
-MathMacroTemplate::MathMacroTemplate(Buffer * buf, docstring const & str)
-       : InsetMathNest(buf, 3), numargs_(0), optionals_(0),
-       type_(MacroTypeNewcommand), lookOutdated_(true)
+bool MathMacroTemplate::fromString(docstring const & str)
 {
-       buffer_ = buf;
-       initMath();
-
-       MathData ar(buf);
+       MathData ar(buffer_);
        mathed_parse_cell(ar, str, Parse::NORMAL);
        if (ar.size() != 1 || !ar[0]->asMacroTemplate()) {
                lyxerr << "Cannot read macro from '" << ar << "'" << endl;
                asArray(from_ascii("invalidmacro"), cell(0));
-               // FIXME: The macro template does not make sense after this.
-               // The whole parsing should not be in a constructor which
-               // has no chance to report failure.
-               return;
+               // The macro template does not make sense after this.
+               return false;
        }
        operator=( *(ar[0]->asMacroTemplate()) );
 
        updateLook();
+       return true;
 }
 
 
@@ -857,7 +852,9 @@ void MathMacroTemplate::commitEditChanges(Cursor & cur,
 {
        int args_in_def = maxArgumentInDefinition();
        if (args_in_def != numargs_) {
-               cur.recordUndoFullDocument();
+               // FIXME: implement precise undo handling (only a few places
+               //   need undo)
+               cur.recordUndoFullBuffer();
                changeArity(cur, inset_pos, args_in_def);
        }
        insertMissingArguments(args_in_def);
@@ -873,7 +870,7 @@ void MathMacroTemplate::insertParameter(Cursor & cur,
 {
        if (pos <= numargs_ && pos >= optionals_ && numargs_ < 9) {
                ++numargs_;
-               
+
                // append example #n
                if (addarg) {
                        shiftArguments(pos, 1);
@@ -990,7 +987,9 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MATH_MACRO_ADD_PARAM:
                if (numargs_ < 9) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        size_t pos = numargs_;
                        if (!arg.empty())
                                pos = (size_t)convert<int>(arg) - 1; // it is checked for >=0 in getStatus
@@ -1002,7 +1001,9 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MATH_MACRO_REMOVE_PARAM:
                if (numargs_ > 0) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        size_t pos = numargs_ - 1;
                        if (!arg.empty())
                                pos = (size_t)convert<int>(arg) - 1; // it is checked for >=0 in getStatus
@@ -1013,7 +1014,9 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MATH_MACRO_APPEND_GREEDY_PARAM:
                if (numargs_ < 9) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        insertParameter(cur, cur, numargs_, true);
                }
                break;
@@ -1021,27 +1024,35 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM:
                if (numargs_ > 0) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        removeParameter(cur, cur, numargs_ - 1, true);
                }
                break;
 
        case LFUN_MATH_MACRO_MAKE_OPTIONAL:
                commitEditChanges(cur, cur);
-               cur.recordUndoFullDocument();
+               // FIXME: implement precise undo handling (only a few places
+               //   need undo)
+               cur.recordUndoFullBuffer();
                makeOptional(cur, cur);
                break;
 
        case LFUN_MATH_MACRO_MAKE_NONOPTIONAL:
                commitEditChanges(cur, cur);
-               cur.recordUndoFullDocument();
+               // FIXME: implement precise undo handling (only a few places
+               //   need undo)
+               cur.recordUndoFullBuffer();
                makeNonOptional(cur, cur);
                break;
 
        case LFUN_MATH_MACRO_ADD_OPTIONAL_PARAM:
                if (numargs_ < 9) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        insertParameter(cur, cur, optionals_);
                        makeOptional(cur, cur);
                }
@@ -1050,14 +1061,18 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MATH_MACRO_REMOVE_OPTIONAL_PARAM:
                if (optionals_ > 0) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        removeParameter(cur, cur, optionals_ - 1);
                } break;
 
        case LFUN_MATH_MACRO_ADD_GREEDY_OPTIONAL_PARAM:
                if (numargs_ == optionals_) {
                        commitEditChanges(cur, cur);
-                       cur.recordUndoFullDocument();
+                       // FIXME: implement precise undo handling (only a few places
+                       //   need undo)
+                       cur.recordUndoFullBuffer();
                        insertParameter(cur, cur, 0, true);
                        makeOptional(cur, cur);
                }
@@ -1070,7 +1085,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
+bool MathMacroTemplate::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & flag) const
 {
        bool ret = true;
@@ -1128,7 +1143,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
                        break;
 
                default:
-                       ret = false;
+                       ret = InsetMathNest::getStatus(cur, cmd, flag);
                        break;
        }
        return ret;
@@ -1153,7 +1168,9 @@ void MathMacroTemplate::read(Lexer & lex)
 void MathMacroTemplate::write(ostream & os) const
 {
        odocstringstream oss;
-       WriteStream wi(oss, false, false, WriteStream::wsDefault);
+       TexRow texrow(false);
+       otexrowstream ots(oss,texrow);
+       WriteStream wi(ots, false, false, WriteStream::wsDefault);
        oss << "FormulaMacro\n";
        write(wi);
        os << to_utf8(oss.str());
@@ -1253,7 +1270,7 @@ docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const
 int MathMacroTemplate::plaintext(odocstringstream & os,
                                 OutputParams const &, size_t) const
 {
-       static docstring const str = '[' + buffer().B_("math macro") + ']';
+       docstring const str = '[' + buffer().B_("math macro") + ']';
 
        os << str;
        return str.size();
@@ -1369,4 +1386,17 @@ string MathMacroTemplate::contextMenuName() const
        return "context-math-macro-definition";
 }
 
+void MathMacroTemplate::addToToc(DocIterator const & pit, bool output_active,
+                                                                UpdateType) const
+{
+       shared_ptr<Toc> toc = buffer().tocBackend().toc("math-macro");
+       docstring str;
+       if (!validMacro())
+               str = bformat(_("Invalid macro! \\%1$s"), name());
+       else
+               str = "\\" + name();
+       toc->push_back(TocItem(pit, 0, str, output_active));
+}
+
+
 } // namespace lyx