use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index 9957c17b82982dc2b9f06d1ac23a98f4107a6790..4b3c16d606522c2c76d048f9048c866894276d19 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -132,7 +132,7 @@ LyXLength MathGridInset::vskip(row_type row) const
 }
 
 
-void MathGridInset::metrics(MathStyles st) const
+void MathGridInset::metrics(MathMetricsInfo const & st) const
 {
        // let the cells adjust themselves
        MathNestInset::metrics(st);
@@ -264,15 +264,29 @@ void MathGridInset::draw(Painter & pain, int x, int y) const
 }
 
 
-void MathGridInset::write(std::ostream & os, bool fragile) const
+void MathGridInset::write(MathWriteInfo & os) const
 {
        for (row_type row = 0; row < nrows(); ++row) {
+               for (col_type col = 0; col < ncols(); ++col) 
+                       os << cell(index(row, col)) << eocString(col);
+               os << eolString(row);
+       }
+}
+
+
+void MathGridInset::writeNormal(std::ostream & os) const
+{
+       os << "[grid ";
+       for (row_type row = 0; row < nrows(); ++row) {
+               os << "[row ";
                for (col_type col = 0; col < ncols(); ++col) {
-                       cell(index(row, col)).write(os, fragile);
-                       os << eocString(col);
+                       os << "[cell ";
+                       cell(index(row, col)).writeNormal(os);
+                       os << "]";
                }
-               os << eolString(row);
+               os << "]";
        }
+       os << "]";
 }