rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 3afff07b3eb05273a76c9b3ada3582a7caaa8994..44071e9001c25114540b26bf3d3e27c30a280699 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"
@@ -59,6 +56,7 @@ following hack as starting point to write some macros:
 #include "math_sqrtinset.h"
 #include "math_stringinset.h"
 #include "math_support.h"
+#include "math_tabularinset.h"
 #include "math_xyarrowinset.h"
 
 //#include "insets/insetref.h"
@@ -207,9 +205,11 @@ private:
 ostream & operator<<(ostream & os, Token const & t)
 {
        if (t.cs().size())
-               os << "\\" << t.cs();
+               os << '\\' << t.cs();
+       else if (t.cat() == catLetter)
+               os << t.character();
        else
-               os << "[" << t.character() << "," << t.cat() << "]";
+               os << '[' << t.character() << ',' << t.cat() << ']';
        return os;
 }
 
@@ -403,6 +403,9 @@ void Parser::tokenize(istream & is)
                        break;
                }
        }
+       // Remove the space after \end_inset
+       if (is.get(c) && c != ' ')
+               is.unget();
 
        // tokenize buffer
        tokenize(s);
@@ -528,6 +531,7 @@ bool Parser::parse(MathAtom & at)
 
 string Parser::parse_verbatim_option()
 {
+       skipSpaces();
        string res;
        if (nextToken().character() == '[') {
                Token t = getToken();
@@ -535,7 +539,7 @@ string Parser::parse_verbatim_option()
                        if (t.cat() == catBegin) {
                                putback();
                                res += '{' + parse_verbatim_item() + '}';
-                       } else 
+                       } else
                                res += t.asString();
                }
        }
@@ -545,6 +549,7 @@ string Parser::parse_verbatim_option()
 
 string Parser::parse_verbatim_item()
 {
+       skipSpaces();
        string res;
        if (nextToken().cat() == catBegin) {
                Token t = getToken();
@@ -553,7 +558,7 @@ string Parser::parse_verbatim_item()
                                putback();
                                res += '{' + parse_verbatim_item() + '}';
                        }
-                       else 
+                       else
                                res += t.asString();
                }
        }
@@ -577,15 +582,15 @@ void Parser::parse(MathArray & array, unsigned flags, mode_type mode)
 }
 
 
-void Parser::parse2(MathAtom & at, unsigned flags, mode_type mode,
-       bool numbered)
+void Parser::parse2(MathAtom & at, const unsigned flags, const mode_type mode,
+       const bool numbered)
 {
        parse1(*(at.nucleus()->asGridInset()), flags, mode, numbered);
 }
 
 
 void Parser::parse1(MathGridInset & grid, unsigned flags,
-       mode_type mode, bool numbered)
+       const mode_type mode, const bool numbered)
 {
        int limits = 0;
        MathGridInset::row_type cellrow = 0;
@@ -608,8 +613,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 #endif
 
                if (flags & FLAG_ITEM) {
-                       if (t.cat() == catSpace)
-                               continue;
+                       skipSpaces();
 
                        flags &= ~FLAG_ITEM;
                        if (t.cat() == catBegin) {
@@ -746,9 +750,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);
@@ -956,16 +961,25 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        }
                }
 
-               else if (t.cs() == "ref") {
-                       cell->push_back(MathAtom(new RefInset));
+               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" || t.cs() == "prettyref" ||
+                               t.cs() == "pageref" || t.cs() == "vpageref" || t.cs() == "vref") {
+                       cell->push_back(MathAtom(new RefInset(t.cs())));
                        parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
                        parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
                }
 
                else if (t.cs() == "left") {
+                       skipSpaces();
                        string l = getToken().asString();
                        MathArray ar;
                        parse(ar, FLAG_RIGHT, mode);
+                       skipSpaces();
                        string r = getToken().asString();
                        cell->push_back(MathAtom(new MathDelimInset(l, r, ar)));
                }
@@ -988,6 +1002,13 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                                parse2(cell->back(), FLAG_END, mode, false);
                        }
 
+                       else if (name == "tabular") {
+                               string const valign = parse_verbatim_option() + 'c';
+                               string const halign = parse_verbatim_item();
+                               cell->push_back(MathAtom(new MathTabularInset(name, valign[0], halign)));
+                               parse2(cell->back(), FLAG_END, MathInset::TEXT_MODE, false);
+                       }
+
                        else if (name == "split" || name == "cases" ||
                                         name == "gathered" || name == "aligned") {
                                cell->push_back(createMathInset(name));
@@ -1059,10 +1080,11 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        }
 
                        else {
-                               // lyxerr << "unknow math inset begin '" << name << "'\n";
+                               dump();
+                               lyxerr << "found unknown math environment '" << name << "'\n";
                                // create generic environment inset
                                cell->push_back(MathAtom(new MathEnvInset(name)));
-                               parse(cell->back().nucleus()->cell(0), FLAG_END, mode);
+                               parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
                        }
                }
 
@@ -1071,7 +1093,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();
@@ -1115,8 +1137,9 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 
                else if (t.cs() == "framebox") {
                        cell->push_back(createMathInset(t.cs()));
-                       parse(cell->back().nucleus()->cell(0), FLAG_OPTION, mode);
-                       parse(cell->back().nucleus()->cell(1), FLAG_ITEM, mode);
+                       parse(cell->back().nucleus()->cell(0), FLAG_OPTION, MathInset::TEXT_MODE);
+                       parse(cell->back().nucleus()->cell(1), FLAG_OPTION, MathInset::TEXT_MODE);
+                       parse(cell->back().nucleus()->cell(2), FLAG_ITEM, MathInset::TEXT_MODE);
                }
 
 #if 0
@@ -1168,7 +1191,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);
@@ -1252,4 +1275,3 @@ void mathed_parse_normal(MathGridInset & grid, string const & str)
        istringstream is(str.c_str());
        Parser(is).parse1(grid, 0, MathInset::MATH_MODE, false);
 }
-