/*
* File: math_parser.C
* Purpose: Parser for mathed
- * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
* Created: January 1996
* Description: Parse LaTeX2e math mode code.
*
* the GNU General Public Licence version 2 or later.
*/
-#include <config.h>
+/*
-#include <cctype>
+If someone desperately needs partial "structures" (such as a few cells of
+an array inset or similar) (s)he could uses the following hack as starting
+point to write some macros:
+
+ \newif\ifcomment
+ \commentfalse
+ \ifcomment
+ \def\makeamptab{\catcode`\&=4\relax}
+ \def\makeampletter{\catcode`\&=11\relax}
+ \def\b{\makeampletter\expandafter\makeamptab\bi}
+ \long\def\bi#1\e{}
+ \else
+ \def\b{}\def\e{}
+ \fi
+
+ ...
+
+ \[\begin{array}{ccc}
+ 1 & 2\b & 3^2\\
+ 4 & 5\e & 6\\
+ 7 & 8 & 9
+ \end{array}\]
+
+*/
+
+
+#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif
#include "math_parser.h"
-#include "array.h"
#include "math_inset.h"
#include "math_arrayinset.h"
+#include "math_braceinset.h"
+#include "math_boxinset.h"
#include "math_charinset.h"
#include "math_deliminset.h"
#include "math_factory.h"
#include "math_macro.h"
#include "math_macrotable.h"
#include "math_macrotemplate.h"
-#include "math_matrixinset.h"
+#include "math_hullinset.h"
#include "math_rootinset.h"
+#include "math_sizeinset.h"
#include "math_sqrtinset.h"
#include "math_scriptinset.h"
#include "math_specialcharinset.h"
-#include "math_splitinset.h"
#include "math_sqrtinset.h"
-#include "debug.h"
-#include "support.h"
+#include "math_support.h"
+#include "math_xyarrowinset.h"
+
#include "lyxlex.h"
+#include "debug.h"
+#include "support/LAssert.h"
#include "support/lstrings.h"
+#include <cctype>
+#include <stack>
+#include <algorithm>
+
using std::istream;
using std::ostream;
using std::ios;
using std::endl;
+using std::stack;
+using std::fill;
+using std::vector;
+
+//#define FILEDEBUG
namespace {
bool stared(string const & s)
{
- unsigned n = s.size();
+ string::size_type const n = s.size();
return n && s[n - 1] == '*';
}
-MathScriptInset * prevScriptInset(MathArray const & array)
-{
- MathInset * p = array.back();
- return (p && p->isScriptInset()) ? static_cast<MathScriptInset *>(p) : 0;
-}
-
-MathInset * lastScriptInset(MathArray & array, bool up, int limits)
+void add(MathArray & ar, char c, MathTextCodes code)
{
- MathScriptInset * p = prevScriptInset(array);
- if (!p) {
- MathInset * b = array.back();
- if (b && b->isScriptable()) {
- p = new MathScriptInset(up, !up, b->clone());
- array.pop_back();
- } else {
- p = new MathScriptInset(up, !up);
- }
- array.push_back(p);
- }
- if (up)
- p->up(true);
- else
- p->down(true);
- if (limits)
- p->limits(limits);
- return p;
+ ar.push_back(MathAtom(new MathCharInset(c, code)));
}
// These are TeX's catcodes
enum CatCode {
- catEscape, // 0 backslash
+ catEscape, // 0 backslash
catBegin, // 1 {
catEnd, // 2 }
catMath, // 3 $
catParameter, // 6 #
catSuper, // 7 ^
catSub, // 8 _
- catIgnore, // 9
+ catIgnore, // 9
catSpace, // 10 space
catLetter, // 11 a-zA-Z
catOther, // 12 none of the above
catInvalid // 15 <delete>
};
-CatCode theCatcode[256];
+CatCode theCatcode[256];
inline CatCode catcode(unsigned char c)
enum {
- FLAG_BRACE = 1 << 0, // an opening brace needed
FLAG_BRACE_LAST = 1 << 1, // last closing brace 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_BRACK_END = 1 << 4, // next closing bracket ends the parsing process
- FLAG_NEWLINE = 1 << 6, // next \\\\ ends the parsing process
- FLAG_ITEM = 1 << 7, // read a (possibly braced token)
- FLAG_BLOCK = 1 << 8, // next block ends the parsing process
+ FLAG_BOX = 1 << 5, // we are in a box
+ FLAG_ITEM = 1 << 6, // read a (possibly braced token)
+ FLAG_BLOCK = 1 << 7, // next block ends the parsing process
+ FLAG_BLOCK2 = 1 << 8, // next block2 ends the parsing process
FLAG_LEAVE = 1 << 9 // leave the loop at the end
};
void catInit()
{
- for (int i = 0; i <= 255; ++i)
- theCatcode[i] = catOther;
- for (int i = 'a'; i <= 'z'; ++i)
- theCatcode[i] = catLetter;
- for (int i = 'A'; i <= 'Z'; ++i)
- theCatcode[i] = catLetter;
-
- theCatcode['\\'] = catEscape;
- theCatcode['{'] = catBegin;
- theCatcode['}'] = catEnd;
- theCatcode['$'] = catMath;
- theCatcode['&'] = catAlign;
- theCatcode['\n'] = catNewline;
- theCatcode['#'] = catParameter;
- theCatcode['^'] = catSuper;
- theCatcode['_'] = catSub;
- theCatcode['\7f'] = catIgnore;
- theCatcode[' '] = catSpace;
- theCatcode['\t'] = catSpace;
- theCatcode['\r'] = catSpace;
- theCatcode['~'] = catActive;
- theCatcode['%'] = catComment;
+ fill(theCatcode, theCatcode + 256, catOther);
+ fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter);
+ fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter);
+
+ theCatcode['\\'] = catEscape;
+ theCatcode['{'] = catBegin;
+ theCatcode['}'] = catEnd;
+ theCatcode['$'] = catMath;
+ theCatcode['&'] = catAlign;
+ theCatcode['\n'] = catNewline;
+ theCatcode['#'] = catParameter;
+ theCatcode['^'] = catSuper;
+ theCatcode['_'] = catSub;
+ theCatcode['\7f'] = catIgnore;
+ theCatcode[' '] = catSpace;
+ theCatcode['\t'] = catSpace;
+ theCatcode['\r'] = catSpace;
+ theCatcode['~'] = catActive;
+ theCatcode['%'] = catComment;
}
///
Token(char c, CatCode cat) : cs_(), char_(c), cat_(cat) {}
///
- Token(const string & cs) : cs_(cs), char_(0), cat_(catIgnore) {}
+ Token(string const & cs) : cs_(cs), char_(0), cat_(catIgnore) {}
///
string const & cs() const { return cs_; }
char character() const { return char_; }
///
string asString() const;
+ ///
+ bool isCR() const;
-private:
+private:
///
string cs_;
///
CatCode cat_;
};
-string Token::asString() const
+bool Token::isCR() const
{
- return cs_.size() ? cs_ : string(1, char_);
+ return cs_ == "\\" || cs_ == "cr" || cs_ == "crcr";
}
-bool operator==(Token const & s, Token const & t)
+string Token::asString() const
{
- return s.character() == t.character()
- && s.cat() == t.cat() && s.cs() == t.cs();
+ return cs_.size() ? cs_ : string(1, char_);
}
-bool operator!=(Token const & s, Token const & t)
-{
- return !(s == t);
-}
+// Angus' compiler says these are not needed
+//bool operator==(Token const & s, Token const & t)
+//{
+// return s.character() == t.character()
+// && s.cat() == t.cat() && s.cs() == t.cs();
+//}
+//
+//bool operator!=(Token const & s, Token const & t)
+//{
+// return !(s == t);
+//}
ostream & operator<<(ostream & os, Token const & t)
{
Parser(istream & is);
///
- MathMacroTemplate * parse_macro();
+ bool parse_macro(string & name);
///
- MathMatrixInset * parse_normal();
+ bool parse_normal(MathAtom &);
///
void parse_into(MathArray & array, unsigned flags, MathTextCodes = LM_TC_MIN);
///
void putback();
private:
+ ///
+ void parse_into1(MathArray & array, unsigned flags, MathTextCodes);
///
string getArg(char lf, char rf);
///
///
void error(string const & msg);
///
- void parse_lines(MathGridInset * p, bool numbered, bool outmost);
- ///
- latexkeys const * read_delim();
+ bool parse_lines(MathAtom & t, bool numbered, bool outmost);
+ /// parses {... & ... \\ ... & ... }
+ bool parse_lines2(MathAtom & t, bool braced);
+ /// dump contents to screen
+ void dump() const;
private:
///
///
void tokenize(string const & s);
///
+ void skipSpaceTokens(istream & is, char c);
+ ///
void push_back(Token const & t);
///
void pop_back();
Token const & nextToken() const;
///
Token const & getToken();
+ /// skips spaces if any
+ void skipSpaces();
+ /// skips opening brace
+ void skipBegin();
+ /// skips closing brace
+ void skipEnd();
+ /// counts a sequence of hlines
+ int readHLines();
///
void lex(string const & s);
///
///
int lineno_;
///
- std::vector<Token> tokens_;
+ vector<Token> tokens_;
///
unsigned pos_;
///
Token const & Parser::getToken()
{
static const Token dummy;
+ //lyxerr << "looking at token " << tokens_[pos_] << " pos: " << pos_ << '\n';
return good() ? tokens_[pos_++] : dummy;
}
+void Parser::skipSpaces()
+{
+ while (nextToken().cat() == catSpace)
+ getToken();
+}
+
+
+void Parser::skipBegin()
+{
+ if (nextToken().cat() == catBegin)
+ getToken();
+ else
+ lyxerr << "'{' expected\n";
+}
+
+
+void Parser::skipEnd()
+{
+ if (nextToken().cat() == catEnd)
+ getToken();
+ else
+ lyxerr << "'}' expected\n";
+}
+
+
+int Parser::readHLines()
+{
+ int num = 0;
+ skipSpaces();
+ while (nextToken().cs() == "hline") {
+ getToken();
+ ++num;
+ skipSpaces();
+ }
+ return num;
+}
+
+
void Parser::putback()
{
--pos_;
}
-string Parser::getArg(char lf, char rg)
+string Parser::getArg(char left, char right)
{
+ skipSpaces();
+
string result;
char c = getChar();
- if (c != lf)
+ if (c != left)
putback();
- else
- while ((c = getChar()) != rg && good())
+ else
+ while ((c = getChar()) != right && good())
result += c;
return result;
}
+void Parser::skipSpaceTokens(istream & is, char c)
+{
+ // skip trailing spaces
+ while (catcode(c) == catSpace || catcode(c) == catNewline)
+ if (!is.get(c))
+ break;
+ //lyxerr << "putting back: " << c << "\n";
+ is.putback(c);
+}
+
+
void Parser::tokenize(string const & buffer)
{
static bool init_done = false;
-
+
if (!init_done) {
catInit();
init_done = true;
char c;
while (is.get(c)) {
+ //lyxerr << "reading c: " << c << "\n";
switch (catcode(c)) {
case catNewline: {
- ++lineno_;
+ ++lineno_;
is.get(c);
if (catcode(c) == catNewline)
; //push_back(Token("par"));
else {
push_back(Token(' ', catSpace));
- is.putback(c);
+ is.putback(c);
}
break;
}
case catComment: {
while (is.get(c) && catcode(c) != catNewline)
;
- ++lineno_;
+ ++lineno_;
break;
}
case catEscape: {
is.get(c);
- string s(1, c);
- if (catcode(c) == catLetter) {
- while (is.get(c) && catcode(c) == catLetter)
- s += c;
- if (catcode(c) == catSpace)
- while (is.get(c) && catcode(c) == catSpace)
- ;
- is.putback(c);
- }
- push_back(Token(s));
+ if (!is) {
+ error("unexpected end of input");
+ } else {
+ string s(1, c);
+ if (catcode(c) == catLetter) {
+ // collect letters
+ while (is.get(c) && catcode(c) == catLetter)
+ s += c;
+ skipSpaceTokens(is, c);
+ }
+ push_back(Token(s));
+ }
+ break;
+ }
+
+ case catSuper:
+ case catSub: {
+ push_back(Token(c, catcode(c)));
+ is.get(c);
+ skipSpaceTokens(is, c);
+ break;
+ }
+
+ case catIgnore: {
+ lyxerr << "ignoring a char: " << int(c) << "\n";
break;
}
}
}
-#if 0
+#ifdef FILEDEBUG
+ dump();
+#endif
+}
+
+
+void Parser::dump() const
+{
lyxerr << "\nTokens: ";
- for (unsigned i = 0; i < tokens_.size(); ++i)
+ for (unsigned i = 0; i < tokens_.size(); ++i) {
+ if (i == pos_)
+ lyxerr << " <#> ";
lyxerr << tokens_[i];
+ }
lyxerr << "\n";
-#endif
}
-void Parser::error(string const & msg)
+void Parser::error(string const & msg)
{
lyxerr << "Line ~" << lineno_ << ": Math parse error: " << msg << endl;
+ dump();
+ //exit(1);
}
-void Parser::parse_lines(MathGridInset * p, bool numbered, bool outmost)
+
+bool Parser::parse_lines(MathAtom & t, bool numbered, bool outmost)
{
- const int cols = p->ncols();
+ MathGridInset * p = t->asGridInset();
+ if (!p) {
+ dump();
+ lyxerr << "error in Parser::parse_lines() 1\n";
+ return false;
+ }
// save global variables
bool const saved_num = curr_num_;
string const saved_label = curr_label_;
+ // read initial hlines
+ p->rowinfo(0).lines_ = readHLines();
+
for (int row = 0; true; ++row) {
// reset global variables
curr_num_ = numbered;
curr_label_.erase();
// reading a row
- for (int col = 0; col < cols; ++col) {
- //lyxerr << "reading cell " << row << " " << col << "\n";
- parse_into(p->cell(col + row * cols), FLAG_BLOCK);
+ for (MathInset::col_type col = 0; true; ++col) {
+ //lyxerr << "reading cell " << row << " " << col << " "
+ // << p->ncols() << "\n";
+ //lyxerr << "ncols: " << p->ncols() << "\n";
+
+ if (col >= p->ncols()) {
+ //lyxerr << "adding col " << col << "\n";
+ p->addCol(p->ncols());
+ }
- // no ampersand
- if (prevToken().cat() != catAlign) {
+ MathArray & ar = p->cell(col + row * p->ncols());
+ parse_into(ar, FLAG_BLOCK);
+ // remove 'unnecessary' braces:
+ if (ar.size() == 1 && ar.back()->asBraceInset())
+ ar = ar.back()->asBraceInset()->cell(0);
+ //lyxerr << "ar: " << ar << "\n";
+
+ // break if cell is not followed by an ampersand
+ if (nextToken().cat() != catAlign) {
//lyxerr << "less cells read than normal in row/col: "
// << row << " " << col << "\n";
break;
}
+
+ // skip the ampersand
+ getToken();
}
if (outmost) {
- MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+ MathHullInset * m = t->asHullInset();
+ if (!m) {
+ lyxerr << "error in Parser::parse_lines() 2\n";
+ return false;
+ }
m->numbered(row, curr_num_);
m->label(row, curr_label_);
if (curr_skip_.size()) {
- m->vskip(LyXLength(curr_skip_), row);
+ m->vcrskip(LyXLength(curr_skip_), row);
curr_skip_.erase();
}
}
- // no newline?
- if (prevToken() != Token("\\")) {
- //lyxerr << "no newline here\n";
+ // is a \\ coming?
+ if (nextToken().isCR()) {
+ // skip the cr-token
+ getToken();
+
+ // try to read a length
+ //get
+
+ // read hlines for next row
+ p->rowinfo(row + 1).lines_ = readHLines();
+ }
+
+ // we are finished if the next token is an 'end'
+ if (nextToken().cs() == "end") {
+ // skip the end-token
+ getToken();
+ getArg('{','}');
+
+ // leave the 'read a line'-loop
break;
}
+ // otherwise, we have to start a new row
p->appendRow();
}
// restore "global" variables
curr_num_ = saved_num;
curr_label_ = saved_label;
+
+ return true;
}
-MathMacroTemplate * Parser::parse_macro()
+bool Parser::parse_lines2(MathAtom & t, bool braced)
{
- while (nextToken().cat() == catSpace)
+ MathGridInset * p = t->asGridInset();
+ if (!p) {
+ lyxerr << "error in Parser::parse_lines() 1\n";
+ return false;
+ }
+
+ for (int row = 0; true; ++row) {
+ // reading a row
+ for (MathInset::col_type col = 0; true; ++col) {
+ //lyxerr << "reading cell " << row << " " << col << " " << p->ncols() << "\n";
+
+ if (col >= p->ncols()) {
+ //lyxerr << "adding col " << col << "\n";
+ p->addCol(p->ncols());
+ }
+
+ parse_into(p->cell(col + row * p->ncols()), FLAG_BLOCK2);
+ //lyxerr << "read cell: " << p->cell(col + row * p->ncols()) << "\n";
+
+ // break if cell is not followed by an ampersand
+ if (nextToken().cat() != catAlign) {
+ //lyxerr << "less cells read than normal in row/col: " << row << " " << col << "\n";
+ break;
+ }
+
+ // skip the ampersand
+ getToken();
+ }
+
+ // is a \\ coming?
+ if (nextToken().isCR()) {
+ // skip the cr-token
+ getToken();
+ }
+
+ // we are finished if the next token is the one we expected
+ // skip the end-token
+ // leave the 'read a line'-loop
+ if (braced) {
+ if (nextToken().cat() == catEnd) {
+ getToken();
+ break;
+ }
+ } else {
+ if (nextToken().cs() == "end") {
+ getToken();
+ getArg('{','}');
+ break;
+ }
+ }
+
+ // otherwise, we have to start a new row
+ p->appendRow();
+ }
+
+ return true;
+}
+
+
+
+
+bool Parser::parse_macro(string & name)
+{
+ int nargs = 0;
+ name = "{error}";
+ skipSpaces();
+
+ if (nextToken().cs() == "def") {
+
+ getToken();
+ name = getToken().cs();
+
+ string pars;
+ while (good() && nextToken().cat() != catBegin)
+ pars += getToken().cs();
+
+ if (!good()) {
+ lyxerr << "bad stream in parse_macro\n";
+ dump();
+ return false;
+ }
+
+ //lyxerr << "read \\def parameter list '" << pars << "'\n";
+ if (!pars.empty()) {
+ lyxerr << "can't handle non-empty parameter lists\n";
+ dump();
+ return false;
+ }
+
+ } else if (nextToken().cs() == "newcommand") {
+
getToken();
- if (getToken().cs() != "newcommand") {
- lyxerr << "\\newcommand expected\n";
- return 0;
+ if (getToken().cat() != catBegin) {
+ lyxerr << "'{' in \\newcommand expected (1) \n";
+ dump();
+ return false;
+ }
+
+ name = getToken().cs();
+
+ if (getToken().cat() != catEnd) {
+ lyxerr << "'}' expected\n";
+ return false;
+ }
+
+ string arg = getArg('[', ']');
+ if (!arg.empty())
+ nargs = atoi(arg.c_str());
+
+ } else {
+ lyxerr << "\\newcommand or \\def expected\n";
+ return false;
}
+
if (getToken().cat() != catBegin) {
- lyxerr << "'{' expected\n";
- return 0;
+ lyxerr << "'{' in macro definition expected (2)\n";
+ return false;
}
- string name = getToken().cs();
+ MathArray ar1;
+ parse_into(ar1, FLAG_BRACE_LAST);
- if (getToken().cat() != catEnd) {
- lyxerr << "'}' expected\n";
- return 0;
+ // we cannot handle recursive stuff at all
+ MathArray test;
+ test.push_back(createMathInset(name));
+ if (ar1.contains(test)) {
+ lyxerr << "we cannot handle recursive macros at all.\n";
+ return false;
}
- string arg = getArg('[', ']');
- int narg = arg.empty() ? 0 : atoi(arg.c_str());
- //lyxerr << "creating macro " << name << " with " << narg << "args\n";
- MathMacroTemplate * p = new MathMacroTemplate(name, narg);
- parse_into(p->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
- return p;
+ MathArray ar2;
+ parse_into(ar2, FLAG_ITEM);
+
+ MathMacroTable::create(name, nargs, ar1, ar2);
+ return true;
}
-MathMatrixInset * Parser::parse_normal()
+bool Parser::parse_normal(MathAtom & matrix)
{
- while (nextToken().cat() == catSpace)
- getToken();
-
+ skipSpaces();
Token const & t = getToken();
- if (t.cat() == catMath || t.cs() == "(") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_SIMPLE);
- parse_into(p->cell(0), 0);
- return p;
+ if (t.cs() == "(") {
+ matrix = MathAtom(new MathHullInset(LM_OT_SIMPLE));
+ parse_into(matrix->cell(0), 0);
+ return true;
+ }
+
+ if (t.cat() == catMath) {
+ Token const & n = getToken();
+ if (n.cat() == catMath) {
+ // TeX's $$...$$ syntax for displayed math
+ matrix = MathAtom(new MathHullInset(LM_OT_EQUATION));
+ MathHullInset * p = matrix->asHullInset();
+ parse_into(p->cell(0), 0);
+ p->numbered(0, curr_num_);
+ p->label(0, curr_label_);
+ } else {
+ // simple $...$ stuff
+ putback();
+ matrix = MathAtom(new MathHullInset(LM_OT_SIMPLE));
+ parse_into(matrix->cell(0), 0);
+ }
+ return true;
}
if (!t.cs().size()) {
lyxerr << "start of math expected, got '" << t << "'\n";
- return 0;
+ return false;
}
string const & cs = t.cs();
if (cs == "[") {
curr_num_ = 0;
curr_label_.erase();
- MathMatrixInset * p = new MathMatrixInset(LM_OT_EQUATION);
+ matrix = MathAtom(new MathHullInset(LM_OT_EQUATION));
+ MathHullInset * p = matrix->asHullInset();
parse_into(p->cell(0), 0);
p->numbered(0, curr_num_);
p->label(0, curr_label_);
- return p;
+ return true;
}
if (cs != "begin") {
lyxerr << "'begin' of un-simple math expected, got '" << cs << "'\n";
- return 0;
+ return false;
}
string const name = getArg('{', '}');
- if (name == "equation" || name == "equation*") {
- curr_num_ = !stared(name);
+ if (name == "math") {
+ matrix = MathAtom(new MathHullInset(LM_OT_SIMPLE));
+ parse_into(matrix->cell(0), 0);
+ return true;
+ }
+
+ if (name == "equation" || name == "equation*" || name == "displaymath") {
+ curr_num_ = (name == "equation");
curr_label_.erase();
- MathMatrixInset * p = new MathMatrixInset(LM_OT_EQUATION);
+ matrix = MathAtom(new MathHullInset(LM_OT_EQUATION));
+ MathHullInset * p = matrix->asHullInset();
parse_into(p->cell(0), FLAG_END);
p->numbered(0, curr_num_);
p->label(0, curr_label_);
- return p;
+ return true;
}
if (name == "eqnarray" || name == "eqnarray*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_EQNARRAY);
- parse_lines(p, !stared(name), true);
- return p;
+ matrix = MathAtom(new MathHullInset(LM_OT_EQNARRAY));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "align" || name == "align*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_ALIGN);
- parse_lines(p, !stared(name), true);
- return p;
+ matrix = MathAtom(new MathHullInset(LM_OT_ALIGN));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "alignat" || name == "alignat*") {
- MathMatrixInset * p =
- new MathMatrixInset(LM_OT_ALIGNAT, 2 * atoi(getArg('{', '}').c_str()));
- parse_lines(p, !stared(name), true);
- return p;
+ int nc = 2 * atoi(getArg('{', '}').c_str());
+ matrix = MathAtom(new MathHullInset(LM_OT_ALIGNAT, nc));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "xalignat" || name == "xalignat*") {
- MathMatrixInset * p =
- new MathMatrixInset(LM_OT_XALIGNAT, 2 * atoi(getArg('{', '}').c_str()));
- parse_lines(p, !stared(name), true);
- return p;
+ int nc = 2 * atoi(getArg('{', '}').c_str());
+ matrix = MathAtom(new MathHullInset(LM_OT_XALIGNAT, nc));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "xxalignat") {
- MathMatrixInset * p =
- new MathMatrixInset(LM_OT_XXALIGNAT, 2 * atoi(getArg('{', '}').c_str()));
- parse_lines(p, !stared(name), true);
- return p;
+ int nc = 2 * atoi(getArg('{', '}').c_str());
+ matrix = MathAtom(new MathHullInset(LM_OT_XXALIGNAT, nc));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "multline" || name == "multline*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_MULTLINE);
- parse_lines(p, !stared(name), true);
- return p;
+ matrix = MathAtom(new MathHullInset(LM_OT_MULTLINE));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "gather" || name == "gather*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_GATHER);
- parse_lines(p, !stared(name), true);
- return p;
+ matrix = MathAtom(new MathHullInset(LM_OT_GATHER));
+ return parse_lines(matrix, !stared(name), true);
}
lyxerr[Debug::MATHED] << "1: unknown math environment: " << name << "\n";
- return 0;
+ lyxerr << "1: unknown math environment: " << name << "\n";
+ return false;
}
-latexkeys const * Parser::read_delim()
+void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
{
- Token const & t = getToken();
- latexkeys const * l = in_word_set(t.asString());
- return l ? l : in_word_set(".");
+ parse_into1(array, flags, code);
+ // remove 'unnecessary' braces:
+ if (array.size() == 1 && array.back()->asBraceInset()) {
+ lyxerr << "extra braces removed\n";
+ array = array.back()->asBraceInset()->cell(0);
+ }
}
-void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
+void Parser::parse_into1(MathArray & array, unsigned flags, MathTextCodes code)
{
- MathTextCodes yyvarcode = LM_TC_MIN;
-
bool panic = false;
int limits = 0;
while (good()) {
Token const & t = getToken();
-
- //lyxerr << "t: " << t << " flags: " << flags << "'\n";
- //array.dump(lyxerr);
- //lyxerr << "\n";
+
+#ifdef FILEDEBUG
+ lyxerr << "t: " << t << " flags: " << flags << "\n";
+ //array.dump();
+ lyxerr << "\n";
+#endif
if (flags & FLAG_ITEM) {
+ if (t.cat() == catSpace)
+ continue;
+
flags &= ~FLAG_ITEM;
- if (t.cat() == catBegin) {
+ if (t.cat() == catBegin) {
// skip the brace and collect everything to the next matching
// closing brace
flags |= FLAG_BRACE_LAST;
continue;
- } else {
- // handle only this single token, leave the loop if done
- flags |= FLAG_LEAVE;
}
- }
- if (flags & FLAG_BRACE) {
- if (t.cat() != catBegin) {
- error("Expected {. Maybe you forgot to enclose an argument in {}");
- panic = true;
- break;
- } else {
- flags &= ~FLAG_BRACE;
- continue;
- }
+ // handle only this single token, leave the loop if done
+ flags |= FLAG_LEAVE;
}
if (flags & FLAG_BLOCK) {
- if (t.cat() == catAlign || t.cs() == "\\")
+ if (t.cat() == catAlign || t.isCR() || t.cs() == "end") {
+ putback();
return;
- if (t.cs() == "end") {
- getArg('{', '}');
+ }
+ }
+
+ if (flags & FLAG_BLOCK2) {
+ if (t.cat() == catAlign || t.isCR() || t.cs() == "end"
+ || t.cat() == catEnd) {
+ putback();
return;
}
}
//
// cat codes
//
- if (t.cat() == catMath)
- break;
+ if (t.cat() == catMath) {
+ if (flags & FLAG_BOX) {
+ // we are inside an mbox, so opening new math is allowed
+ array.push_back(MathAtom(new MathHullInset(LM_OT_SIMPLE)));
+ parse_into(array.back()->cell(0), 0);
+ } else {
+ // otherwise this is the end of the formula
+ break;
+ }
+ }
else if (t.cat() == catLetter)
- array.push_back(new MathCharInset(t.character(), yyvarcode));
+ add(array, t.character(), code);
- else if (t.cat() == catSpace &&
- (yyvarcode == LM_TC_TEXTRM || code == LM_TC_TEXTRM))
- array.push_back(new MathCharInset(' ', yyvarcode));
+ else if (t.cat() == catSpace && code == LM_TC_TEXTRM)
+ add(array, t.character(), code);
else if (t.cat() == catParameter) {
Token const & n = getToken();
- MathMacroArgument * p = new MathMacroArgument(n.character() - '0');
- array.push_back(p);
+ array.push_back(MathAtom(new MathMacroArgument(n.character()-'0', code)));
}
else if (t.cat() == catBegin) {
- array.push_back(new MathCharInset('{', LM_TC_TEX));
+ MathArray ar;
+ parse_into(ar, FLAG_BRACE_LAST);
+#ifndef WITH_WARNINGS
+#warning this might be wrong in general!
+#endif
+ // ignore braces around simple items
+ if ((ar.size() == 1 && !ar.front()->needsBraces()
+ || (ar.size() == 2 && !ar.front()->needsBraces()
+ && ar.back()->asScriptInset()))
+ || (ar.size() == 0 && array.size() == 0))
+ {
+ array.push_back(ar);
+ } else {
+ array.push_back(MathAtom(new MathBraceInset));
+ array.back()->cell(0).swap(ar);
+ }
}
else if (t.cat() == catEnd) {
if (flags & FLAG_BRACE_LAST)
return;
- array.push_back(new MathCharInset('}', LM_TC_TEX));
+ dump();
+ lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
+ //lyxerr << "found '}' unexpectedly\n";
+ lyx::Assert(0);
+ add(array, '}', LM_TC_TEX);
}
-
+
else if (t.cat() == catAlign) {
lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
- array.push_back(new MathCharInset('&', LM_TC_TEX));
- }
-
- else if (t.cat() == catSuper)
- parse_into(lastScriptInset(array, true, limits)->cell(0), FLAG_ITEM);
-
- else if (t.cat() == catSub)
- parse_into(lastScriptInset(array, false, limits)->cell(1), FLAG_ITEM);
-
+ //lyxerr << "found tab unexpectedly\n";
+ add(array, '&', LM_TC_TEX);
+ }
+
+ else if (t.cat() == catSuper || t.cat() == catSub) {
+ bool up = (t.cat() == catSuper);
+ MathScriptInset * p = 0;
+ if (array.size())
+ p = array.back()->asScriptInset();
+ if (!p || p->has(up)) {
+ array.push_back(MathAtom(new MathScriptInset(up)));
+ p = array.back()->asScriptInset();
+ }
+ p->ensure(up);
+ parse_into(p->cell(up), FLAG_ITEM);
+ p->limits(limits);
+ limits = 0;
+ }
+
else if (t.character() == ']' && (flags & FLAG_BRACK_END))
return;
else if (t.cat() == catOther)
- array.push_back(new MathCharInset(t.character(), yyvarcode));
-
+ add(array, t.character(), code);
+
//
- // codesequences
- //
- else if (t.cs() == "protect")
+ // control sequences
+ //
+ else if (t.cs() == "protect")
+ // ignore \\protect, will be re-added during output
;
else if (t.cs() == "end")
else if (t.cs() == "\\") {
curr_skip_ = getArg('[', ']');
- if (flags & FLAG_NEWLINE)
- return;
- lyxerr[Debug::MATHED]
- << "found newline unexpectedly, array: '" << array << "'\n";
+ //lyxerr << "found newline unexpectedly, array: '" << array << "'\n";
+ lyxerr << "found newline unexpectedly\n";
array.push_back(createMathInset("\\"));
}
-
- else if (t.cs() == "limits")
+
+ else if (t.cs() == "limits")
limits = 1;
-
- else if (t.cs() == "nolimits")
+
+ else if (t.cs() == "nolimits")
limits = -1;
-
+
else if (t.cs() == "nonumber")
curr_num_ = false;
else if (t.cs() == "sqrt") {
char c = getChar();
if (c == '[') {
- array.push_back(new MathRootInset);
+ array.push_back(MathAtom(new MathRootInset));
parse_into(array.back()->cell(0), FLAG_BRACK_END);
parse_into(array.back()->cell(1), FLAG_ITEM);
} else {
putback();
- array.push_back(new MathSqrtInset);
+ array.push_back(MathAtom(new MathSqrtInset));
parse_into(array.back()->cell(0), FLAG_ITEM);
}
}
-
+
else if (t.cs() == "left") {
- latexkeys const * l = read_delim();
+ string l = getToken().asString();
MathArray ar;
parse_into(ar, FLAG_RIGHT);
- latexkeys const * r = read_delim();
- MathDelimInset * dl = new MathDelimInset(l, r);
+ string r = getToken().asString();
+ MathAtom dl(new MathDelimInset(l, r));
dl->cell(0) = ar;
array.push_back(dl);
}
-
+
else if (t.cs() == "right") {
- if (!(flags & FLAG_RIGHT))
+ if (!(flags & FLAG_RIGHT)) {
+ //lyxerr << "got so far: '" << array << "'\n";
error("Unmatched right delimiter");
+ }
return;
}
-/*
- case LM_TK_STY:
- {
- lyxerr[Debug::MATHED] << "LM_TK_STY not implemented\n";
- //MathArray tmp = array;
- //MathSizeInset * p = new MathSizeInset(MathStyles(lval_->id));
- //array.push_back(p);
- //parse_into(p->cell(0), FLAG_BRACE_FONT);
- break;
- }
-
- else LM_TK_SPECIAL:
- array.push_back(new MathCharInset(ival_, LM_TC_TEX));
- break;
-*/
-
else if (t.cs() == "begin") {
- string const name = getArg('{', '}');
- if (name == "array") {
+ string const name = getArg('{', '}');
+ if (name == "array" || name == "subarray") {
string const valign = getArg('[', ']') + 'c';
string const halign = getArg('{', '}');
- MathArrayInset * m = new MathArrayInset(halign.size(), 1);
- m->valign(valign[0]);
- m->halign(halign);
- parse_lines(m, false, false);
- array.push_back(m);
- } else if (name == "split") {
- MathSplitInset * m = new MathSplitInset(1);
- parse_lines(m, false, false);
- array.push_back(m);
- } else
- lyxerr[Debug::MATHED] << "unknow math inset begin '" << name << "'\n";
+ array.push_back(MathAtom(new MathArrayInset(name, valign[0], halign)));
+ parse_lines(array.back(), false, false);
+ } else if (name == "split" || name == "cases" ||
+ name == "gathered" || name == "aligned") {
+ array.push_back(createMathInset(name));
+ parse_lines(array.back(), false, false);
+ } else if (name == "matrix" || name == "pmatrix" || name == "bmatrix" ||
+ name == "vmatrix" || name == "Vmatrix") {
+ array.push_back(createMathInset(name));
+ parse_lines2(array.back(), false);
+ } else
+ lyxerr << "unknow math inset begin '" << name << "'\n";
}
-
+
else if (t.cs() == "kern") {
#ifdef WITH_WARNINGS
#warning A hack...
while (1) {
Token const & t = getToken();
if (!good()) {
- putback();
+ putback();
break;
}
s += t.character();
if (isValidLength(s))
break;
}
- array.push_back(new MathKernInset(s));
+ array.push_back(MathAtom(new MathKernInset(s)));
+ }
+
+/*
+ else if (t.cs() == "lyxkern") {
+ MathAtom p = createMathInset(t.cs());
+ parse_into(p->cell(0), flags, code);
+ array.push_back(p);
}
+*/
else if (t.cs() == "label") {
- //MathArray ar;
- //parse_into(ar, FLAG_ITEM);
- //ostringstream os;
- //ar.write(os, true);
- //curr_label_ = os.str();
- // was:
curr_label_ = getArg('{', '}');
}
else if (t.cs() == "choose" || t.cs() == "over" || t.cs() == "atop") {
- limits = 0;
- MathInset * p = createMathInset(t.cs());
- // search backward for position of last '{' if any
- int pos;
- for (pos = array.size() - 1; pos >= 0; --pos) {
- MathInset * q = array.nextInset(pos);
- if (q->getChar() == '{')
- break;
- }
- if (pos >= 0) {
- // found it -> use the part after '{' as "numerator", erase the '{'
- p->cell(0) = MathArray(array, pos + 1, array.size());
- array.erase(pos, array.size());
+ MathAtom p = createMathInset(t.cs());
+ array.swap(p->cell(0));
+ parse_into(p->cell(1), flags, code);
+ array.push_back(p);
+ return;
+ }
+
+ else if (t.cs() == "substack") {
+ array.push_back(createMathInset(t.cs()));
+ skipBegin();
+ parse_lines2(array.back(), true);
+ }
+
+ else if (t.cs() == "xymatrix") {
+ array.push_back(createMathInset(t.cs()));
+ skipBegin();
+ parse_lines2(array.back(), true);
+ }
+
+#if 0
+ // Disabled
+ else if (1 && t.cs() == "ar") {
+ MathXYArrowInset * p = new MathXYArrowInset;
+
+ // try to read target
+ char c = getChar();
+ if (c == '[') {
+ parse_into(p->cell(0), FLAG_BRACK_END);
+ //lyxerr << "read target: " << p->cell(0) << "\n";
} else {
- // not found -> use everything as "numerator"
- p->cell(0).swap(array);
+ putback();
}
- array.push_back(p);
- parse_into(p->cell(1), FLAG_BLOCK);
+
+ // try to read label
+ if (nextToken().cat() == catSuper || nextToken().cat() == catSub) {
+ p->up_ = nextToken().cat() == catSuper;
+ getToken();
+ parse_into(p->cell(1), FLAG_ITEM);
+ //lyxerr << "read label: " << p->cell(1) << "\n";
+ }
+
+ array.push_back(MathAtom(p));
+ //lyxerr << "read array: " << array << "\n";
}
-
+#endif
+
+#if 0
+ else if (t.cs() == "mbox" || t.cs() == "text") {
+ //array.push_back(createMathInset(t.cs()));
+ array.push_back(MathAtom(new MathBoxInset(t.cs())));
+ // slurp in the argument of mbox
+
+ MathBoxInset * p = array.back()->asBoxInset();
+ //lyx::assert(p);
+ }
+#endif
+
+
else if (t.cs().size()) {
- limits = 0;
latexkeys const * l = in_word_set(t.cs());
if (l) {
if (l->token == LM_TK_FONT) {
//lyxerr << "starting font\n";
//CatCode catSpaceSave = theCatcode[' '];
//if (l->id == LM_TC_TEXTRM) {
- // // temporarily change catcode
- // theCatcode[' '] = catLetter;
+ // // temporarily change catcode
+ // theCatcode[' '] = catLetter;
//}
- MathTextCodes t = static_cast<MathTextCodes>(l->id);
MathArray ar;
- parse_into(ar, FLAG_ITEM, t);
- for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it)
- (*it)->handleFont(t);
+ parse_into(ar, FLAG_ITEM, static_cast<MathTextCodes>(l->id));
array.push_back(ar);
// undo catcode changes
//lyxerr << "ending font\n";
}
- else if (l->token == LM_TK_OLDFONT)
- yyvarcode = static_cast<MathTextCodes>(l->id);
+ else if (l->token == LM_TK_OLDFONT) {
+ code = static_cast<MathTextCodes>(l->id);
+ }
+
+ else if (l->token == LM_TK_BOX) {
+ MathAtom p = createMathInset(t.cs());
+ parse_into(p->cell(0), FLAG_ITEM | FLAG_BOX, LM_TC_BOX);
+ array.push_back(p);
+ }
+
+ else if (l->token == LM_TK_STY) {
+ MathAtom p = createMathInset(t.cs());
+ parse_into(p->cell(0), flags, code);
+ array.push_back(p);
+ return;
+ }
else {
- MathInset * p = createMathInset(t.cs());
- for (int i = 0; i < p->nargs(); ++i)
+ MathAtom p = createMathInset(t.cs());
+ for (MathInset::idx_type i = 0; i < p->nargs(); ++i)
parse_into(p->cell(i), FLAG_ITEM);
array.push_back(p);
}
}
else {
- MathInset * p = createMathInset(t.cs());
- if (p) {
- for (int i = 0; i < p->nargs(); ++i)
- parse_into(p->cell(i), FLAG_ITEM);
- array.push_back(p);
- } else {
- error("Unrecognized token");
- //lyxerr[Debug::MATHED] << "[" << t << "]\n";
- lyxerr << t << "\n";
- }
+ MathAtom p = createMathInset(t.cs());
+ for (MathInset::idx_type i = 0; i < p->nargs(); ++i)
+ parse_into(p->cell(i), FLAG_ITEM);
+ array.push_back(p);
}
}
if (panic) {
lyxerr << " Math Panic, expect problems!\n";
- // Search for the end command.
+ // Search for the end command.
Token t;
do {
t = getToken();
}
}
-} // anonymous namespace
+} // anonymous namespace
+
-MathArray mathed_parse_cell(string const & str)
+void mathed_parse_cell(MathArray & ar, string const & str)
{
istringstream is(str.c_str());
- Parser parser(is);
- MathArray ar;
- parser.parse_into(ar, 0);
- return ar;
+ mathed_parse_cell(ar, is);
+}
+
+
+void mathed_parse_cell(MathArray & ar, istream & is)
+{
+ Parser(is).parse_into(ar, 0);
}
-MathMacroTemplate * mathed_parse_macro(string const & str)
+bool mathed_parse_macro(string & name, string const & str)
{
istringstream is(str.c_str());
Parser parser(is);
- return parser.parse_macro();
+ return parser.parse_macro(name);
}
-MathMacroTemplate * mathed_parse_macro(istream & is)
+bool mathed_parse_macro(string & name, istream & is)
{
Parser parser(is);
- return parser.parse_macro();
+ return parser.parse_macro(name);
}
-MathMacroTemplate * mathed_parse_macro(LyXLex & lex)
+bool mathed_parse_macro(string & name, LyXLex & lex)
{
Parser parser(lex);
- return parser.parse_macro();
+ return parser.parse_macro(name);
}
-MathMatrixInset * mathed_parse_normal(string const & str)
+bool mathed_parse_normal(MathAtom & t, string const & str)
{
istringstream is(str.c_str());
Parser parser(is);
- return parser.parse_normal();
+ return parser.parse_normal(t);
}
-MathMatrixInset * mathed_parse_normal(istream & is)
+bool mathed_parse_normal(MathAtom & t, istream & is)
{
Parser parser(is);
- return parser.parse_normal();
+ return parser.parse_normal(t);
}
-MathMatrixInset * mathed_parse_normal(LyXLex & lex)
+bool mathed_parse_normal(MathAtom & t, LyXLex & lex)
{
Parser parser(lex);
- return parser.parse_normal();
+ return parser.parse_normal(t);
}
projects / lyx.git / blobdiff