]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_hullinset.C
Fix to bug 2362: Deleting superscript also deletes subscript.
[lyx.git] / src / mathed / math_hullinset.C
index ae423b5b78705b31bd786394331b137f7e1298e3..da192918b999b6b0467740723169a9dcd515c0e4 100644 (file)
@@ -14,6 +14,7 @@
 #include "math_colorinset.h"
 #include "math_data.h"
 #include "math_extern.h"
+#include "math_factory.h"
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "undo.h"
 
 #include "insets/render_preview.h"
+#include "insets/insetlabel.h"
 
-#include "frontends/Alert.h"
+#include "frontends/Dialogs.h"
+#include "frontends/LyXView.h"
 
 #include "graphics/PreviewImage.h"
 #include "graphics/PreviewLoader.h"
@@ -140,6 +143,7 @@ MathHullInset::MathHullInset()
        //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << endl;
        //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << endl;
        //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << endl;
+       initMath();
        setDefaults();
 }
 
@@ -148,6 +152,7 @@ MathHullInset::MathHullInset(string const & type)
        : MathGridInset(getCols(type), 1), type_(type), nonum_(1), label_(1),
          preview_(new RenderPreview(this))
 {
+       initMath();
        setDefaults();
 }
 
@@ -185,7 +190,7 @@ MathHullInset & MathHullInset::operator=(MathHullInset const & other)
 
 InsetBase * MathHullInset::editXY(LCursor & cur, int x, int y)
 {
-       if (RenderPreview::status() == LyXRC::PREVIEW_ON) {
+       if (use_preview_) {
                edit(cur, true);
                return this;
        }
@@ -242,25 +247,24 @@ int MathHullInset::defaultColSpace(col_type col)
 
 char const * MathHullInset::standardFont() const
 {
-       if (type_ == "none")
-               return "lyxnochange";
-       return "mathnormal";
+       return type_ == "none" ? "lyxnochange" : "mathnormal";
 }
 
 
-void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
+bool MathHullInset::previewState(BufferView * bv) const
 {
-       BOOST_ASSERT(mi.base.bv && mi.base.bv->buffer());
-
-       bool use_preview = false;
-       if (!editing(mi.base.bv) &&
-           RenderPreview::status() == LyXRC::PREVIEW_ON) {
+       if (!editing(bv) && RenderPreview::status() == LyXRC::PREVIEW_ON) {
                lyx::graphics::PreviewImage const * pimage =
-                       preview_->getPreviewImage(*mi.base.bv->buffer());
-               use_preview = pimage && pimage->image();
+                       preview_->getPreviewImage(*bv->buffer());
+               return pimage && pimage->image();
        }
+       return false;
+}
 
-       if (use_preview) {
+
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       if (previewState(mi.base.bv)) {
                preview_->metrics(mi, dim);
                // insert a one pixel gap in front of the formula
                dim.wid += 1;
@@ -304,17 +308,9 @@ void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
-       BOOST_ASSERT(pi.base.bv && pi.base.bv->buffer());
+       use_preview_ = previewState(pi.base.bv);
 
-       bool use_preview = false;
-       if (!editing(pi.base.bv) &&
-           RenderPreview::status() == LyXRC::PREVIEW_ON) {
-               lyx::graphics::PreviewImage const * pimage =
-                       preview_->getPreviewImage(*pi.base.bv->buffer());
-               use_preview = pimage && pimage->image();
-       }
-
-       if (use_preview) {
+       if (use_preview_) {
                // one pixel gap in front
                preview_->draw(pi, x + 1, y);
                setPosCache(pi, x, y);
@@ -330,7 +326,7 @@ void MathHullInset::draw(PainterInfo & pi, int x, int y) const
                for (row_type row = 0; row < nrows(); ++row) {
                        int const yy = y + rowinfo_[row].offset_;
                        FontSetChanger dummy(pi.base, "mathrm");
-                       drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
+                       pi.draw(xx, yy, nicelabel(row));
                }
        }
        setPosCache(pi, x, y);
@@ -595,6 +591,10 @@ void MathHullInset::delRow(row_type row)
        if (nrows() <= 1 || !rowChangeOK())
                return;
        MathGridInset::delRow(row);
+       // The last dummy row has no number info nor a label.
+       // Test nrows() + 1 because we have already erased the row.
+       if (row == nrows() + 1)
+               row--;
        nonum_.erase(nonum_.begin() + row);
        label_.erase(label_.begin() + row);
 }
@@ -857,7 +857,7 @@ void MathHullInset::mutate(string const & newtype)
 }
 
 
-string MathHullInset::eolString(row_type row, bool fragile) const
+string MathHullInset::eolString(row_type row, bool emptyline, bool fragile) const
 {
        string res;
        if (numberedType()) {
@@ -866,7 +866,7 @@ string MathHullInset::eolString(row_type row, bool fragile) const
                if (nonum_[row] && (type_ != "multline"))
                        res += "\\nonumber ";
        }
-       return res + MathGridInset::eolString(row, fragile);
+       return res + MathGridInset::eolString(row, emptyline, fragile);
 }
 
 
@@ -986,14 +986,17 @@ void MathHullInset::doExtern(LCursor & cur, FuncRequest & func)
 
 void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
+       //lyxerr << "action: " << cmd.action << endl;
        switch (cmd.action) {
 
        case LFUN_FINISHED_LEFT:
        case LFUN_FINISHED_RIGHT:
        case LFUN_FINISHED_UP:
        case LFUN_FINISHED_DOWN:
+               //lyxerr << "action: " << cmd.action << endl;
                MathGridInset::doDispatch(cur, cmd);
                notifyCursorLeaves(cur);
+               cur.undispatched();
                break;
 
        case LFUN_BREAKPARAGRAPH:
@@ -1041,23 +1044,50 @@ void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd)
                recordUndoInset(cur);
                row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
                string old_label = label(r);
-               string new_label = cmd.argument;
-
-               if (new_label.empty()) {
-                       string const default_label =
-                               (lyxrc.label_init_length >= 0) ? "eq:" : "";
-                       pair<bool, string> const res = old_label.empty()
-                               ? Alert::askForText(_("Enter new label to insert:"), default_label)
-                               : Alert::askForText(_("Enter label:"), old_label);
-                       if (res.first)
-                               new_label = lyx::support::trim(res.second);
-                       else
-                               new_label = old_label;
+               string const default_label =
+                       (lyxrc.label_init_length >= 0) ? "eq:" : "";
+               if (old_label.empty())
+                       old_label = default_label;
+               string const contents = cmd.argument.empty() ?
+                       old_label : cmd.argument;
+
+               InsetCommandParams p("label", contents);
+               string const data = InsetCommandMailer::params2string("label", p);
+
+               if (cmd.argument.empty()) {
+                       cur.bv().owner()->getDialogs().show("label", data, 0);
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, data);
+                       dispatch(cur, fr);
                }
+               break;
+       }
 
-               if (!new_label.empty())
-                       numbered(r, true);
-               label(r, new_label);
+       case LFUN_INSET_INSERT: {
+               //lyxerr << "arg: " << cmd.argument << endl;
+               string const name = cmd.getArg(0);
+               if (name == "label") {
+                       InsetCommandParams p;
+                       InsetCommandMailer::string2params(name, cmd.argument, p);
+                       string str = p.getContents();
+                       recordUndoInset(cur);
+                       row_type const r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                       str = lyx::support::trim(str);
+                       if (!str.empty())
+                               numbered(r, true);
+                       string old = label(r);
+                       if (str != old) {
+                               cur.bv().buffer()->changeRefsIfUnique(old, str);
+                               label(r, str);
+                       }
+                       break;
+               }
+               MathArray ar;
+               if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                       recordUndo(cur);
+                       cur.insert(ar);
+               } else
+                       cur.undispatched();
                break;
        }
 
@@ -1099,19 +1129,36 @@ void MathHullInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 
 
 bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
-               FuncStatus & flag) const
+               FuncStatus & status) const
 {
        switch (cmd.action) {
+       case LFUN_FINISHED_LEFT:
+       case LFUN_FINISHED_RIGHT:
+       case LFUN_FINISHED_UP:
+       case LFUN_FINISHED_DOWN:
+               status.enabled(true);
+               return true;
        case LFUN_BREAKLINE:
        case LFUN_MATH_NUMBER:
        case LFUN_MATH_NONUMBER:
-       case LFUN_INSERT_LABEL:
        case LFUN_MATH_EXTERN:
        case LFUN_MATH_MUTATE:
        case LFUN_MATH_DISPLAY:
                // we handle these
-               flag.enabled(true);
+               status.enabled(true);
                return true;
+       case LFUN_INSERT_LABEL:
+               status.enabled(type_ != "simple");
+               return true;
+       case LFUN_INSET_INSERT: {
+               // Don't test createMathInset_fromDialogStr(), since
+               // getStatus is not called with a valid reference and the
+               // dialog would not be applyable.
+               string const name = cmd.getArg(0);
+               status.enabled(name == "ref" ||
+                              (name == "label" && type_ != "simple"));
+               break;
+       }
        case LFUN_TABULAR_FEATURE: {
                istringstream is(cmd.argument);
                string s;
@@ -1120,50 +1167,53 @@ bool MathHullInset::getStatus(LCursor & cur, FuncRequest const & cmd,
                    && (s == "append-row"
                        || s == "delete-row"
                        || s == "copy-row")) {
-                       flag.message(bformat(
+                       status.message(bformat(
                                N_("Can't change number of rows in '%1$s'"),
                                type_));
-                       flag.enabled(false);
+                       status.enabled(false);
                        return true;
                }
                if (!colChangeOK()
                    && (s == "append-column"
                        || s == "delete-column"
                        || s == "copy-column")) {
-                       flag.message(bformat(
+                       status.message(bformat(
                                N_("Can't change number of columns in '%1$s'"),
                                type_));
-                       flag.enabled(false);
+                       status.enabled(false);
                        return true;
                }
                if ((type_ == "simple"
                  || type_ == "equation"
                  || type_ == "none") &&
                    (s == "add-hline-above" || s == "add-hline-below")) {
-                       flag.message(bformat(
+                       status.message(bformat(
                                N_("Can't add horizontal grid lines in '%1$s'"),
                                type_));
-                       flag.enabled(false);
+                       status.enabled(false);
                        return true;
                }
                if (s == "add-vline-left" || s == "add-vline-right") {
-                       flag.message(bformat(
+                       status.message(bformat(
                                N_("Can't add vertical grid lines in '%1$s'"),
                                type_));
-                       flag.enabled(false);
+                       status.enabled(false);
                        return true;
                }
                if (s == "valign-top" || s == "valign-middle"
                 || s == "valign-bottom" || s == "align-left"
                 || s == "align-center" || s == "align-right") {
-                       flag.enabled(false);
+                       status.enabled(false);
                        return true;
                }
-               return MathGridInset::getStatus(cur, cmd, flag);
+               return MathGridInset::getStatus(cur, cmd, status);
        }
        default:
-               return MathGridInset::getStatus(cur, cmd, flag);
+               return MathGridInset::getStatus(cur, cmd, status);
        }
+
+       // This cannot really happen, but inserted to shut-up gcc
+       return MathGridInset::getStatus(cur, cmd, status);
 }
 
 
@@ -1248,14 +1298,6 @@ string const MathHullInset::editMessage() const
 }
 
 
-void MathHullInset::getCursorDim(int & asc, int & desc) const
-{
-       asc = 10;
-       desc = 2;
-       //math_font_max_dim(font_, asc, des);
-}
-
-
 void MathHullInset::revealCodes(LCursor & cur) const
 {
        if (!cur.inMathed())
@@ -1427,9 +1469,9 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
        ms <<  "<graphic fileref=\"eqn/";
        if ( !label(0).empty())
                ms << sgml::cleanID(buf, runparams, label(0));
-       else {
+       else
                ms << sgml::uniqueID("anon");
-       }
+
        if (runparams.flavor == OutputParams::XML)
                ms << "\"/>";
        else
@@ -1438,3 +1480,10 @@ int MathHullInset::docbook(Buffer const & buf, ostream & os,
        ms << ETag(name.c_str());
        return ms.line() + res;
 }
+
+
+int MathHullInset::textString(Buffer const & buf, ostream & os,
+                      OutputParams const & op) const
+{
+       return plaintext(buf, os, op);
+}