]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_hullinset.C
mathed uglyfication
[lyx.git] / src / mathed / math_hullinset.C
index 361c241ea1e3148ca05abd94a2910bdbcd9e72da..4926e1456eeaf65ee99c3adcc6538477eac9a3bc 100644 (file)
@@ -1,25 +1,47 @@
-#include <config.h>
+/**
+ * \file math_hullinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_cursor.h"
 #include "math_support.h"
-#include "debug.h"
-#include "frontends/Painter.h"
+#include "math_extern.h"
+#include "math_charinset.h"
 #include "textpainter.h"
-#include "Lsstream.h"
+#include "dispatchresult.h"
+#include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "support/LAssert.h"
+#include "LColor.h"
+#include "lyxrc.h"
 
-#include <vector>
+#include "frontends/Alert.h"
+
+#include "support/std_sstream.h"
+
+
+using lyx::support::trim;
 
-using std::vector;
-using std::max;
 using std::endl;
+using std::max;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
+using std::pair;
+
 
 namespace {
 
@@ -29,6 +51,8 @@ namespace {
                        return 3;
                if (type == "align")
                        return 2;
+               if (type == "flalign")
+                       return 2;
                if (type == "alignat")
                        return 2;
                if (type == "xalignat")
@@ -68,7 +92,8 @@ namespace {
                if (s == "xxalignat") return 7;
                if (s == "multline")  return 8;
                if (s == "gather")    return 9;
-               lyxerr << "unknown hull type '" << s << "'\n";
+               if (s == "flalign")   return 10;
+               lyxerr << "unknown hull type '" << s << "'" << endl;
                return 0;
        }
 
@@ -95,9 +120,9 @@ MathHullInset::MathHullInset(string const & type)
 }
 
 
-MathInset * MathHullInset::clone() const
+auto_ptr<InsetBase> MathHullInset::clone() const
 {
-       return new MathHullInset(*this);
+       return auto_ptr<InsetBase>(new MathHullInset(*this));
 }
 
 
@@ -110,18 +135,20 @@ MathInset::mode_type MathHullInset::currentMode() const
 }
 
 
-bool MathHullInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxFirst(BufferView & bv) const
 {
-       idx = 0;
-       pos = 0;
+       CursorSlice & cur = cursorTip(bv);
+       cur.idx() = 0;
+       cur.pos() = 0;
        return true;
 }
 
 
-bool MathHullInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxLast(BufferView & bv) const
 {
-       idx = nargs() - 1;
-       pos = cell(idx).size();
+       CursorSlice & cur = cursorTip(bv);
+       cur.idx() = nargs() - 1;
+       cur.pos() = cur.lastpos();
        return true;
 }
 
@@ -142,7 +169,7 @@ int MathHullInset::defaultColSpace(col_type col)
                return 0;
        if (type_ == "xalignat")
                return (col & 1) ? 20 : 0;
-       if (type_ == "xxalignat")
+       if (type_ == "xxalignat" || type_ == "flalign")
                return (col & 1) ? 40 : 0;
        return 0;
 }
@@ -156,52 +183,53 @@ char const * MathHullInset::standardFont() const
 }
 
 
-void MathHullInset::metrics(MathMetricsInfo & mi) const
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MathFontSetChanger dummy1(mi.base, standardFont());
-       MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       FontSetChanger dummy1(mi.base, standardFont());
+       StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 
        // let the cells adjust themselves
        MathGridInset::metrics(mi);
 
        if (display()) {
-               dim_.a += 12;
-               dim_.d += 12;
+               dim_.asc += 12;
+               dim_.des += 12;
        }
 
        if (numberedType()) {
-               MathFontSetChanger dummy(mi.base, "mathbf");
+               FontSetChanger dummy(mi.base, "mathbf");
                int l = 0;
                for (row_type row = 0; row < nrows(); ++row)
                        l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
 
                if (l)
-                       dim_.w += 30 + l;
+                       dim_.wid += 30 + l;
        }
 
        // make it at least as high as the current font
        int asc = 0;
        int des = 0;
        math_font_max_dim(mi.base.font, asc, des);
-       dim_.a = max(dim_.a,  asc);
-       dim_.d = max(dim_.d, des);
+       dim_.asc = max(dim_.asc, asc);
+       dim_.des = max(dim_.des, des);
 
        // for markers
        metricsMarkers2();
+       dim = dim_;
 }
 
 
-void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
-       MathFontSetChanger dummy1(pi.base, standardFont());
-       MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+       FontSetChanger dummy1(pi.base, standardFont());
+       StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
        MathGridInset::draw(pi, x + 1, y);
 
        if (numberedType()) {
                int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
                for (row_type row = 0; row < nrows(); ++row) {
                        int const yy = y + rowinfo_[row].offset_;
-                       MathFontSetChanger dummy(pi.base, "mathrm");
+                       FontSetChanger dummy(pi.base, "mathrm");
                        drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
                }
        }
@@ -210,17 +238,17 @@ void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
 }
 
 
-void MathHullInset::metricsT(TextMetricsInfo const & mi) const
+void MathHullInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
        if (display()) {
-               MathGridInset::metricsT(mi);
+               MathGridInset::metricsT(mi, dim);
        } else {
                ostringstream os;
                WriteStream wi(os, false, true);
                write(wi);
-               dim_.w = os.str().size();
-               dim_.a = 1;
-               dim_.d = 0;
+               dim.wid = os.str().size();
+               dim.asc = 1;
+               dim.des = 0;
        }
 }
 
@@ -241,14 +269,14 @@ void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 string MathHullInset::label(row_type row) const
 {
        row_type n = nrows();
-       lyx::Assert(row < n);
+       BOOST_ASSERT(row < n);
        return label_[row];
 }
 
 
 void MathHullInset::label(row_type row, string const & label)
 {
-       lyxerr << "setting label '" << label << "' for row " << row << endl;
+       //lyxerr << "setting label '" << label << "' for row " << row << endl;
        label_[row] = label;
 }
 
@@ -269,6 +297,7 @@ bool MathHullInset::ams() const
 {
        return
                type_ == "align" ||
+               type_ == "flalign" ||
                type_ == "multline" ||
                type_ == "gather" ||
                type_ == "alignat" ||
@@ -283,7 +312,8 @@ bool MathHullInset::display() const
 }
 
 
-void MathHullInset::getLabelList(std::vector<string> & labels) const
+void MathHullInset::getLabelList(Buffer const &,
+                                std::vector<string> & labels) const
 {
        for (row_type row = 0; row < nrows(); ++row)
                if (!label_[row].empty() && nonum_[row] != 1)
@@ -320,7 +350,7 @@ void MathHullInset::validate(LaTeXFeatures & features) const
        features.require("boldsymbol");
        //features.binom      = true;
 
-       MathNestInset::validate(features);
+       MathGridInset::validate(features);
 }
 
 
@@ -344,22 +374,20 @@ void MathHullInset::header_write(WriteStream & os) const
                        os << "\\[\n";
        }
 
-       else if (type_ == "eqnarray" || type_ == "align")
+       else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+                || type_ == "gather" || type_ == "multline")
                        os << "\\begin{" << type_ << star(n) << "}\n";
 
-       else if (type_ == "alignat" || type_ == "xalignat") 
-               os << "\\begin{" << type_ << star(n) << "}"
-                 << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
-       else if (type_ == "xxalignat") 
-               os << "\\begin{" << type_ << "}"
-                 << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
-       else if (type_ == "multline" || type_ == "gather") 
-               os << "\\begin{" << type_ << "}\n";
+       else if (type_ == "alignat" || type_ == "xalignat")
+               os << "\\begin{" << type_ << star(n) << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+
+       else if (type_ == "xxalignat")
+               os << "\\begin{" << type_ << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
 
-       else 
-               os << "\\begin{unknown" << star(n) << "}";
+       else
+               os << "\\begin{unknown" << star(n) << '}';
 }
 
 
@@ -379,15 +407,24 @@ void MathHullInset::footer_write(WriteStream & os) const
                else
                        os << "\\]\n";
 
-       else if (type_ == "eqnarray" || type_ == "align" || type_ == "alignat"
-             || type_ == "xalignat")
-               os << "\n\\end{" << type_ << star(n) << "}\n";
+       else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+                || type_ == "alignat" || type_ == "xalignat"
+                || type_ == "gather" || type_ == "multline")
+               os << "\\end{" << type_ << star(n) << "}\n";
 
-       else if (type_ == "xxalignat" || type_ == "multline" || type_ == "gather")
-               os << "\n\\end{" << type_ << "}\n";
+       else if (type_ == "xxalignat")
+               os << "\\end{" << type_ << "}\n";
 
        else
-               os << "\\end{unknown" << star(n) << "}";
+               os << "\\end{unknown" << star(n) << '}';
+}
+
+
+bool MathHullInset::colChangeOK() const
+{
+       return
+               type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
+               type_ == "xalignat" || type_ == "xxalignat";
 }
 
 
@@ -399,34 +436,43 @@ void MathHullInset::addRow(row_type row)
 }
 
 
+void MathHullInset::swapRow(row_type row)
+{
+       if (nrows() == 1)
+               return;
+       if (row + 1 == nrows())
+               --row;
+       std::swap(nonum_[row], nonum_[row + 1]);
+       std::swap(label_[row], label_[row + 1]);
+       MathGridInset::swapRow(row);
+}
+
+
 void MathHullInset::delRow(row_type row)
 {
+       if (nrows() <= 1)
+               return;
        MathGridInset::delRow(row);
        nonum_.erase(nonum_.begin() + row);
        label_.erase(label_.begin() + row);
 }
 
 
-void MathHullInset::addFancyCol(col_type col)
+void MathHullInset::addCol(col_type col)
 {
-       if (type_ == "equation")
-               mutate("eqnarray");
-       
-       else if (type_ == "eqnarray") {
-               mutate("align");
-               addFancyCol(col);
-       }
-
-       else if (type_ == "align" || type_ == "alignat"
-             || type_ == "xalignat" || type_ == "xxalignat") 
+       if (colChangeOK())
                MathGridInset::addCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
-void MathHullInset::delFancyCol(col_type col)
+void MathHullInset::delCol(col_type col)
 {
-       if (type_ == "alignat" || type_ == "xalignat" || type_ == "xxalignat") 
+       if (colChangeOK())
                MathGridInset::delCol(col);
+       else
+               lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
@@ -436,7 +482,7 @@ string MathHullInset::nicelabel(row_type row) const
                return string();
        if (label_[row].empty())
                return string("(#)");
-       return "(" + label_[row] + ")";
+       return '(' + label_[row] + ')';
 }
 
 
@@ -467,10 +513,10 @@ void MathHullInset::setType(string const & type)
 
 void MathHullInset::mutate(string const & newtype)
 {
-       //lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'\n";
+       lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
        // we try to move along the chain
-       // none <-> simple <-> equation <-> eqnarray 
+       // none <-> simple <-> equation <-> eqnarray
 
        if (newtype == "dump") {
                dump();
@@ -516,10 +562,9 @@ void MathHullInset::mutate(string const & newtype)
                        setType("eqnarray");
                        mutate(newtype);
                } else if (newtype == "multline" || newtype == "gather") {
-                       setType("multline");
+                       setType(newtype);
                        numbered(0, false);
-                       mutate(newtype);
-               } else {                        
+               } else {
                        MathGridInset::addCol(1);
                        // split it "nicely"
                        pos_type pos = firstRelOp(cell(0));
@@ -574,12 +619,16 @@ void MathHullInset::mutate(string const & newtype)
        }
 
        else if (type_ == "multline") {
-               if (newtype == "gather") {
-                       setType("gather");
+               if (newtype == "gather" || newtype == "align" ||
+                   newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
+                       setType(newtype);
+               else if (newtype == "eqnarray") {
+                       MathGridInset::addCol(1);
+                       MathGridInset::addCol(1);
+                       setType("eqnarray");
                } else {
                        lyxerr << "mutation from '" << type_
-                               << "' to '" << newtype << "' not implemented"
-                                                << endl;
+                               << "' to '" << newtype << "' not implemented" << endl;
                }
        }
 
@@ -599,31 +648,30 @@ void MathHullInset::mutate(string const & newtype)
 }
 
 
-void MathHullInset::write(WriteStream & os) const
+string MathHullInset::eolString(row_type row, bool fragile) const
 {
-       header_write(os);
-
-       bool n = numberedType();
-
-       for (row_type row = 0; row < nrows(); ++row) {
-               for (col_type col = 0; col < ncols(); ++col)
-                       os << cell(index(row, col)) << eocString(col);
-               if (n) {
-                       if (!label_[row].empty())
-                               os << "\\label{" << label_[row] << "}";
-                       if (nonum_[row])
-                               os << "\\nonumber ";
-               }
-               os << eolString(row);
+       string res;
+       if (numberedType()) {
+               if (!label_[row].empty() && !nonum_[row])
+                       res += "\\label{" + label_[row] + '}';
+               if (nonum_[row] && (type_ != "multline"))
+                       res += "\\nonumber ";
        }
+       return res + MathGridInset::eolString(row, fragile);
+}
+
 
+void MathHullInset::write(WriteStream & os) const
+{
+       header_write(os);
+       MathGridInset::write(os);
        footer_write(os);
 }
 
 
 void MathHullInset::normalize(NormalStream & os) const
 {
-       os << "[formula " << type_ << " ";
+       os << "[formula " << type_ << ' ';
        MathGridInset::normalize(os);
        os << "] ";
 }
@@ -643,6 +691,186 @@ void MathHullInset::infoize(std::ostream & os) const
 
 void MathHullInset::check() const
 {
-       lyx::Assert(nonum_.size() == nrows());
-       lyx::Assert(label_.size() == nrows());
+       BOOST_ASSERT(nonum_.size() == nrows());
+       BOOST_ASSERT(label_.size() == nrows());
+}
+
+
+void MathHullInset::doExtern(FuncRequest const & func, BufferView & bv)
+{
+       CursorSlice & cur = cursorTip(bv);
+       string lang;
+       string extra;
+       istringstream iss(func.argument.c_str());
+       iss >> lang >> extra;
+       if (extra.empty())
+               extra = "noextra";
+
+#ifdef WITH_WARNINGS
+#warning temporarily disabled
+       //if (selection()) {
+       //      MathArray ar;
+       //      selGet(ar);
+       //      lyxerr << "use selection: " << ar << endl;
+       //      insert(pipeThroughExtern(lang, extra, ar));
+       //      return;
+       //}
+#endif
+
+       MathArray eq;
+       eq.push_back(MathAtom(new MathCharInset('=')));
+
+       // go to first item in line
+       cur.idx() -= cur.idx() % ncols();
+       cur.pos() = 0;
+
+       if (getType() == "simple") {
+               size_type pos = cur.cell().find_last(eq);
+               MathArray ar;
+               if (mathcursor && mathcursor->selection()) {
+                       asArray(mathcursor->grabAndEraseSelection(bv), ar);
+               } else if (pos == cur.cell().size()) {
+                       ar = cur.cell();
+                       lyxerr << "use whole cell: " << ar << endl;
+               } else {
+                       ar = MathArray(cur.cell().begin() + pos + 1, cur.cell().end());
+                       lyxerr << "use partial cell form pos: " << pos << endl;
+               }
+               cur.cell().append(eq);
+               cur.cell().append(pipeThroughExtern(lang, extra, ar));
+               cur.pos() = cur.lastpos();
+               return;
+       }
+
+       if (getType() == "equation") {
+               lyxerr << "use equation inset" << endl;
+               mutate("eqnarray");
+               MathArray & ar = cur.cell();
+               lyxerr << "use cell: " << ar << endl;
+               ++cur.idx();
+               cur.cell() = eq;
+               ++cur.idx();
+               cur.cell() = pipeThroughExtern(lang, extra, ar);
+               // move to end of line
+               cur.pos() = cur.lastpos();
+               return;
+       }
+
+       {
+               lyxerr << "use eqnarray" << endl;
+               cur.idx() += 2 - cur.idx() % ncols();
+               cur.pos() = 0;
+               MathArray ar = cur.cell();
+               lyxerr << "use cell: " << ar << endl;
+#ifdef WITH_WARNINGS
+#warning temporarily disabled
+#endif
+               addRow(cur.row());
+               ++cur.idx();
+               ++cur.idx();
+               cur.cell() = eq;
+               ++cur.idx();
+               cur.cell() = pipeThroughExtern(lang, extra, ar);
+               cur.pos() = cur.lastpos();
+       }
+}
+
+
+DispatchResult
+MathHullInset::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
+{
+       CursorSlice & cur = cursorTip(bv);
+       switch (cmd.action) {
+
+               case LFUN_BREAKLINE:
+                       if (type_ == "simple" || type_ == "equation") {
+                               mutate("eqnarray");
+                               cur.idx() = 1;
+                               cur.pos() = 0;
+                               return DispatchResult(true, FINISHED);
+                       }
+                       return MathGridInset::priv_dispatch(bv, cmd);
+
+               case LFUN_MATH_NUMBER:
+                       //lyxerr << "toggling all numbers" << endl;
+                       if (display()) {
+                               //recordUndo(bv, Undo::INSERT);
+                               bool old = numberedType();
+                               if (type_ == "multline")
+                                       numbered(nrows() - 1, !old);
+                               else
+                                       for (row_type row = 0; row < nrows(); ++row)
+                                               numbered(row, !old);
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                       }
+                       return DispatchResult(true, true);
+
+               case LFUN_MATH_NONUMBER:
+                       if (display()) {
+                               row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+                               //recordUndo(bv, Undo::INSERT);
+                               bool old = numbered(r);
+                               //bv->owner()->message(old ? _("No number") : _("Number"));
+                               numbered(r, !old);
+                       }
+                       return DispatchResult(true, true);
+
+               case LFUN_INSERT_LABEL: {
+                       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)
+                                       return DispatchResult(false);
+                               new_label = trim(res.second);
+                       }
+
+                       //if (new_label == old_label)
+                       //      break;  // Nothing to do
+
+                       if (!new_label.empty())
+                               numbered(r, true);
+                       label(r, new_label);
+                       return DispatchResult(true, true);
+               }
+
+               case LFUN_MATH_EXTERN:
+                       doExtern(cmd, bv);
+                       return DispatchResult(true, FINISHED);
+
+               case LFUN_MATH_MUTATE: {
+                       lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
+                       row_type r = cur.row();
+                       col_type c = cur.col();
+                       mutate(cmd.argument);
+                       cur.idx() = r * ncols() + c;
+                       if (cur.idx() >= nargs())
+                               cur.idx() = nargs() - 1;
+                       if (cur.pos() > cur.lastpos())
+                               cur.pos() = cur.lastpos();
+                       return DispatchResult(true, FINISHED);
+               }
+
+               case LFUN_MATH_DISPLAY: {
+                       mutate(type_ == "simple" ? "equation" : "simple");
+                       cur.idx() = 0;
+                       cur.pos() = cur.lastpos();
+                       return DispatchResult(true, FINISHED);
+               }
+
+               default:
+                       return MathGridInset::priv_dispatch(bv, cmd);
+       }
+}
+
+
+string MathHullInset::fileInsetLabel() const
+{
+       return "Formula";
 }