* the GNU General Public Licence version 2 or later.
*/
-#include <config.h>
+/*
+
+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 <cctype>
-#include <stack>
+*/
+
+
+#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;
+
+//#define FILEDEBUG
namespace {
bool stared(string const & s)
{
- unsigned n = s.size();
+ string::size_type const n = s.size();
return n && s[n - 1] == '*';
}
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;
+ fill(theCatcode, theCatcode + 256, catOther);
+ fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter);
+ fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter);
theCatcode['\\'] = catEscape;
theCatcode['{'] = catBegin;
///
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:
///
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);
///
- string parse_macro();
+ bool parse_macro(string & name);
///
bool parse_normal(MathAtom &);
///
void putback();
private:
+ ///
+ void parse_into1(MathArray & array, unsigned flags, MathTextCodes);
///
string getArg(char lf, char rf);
///
void error(string const & msg);
///
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);
///
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)
{
+ skipSpaces();
+
string result;
char c = getChar();
}
+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;
char c;
while (is.get(c)) {
+ //lyxerr << "reading c: " << c << "\n";
switch (catcode(c)) {
case catNewline: {
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)
lyxerr << tokens_[i];
lyxerr << "\n";
-#endif
}
void Parser::error(string const & msg)
{
lyxerr << "Line ~" << lineno_ << ": Math parse error: " << msg << endl;
+ dump();
//exit(1);
}
+
bool Parser::parse_lines(MathAtom & t, bool numbered, bool outmost)
{
MathGridInset * p = t->asGridInset();
if (!p) {
+ dump();
lyxerr << "error in Parser::parse_lines() 1\n";
return false;
}
- const int cols = p->ncols();
-
// 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());
+ }
+
+ 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";
- // no ampersand
- if (prevToken().cat() != catAlign) {
+ // 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 = t->asMatrixInset();
+ 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();
}
}
-string Parser::parse_macro()
-{
- string name = "{error}";
+bool Parser::parse_lines2(MathAtom & t, bool braced)
+{
+ MathGridInset * p = t->asGridInset();
+ if (!p) {
+ lyxerr << "error in Parser::parse_lines() 1\n";
+ return false;
+ }
- while (nextToken().cat() == catSpace)
- getToken();
+ 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)
+{
+ name = "{error}";
+ skipSpaces();
if (getToken().cs() != "newcommand") {
lyxerr << "\\newcommand expected\n";
- return name;
+ return false;
}
if (getToken().cat() != catBegin) {
- lyxerr << "'{' expected\n";
- return name;
+ lyxerr << "'{' in \\newcommand expected (1)\n";
+ return false;
}
name = getToken().cs();
if (getToken().cat() != catEnd) {
lyxerr << "'}' expected\n";
- return name;
+ return false;
}
string arg = getArg('[', ']');
int narg = arg.empty() ? 0 : atoi(arg.c_str());
+
+ if (getToken().cat() != catBegin) {
+ lyxerr << "'{' in \\newcommand expected (2)\n";
+ return false;
+ }
+
MathArray ar;
- parse_into(ar, FLAG_BRACE | FLAG_BRACE_LAST);
+ parse_into(ar, FLAG_BRACE_LAST);
+
+ // we cannot handle recursive stuff at all
+ MathArray test;
+ test.push_back(createMathInset(name));
+ if (ar.contains(test)) {
+ lyxerr << "we cannot handle recursive macros at all.\n";
+ return false;
+ }
+
MathMacroTable::create(name, narg, ar);
-
- return name;
+ return true;
}
bool Parser::parse_normal(MathAtom & matrix)
{
- while (nextToken().cat() == catSpace)
- getToken();
-
+ skipSpaces();
Token const & t = getToken();
if (t.cs() == "(") {
- matrix = MathAtom(new MathMatrixInset(LM_OT_SIMPLE));
+ matrix = MathAtom(new MathHullInset(LM_OT_SIMPLE));
parse_into(matrix->cell(0), 0);
return true;
}
Token const & n = getToken();
if (n.cat() == catMath) {
// TeX's $$...$$ syntax for displayed math
- matrix = MathAtom(new MathMatrixInset(LM_OT_EQUATION));
- MathMatrixInset * p = matrix->asMatrixInset();
+ 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 MathMatrixInset(LM_OT_SIMPLE));
+ matrix = MathAtom(new MathHullInset(LM_OT_SIMPLE));
parse_into(matrix->cell(0), 0);
}
return true;
if (cs == "[") {
curr_num_ = 0;
curr_label_.erase();
- matrix = MathAtom(new MathMatrixInset(LM_OT_EQUATION));
- MathMatrixInset * p = matrix->asMatrixInset();
+ 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_);
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();
- matrix = MathAtom(new MathMatrixInset(LM_OT_EQUATION));
- MathMatrixInset * p = matrix->asMatrixInset();
+ 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_);
}
if (name == "eqnarray" || name == "eqnarray*") {
- matrix = MathAtom(new MathMatrixInset(LM_OT_EQNARRAY));
+ matrix = MathAtom(new MathHullInset(LM_OT_EQNARRAY));
return parse_lines(matrix, !stared(name), true);
}
if (name == "align" || name == "align*") {
- matrix = MathAtom(new MathMatrixInset(LM_OT_ALIGN));
+ matrix = MathAtom(new MathHullInset(LM_OT_ALIGN));
return parse_lines(matrix, !stared(name), true);
}
if (name == "alignat" || name == "alignat*") {
int nc = 2 * atoi(getArg('{', '}').c_str());
- matrix = MathAtom(new MathMatrixInset(LM_OT_ALIGNAT, nc));
+ matrix = MathAtom(new MathHullInset(LM_OT_ALIGNAT, nc));
return parse_lines(matrix, !stared(name), true);
}
if (name == "xalignat" || name == "xalignat*") {
int nc = 2 * atoi(getArg('{', '}').c_str());
- matrix = MathAtom(new MathMatrixInset(LM_OT_XALIGNAT, nc));
+ matrix = MathAtom(new MathHullInset(LM_OT_XALIGNAT, nc));
return parse_lines(matrix, !stared(name), true);
}
if (name == "xxalignat") {
int nc = 2 * atoi(getArg('{', '}').c_str());
- matrix = MathAtom(new MathMatrixInset(LM_OT_XXALIGNAT, nc));
+ matrix = MathAtom(new MathHullInset(LM_OT_XXALIGNAT, nc));
return parse_lines(matrix, !stared(name), true);
}
if (name == "multline" || name == "multline*") {
- matrix = MathAtom(new MathMatrixInset(LM_OT_MULTLINE));
+ matrix = MathAtom(new MathHullInset(LM_OT_MULTLINE));
return parse_lines(matrix, !stared(name), true);
}
if (name == "gather" || name == "gather*") {
- matrix = MathAtom(new MathMatrixInset(LM_OT_GATHER));
+ matrix = MathAtom(new MathHullInset(LM_OT_GATHER));
return parse_lines(matrix, !stared(name), true);
}
lyxerr[Debug::MATHED] << "1: unknown math environment: " << name << "\n";
+ lyxerr << "1: unknown math environment: " << name << "\n";
return false;
}
void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
{
- stack<MathTextCodes> fontcodes;
- fontcodes.push(LM_TC_MIN);
+ 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_into1(MathArray & array, unsigned flags, MathTextCodes code)
+{
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) {
flags &= ~FLAG_ITEM;
}
}
- 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;
+ if (flags & FLAG_BLOCK) {
+ if (t.cat() == catAlign || t.isCR() || t.cs() == "end") {
+ putback();
+ return;
}
}
- if (flags & FLAG_BLOCK) {
- if (t.cat() == catAlign || t.cs() == "\\")
- 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)
- add(array, t.character(), fontcodes.top());
+ add(array, t.character(), code);
- else if (t.cat() == catSpace &&
- (fontcodes.top() == LM_TC_TEXTRM || code == LM_TC_TEXTRM))
- add(array, ' ', fontcodes.top());
+ else if (t.cat() == catSpace && code == LM_TC_TEXTRM)
+ add(array, t.character(), code);
else if (t.cat() == catParameter) {
Token const & n = getToken();
- array.push_back(MathAtom(new MathMacroArgument(n.character() - '0')));
+ array.push_back(MathAtom(new MathMacroArgument(n.character()-'0', code)));
}
else if (t.cat() == catBegin) {
- add(array, '{', LM_TC_TEX);
- fontcodes.push(LM_TC_MIN);
+ 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;
+ lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
+ //lyxerr << "found '}' unexpectedly\n";
+ lyx::Assert(0);
add(array, '}', LM_TC_TEX);
- fontcodes.pop();
}
else if (t.cat() == catAlign) {
lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
+ //lyxerr << "found tab unexpectedly\n";
add(array, '&', LM_TC_TEX);
}
return;
else if (t.cat() == catOther)
- add(array, t.character(), fontcodes.top());
+ add(array, t.character(), code);
//
- // codesequences
+ // control sequences
//
- else if (t.cs() == "protect")
+ 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() == "right") {
if (!(flags & FLAG_RIGHT)) {
- lyxerr << "got so far: '" << array << "'\n";
+ //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 if (t.cs() == "begin") {
string const name = getArg('{', '}');
- if (name == "array") {
+ if (name == "array" || name == "subarray") {
string const valign = getArg('[', ']') + 'c';
string const halign = getArg('{', '}');
- array.push_back(
- MathAtom(new MathArrayInset(halign.size(), 1, valign[0], halign)));
+ array.push_back(MathAtom(new MathArrayInset(name, valign[0], halign)));
parse_lines(array.back(), false, false);
- } else if (name == "split") {
- array.push_back(MathAtom(new MathSplitInset(1)));
+ } 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[Debug::MATHED] << "unknow math inset begin '" << name << "'\n";
+ lyxerr << "unknow math inset begin '" << name << "'\n";
}
else if (t.cs() == "kern") {
}
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") {
MathAtom p = createMathInset(t.cs());
- // search backward for position of last '{' if any
- int pos;
- for (pos = array.size() - 1; pos >= 0; --pos)
- if (array.at(pos)->getChar() == '{')
- break;
- if (pos >= 0) {
- // found it -> use the part after '{' as "numerator"
- p->cell(0) = MathArray(array, pos + 1, array.size());
- parse_into(p->cell(1), FLAG_BRACE_LAST);
- // delete denominator and the '{'
- array.erase(pos, array.size());
- } else if (flags & FLAG_RIGHT) {
- // we are inside a \left ... \right block
- //lyxerr << "found '" << t.cs() << "' enclosed by \\left .. \\right\n";
- p->cell(0).swap(array);
- parse_into(p->cell(1), FLAG_RIGHT);
- // handle the right delimiter properly
- putback();
+ 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);
- parse_into(p->cell(1), FLAG_BLOCK);
+ putback();
}
+
+ // 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
-/*
- // Disabled
- else if (t.cs() == "mbox") {
- array.push_back(createMathInset(t.cs()));
+#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()) {
latexkeys const * l = in_word_set(t.cs());
// 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
}
else if (l->token == LM_TK_OLDFONT) {
- fontcodes.pop();
- fontcodes.push(static_cast<MathTextCodes>(l->id));
+ 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 {
-string 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);
}
-string 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);
}
-string 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);
}
projects / lyx.git / blobdiff