rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

[lyx.git] / src / mathed / math_hullinset.C

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 4f5a81d29b9d640feb48e1006cc34819102eba8a..c70f25fa74e1a67a200af0f49a9f8c15d506c37a 100644 (file)
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1,12 +1,10 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_cursor.h"
 #include "math_support.h"
 #include "math_extern.h"
 #include "math_charinset.h"
@@ -38,6 +36,8 @@ namespace {
                        return 3;
                if (type == "align")
                        return 2;
+               if (type == "flalign")
+                       return 2;
                if (type == "alignat")
                        return 2;
                if (type == "xalignat")
@@ -77,6 +77,7 @@ namespace {
                if (s == "xxalignat") return 7;
                if (s == "multline")  return 8;
                if (s == "gather")    return 9;
+               if (s == "flalign")   return 10;
                lyxerr << "unknown hull type '" << s << "'\n";
                return 0;
        }
@@ -151,7 +152,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;
 }
@@ -192,7 +193,7 @@ void MathHullInset::metrics(MathMetricsInfo & mi) const
        int asc = 0;
        int des = 0;
        math_font_max_dim(mi.base.font, asc, des);
-       dim_.a = max(dim_.a,  asc);
+       dim_.a = max(dim_.a, asc);
        dim_.d = max(dim_.d, des);
 
        // for markers
@@ -278,6 +279,7 @@ bool MathHullInset::ams() const
 {
        return
                type_ == "align" ||
+               type_ == "flalign" ||
                type_ == "multline" ||
                type_ == "gather" ||
                type_ == "alignat" ||
@@ -329,7 +331,7 @@ void MathHullInset::validate(LaTeXFeatures & features) const
        features.require("boldsymbol");
        //features.binom      = true;
 
-       MathNestInset::validate(features);
+       MathGridInset::validate(features);
 }
 
 
@@ -353,22 +355,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";
+               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";
+               os << "\\begin{" << type_ << '}'
+                 << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
 
        else
-               os << "\\begin{unknown" << star(n) << "}";
+               os << "\\begin{unknown" << star(n) << '}';
 }
 
 
@@ -388,22 +388,23 @@ 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_ == "alignat" ||
+               type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
                type_ == "xalignat" || type_ == "xxalignat";
 }
 
@@ -428,7 +429,7 @@ void MathHullInset::delRow(row_type row)
 
 void MathHullInset::addCol(col_type col)
 {
-       if (colChangeOK()) 
+       if (colChangeOK())
                MathGridInset::addCol(col);
        else
                lyxerr << "Can't change number of columns in '" << type_ << "'\n";
@@ -437,7 +438,7 @@ void MathHullInset::addCol(col_type col)
 
 void MathHullInset::delCol(col_type col)
 {
-       if (colChangeOK()) 
+       if (colChangeOK())
                MathGridInset::delCol(col);
        else
                lyxerr << "Can't change number of columns in '" << type_ << "'\n";
@@ -450,7 +451,7 @@ string MathHullInset::nicelabel(row_type row) const
                return string();
        if (label_[row].empty())
                return string("(#)");
-       return "(" + label_[row] + ")";
+       return '(' + label_[row] + ')';
 }
 
 
@@ -587,8 +588,8 @@ void MathHullInset::mutate(string const & newtype)
        }
 
        else if (type_ == "multline") {
-               if (newtype == "gather" || newtype == "align" ||        
-                          newtype == "xalign" || newtype == "xxalign")
+               if (newtype == "gather" || newtype == "align" ||
+                   newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
                        setType(newtype);
                else if (newtype == "eqnarray") {
                        MathGridInset::addCol(1);
@@ -620,9 +621,9 @@ string MathHullInset::eolString(row_type row, bool fragile) const
 {
        string res;
        if (numberedType()) {
-               if (!label_[row].empty())
-                       res += "\\label{" + label_[row] + "}";
-               if (nonum_[row])
+               if (!label_[row].empty() && !nonum_[row])
+                       res += "\\label{" + label_[row] + '}';
+               if (nonum_[row] && (type_ != "multline"))
                        res += "\\nonumber ";
        }
        return res + MathGridInset::eolString(row, fragile);
@@ -639,7 +640,7 @@ void MathHullInset::write(WriteStream & os) const
 
 void MathHullInset::normalize(NormalStream & os) const
 {
-       os << "[formula " << type_ << " ";
+       os << "[formula " << type_ << ' ';
        MathGridInset::normalize(os);
        os << "] ";
 }
@@ -695,7 +696,9 @@ void MathHullInset::doExtern
        if (getType() == "simple") {
                size_type pos = cell(idx).find_last(eq);
                MathArray ar;
-               if (pos == cell(idx).size()) {
+               if (mathcursor && mathcursor->selection()) {
+                       ar = asArray(mathcursor->grabAndEraseSelection());
+               } else if (pos == cell(idx).size()) {
                        ar = cell(idx);
                        lyxerr << "use whole cell: " << ar << "\n";
                } else {
@@ -740,7 +743,7 @@ void MathHullInset::doExtern
 }
 
 
-MathInset::result_type MathHullInset::dispatch
+dispatch_result MathHullInset::dispatch
        (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
        switch (cmd.action) {
@@ -759,25 +762,27 @@ MathInset::result_type MathHullInset::dispatch
                        if (display()) {
                                //bv->lockedInsetStoreUndo(Undo::INSERT);
                                bool old = numberedType();
-                               for (row_type row = 0; row < nrows(); ++row)
-                                       numbered(row, !old);
+                               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"));
-                               //updateLocal(bv, true);
                        }
                        return DISPATCHED;
 
                case LFUN_MATH_NONUMBER:
                        if (display()) {
+                               row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
                                //bv->lockedInsetStoreUndo(Undo::INSERT);
-                               bool old = numbered(row(idx));
+                               bool old = numbered(r);
                                //bv->owner()->message(old ? _("No number") : _("Number"));
-                               numbered(row(idx), !old);
-                               //updateLocal(bv, true);
+                               numbered(r, !old);
                        }
                        return DISPATCHED;
 
                case LFUN_INSERT_LABEL: {
-                       row_type r = row(idx);
+                       row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
                        string old_label = label(r);
                        string new_label = cmd.argument;
 
@@ -819,7 +824,7 @@ MathInset::result_type MathHullInset::dispatch
                        idx = r * ncols() + c;
                        if (idx >= nargs())
                                idx = nargs() - 1;
-                       if (pos > cell(idx).size()) 
+                       if (pos > cell(idx).size())
                                pos = cell(idx).size();
                        return DISPATCHED_POP;
                }