split inset -> inset + updatableinset

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

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 7c5d2d51cd45b09770fb5f810268c6bf1c76d7ae..fdecd97f8d8cb5917b0b97730343c7f4f504c996 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -22,9 +22,9 @@ following hack as starting point to write some macros:
   ...
 
   \[\begin{array}{ccc}
-   1 & 2\b & 3^2\\
-   4 & 5\e & 6\\
-   7 & 8 & 9
+1
+&
+
   \end{array}\]
 
 */
@@ -32,9 +32,6 @@ following hack as starting point to write some macros:
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_parser.h"
 #include "math_inset.h"
@@ -207,9 +204,9 @@ private:
 ostream & operator<<(ostream & os, Token const & t)
 {
        if (t.cs().size())
-               os << "\\" << t.cs();
+               os << '\\' << t.cs();
        else
-               os << "[" << t.character() << "," << t.cat() << "]";
+               os << '[' << t.character() << ',' << t.cat() << ']';
        return os;
 }
 
@@ -403,6 +400,9 @@ void Parser::tokenize(istream & is)
                        break;
                }
        }
+       // Remove the space after \end_inset
+       if (is.get(c) && c != ' ')
+               is.unget();
 
        // tokenize buffer
        tokenize(s);
@@ -535,7 +535,7 @@ string Parser::parse_verbatim_option()
                        if (t.cat() == catBegin) {
                                putback();
                                res += '{' + parse_verbatim_item() + '}';
-                       } else 
+                       } else
                                res += t.asString();
                }
        }
@@ -553,7 +553,7 @@ string Parser::parse_verbatim_item()
                                putback();
                                res += '{' + parse_verbatim_item() + '}';
                        }
-                       else 
+                       else
                                res += t.asString();
                }
        }
@@ -746,9 +746,10 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        MathScriptInset * p = cell->back().nucleus()->asScriptInset();
                        // special handling of {}-bases
                        // is this always correct?
-                       if (p->nuc().size() == 1 && p->nuc().back()->asNestInset() &&
-                                       p->nuc().back()->extraBraces())
-                               p->nuc() = p->nuc().back()->asNestInset()->cell(0);
+                       // It appears that this is wrong (Dekel)
+                       //if (p->nuc().size() == 1 && p->nuc().back()->asNestInset() &&
+                       //    p->nuc().back()->extraBraces())
+                       //      p->nuc() = p->nuc().back()->asNestInset()->cell(0);
                        parse(p->cell(up), FLAG_ITEM, mode);
                        if (limits) {
                                p->limits(limits);
@@ -940,8 +941,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                }
 
                else if (t.cs() == "hline") {
-                       if (grid.asHullInset())
-                               grid.asHullInset()->rowinfo(cellrow + 1);
+                       grid.rowinfo(cellrow).lines_ ++;
                }
 
                else if (t.cs() == "sqrt") {
@@ -957,6 +957,12 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        }
                }
 
+               else if (t.cs() == "xrightarrow" || t.cs() == "xleftarrow") {
+                       cell->push_back(createMathInset(t.cs()));
+                       parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
+                       parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
+               }
+
                else if (t.cs() == "ref") {
                        cell->push_back(MathAtom(new RefInset));
                        parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
@@ -1072,7 +1078,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 #warning A hack...
 #endif
                        string s;
-                       while (1) {
+                       while (true) {
                                Token const & t = getToken();
                                if (!good()) {
                                        putback();
@@ -1169,7 +1175,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                                else if (l->inset == "parbox") {
                                        // read optional positioning and width
                                        string pos   = parse_verbatim_option();
-                                       string width = parse_verbatim_item();
+                                       string width = parse_verbatim_item();
                                        cell->push_back(createMathInset(t.cs()));
                                        parse(cell->back().nucleus()->cell(0), FLAG_ITEM, MathInset::TEXT_MODE);
                                        cell->back().nucleus()->asParboxInset()->setPosition(pos);
@@ -1253,4 +1259,3 @@ void mathed_parse_normal(MathGridInset & grid, string const & str)
        istringstream is(str.c_str());
        Parser(is).parse1(grid, 0, MathInset::MATH_MODE, false);
 }
-