#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"
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)));
}
Parser(istream & is);
///
- MathMacroTemplate * parse_macro();
+ string parse_macro();
///
- MathMatrixInset * parse_normal();
+ bool parse_normal(MathAtom &);
///
void parse_into(MathArray & array, unsigned flags, MathTextCodes = LM_TC_MIN);
///
///
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);
private:
///
init_done = true;
}
- istringstream is(buffer, ios::in | ios::binary);
+ istringstream is(buffer.c_str(), ios::in | ios::binary);
char c;
while (is.get(c)) {
void Parser::error(string const & msg)
{
lyxerr << "Line ~" << lineno_ << ": Math parse error: " << msg << endl;
+ //exit(1);
}
-void Parser::parse_lines(MathGridInset * p, bool numbered, bool outmost)
-{
+bool Parser::parse_lines(MathAtom & t, bool numbered, bool outmost)
+{
+ MathGridInset * p = t->asGridInset();
+ if (!p) {
+ lyxerr << "error in Parser::parse_lines() 1\n";
+ return false;
+ }
+
const int cols = p->ncols();
// save global variables
}
if (outmost) {
- MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+ MathMatrixInset * m = t->asMatrixInset();
+ 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()) {
// restore "global" variables
curr_num_ = saved_num;
curr_label_ = saved_label;
+
+ return true;
}
-MathMacroTemplate * Parser::parse_macro()
+string Parser::parse_macro()
{
+ string name = "{error}";
+
while (nextToken().cat() == catSpace)
getToken();
if (getToken().cs() != "newcommand") {
lyxerr << "\\newcommand expected\n";
- return 0;
+ return name;
}
if (getToken().cat() != catBegin) {
lyxerr << "'{' expected\n";
- return 0;
+ return name;
}
- string name = getToken().cs();
+ name = getToken().cs();
if (getToken().cat() != catEnd) {
lyxerr << "'}' expected\n";
- return 0;
+ return name;
}
- 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;
+ string arg = getArg('[', ']');
+ int narg = arg.empty() ? 0 : atoi(arg.c_str());
+ MathArray ar;
+ parse_into(ar, FLAG_BRACE | FLAG_BRACE_LAST);
+ MathMacroTable::create(name, narg, ar);
+
+ return name;
}
-MathMatrixInset * Parser::parse_normal()
+bool Parser::parse_normal(MathAtom & matrix)
{
while (nextToken().cat() == catSpace)
getToken();
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 MathMatrixInset(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 MathMatrixInset(LM_OT_EQUATION));
+ MathMatrixInset * p = matrix->asMatrixInset();
+ 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));
+ 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 MathMatrixInset(LM_OT_EQUATION));
+ MathMatrixInset * p = matrix->asMatrixInset();
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);
curr_label_.erase();
- MathMatrixInset * p = new MathMatrixInset(LM_OT_EQUATION);
+ matrix = MathAtom(new MathMatrixInset(LM_OT_EQUATION));
+ MathMatrixInset * p = matrix->asMatrixInset();
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 MathMatrixInset(LM_OT_EQNARRAY));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "align" || name == "align*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_ALIGN);
- p->halign(getArg('{', '}'));
- parse_lines(p, !stared(name), true);
- return p;
+ matrix = MathAtom(new MathMatrixInset(LM_OT_ALIGN));
+ return parse_lines(matrix, !stared(name), true);
}
if (name == "alignat" || name == "alignat*") {
- MathMatrixInset * p = new MathMatrixInset(LM_OT_ALIGNAT);
- p->halign(getArg('{', '}'));
- parse_lines(p, !stared(name), true);
- return p;
+ int nc = 2 * atoi(getArg('{', '}').c_str());
+ matrix = MathAtom(new MathMatrixInset(LM_OT_ALIGNAT, nc));
+ return parse_lines(matrix, !stared(name), true);
}
- lyxerr[Debug::MATHED] << "1: unknown math environment: " << name << "\n";
- return 0;
-}
+ if (name == "xalignat" || name == "xalignat*") {
+ int nc = 2 * atoi(getArg('{', '}').c_str());
+ matrix = MathAtom(new MathMatrixInset(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));
+ return parse_lines(matrix, !stared(name), true);
+ }
-latexkeys const * Parser::read_delim()
-{
- Token const & t = getToken();
- latexkeys const * l = in_word_set(t.asString());
- return l ? l : in_word_set(".");
+ if (name == "multline" || name == "multline*") {
+ matrix = MathAtom(new MathMatrixInset(LM_OT_MULTLINE));
+ return parse_lines(matrix, !stared(name), true);
+ }
+
+ if (name == "gather" || name == "gather*") {
+ matrix = MathAtom(new MathMatrixInset(LM_OT_GATHER));
+ return parse_lines(matrix, !stared(name), true);
+ }
+
+ lyxerr[Debug::MATHED] << "1: unknown math environment: " << name << "\n";
+ return false;
}
break;
else if (t.cat() == catLetter)
- array.push_back(new MathCharInset(t.character(), yyvarcode));
+ add(array, t.character(), yyvarcode);
else if (t.cat() == catSpace &&
(yyvarcode == LM_TC_TEXTRM || code == LM_TC_TEXTRM))
- array.push_back(new MathCharInset(' ', yyvarcode));
+ add(array, ' ', yyvarcode);
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')));
}
else if (t.cat() == catBegin) {
- array.push_back(new MathCharInset('{', LM_TC_TEX));
+ add(array, '{', LM_TC_TEX);
}
else if (t.cat() == catEnd) {
if (flags & FLAG_BRACE_LAST)
return;
- array.push_back(new MathCharInset('}', LM_TC_TEX));
+ 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));
+ add(array, '&', 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);
-
+ 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(), yyvarcode);
//
// codesequences
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")
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;
}
break;
}
- else LM_TK_SPECIAL:
- array.push_back(new MathCharInset(ival_, LM_TC_TEX));
- break;
*/
else if (t.cs() == "begin") {
if (name == "array") {
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);
+ array.push_back(
+ MathAtom(new MathArrayInset(halign.size(), 1, valign[0], halign)));
+ parse_lines(array.back(), false, false);
+ } else if (name == "split") {
+ array.push_back(MathAtom(new MathSplitInset(1)));
+ parse_lines(array.back(), false, false);
} else
lyxerr[Debug::MATHED] << "unknow math inset begin '" << name << "'\n";
}
if (isValidLength(s))
break;
}
- array.push_back(new MathKernInset(s));
+ array.push_back(MathAtom(new MathKernInset(s)));
}
else if (t.cs() == "label") {
}
else if (t.cs() == "choose" || t.cs() == "over" || t.cs() == "atop") {
- limits = 0;
- MathInset * p = createMathInset(t.cs());
+ MathAtom 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() == '{')
+ 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", erase the '{'
+ // 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();
} else {
// not found -> use everything as "numerator"
p->cell(0).swap(array);
+ parse_into(p->cell(1), FLAG_BLOCK);
}
- array.push_back(p);
- parse_into(p->cell(1), FLAG_BLOCK);
+ array.push_back(MathAtom(p));
+ }
+
+/*
+ // Disabled
+ else if (t.cs() == "mbox") {
+ array.push_back(createMathInset(t.cs()));
+ // slurp in the argument of mbox
+
+ MathBoxInset * p = array.back()->asBoxInset();
+ //lyx::assert(p);
}
+*/
else if (t.cs().size()) {
- limits = 0;
latexkeys const * l = in_word_set(t.cs());
if (l) {
if (l->token == LM_TK_FONT) {
yyvarcode = static_cast<MathTextCodes>(l->id);
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);
}
}
}
}
-} // 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)
+string mathed_parse_macro(string const & str)
{
istringstream is(str.c_str());
Parser parser(is);
return parser.parse_macro();
}
-MathMacroTemplate * mathed_parse_macro(istream & is)
+string mathed_parse_macro(istream & is)
{
Parser parser(is);
return parser.parse_macro();
}
-MathMacroTemplate * mathed_parse_macro(LyXLex & lex)
+string mathed_parse_macro(LyXLex & lex)
{
Parser parser(lex);
return parser.parse_macro();
-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