make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index 862e3b41738ed7fd423ba35700c1f5e3330a5765..ab216d492f5a113f4040dac4befeba6cb15635ed 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,16 +1,20 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <iterator>
-
 #include "math_arrayinset.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "Lsstream.h"
 
+#include <iterator>
+
 using std::vector;
 using std::istringstream;
+using std::getline;
 
 
 MathArrayInset::MathArrayInset(int m, int n)
@@ -23,6 +27,11 @@ MathArrayInset::MathArrayInset(int m, int n, char valign, string const & halign)
 {}
 
 
+MathArrayInset::MathArrayInset(char valign, string const & halign)
+       : MathGridInset(valign, halign)
+{}
+
+
 MathArrayInset::MathArrayInset(string const & str)
        : MathGridInset(1, 1)
 {
@@ -65,21 +74,17 @@ void MathArrayInset::metrics(MathMetricsInfo const & st) const
 
 void MathArrayInset::write(WriteStream & os) const
 {
-       if (os.fragile)
+       if (os.fragile())
                os << "\\protect";
        os << "\\begin{array}";
 
        if (v_align_ == 't' || v_align_ == 'b') 
                os << '[' << char(v_align_) << ']';
-
-       os << '{';
-       for (col_type col = 0; col < ncols(); ++col)
-               os << colinfo_[col].align_;
-       os << "}\n";
+       os << '{' << halign() << "}\n";
 
        MathGridInset::write(os);
 
-       if (os.fragile)
+       if (os.fragile())
                os << "\\protect";
        os << "\\end{array}\n";
 }