* src/mathed/InsetMathHull.cpp:

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

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 6a5f44ce558022f95903c89f17b32635b01bf53f..c77b24068f3bdc616fb0bc34013b6ba61b54b284 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -52,7 +52,7 @@
 #include "frontends/Painter.h"
 #include "frontends/Selection.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -336,7 +336,9 @@ MathData InsetMathNest::glue() const
 
 void InsetMathNest::write(WriteStream & os) const
 {
-       os << '\\' << name().c_str();
+       ModeSpecifier specifier(os, currentMode());
+       docstring const latex_name = name();
+       os << '\\' << latex_name;
        for (size_t i = 0; i < nargs(); ++i)
                os << '{' << cell(i) << '}';
        if (nargs() == 0)
@@ -350,7 +352,7 @@ void InsetMathNest::write(WriteStream & os) const
 
 void InsetMathNest::normalize(NormalStream & os) const
 {
-       os << '[' << name().c_str();
+       os << '[' << name();
        for (size_t i = 0; i < nargs(); ++i)
                os << ' ' << cell(i);
        os << ']';
@@ -359,7 +361,8 @@ void InsetMathNest::normalize(NormalStream & os) const
 
 int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const
 {
-       WriteStream wi(os, runparams.moving_arg, true);
+       WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun,
+                       runparams.encoding);
        write(wi);
        return wi.line();
 }
@@ -866,8 +869,8 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        //  Math fonts
-       case LFUN_FONT_FREE_APPLY:
-       case LFUN_FONT_FREE_UPDATE:
+       case LFUN_TEXTSTYLE_APPLY:
+       case LFUN_TEXTSTYLE_UPDATE:
                handleFont2(cur, cmd.argument());
                break;
 
@@ -917,11 +920,6 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                else
                        handleFont(cur, cmd.argument(), "mathbb");
                break;
-       /*
-       case LFUN_FONT_FREE_APPLY:
-               handleFont(cur, cmd.argument(), "textrm");
-               break;
-       */
        case LFUN_FONT_DEFAULT:
                handleFont(cur, cmd.argument(), "textnormal");
                break;
@@ -951,12 +949,11 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_MATH_SIZE:
-#if 0
-               cur.recordUndoSelection();
-               cur.setSize(arg);
-#endif
+       case LFUN_MATH_SIZE: {
+               FuncRequest fr = FuncRequest(LFUN_MATH_INSERT, cmd.argument());
+               doDispatch(cur, fr);
                break;
+       }
 
        case LFUN_MATH_MATRIX: {
                cur.recordUndo();
@@ -1020,11 +1017,18 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        case LFUN_SPACE_INSERT:
-       case LFUN_MATH_SPACE:
                cur.recordUndoSelection();
                cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
                break;
 
+       case LFUN_MATH_SPACE:
+               cur.recordUndoSelection();
+               if (cmd.argument().empty())
+                       cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
+               else
+                       cur.insert(MathAtom(new InsetMathSpace(cmd.argument())));
+               break;
+
        case LFUN_ERT_INSERT:
                // interpret this as if a backslash was typed
                cur.recordUndo();
@@ -1076,7 +1080,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                        MathData ar;
                        asArray(cmd.argument(), ar);
                        if (ar.size() == 1 && ar[0]->asNestInset()
-                                       && ar[0]->asNestInset()->nargs())
+                                       && ar[0]->asNestInset()->nargs() > 1)
                                handleNest(cur, ar[0]);
                        else
                                cur.niceInsert(cmd.argument());
@@ -1161,7 +1165,7 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
        string const arg = to_utf8(cmd.argument());
        switch (cmd.action) {
        case LFUN_TABULAR_FEATURE:
-               flag.enabled(false);
+               flag.setEnabled(false);
                break;
 #if 0
        case LFUN_TABULAR_FEATURE:
@@ -1192,7 +1196,7 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_NOUN:
        case LFUN_FONT_ROMAN:
        case LFUN_FONT_DEFAULT:
-               flag.enabled(true);
+               flag.setEnabled(true);
                break;
        case LFUN_MATH_MUTATE:
                //flag.setOnOff(mathcursor::formula()->hullType() == to_utf8(cmd.argument()));
@@ -1204,11 +1208,11 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_MATH_SPACE:
        case LFUN_MATH_LIMITS:
        case LFUN_MATH_EXTERN:
-               flag.enabled(true);
+               flag.setEnabled(true);
                break;
 
        case LFUN_FONT_FRAK:
-               flag.enabled(currentMode() != TEXT_MODE);
+               flag.setEnabled(currentMode() != TEXT_MODE);
                break;
 
        case LFUN_MATH_INSERT: {
@@ -1219,12 +1223,12 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
                        arg == "\\textsl"   || arg == "\\textup" ||
                        arg == "\\texttt"   || arg == "\\textbb" ||
                        arg == "\\textnormal";
-               flag.enabled(currentMode() != TEXT_MODE || textarg);
+               flag.setEnabled(currentMode() != TEXT_MODE || textarg);
                break;
        }
 
        case LFUN_MATH_MATRIX:
-               flag.enabled(currentMode() == MATH_MODE);
+               flag.setEnabled(currentMode() == MATH_MODE);
                break;
 
        case LFUN_INSET_INSERT: {
@@ -1232,31 +1236,31 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
                // getStatus is not called with a valid reference and the
                // dialog would not be applyable.
                string const name = cmd.getArg(0);
-               flag.enabled(name == "ref");
+               flag.setEnabled(name == "ref");
                break;
        }
 
        case LFUN_MATH_DELIM:
        case LFUN_MATH_BIGDELIM:
                // Don't do this with multi-cell selections
-               flag.enabled(cur.selBegin().idx() == cur.selEnd().idx());
+               flag.setEnabled(cur.selBegin().idx() == cur.selEnd().idx());
                break;
                
        case LFUN_MATH_MACRO_FOLD:
        case LFUN_MATH_MACRO_UNFOLD: {
                Cursor it = cur;
                bool found = findMacroToFoldUnfold(it, cmd.action == LFUN_MATH_MACRO_FOLD);
-               flag.enabled(found);
+               flag.setEnabled(found);
                break;
        }
                
        case LFUN_SPECIALCHAR_INSERT:
                // FIXME: These would probably make sense in math-text mode
-               flag.enabled(false);
+               flag.setEnabled(false);
                break;
 
        case LFUN_INSET_DISSOLVE:
-               flag.enabled(!asHullInset());
+               flag.setEnabled(!asHullInset());
                break;
 
        default: