* the GNU General Public Licence version 2 or later.
*/
+// {[(
+
#include <config.h>
#include <cctype>
#ifdef __GNUG__
-#pragma implementation "math_parser.h"
+#pragma implementation
#endif
#include "math_parser.h"
-#include "math_iter.h"
+#include "array.h"
#include "math_inset.h"
+#include "math_arrayinset.h"
+#include "math_bigopinset.h"
+#include "math_dotsinset.h"
+#include "math_decorationinset.h"
+#include "math_deliminset.h"
+#include "math_fracinset.h"
+#include "math_funcinset.h"
#include "math_macro.h"
-#include "math_root.h"
+#include "math_macrotable.h"
+#include "math_macrotemplate.h"
+#include "math_matrixinset.h"
+#include "math_rootinset.h"
+#include "math_scriptinset.h"
+#include "math_sizeinset.h"
+#include "math_spaceinset.h"
+#include "math_sqrtinset.h"
#include "debug.h"
-#include "support/lyxlib.h"
+#include "mathed/support.h"
+#include "lyxlex.h"
using std::istream;
using std::endl;
-#if 0
-using std::isalpha;
-using std::isdigit;
-using std::isspace;
-#endif
-extern MathMatrixInset * create_multiline(short int type, int cols);
+// These are lexical codes, not semantic
+enum lexcode_enum {
+ LexNone,
+ LexESC,
+ LexAlpha,
+ LexDigit,
+ LexBOP, // Binary operators or relations
+ LexMathSpace,
+ LexOpen,
+ LexClose,
+ LexComment,
+ LexArgument,
+ LexSpace,
+ LexNewLine,
+ LexOther,
+ LexSelf
+};
+
+lexcode_enum lexcode[256];
+
+
+char const * latex_special_chars = "#$%&_{}";
+
+
+namespace {
+
+void mathed_parse(MathArray & array, unsigned flags);
+
+unsigned char getuchar(std::istream * is)
+{
+ char c;
+ is->get(c);
+ return static_cast<unsigned char>(c);
+}
+
+const unsigned char LM_TK_OPEN = '{';
+const unsigned char LM_TK_CLOSE = '}';
enum {
- FLAG_BRACE = 1, // A { needed
- FLAG_BRACE_ARG = 2, // Next { is argument
- FLAG_BRACE_OPT = 4, // Optional {
- FLAG_BRACE_LAST = 8, // Last } ends the parsing process
- FLAG_BRACK_ARG = 16, // Optional [
- FLAG_RIGHT = 32, // Next right ends the parsing process
- FLAG_END = 64, // Next end ends the parsing process
- FLAG_BRACE_FONT = 128, // Next } closes a font
- FLAG_BRACK_END = 256 // Next ] ends the parsing process
+ FLAG_BRACE = 1 << 0, // A { needed //}
+ FLAG_BRACE_LAST = 1 << 1, // // { Last } ends the parsing process
+ FLAG_RIGHT = 1 << 2, // Next right ends the parsing process
+ FLAG_END = 1 << 3, // Next end ends the parsing process
+ FLAG_BRACE_FONT = 1 << 4, // // { Next } closes a font
+ FLAG_BRACK_END = 1 << 5, // // [ Next ] ends the parsing process
+ FLAG_AMPERSAND = 1 << 6, // Next & ends the parsing process
+ FLAG_NEWLINE = 1 << 7, // Next \\ ends the parsing process
+ FLAG_ITEM = 1 << 8, // read a (possibly braced token)
+ FLAG_LEAVE = 1 << 9, // marker for leaving the
+ FLAG_OPTARG = 1 << 10 // reads an argument in []
};
-static
-YYSTYPE yylval;
+///
+union {
+ ///
+ int i;
+ ///
+ latexkeys const * l;
+} yylval;
-static
-MathedInsetTypes mathed_env = LM_OT_MIN;
-string mathed_label;
+string yytext;
+int yylineno;
+istream * yyis;
+MathTextCodes yyvarcode;
-int const latex_mathenv_num = 10;
-char const * latex_mathenv[latex_mathenv_num] = {
- "math",
- "displaymath",
- "equation",
- "eqnarray*",
- "eqnarray",
- "alignat*",
- "alignat",
- "multline*",
- "multline",
- "array"
-};
+struct latex_mathenv_type {
+ char const * name;
+ char const * basename;
+ MathInsetTypes typ;
+ bool numbered;
+ bool ams;
+};
-char const * latex_mathspace[] = {
- "!", ",", ":", ";", "quad", "qquad"
+latex_mathenv_type latex_mathenv[] = {
+ {"math", "math", LM_OT_SIMPLE, 0, 0},
+ {"equation*", "equation", LM_OT_EQUATION, 0, 0},
+ {"equation", "equation", LM_OT_EQUATION, 1, 0},
+ {"eqnarray*", "eqnarray", LM_OT_EQNARRAY, 0, 0},
+ {"eqnarray", "eqnarray", LM_OT_EQNARRAY, 1, 0},
+ {"align*", "align", LM_OT_ALIGN, 0, 1},
+ {"align", "align", LM_OT_ALIGN, 1, 1},
+ {"alignat*", "alignat", LM_OT_ALIGNAT, 0, 1},
+ {"alignat", "alignat", LM_OT_ALIGNAT, 1, 1},
+ {"multline*", "multline", LM_OT_MULTLINE, 0, 1},
+ {"multline", "multline", LM_OT_MULTLINE, 1, 1},
+ {"array", "array", LM_OT_MATRIX, 0, 1}
};
+int const latex_mathenv_num = sizeof(latex_mathenv)/sizeof(latex_mathenv[0]);
+
-char const * latex_special_chars = "#$%&_{}";
-
-// These are lexical codes, not semantic
-enum lexcode_enum {
- LexNone,
- LexESC,
- LexAlpha,
- LexDigit,
- LexBOP, // Binary operators or relations
- LexMathSpace,
- LexOpen,
- LexClose,
- LexComment,
- LexArgument,
- LexSpace,
- LexNewLine,
- LexOther,
- LexSelf
-};
-static lexcode_enum lexcode[256];
-#warning Replace with string
-static char yytext[256];
-static int yylineno;
-static istream * yyis;
-static bool yy_mtextmode= false;
-
-static
void mathPrintError(string const & msg)
{
- lyxerr << "Line ~" << yylineno << ": Math parse error: "
- << msg << endl;
+ //lyxerr[Debug::MATHED] << "Line ~" << yylineno << ": Math parse error: " << msg << endl;
+ lyxerr << "Line ~" << yylineno << ": Math parse error: " << msg << endl;
}
-static
-void LexInitCodes()
+void lexInit()
{
- for (int i = 0; i <= 255; ++i) {
- if (isalpha(i)) lexcode[i] = LexAlpha;
- else if (isdigit(i)) lexcode[i] = LexDigit;
- else if (isspace(i)) lexcode[i] = LexSpace;
- else lexcode[i] = LexNone;
- }
-
- lexcode['\t'] = lexcode['\f'] = lexcode[' '] = LexSpace;
- lexcode['\n'] = LexNewLine;
- lexcode['%'] = LexComment;
- lexcode['#'] = LexArgument;
- lexcode['+'] = lexcode['-'] = lexcode['*'] = lexcode['/'] =
- lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
-
- lexcode['!'] = lexcode[','] = lexcode[':'] = lexcode[';'] = LexMathSpace;
-
- lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] =
- lexcode['?'] = LexOther;
-
- lexcode['\''] = lexcode['@'] = LexAlpha;
-
- lexcode['['] = lexcode[']'] = lexcode['^'] = lexcode['_'] =
- lexcode['&'] = LexSelf;
-
- lexcode['\\'] = LexESC;
- lexcode['{'] = LexOpen;
- lexcode['}'] = LexClose;
+ for (int i = 0; i <= 255; ++i) {
+ if (isdigit(i))
+ lexcode[i] = LexDigit;
+ else if (isspace(i))
+ lexcode[i] = LexSpace;
+ else
+ lexcode[i] = LexAlpha;
+ }
+
+ lexcode['\t'] = lexcode['\f'] = lexcode[' '] = LexSpace;
+ lexcode['\n'] = LexNewLine;
+ lexcode['%'] = LexComment;
+ lexcode['#'] = LexArgument;
+ lexcode['+'] = lexcode['-'] = lexcode['*'] = lexcode['/']
+ = lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
+
+ lexcode['!'] = lexcode[','] = lexcode[':']
+ = lexcode[';'] = LexMathSpace;
+
+ lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] =
+ lexcode['?'] = LexOther;
+
+ lexcode['\''] = lexcode['@'] = LexAlpha;
+
+ lexcode['['] = lexcode[']'] = lexcode['^'] = lexcode['_'] =
+ lexcode['&'] = LexSelf;
+
+ lexcode['\\'] = LexESC;
+ lexcode['{'] = LexOpen;
+ lexcode['}'] = LexClose;
}
-static
-char LexGetArg(char lf, bool accept_spaces= false)
+string lexArg(unsigned char lf, bool accept_spaces = false)
{
- unsigned char c;
- char cc;
- while (yyis->good()) {
- yyis->get(cc);
- c = cc;
- if (c > ' ') {
- if (!lf)
- lf = c;
- else if (c != lf) {
- lyxerr << "Math parse error: unexpected '"
- << c << "'" << endl;
- return '\0';
- }
- break;
- }
- }
- char const rg =
- (lf == '{') ? '}' : ((lf == '[') ? ']' : ((lf == '(') ? ')' : 0));
- if (!rg) {
- lyxerr << "Math parse error: unknown bracket '"
- << lf << "'" << endl;
- return '\0';
- }
- char * p = &yytext[0];
- int bcnt = 1;
- do {
- yyis->get(cc);
- c = cc;
- if (c == lf) ++bcnt;
- if (c == rg) --bcnt;
- if ((c > ' ' || (c == ' ' && accept_spaces)) && bcnt > 0) *(p++) = c;
- } while (bcnt > 0 && yyis->good() && p-yytext < 255);
- *p = '\0';
- return rg;
-}
+ string result;
+ unsigned char c = 0;
+ while (yyis->good()) {
+ c = getuchar(yyis);
+ if (!isspace(c))
+ break;
+ }
+ if (c != lf) {
+ yyis->putback(c);
+ return result;
+ }
+
+ unsigned char rg = 0;
+ if (lf == '{') rg = '}';
+ if (lf == '[') rg = ']';
+ if (lf == '(') rg = ')';
+ if (!rg) {
+ lyxerr[Debug::MATHED] << "Math parse error: unknown bracket '"
+ << lf << "'" << endl;
+ return result;
+ }
-static
-int yylex(void)
-{
- static int init_done = 0;
-
- if (!init_done) LexInitCodes();
-
- unsigned char c;
- char cc;
- while (yyis->good()) {
- yyis->get(cc);
- c = cc;
-
- if (yy_mtextmode && c == ' ') {
- yylval.i= ' ';
- return LM_TK_ALPHA;
- } else
-
- if (lexcode[c] == LexNewLine) {
- ++yylineno;
- continue;
- } else
-
- if (lexcode[c] == LexComment) {
+ int depth = 1;
do {
- yyis->get(cc);
- c = cc;
- } while (c != '\n' % yyis->good()); // eat comments
- } else
-
- if (lexcode[c] == LexDigit
- || lexcode[c] == LexOther
- || lexcode[c] == LexMathSpace) {
- yylval.i = c;
- return LM_TK_STR;
- } else
- if (lexcode[c] == LexAlpha) {
- yylval.i= c;
- return LM_TK_ALPHA;
- } else
- if (lexcode[c] == LexBOP) {
- yylval.i= c;
- return LM_TK_BOP;
- } else
- if (lexcode[c] == LexSelf) {
- return c;
- } else
- if (lexcode[c] == LexArgument) {
- yyis->get(cc);
- c = cc;
- yylval.i = c - '0';
- return LM_TK_ARGUMENT;
- } else
- if (lexcode[c] == LexOpen) {
- return LM_TK_OPEN;
- } else
- if (lexcode[c] == LexClose) {
- return LM_TK_CLOSE;
- } else
- if (lexcode[c] == LexESC) {
- yyis->get(cc);
- c = cc;
- if (c == '\\') {
- return LM_TK_NEWLINE;
- }
- if (c == '(') {
- yylval.i = LM_OT_MIN;
- return LM_TK_BEGIN;
- }
- if (c == ')') {
- yylval.i = LM_OT_MIN;
- return LM_TK_END;
- }
- if (c == '[') {
- yylval.i = LM_OT_PAR;
- return LM_TK_BEGIN;
- }
- if (c == ']') {
- yylval.i = LM_OT_PAR;
- return LM_TK_END;
- }
- if (strchr(latex_special_chars, c)) {
- yylval.i = c;
- return LM_TK_SPECIAL;
- }
- if (lexcode[c] == LexMathSpace) {
- int i;
- for (i = 0; i < 4 && static_cast<int>(c) != latex_mathspace[i][0]; ++i);
- yylval.i = (i < 4) ? i : 0;
- return LM_TK_SPACE;
- }
- if (lexcode[c] == LexAlpha || lexcode[c] == LexDigit) {
- char * p = &yytext[0];
- while ((lexcode[c] == LexAlpha || lexcode[c] == LexDigit)
- && p-yytext < 255) {
- *p = c;
- yyis->get(cc);
- c = cc;
- ++p;
- }
- *p = '\0';
- if (yyis->good()) yyis->putback(c);
- latexkeys * l = in_word_set (yytext, strlen(yytext));
- if (l) {
- if (l->token == LM_TK_BEGIN || l->token == LM_TK_END) {
- int i;
- LexGetArg('{');
-// for (i = 0; i < 5 && strncmp(yytext, latex_mathenv[i],
-// strlen(latex_mathenv[i])); ++i);
-
- for (i = 0; i < latex_mathenv_num
- && strcmp(yytext, latex_mathenv[i]); ++i);
- yylval.i = i;
- } else
- if (l->token == LM_TK_SPACE)
- yylval.i = l->id;
- else
- yylval.l = l;
- return l->token;
- } else {
- yylval.s = yytext;
- return LM_TK_UNDEF;
- }
- }
- }
- }
- return 0;
+ unsigned char c = getuchar(yyis);
+ if (c == lf)
+ ++depth;
+ if (c == rg)
+ --depth;
+ if ((!isspace(c) || (c == ' ' && accept_spaces)) && depth > 0)
+ result += c;
+ } while (depth > 0 && yyis->good());
+
+ return result;
}
-static
-int parse_align(char * hor, char *)
+int yylex()
{
- int nc = 0;
- for (char * c = hor; c && *c > ' '; ++c) ++nc;
- return nc;
+ static bool init_done = false;
+
+ if (!init_done) {
+ lexInit();
+ init_done = true;
+ }
+
+ while (yyis->good()) {
+ unsigned char c = getuchar(yyis);
+ //lyxerr << "reading byte: '" << c << "' code: " << lexcode[c] << endl;
+
+ if (yyvarcode == LM_TC_TEXTRM && c == ' ') {
+ yylval.i = ' ';
+ return LM_TK_ALPHA;
+ } else if (lexcode[c] == LexNewLine) {
+ ++yylineno;
+ continue;
+ } else if (lexcode[c] == LexComment) {
+ do {
+ c = getuchar(yyis);
+ } while (c != '\n' && yyis->good()); // eat comments
+ } else if (lexcode[c] == LexDigit
+ || lexcode[c] == LexOther
+ || lexcode[c] == LexMathSpace) {
+ yylval.i = c;
+ return LM_TK_STR;
+ } else if (lexcode[c] == LexAlpha) {
+ yylval.i = c;
+ return LM_TK_ALPHA;
+ } else if (lexcode[c] == LexBOP) {
+ yylval.i = c;
+ return LM_TK_BOP;
+ } else if (lexcode[c] == LexSelf) {
+ return c;
+ } else if (lexcode[c] == LexArgument) {
+ c = getuchar(yyis);
+ yylval.i = c - '0';
+ return LM_TK_ARGUMENT;
+ } else if (lexcode[c] == LexOpen) {
+ return LM_TK_OPEN;
+ } else if (lexcode[c] == LexClose) {
+ return LM_TK_CLOSE;
+ } else if (lexcode[c] == LexESC) {
+ c = getuchar(yyis);
+ if (c == '\\') {
+ yylval.i = -1;
+ return LM_TK_NEWLINE;
+ }
+ if (c == '(') {
+ yylval.i = LM_OT_SIMPLE;
+ return LM_TK_BEGIN;
+ }
+ if (c == ')') {
+ yylval.i = LM_OT_SIMPLE;
+ return LM_TK_END;
+ }
+ if (c == '[') {
+ yylval.i = LM_OT_EQUATION;
+ return LM_TK_BEGIN;
+ }
+ if (c == ']') {
+ yylval.i = LM_OT_EQUATION;
+ return LM_TK_END;
+ }
+ if (contains(latex_special_chars, c)) {
+ yylval.i = c;
+ return LM_TK_SPECIAL;
+ }
+ if (lexcode[c] == LexMathSpace) {
+ int i;
+ for (i = 0; i < 4 && static_cast<int>(c) != latex_mathspace[i][0]; ++i)
+ ;
+ yylval.i = (i < 4) ? i : 0;
+ return LM_TK_SPACE;
+ }
+ if (lexcode[c] == LexAlpha) {
+ yytext.erase();
+ while (lexcode[c] == LexAlpha) {
+ yytext += c;
+ c = getuchar(yyis);
+ }
+ if (yyis->good())
+ yyis->putback(c);
+ //lyxerr[Debug::MATHED] << "reading: text '" << yytext << "'\n";
+ latexkeys const * l = in_word_set(yytext);
+ if (!l)
+ return LM_TK_UNDEF;
+
+ if (l->token == LM_TK_BEGIN || l->token == LM_TK_END) {
+ string name = lexArg('{');
+ int i = 0;
+ while (i < latex_mathenv_num && name != latex_mathenv[i].name)
+ ++i;
+ yylval.i = i;
+ } else if (l->token == LM_TK_SPACE)
+ yylval.i = l->id;
+ else
+ yylval.l = l;
+ return l->token;
+ }
+ }
+ }
+ return 0;
}
-// Accent hacks only for 0.12. Stolen from Cursor.
-static
-int accent = 0;
-static
-int nestaccent[8];
+MathInset * lastUpDownInset(MathArray & array, bool up, bool down)
+{
+ MathInset * p = array.back_inset();
+ if (!p || !p->isUpDownInset()) {
+ p = new MathScriptInset(up, down);
+ array.push_back(p);
+ }
+ MathUpDownInset * q = static_cast<MathScriptInset *>(p);
+ if (up)
+ q->up(true);
+ if (down)
+ q->down(down);
+ return p;
+}
+
-static
-void setAccent(int ac)
+MathBigopInset * lastBigopInset(MathArray & array)
{
- if (ac > 0 && accent < 8) {
- nestaccent[accent++] = ac;
- } else
- accent = 0; // consumed!
+ MathInset * p = array.back_inset();
+ return (p && p->isBigopInset()) ? static_cast<MathBigopInset *>(p) : 0;
}
-static
-MathedInset * doAccent(byte c, MathedTextCodes t)
+
+static bool curr_num;
+static string curr_label;
+
+void mathed_parse_lines(MathInset * inset, int col, bool numbered, bool outmost)
{
- MathedInset * ac = 0;
-
- for (int i = accent - 1; i >= 0; --i) {
- if (i == accent - 1)
- ac = new MathAccentInset(c, t, nestaccent[i]);
- else
- ac = new MathAccentInset(ac, nestaccent[i]);
+ // save global variables
+ bool saved_num = curr_num;
+ string saved_label = curr_label;
+
+ MathGridInset * p = static_cast<MathGridInset *>(inset);
+ for (int row = 0; true; ++row) {
+ // reset global variables
+ curr_num = numbered;
+ curr_label = string();
+
+ // reading a row
+ int idx = p->nargs() - p->ncols();
+ for (int i = 0; i < col - 1; ++i, ++idx)
+ mathed_parse(p->cell(idx), FLAG_AMPERSAND);
+ mathed_parse(p->cell(idx), FLAG_NEWLINE | FLAG_END);
+
+ if (outmost) {
+ MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+ m->numbered(row, curr_num);
+ m->label(row, curr_label);
+ }
+
+ // Hack!
+ // no newline
+ if (yylval.i != -1)
+ break;
+
+ p->appendRow();
}
- accent = 0; // consumed!
-
- return ac;
+
+ // restore global variables
+ curr_num = saved_num;
+ curr_label = saved_label;
}
-static
-MathedInset * doAccent(MathedInset * p)
+MathInset * mathed_parse()
{
- MathedInset * ac = 0;
-
- for (int i = accent - 1; i >= 0; --i) {
- if (i == accent - 1)
- ac = new MathAccentInset(p, nestaccent[i]);
- else
- ac = new MathAccentInset(ac, nestaccent[i]);
+ MathInset * p = 0;
+ int t = yylex();
+
+ switch (t) {
+ case LM_TK_NEWCOMMAND: {
+ string name = lexArg('{').substr(1);
+ string arg = lexArg('[');
+ int narg = arg.empty() ? 0 : atoi(arg.c_str());
+ p = new MathMacroTemplate(name, narg);
+ mathed_parse(p->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
+ //lyxerr[Debug::MATHED] << "LM_TK_NEWCOMMAND: name: "
+ // << name << " nargs: " << narg << "\n";
+ break;
+ }
+
+ case LM_TK_BEGIN: {
+ int i = yylval.i;
+ //lyxerr[Debug::MATHED] << "reading math environment " << i << " "
+ // << latex_mathenv[i].name << "\n";
+
+ MathInsetTypes typ = latex_mathenv[i].typ;
+ p = new MathMatrixInset(typ);
+ MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+ switch (typ) {
+
+ case LM_OT_SIMPLE: {
+ curr_num = latex_mathenv[i].numbered;
+ curr_label = string();
+ mathed_parse(m->cell(0), 0);
+ m->numbered(0, curr_num);
+ m->label(0, curr_label);
+ break;
+ }
+
+ case LM_OT_EQUATION: {
+ curr_num = latex_mathenv[i].numbered;
+ curr_label = string();
+ mathed_parse(m->cell(0), FLAG_END);
+ m->numbered(0, curr_num);
+ m->label(0, curr_label);
+ break;
+ }
+
+ case LM_OT_EQNARRAY: {
+ mathed_parse_lines(m, 3, latex_mathenv[i].numbered, true);
+ break;
+ }
+
+ case LM_OT_ALIGN: {
+ m->halign(lexArg('{'));
+ mathed_parse_lines(m, 2, latex_mathenv[i].numbered, true);
+ break;
+ }
+
+ case LM_OT_ALIGNAT: {
+ m->halign(lexArg('{'));
+ mathed_parse_lines(m, 2, latex_mathenv[i].numbered, true);
+ break;
+ }
+
+ default:
+ lyxerr[Debug::MATHED] << "1: unknown math environment: " << typ << "\n";
+ }
+
+ p->SetName(latex_mathenv[i].basename);
+
+ break;
+ }
+
+ default:
+ lyxerr[Debug::MATHED] << "2 unknown math environment: " << t << "\n";
}
- accent = 0; // consumed!
-
- return ac;
+
+ return p;
}
-LyxArrayBase * mathed_parse(unsigned flags, LyxArrayBase * array,
- MathParInset ** mtx)
+void handle_frac(MathArray & array, string const & name)
{
- int t = yylex();
- int tprev = 0;
- bool panic = false;
- static int plevel = -1;
- static int size = LM_ST_TEXT;
- MathedTextCodes varcode = LM_TC_VAR;
- MathedInset * binset = 0;
- static MathMacroTemplate * macro = 0;
-
- int brace = 0;
- int acc_brace = 0;
- int acc_braces[8];
- MathParInset * mt = (mtx) ? *mtx : 0;//(MathParInset*)0;
- MathedRowSt * crow = (mt) ? mt->getRowSt() : 0;
-
- ++plevel;
- if (!array) array = new LyxArrayBase;
- MathedIter data(array);
- while (t) {
- if ((flags & FLAG_BRACE) && t != LM_TK_OPEN) {
- if ((flags & FLAG_BRACK_ARG) && t == '[') {
- }
- else {
- mathPrintError("Expected {. Maybe you forgot to enclose an argument in {}");
- panic = true;
- break;
- }
- }
- MathedInsetTypes fractype = LM_OT_FRAC;
- switch (t) {
- case LM_TK_ALPHA:
- {
- if (accent) {
- data.Insert(doAccent(yylval.i, varcode));
- } else
- data.Insert (yylval.i, varcode); //LM_TC_VAR);
- break;
- }
- case LM_TK_ARGUMENT:
- {
- if (macro) {
- data.Insert(macro->getMacroPar(yylval.i-1), LM_TC_INSET);
- }
- break;
- }
- case LM_TK_NEWCOMMAND:
- {
- int na = 0;
-
- LexGetArg('{');
- string const name(&yytext[1]);
-
- // ugly trick to be removed soon (lyx3)
- char const c = yyis->peek();
- if (c == '[') {
- LexGetArg('[');
- na = lyx::atoi(yytext);
- }
- macro = new MathMacroTemplate(name, na);
- flags = FLAG_BRACE|FLAG_BRACE_LAST;
- *mtx = macro;
- macro->SetData(array);
- break;
- }
- case LM_TK_SPECIAL:
- {
- data.Insert (yylval.i, LM_TC_SPECIAL);
- break;
- }
- case LM_TK_STR:
- {
- if (accent) {
- data.Insert(doAccent(yylval.i, LM_TC_CONST));
- } else
- data.Insert (yylval.i, LM_TC_CONST);
- break;
- }
- case LM_TK_OPEN:
- {
- ++brace;
- if (accent && tprev == LM_TK_ACCENT) {
- acc_braces[acc_brace++] = brace;
- break;
- }
- if (flags & FLAG_BRACE_OPT) {
- flags &= ~FLAG_BRACE_OPT;
- flags |= FLAG_BRACE;
+ MathFracInset * p = new MathFracInset(name);
+ mathed_parse(p->cell(0), FLAG_ITEM);
+ mathed_parse(p->cell(1), FLAG_ITEM);
+ array.push_back(p);
+}
+
+
+void mathed_parse(MathArray & array, unsigned flags)
+{
+ int t = yylex();
+ bool panic = false;
+ static int plevel = -1;
+ yyvarcode = LM_TC_VAR;
+
+ int brace = 0;
+
+ ++plevel;
+ while (t) {
+ //lyxerr << "t: " << t << " flags: " << flags << " i: " << yylval.i << " "
+ // << " plevel: " << plevel << " ";
+ //array.dump(lyxerr);
+ //lyxerr << "\n";
+
+ if (flags & FLAG_ITEM) {
+ flags &= ~FLAG_ITEM;
+ if (t == LM_TK_OPEN) {
+ // skip the brace and regard everything to the next matching
+ // closing brace
+ t = yylex();
+ ++brace;
+ flags |= FLAG_BRACE_LAST;
+ } else {
+ // regard only this single token
+ flags |= FLAG_LEAVE;
+ }
+ }
+
+ if ((flags & FLAG_BRACE) && t != LM_TK_OPEN) {
+ mathPrintError(
+ "Expected {. Maybe you forgot to enclose an argument in {}");
+ panic = true;
+ break;
+ }
+
+ switch (t) {
+
+ case LM_TK_ALPHA:
+ array.push_back(yylval.i, yyvarcode);
+ break;
+
+ case LM_TK_ARGUMENT:
+ array.push_back(new MathMacroArgument(yylval.i));
+ break;
+
+ case LM_TK_SPECIAL:
+ array.push_back(yylval.i, LM_TC_SPECIAL);
+ break;
+
+ case LM_TK_STR:
+ array.push_back(yylval.i, LM_TC_CONST);
+ break;
+
+ case LM_TK_OPEN:
+ ++brace;
+ if (flags & FLAG_BRACE)
+ flags &= ~FLAG_BRACE;
+ else
+ array.push_back('{', LM_TC_TEX);
+ break;
+
+ case LM_TK_CLOSE:
+ --brace;
+ if (brace < 0) {
+ mathPrintError("Unmatching braces");
+ panic = true;
+ break;
+ }
+ if (flags & FLAG_BRACE_FONT) {
+ yyvarcode = LM_TC_VAR;
+ flags &= ~FLAG_BRACE_FONT;
+ break;
+ }
+ if (brace == 0 && (flags & FLAG_BRACE_LAST))
+ flags |= FLAG_LEAVE;
+ else
+ array.push_back('}', LM_TC_TEX);
+ break;
+
+ case '[':
+ array.push_back('[', LM_TC_CONST);
+ break;
+
+ case ']':
+ if (flags & FLAG_BRACK_END)
+ flags |= FLAG_LEAVE;
+ else
+ array.push_back(']', LM_TC_CONST);
+ break;
+
+ case '^':
+ mathed_parse(lastUpDownInset(array, true, false)->cell(0), FLAG_ITEM);
+ break;
+
+ case '_':
+ mathed_parse(lastUpDownInset(array, false, true)->cell(1), FLAG_ITEM);
+ break;
+
+ case LM_TK_LIMIT:
+ {
+ MathBigopInset * p = lastBigopInset(array);
+ if (p)
+ p->limits(yylval.l->id ? 1 : -1);
+ break;
+ }
+
+ case '&':
+ {
+ if (flags & FLAG_AMPERSAND) {
+ flags &= ~FLAG_AMPERSAND;
+ --plevel;
+ return;
+ }
+ lyxerr[Debug::MATHED] << "found tab unexpectedly, array: '" << array << "'\n";
+ break;
+ }
+
+ case LM_TK_NEWLINE:
+ {
+ if (flags & FLAG_NEWLINE) {
+ flags &= ~FLAG_NEWLINE;
+ --plevel;
+ return;
+ }
+ lyxerr[Debug::MATHED] << "found newline unexpectedly, array: '" << array << "'\n";
+ break;
+ }
+
+ case LM_TK_BIGSYM:
+ {
+ array.push_back(new MathBigopInset(yylval.l->name, yylval.l->id));
+ break;
+ }
+
+ case LM_TK_SYM:
+ if (yylval.l->id < 256) {
+ MathTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS : LM_TC_SYMB;
+ array.push_back(yylval.l->id, tc);
+ } else
+ array.push_back(new MathFuncInset(yylval.l->name));
+ break;
+
+ case LM_TK_BOP:
+ array.push_back(yylval.i, LM_TC_BOP);
+ break;
+
+ case LM_TK_SPACE:
+ if (yylval.i >= 0)
+ array.push_back(new MathSpaceInset(yylval.i));
+ break;
+
+ case LM_TK_DOTS:
+ array.push_back(new MathDotsInset(yylval.l->name, yylval.l->id));
+ break;
+
+ case LM_TK_CHOOSE:
+ handle_frac(array, "atop");
+ break;
+
+ case LM_TK_STACK:
+ handle_frac(array, "stackrel");
+ break;
+
+ case LM_TK_FRAC:
+ handle_frac(array, "frac");
+ break;
+
+ case LM_TK_SQRT:
+ {
+ unsigned char c = getuchar(yyis);
+ if (c == '[') {
+ array.push_back(new MathRootInset);
+ mathed_parse(array.back_inset()->cell(0), FLAG_BRACK_END);
+ mathed_parse(array.back_inset()->cell(1), FLAG_ITEM);
+ } else {
+ yyis->putback(c);
+ array.push_back(new MathSqrtInset);
+ mathed_parse(array.back_inset()->cell(0), FLAG_ITEM);
+ }
+ break;
+ }
+
+ case LM_TK_LEFT:
+ {
+ int ld = yylex();
+ if (ld == LM_TK_SYM)
+ ld = yylval.l->id;
+ else if (ld == LM_TK_STR || ld == LM_TK_BOP || ld == LM_TK_SPECIAL)
+ ld = yylval.i;
+
+ MathArray ar;
+ mathed_parse(ar, FLAG_RIGHT);
+
+ int rd = yylex();
+ if (rd == LM_TK_SYM)
+ rd = yylval.l->id;
+ else if (rd == LM_TK_STR || rd == LM_TK_BOP || rd == LM_TK_SPECIAL)
+ rd = yylval.i;
+
+ MathDelimInset * dl = new MathDelimInset(ld, rd);
+ dl->cell(0) = ar;
+ array.push_back(dl);
+ break;
+ }
+
+ case LM_TK_RIGHT:
+ if (flags & FLAG_RIGHT) {
+ --plevel;
+ return;
+ }
+ mathPrintError("Unmatched right delimiter");
+// panic = true;
+ break;
+
+ case LM_TK_FONT:
+ yyvarcode = static_cast<MathTextCodes>(yylval.l->id);
+ flags |= (FLAG_BRACE | FLAG_BRACE_FONT);
+ break;
+
+ case LM_TK_STY:
+ {
+ lyxerr[Debug::MATHED] << "LM_TK_STY not implemented\n";
+ //MathArray tmp = array;
+ //MathSizeInset * p = new MathSizeInset(MathStyles(yylval.l->id));
+ //array.push_back(p);
+ //mathed_parse(p->cell(0), FLAG_BRACE_FONT);
+ break;
+ }
+
+
+ case LM_TK_DECORATION:
+ {
+ MathDecorationInset * p
+ = new MathDecorationInset(yylval.l->name, yylval.l->id);
+ mathed_parse(p->cell(0), FLAG_ITEM);
+ array.push_back(p);
+ break;
+ }
+
+ case LM_TK_NONUM:
+ curr_num = false;
+ break;
+
+ case LM_TK_PMOD:
+ case LM_TK_FUNC:
+ array.push_back(new MathFuncInset(yylval.l->name));
+ break;
+
+ case LM_TK_FUNCLIM:
+ array.push_back(new MathFuncInset(yylval.l->name, LM_OT_FUNCLIM));
+ break;
+
+ case LM_TK_UNDEF:
+ if (MathMacroTable::hasTemplate(yytext)) {
+ MathMacro * m = MathMacroTable::cloneTemplate(yytext);
+ for (int i = 0; i < m->nargs(); ++i)
+ mathed_parse(m->cell(i), FLAG_ITEM);
+ array.push_back(m);
+ m->Metrics(LM_ST_TEXT);
+ } else
+ array.push_back(new MathFuncInset(yytext, LM_OT_UNDEF));
+ break;
+
+ case LM_TK_END:
+ --plevel;
+ return;
+
+ case LM_TK_BEGIN:
+ {
+ int i = yylval.i;
+ MathInsetTypes typ = latex_mathenv[i].typ;
+
+ if (typ == LM_OT_MATRIX) {
+ string valign = lexArg('[') + 'c';
+ string halign = lexArg('{');
+ //lyxerr << "valign: '" << valign << "'\n";
+ //lyxerr << "halign: '" << halign << "'\n";
+ MathArrayInset * m = new MathArrayInset(halign.size(), 1);
+ m->valign(valign[0]);
+ m->halign(halign);
+
+ mathed_parse_lines(m, halign.size(), latex_mathenv[i].numbered, false);
+ array.push_back(m);
+ //lyxerr << "read matrix " << *m << "\n";
+ break;
+ } else
+ lyxerr[Debug::MATHED] << "unknow math inset " << typ << "\n";
+ break;
+ }
+
+ case LM_TK_MACRO:
+ array.push_back(MathMacroTable::cloneTemplate(yylval.l->name));
+ break;
+
+ case LM_TK_LABEL:
+ curr_label = lexArg('{', true);
+ break;
+
+ default:
+ mathPrintError("Unrecognized token");
+ lyxerr[Debug::MATHED] << "[" << t << " " << yytext << "]" << endl;
+ break;
+
+ } // end of big switch
+
+ if (flags & FLAG_LEAVE) {
+ flags &= ~FLAG_LEAVE;
+ break;
+ }
+
+ if (panic) {
+ lyxerr << " Math Panic, expect problems!" << endl;
+ // Search for the end command.
+ do {
+ t = yylex();
+ } while (t != LM_TK_END && t);
+ } else
+ t = yylex();
+
}
-
- if (flags & FLAG_BRACE)
- flags &= ~FLAG_BRACE;
- else {
- data.Insert ('{', LM_TC_TEX);
- }
- break;
- }
- case LM_TK_CLOSE:
- {
- --brace;
- if (brace < 0) {
- mathPrintError("Unmatching braces");
- panic = true;
- break;
- }
- if (acc_brace && brace == acc_braces[acc_brace-1]-1) {
- --acc_brace;
- break;
- }
- if (flags & FLAG_BRACE_FONT) {
- varcode = LM_TC_VAR;
- yy_mtextmode = false;
- flags &= ~FLAG_BRACE_FONT;
- break;
- }
- if (brace == 0 && (flags & FLAG_BRACE_LAST)) {
- --plevel;
- return array;
- } else {
- data.Insert ('}', LM_TC_TEX);
- }
- break;
- }
-
- case '[':
- {
- if (flags & FLAG_BRACK_ARG) {
- flags &= ~FLAG_BRACK_ARG;
- char const rg = LexGetArg('[');
- if (rg != ']') {
- mathPrintError("Expected ']'");
- panic = true;
- break;
- }
-// if (arg) strcpy(arg, yytext);
- } else
- data.Insert ('[');
- break;
- }
- case ']':
- {
- if (flags & FLAG_BRACK_END) {
- --plevel;
- return array;
- } else
- data.Insert (']');
- break;
- }
-
- case '^':
- {
- MathParInset * p = new MathParInset(size, "", LM_OT_SCRIPT);
- LyxArrayBase * ar = mathed_parse(FLAG_BRACE_OPT|FLAG_BRACE_LAST, 0);
- p->SetData(ar);
-// lyxerr << "UP[" << p->GetStyle() << "]" << endl;
- data.Insert (p, LM_TC_UP);
- break;
- }
- case '_':
- {
- MathParInset * p = new MathParInset(size, "", LM_OT_SCRIPT);
- LyxArrayBase * ar = mathed_parse(FLAG_BRACE_OPT|FLAG_BRACE_LAST, 0);
- p->SetData(ar);
- data.Insert (p, LM_TC_DOWN);
- break;
- }
-
- case LM_TK_LIMIT:
- {
- if (binset) {
- binset->SetLimits(bool(yylval.l->id));
- binset = 0;
- }
- break;
- }
-
- case '&': // Tab
- {
- if ((flags & FLAG_END) && mt && data.getCol()<mt->GetColumns() - 1) {
- data.setNumCols(mt->GetColumns());
- data.Insert('T', LM_TC_TAB);
- } else
- mathPrintError("Unexpected tab");
- // debug info. [made that conditional -JMarc]
- if (lyxerr.debugging(Debug::MATHED))
- lyxerr << data.getCol() << " " << mt->GetColumns() << endl;
- break;
- }
- case LM_TK_NEWLINE:
- {
- if (mt && (flags & FLAG_END)) {
- if (mt->Permit(LMPF_ALLOW_CR)) {
- if (crow) {
- crow->setNext(new MathedRowSt(mt->GetColumns() + 1)); // this leaks
- crow = crow->getNext();
- }
- data.Insert('K', LM_TC_CR);
- } else
- mathPrintError("Unexpected newline");
- }
- break;
- }
- case LM_TK_BIGSYM:
- {
- binset = new MathBigopInset(yylval.l->name, yylval.l->id);
- data.Insert(binset);
- break;
- }
- case LM_TK_SYM:
- {
- if (yylval.l->id < 256) {
- MathedTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS: LM_TC_SYMB;
- if (accent) {
- data.Insert(doAccent(yylval.l->id, tc));
- } else
- data.Insert(yylval.l->id, tc);
- } else {
- MathFuncInset * bg = new MathFuncInset(yylval.l->name);
- if (accent) {
- data.Insert(doAccent(bg));
- } else
- data.Insert(bg, true);
- }
- break;
- }
- case LM_TK_BOP:
- {
- if (accent) {
- data.Insert(doAccent(yylval.i, LM_TC_BOP));
- } else
- data.Insert(yylval.i, LM_TC_BOP);
- break;
- }
- case LM_TK_STY:
- {
- if (mt) {
- mt->UserSetSize(yylval.l->id);
- }
- break;
- }
- case LM_TK_SPACE:
- {
- if (yylval.i >= 0) {
- MathSpaceInset * sp = new MathSpaceInset(yylval.i);
- data.Insert(sp);
- }
- break;
- }
- case LM_TK_DOTS:
- {
- MathDotsInset * p = new MathDotsInset(yylval.l->name, yylval.l->id);
- data.Insert(p);
- break;
- }
- case LM_TK_STACK:
- fractype = LM_OT_STACKREL;
- case LM_TK_FRAC:
- {
- MathFracInset * fc = new MathFracInset(fractype);
- LyxArrayBase * num = mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST);
- LyxArrayBase * den = mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST);
- fc->SetData(num, den);
- data.Insert(fc, LM_TC_ACTIVE_INSET);
- break;
- }
- case LM_TK_SQRT:
- {
- MathParInset * rt;
-
- char c; yyis->get(c);
-
- if (c == '[') {
- rt = new MathRootInset(size);
- rt->setArgumentIdx(0);
- rt->SetData(mathed_parse(FLAG_BRACK_END, 0, &rt));
- rt->setArgumentIdx(1);
- } else {
- yyis->putback(c);
- rt = new MathSqrtInset(size);
- }
- rt->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST, 0, &rt));
- data.Insert(rt, LM_TC_ACTIVE_INSET);
- break;
- }
-
- case LM_TK_LEFT:
- {
- int lfd = yylex();
- if (lfd == LM_TK_SYM || lfd == LM_TK_STR || lfd == LM_TK_BOP|| lfd == LM_TK_SPECIAL)
- lfd = (lfd == LM_TK_SYM) ? yylval.l->id: yylval.i;
-// lyxerr << "L[" << lfd << " " << lfd << "]";
- LyxArrayBase * a = mathed_parse(FLAG_RIGHT);
- int rgd = yylex();
-// lyxerr << "R[" << rgd << "]";
- if (rgd == LM_TK_SYM || rgd == LM_TK_STR || rgd == LM_TK_BOP || rgd == LM_TK_SPECIAL)
- rgd = (rgd == LM_TK_SYM) ? yylval.l->id: yylval.i;
- MathDelimInset * dl = new MathDelimInset(lfd, rgd);
- dl->SetData(a);
- data.Insert(dl, LM_TC_ACTIVE_INSET);
-// lyxerr << "RL[" << lfd << " " << rgd << "]";
- break;
- }
- case LM_TK_RIGHT:
- {
- if (flags & FLAG_RIGHT) {
- --plevel;
- return array;
- } else {
- mathPrintError("Unmatched right delimiter");
-// panic = true;
- }
- break;
- }
-
- case LM_TK_FONT:
- {
- varcode = static_cast<MathedTextCodes>(yylval.l->id);
- yy_mtextmode = bool(varcode == LM_TC_TEXTRM);
- flags |= (FLAG_BRACE|FLAG_BRACE_FONT);
- break;
- }
- case LM_TK_WIDE:
- {
- MathDecorationInset * sq = new MathDecorationInset(yylval.l->id,
- size);
- sq->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
- data.Insert(sq, LM_TC_ACTIVE_INSET);
- break;
- }
-
- case LM_TK_ACCENT:
- setAccent(yylval.l->id);
- break;
-
- case LM_TK_NONUM:
- {
- if (crow)
- crow->setNumbered(false);
- break;
- }
-
- case LM_TK_PMOD:
- case LM_TK_FUNC:
- {
- MathedInset * bg = new MathFuncInset(yylval.l->name);
- if (accent) {
- data.Insert(t);
- } else
- data.Insert(bg);
- break;
- }
- case LM_TK_FUNCLIM:
- {
- data.Insert(new MathFuncInset(yylval.l->name, LM_OT_FUNCLIM));
- break;
- }
- case LM_TK_UNDEF:
- {
-
- MathMacro * p =
- MathMacroTable::mathMTable.getMacro(yylval.s);
- if (p) {
- if (accent)
- data.Insert(doAccent(p), p->getTCode());
- else
- data.Insert(p, p->getTCode());
- for (int i = 0; p->setArgumentIdx(i); ++i)
- p->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
- }
- else {
- MathedInset * q = new MathFuncInset(yylval.s, LM_OT_UNDEF);
- if (accent) {
- data.Insert(doAccent(q));
- } else {
- data.Insert(q);
- }
- }
- break;
- }
- case LM_TK_END:
- {
- if (mathed_env != yylval.i && yylval.i != LM_OT_MATRIX)
- mathPrintError("Unmatched environment");
- // debug info [made that conditional -JMarc]
- if (lyxerr.debugging(Debug::MATHED))
- lyxerr << "[" << yylval.i << "]" << endl;
- --plevel;
- if (mt) { // && (flags & FLAG_END)) {
- mt->SetData(array);
- array = 0;
- }
- return array;
- }
- case LM_TK_BEGIN:
- {
- if (yylval.i == LM_OT_MATRIX) {
- char ar[120], ar2[8];
- ar[0] = ar2[0] = '\0';
- char rg = LexGetArg(0);
- if (rg == ']') {
- strcpy(ar2, yytext);
- rg = LexGetArg('{');
- }
- strcpy(ar, yytext);
- int const nc = parse_align(ar, ar2);
- MathParInset * mm = new MathMatrixInset(nc, 0);
- mm->SetAlign(ar2[0], ar);
- data.Insert(mm, LM_TC_ACTIVE_INSET);
- mathed_parse(FLAG_END, mm->GetData(), &mm);
- } else if (is_eqn_type(yylval.i)) {
- if (plevel!= 0) {
- mathPrintError("Misplaced environment");
- break;
- }
- if (!mt) {
- mathPrintError("0 paragraph.");
- panic = true;
- }
-
- mathed_env = static_cast<MathedInsetTypes>(yylval.i);
- if (mathed_env != LM_OT_MIN) {
- size = LM_ST_DISPLAY;
- if (is_multiline(mathed_env)) {
- int cols = 1;
- if (is_multicolumn(mathed_env)) {
- LexGetArg('{');
- cols = strToInt(string(yytext));
- }
- mt = create_multiline(mathed_env, cols);
- if (mtx) *mtx = mt;
- flags |= FLAG_END;
-// data.Insert(' ', LM_TC_TAB);
-// data.Insert(' ', LM_TC_TAB);
-// data.Reset();
- }
- mt->SetStyle(size);
- mt->SetType(mathed_env);
- crow = mt->getRowSt();
- }
-
-#ifdef DEBUG
- lyxerr << "MATH BEGIN[" << mathed_env << "]" << endl;
-#endif
- } else {
-// lyxerr << "MATHCRO[" << yytext << "]";
- MathMacro * p =
- MathMacroTable::mathMTable.getMacro(yytext);
- if (p) {
- data.Insert(p, p->getTCode());
- p->setArgumentIdx(0);
- mathed_parse(FLAG_END, p->GetData(), reinterpret_cast<MathParInset**>(&p));
-// for (int i = 0; p->setArgumentIdx(i); ++i)
-// p->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
- } else
- mathPrintError("Unrecognized environment");
- }
- break;
- }
-
- case LM_TK_MACRO:
- {
- MathedInset * p =
- MathMacroTable::mathMTable.getMacro(yylval.l->name);
-
- if (p) {
- if (accent) {
- data.Insert(doAccent(p));
- } else
- data.Insert(p, static_cast<MathMacro*>(p)->getTCode());
- }
- break;
- }
-
- case LM_TK_LABEL:
- {
- char const rg = LexGetArg('\0', true);
- if (rg != '}') {
- mathPrintError("Expected '{'");
- // debug info
- lyxerr << "[" << yytext << "]" << endl;
- panic = true;
- break;
- }
- if (crow) {
- crow->setLabel(yytext);
- } else {
- mathed_label = yytext;
- }
-#ifdef DEBUG
- lyxerr << "Label[" << mathed_label << "]" << endl;
-#endif
- break;
- }
- default:
- mathPrintError("Unrecognized token");
- // debug info
- lyxerr << "[" << t << " " << yytext << "]" << endl;
- break;
- }
- tprev = t;
- if (panic) {
- lyxerr << " Math Panic, expect problems!" << endl;
- // Search for the end command.
- do {
- t = yylex ();
- } while (t != LM_TK_END && t);
- } else
- t = yylex ();
-
- if ((flags & FLAG_BRACE_OPT)/* && t!= '^' && t!= '_'*/) {
- flags &= ~FLAG_BRACE_OPT;
- //data.Insert (LM_TC_CLOSE);
- break;
- }
- }
- --plevel;
- return array;
+ --plevel;
+}
+
}
-void mathed_parser_file(istream & is, int lineno)
+MathInset * mathed_parse(istream & is)
{
- yyis = &is;
- yylineno = lineno;
- if (!MathMacroTable::built)
- MathMacroTable::mathMTable.builtinMacros();
+ yyis = &is;
+ yylineno = 0;
+ return mathed_parse();
}
-int mathed_parser_lineno()
+MathInset * mathed_parse(LyXLex & lex)
{
- return yylineno;
+ yyis = &lex.getStream();
+ yylineno = lex.GetLineNo();
+
+ MathInset * p = mathed_parse();
+
+ // Update line number
+ lex.setLineNo(yylineno);
+
+ // reading of end_inset
+ while (lex.IsOK()) {
+ lex.nextToken();
+ if (lex.GetString() == "\\end_inset")
+ break;
+ lyxerr[Debug::MATHED] << "InsetFormula::Read: Garbage before \\end_inset,"
+ " or missing \\end_inset!" << endl;
+ }
+
+ return p;
}
+//]})
projects / lyx.git / blobdiff