]> git.lyx.org Git - features.git/blobdiff - src/mathed/math_matrixinset.C
write \mathrm{x}\mathrm{y} as \mathrm{xy} again
[features.git] / src / mathed / math_matrixinset.C
index 32f032b485e4af0597331ab79875b23b244dcbc4..4fa1ebd1f10c906d02d9809b933d45848cc59df9 100644 (file)
 
 namespace {
 
+       int getCols(MathInsetTypes type)
+       {
+               switch (type) {
+                       case LM_OT_EQNARRAY:
+                               return 3;
+                       case LM_OT_ALIGN:
+                       case LM_OT_ALIGNAT:
+                       case LM_OT_XALIGNAT:
+                       case LM_OT_XXALIGNAT:
+                               return 2;
+                       default:;
+               }
+               return 1;
+       }
 
-int getCols(MathInsetTypes type)
-{
-       switch (type) {
-               case LM_OT_EQNARRAY:
-                       return 3;
-               case LM_OT_ALIGN:
-               case LM_OT_ALIGNAT:
-               case LM_OT_XALIGNAT:
-               case LM_OT_XXALIGNAT:
-                       return 2;
-               default:;
+
+       // returns position of first relation operator in the array
+       // used for "intelligent splitting"
+       int firstRelOp(MathArray const & ar)
+       {
+               for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+                       if ((*it)->isRelOp())
+                               return it - ar.begin();
+               return ar.size();
        }
-       return 1;
-}
 
 
-// returns position of first relation operator in the array
-// used for "intelligent splitting"
-int firstRelOp(MathArray const & array)
-{
-       for (MathArray::const_iterator it = array.begin(); it != array.end(); ++it)
-               if ((*it)->isRelOp())
-                       return it - array.begin();
-       return array.size();
-}
+       char const * star(bool numbered)
+       {
+               return numbered ? "" : "*";
+       }
 
+       MathInsetTypes typecode(string const & s)
+       {
+               if (s == "equation")  return LM_OT_EQUATION;
+               if (s == "display")   return LM_OT_EQUATION;
+               if (s == "eqnarray")  return LM_OT_EQNARRAY;
+               if (s == "align")     return LM_OT_ALIGN;
+               if (s == "alignat")   return LM_OT_ALIGNAT;
+               if (s == "xalignat")  return LM_OT_XALIGNAT;
+               if (s == "xxalignat") return LM_OT_XXALIGNAT;
+               if (s == "multline")  return LM_OT_MULTLINE;
+               if (s == "gather")    return LM_OT_GATHER;
+               return LM_OT_SIMPLE;
+       }       
 
-char const * star(bool numbered)
-{
-       return numbered ? "" : "*";
-}
 
-}
+       string normalName(MathInsetTypes t)
+       {
+               switch (t) {
+                       case LM_OT_EQUATION:  return "equation";
+                       case LM_OT_EQNARRAY:  return "eqnarray";
+                       case LM_OT_ALIGN:     return "align";
+                       case LM_OT_ALIGNAT:   return "alignat";
+                       case LM_OT_XALIGNAT:  return "xalignat";
+                       case LM_OT_XXALIGNAT: return "xxalignat";
+                       case LM_OT_MULTLINE:  return "multline";
+                       case LM_OT_GATHER:    return "gather";
+                       case LM_OT_SIMPLE:    return "simple";
+                       default: break;
+               }
+               return "unknown";
+       }       
+
+} // end anon namespace
 
 
 MathMatrixInset::MathMatrixInset()
@@ -64,7 +95,7 @@ MathMatrixInset::MathMatrixInset(MathInsetTypes t)
 }
 
 
-MathMatrixInset::MathMatrixInset(MathInsetTypes t, int cols)
+MathMatrixInset::MathMatrixInset(MathInsetTypes t, col_type cols)
        : MathGridInset(cols, 1), objtype_(t), nonum_(1), label_(1)
 {
        setDefaults();
@@ -77,7 +108,7 @@ MathInset * MathMatrixInset::clone() const
 }
 
 
