enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_arrayinset.C b/src/mathed/math_arrayinset.C
index c0ed8a273f39771aee4b8361e7a285e0587104c8..ab216d492f5a113f4040dac4befeba6cb15635ed 100644 (file)
--- a/src/mathed/math_arrayinset.C
+++ b/src/mathed/math_arrayinset.C
@@ -1,14 +1,17 @@
+#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;
@@ -71,17 +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 << '{' << halign().c_str() << "}\n";
+       os << '{' << halign() << "}\n";
 
        MathGridInset::write(os);
 
-       if (os.fragile)
+       if (os.fragile())
                os << "\\protect";
        os << "\\end{array}\n";
 }