-char MathMatrixInset::defaultColAlign(int col)
+char MathMatrixInset::defaultColAlign(col_type col)
 {
        switch (getType()) {
                case LM_OT_ALIGN:
@@ -92,7 +123,8 @@ char MathMatrixInset::defaultColAlign(int col)
        return 'c';
 }
 
-int MathMatrixInset::defaultColSpace(int col)
+
+int MathMatrixInset::defaultColSpace(col_type col)
 {
        switch (getType()) {
                case LM_OT_ALIGN:
@@ -108,21 +140,13 @@ int MathMatrixInset::defaultColSpace(int col)
 }
 
 
-void MathMatrixInset::setDefaults()
+void MathMatrixInset::metrics(MathMetricsInfo const & mi) const
 {
-       for (int col = 0; col < ncols(); ++col) {
-               colinfo_[col].align_ = defaultColAlign(col);
-               colinfo_[col].skip_  = defaultColSpace(col);
-       }
-}
-
-
-void MathMatrixInset::metrics(MathStyles) const
-{
-       size_ = (getType() == LM_OT_SIMPLE) ? LM_ST_TEXT : LM_ST_DISPLAY;
+       mi_ = mi;
+       mi_.style = (getType() == LM_OT_SIMPLE) ? LM_ST_TEXT : LM_ST_DISPLAY;
 
        // let the cells adjust themselves
-       MathGridInset::metrics(size_);
+       MathGridInset::metrics(mi_);
 
        if (display()) {
                ascent_  += 12;
@@ -131,8 +155,8 @@ void MathMatrixInset::metrics(MathStyles) const
 
        if (numberedType()) {
                int l = 0;
-               for (int row = 0; row < nrows(); ++row)
-                       l = std::max(l, mathed_string_width(LM_TC_BF, size(), nicelabel(row)));
+               for (row_type row = 0; row < nrows(); ++row)
+                       l = std::max(l, mathed_string_width(LM_TC_BF, mi_, nicelabel(row)));
 
                if (l)
                        width_ += 30 + l;
@@ -141,7 +165,7 @@ void MathMatrixInset::metrics(MathStyles) const
        // make it at least as high as the current font
        int asc = 0;
        int des = 0;
-       math_font_max_dim(LM_TC_TEXTRM, LM_ST_TEXT, asc, des);
+       math_font_max_dim(LM_TC_TEXTRM, mi_, asc, des);
        ascent_  = std::max(ascent_,  asc);
        descent_ = std::max(descent_, des);
 }
@@ -149,32 +173,27 @@ void MathMatrixInset::metrics(MathStyles) const
 
 void MathMatrixInset::draw(Painter & pain, int x, int y) const
 {
-       xo(x);
-       yo(y);
-
        MathGridInset::draw(pain, x, y);
 
        if (numberedType()) {
-               int xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
-               for (int row = 0; row < nrows(); ++row) {
-                       int yy = y + rowinfo_[row].offset_;
-                       drawStr(pain, LM_TC_BF, size(), xx, yy, nicelabel(row));
+               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_;
+                       drawStr(pain, LM_TC_BF, mi_, xx, yy, nicelabel(row));
                }
        }
 }
 
 
-void MathMatrixInset::write(std::ostream & os, bool fragile) const
+void MathMatrixInset::write(MathWriteInfo & os) const
 {
-  header_write(os);
+  header_write(os.os);
 
        bool n = numberedType();
 
-       for (int row = 0; row < nrows(); ++row) {
-               for (int col = 0; col < ncols(); ++col) {
-                       cell(index(row, col)).write(os, fragile);
-                       os << eocString(col);
-               }
+       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] << "}";
@@ -184,29 +203,38 @@ void MathMatrixInset::write(std::ostream & os, bool fragile) const
                os << eolString(row);
        }
 
-  footer_write(os);
+  footer_write(os.os);
 }
 
 
-string MathMatrixInset::label(int row) const
+void MathMatrixInset::writeNormal(std::ostream & os) const
+{
+       os << "[formula " << normalName(getType()) << " ";
+       MathGridInset::writeNormal(os);
+       os << "] ";
+}
+
+
+
+string MathMatrixInset::label(row_type row) const
 {
        return label_[row];
 }
 
 
-void MathMatrixInset::label(int row, string const & label)
+void MathMatrixInset::label(row_type row, string const & label)
 {
        label_[row] = label; 
 }
 
 
-void MathMatrixInset::numbered(int row, bool num)
+void MathMatrixInset::numbered(row_type row, bool num)
 {
        nonum_[row] = !num; 
 }
 
 
-bool MathMatrixInset::numbered(int row) const
+bool MathMatrixInset::numbered(row_type row) const
 {
        return !nonum_[row];
 }
@@ -215,6 +243,14 @@ bool MathMatrixInset::numbered(int row) const
 bool MathMatrixInset::ams() const
 {
        return true;
+
+       return 
+               objtype_ == LM_OT_ALIGN ||
+               objtype_ == LM_OT_MULTLINE ||
+               objtype_ == LM_OT_GATHER ||
+               objtype_ == LM_OT_ALIGNAT ||
+               objtype_ == LM_OT_XALIGNAT ||
+               objtype_ == LM_OT_XXALIGNAT;
 }
 
 
@@ -227,7 +263,7 @@ bool MathMatrixInset::display() const
 std::vector<string> const MathMatrixInset::getLabelList() const
 {
        std::vector<string> res;
-       for (int row = 0; row < nrows(); ++row)
+       for (row_type row = 0; row < nrows(); ++row)
                if (!label_[row].empty() && nonum_[row] != 1)
                        res.push_back(label_[row]);
        return res;
@@ -238,7 +274,7 @@ bool MathMatrixInset::numberedType() const
 {
        if (getType() == LM_OT_SIMPLE || getType() == LM_OT_XXALIGNAT)
                return false;
-       for (int row = 0; row < nrows(); ++row)
+       for (row_type row = 0; row < nrows(); ++row)
                if (!nonum_[row])
                        return true;
        return false;
@@ -284,7 +320,7 @@ void MathMatrixInset::header_write(std::ostream & os) const
                        break;
 
                case LM_OT_ALIGN:
-                       os << "\\begin{align" << star(n) << "}";
+                       os << "\\begin{align" << star(n) << "}\n";
                        break;
 
                case LM_OT_ALIGNAT:
@@ -330,31 +366,31 @@ void MathMatrixInset::footer_write(std::ostream & os) const
                        break;
 
                case LM_OT_EQNARRAY:
-                       os << "\\end{eqnarray" << star(n) << "}\n";
+                       os << "\n\\end{eqnarray" << star(n) << "}\n";
                        break;
 
                case LM_OT_ALIGN:
-                       os << "\\end{align" << star(n) << "}\n";
+                       os << "\n\\end{align" << star(n) << "}\n";
                        break;
 
                case LM_OT_ALIGNAT:
-                       os << "\\end{alignat" << star(n) << "}\n";
+                       os << "\n\\end{alignat" << star(n) << "}\n";
                        break;
 
                case LM_OT_XALIGNAT:
-                       os << "\\end{xalignat" << star(n) << "}\n";
+                       os << "\n\\end{xalignat" << star(n) << "}\n";
                        break;
 
                case LM_OT_XXALIGNAT:
-                       os << "\\end{xxalignat}\n";
+                       os << "\n\\end{xxalignat}\n";
                        break;
 
                case LM_OT_MULTLINE:
-                       os << "\\end{multline}\n";
+                       os << "\n\\end{multline}\n";
                        break;
 
                case LM_OT_GATHER:
-                       os << "\\end{gather}\n";
+                       os << "\n\\end{gather}\n";
                        break;
 
                default:
@@ -363,7 +399,7 @@ void MathMatrixInset::footer_write(std::ostream & os) const
 }
 
 
-void MathMatrixInset::addRow(int row) 
+void MathMatrixInset::addRow(row_type row) 
 {
        nonum_.insert(nonum_.begin() + row + 1, !numberedType());
        label_.insert(label_.begin() + row + 1, string());
@@ -379,7 +415,7 @@ void MathMatrixInset::appendRow()
 }
 
 
-void MathMatrixInset::delRow(int row) 
+void MathMatrixInset::delRow(row_type row) 
 {
        MathGridInset::delRow(row);
        nonum_.erase(nonum_.begin() + row);
@@ -387,7 +423,7 @@ void MathMatrixInset::delRow(int row)
 }
 
 
-void MathMatrixInset::addCol(int col)
+void MathMatrixInset::addCol(col_type col)
 {
        switch (getType()) {
                case LM_OT_EQUATION:
@@ -417,7 +453,7 @@ void MathMatrixInset::addCol(int col)
 }
 
 
-void MathMatrixInset::delCol(int col)
+void MathMatrixInset::delCol(col_type col)
 {
        switch (getType()) {
                case LM_OT_ALIGNAT:
@@ -432,7 +468,7 @@ void MathMatrixInset::delCol(int col)
 }
 
 
-string MathMatrixInset::nicelabel(int row) const
+string MathMatrixInset::nicelabel(row_type row) const
 {
        if (nonum_[row])
                return string();
@@ -442,31 +478,6 @@ string MathMatrixInset::nicelabel(int row) const
 }
 
 
-namespace {
-       MathInsetTypes typecode(string const & s)
-       {
-               if (s == "equation")
-                       return LM_OT_EQUATION;
-               if (s == "display")
-                       return LM_OT_EQUATION;
-               if (s == "eqnarray")
-                       return LM_OT_EQNARRAY;
-               if (s == "align")
-                       return LM_OT_ALIGN;
-               if (s == "alignat")
-                       return LM_OT_ALIGN;
-               if (s == "xalignat")
-                       return LM_OT_XALIGNAT;
-               if (s == "xxalignat")
-                       return LM_OT_XXALIGNAT;
-               if (s == "multline")
-                       return LM_OT_MULTLINE;
-               if (s == "gather")
-                       return LM_OT_GATHER;
-               return LM_OT_SIMPLE;
-       }       
-}
-
 void MathMatrixInset::mutate(string const & newtype)
 {
        if (newtype == "dump") {
@@ -477,10 +488,11 @@ void MathMatrixInset::mutate(string const & newtype)
        mutate(typecode(newtype));
 }
 
+
 void MathMatrixInset::glueall()
 {
        MathArray ar;
-       for (int i = 0; i < nargs(); ++i)
+       for (idx_type i = 0; i < nargs(); ++i)
                ar.push_back(cell(i));
        *this = MathMatrixInset(LM_OT_SIMPLE);
        cell(0) = ar;
@@ -529,7 +541,7 @@ void MathMatrixInset::mutate(MathInsetTypes newtype)
                                        MathGridInset::addCol(1);
 
                                        // split it "nicely"
-                                       int pos = firstRelOp(cell(0));  
+                                       pos_type pos = firstRelOp(cell(0));     
                                        cell(1) = cell(0);
                                        cell(0).erase(pos, cell(0).size());
                                        cell(1).erase(0, pos);
@@ -544,7 +556,7 @@ void MathMatrixInset::mutate(MathInsetTypes newtype)
                                        MathGridInset::addCol(1);
 
                                        // split it "nicely" on the firest relop
-                                       int pos = firstRelOp(cell(0));  
+                                       pos_type pos = firstRelOp(cell(0));     
                                        cell(1) = cell(0);
                                        cell(0).erase(pos, cell(0).size());
                                        cell(1).erase(0, pos);
@@ -567,16 +579,16 @@ void MathMatrixInset::mutate(MathInsetTypes newtype)
                                case LM_OT_EQUATION: {
                                        // set correct (no)numbering
                                        bool allnonum = true;
-                                       for (int r = 0; r < nrows(); ++r) {
-                                               if (!nonum_[r])
+                                       for (row_type row = 0; row < nrows(); ++row) {
+                                               if (!nonum_[row])
                                                        allnonum = false;
                                        }
 
                                        // set first non-empty label
                                        string label;
-                                       for (int r = 0; r < nrows(); ++r) {
-                                               if (!label_[r].empty()) {
-                                                       label = label_[r];
+                                       for (row_type row = 0; row < nrows(); ++row) {
+                                               if (!label_[row].empty()) {
+                                                       label = label_[row];
                                                        break;
                                                }
                                        }
@@ -594,8 +606,8 @@ void MathMatrixInset::mutate(MathInsetTypes newtype)
                                case LM_OT_XALIGNAT:
                                case LM_OT_XXALIGNAT:
                                default: {
-                                       for (int row = 0; row < nrows(); ++row) {
-                                               int c = 3 * row + 1;
+                                       for (row_type row = 0; row < nrows(); ++row) {
+                                               idx_type c = 3 * row + 1;
                                                cell(c).push_back(cell(c + 1));
                                        }
                                        MathGridInset::delCol(2);