#include "math_braceinset.h"
#include "math_boxinset.h"
#include "math_charinset.h"
+#include "math_commentinset.h"
#include "math_deliminset.h"
#include "math_envinset.h"
#include "math_extern.h"
namespace {
-MathInset::mode_type asMode(string const & str)
+MathInset::mode_type asMode(MathInset::mode_type oldmode, string const & str)
{
if (str == "mathmode")
return MathInset::MATH_MODE;
if (str == "textmode" || str == "forcetext")
return MathInset::TEXT_MODE;
- if (str == "verbatimmode")
- return MathInset::VERBATIM_MODE;
- return MathInset::UNDECIDED_MODE;
+ return oldmode;
}
ostream & operator<<(ostream & os, Token const & t)
{
if (t.cs().size())
- os << "\\" << t.cs();
+ os << '\\' << t.cs();
else
- os << "[" << t.character() << "," << t.cat() << "]";
+ os << '[' << t.character() << ',' << t.cat() << ']';
return os;
}
///
void parse(MathArray & array, unsigned flags, mode_type mode);
///
+ void parse1(MathGridInset & grid, unsigned flags, mode_type mode,
+ bool numbered);
+ ///
MathArray parse(unsigned flags, mode_type mode);
///
int lineno() const { return lineno_; }
private:
///
- void parse1(MathGridInset & grid, unsigned flags, mode_type mode,
- bool numbered);
- ///
void parse2(MathAtom & at, unsigned flags, mode_type mode, bool numbered);
/// get arg delimited by 'left' and 'right'
string getArg(char left, char right);
void lex(string const & s);
///
bool good() const;
+ ///
+ string parse_verbatim_item();
+ ///
+ string parse_verbatim_option();
///
int lineno_;
break;
}
}
+ // Remove the space after \end_inset
+ if (is.get(c) && c != ' ')
+ is.unget();
// tokenize buffer
tokenize(s);
break;
}
+/*
case catComment: {
while (is.get(c) && catcode(c) != catNewline)
;
++lineno_;
break;
}
+*/
case catEscape: {
is.get(c);
parse(ar, false, MathInset::UNDECIDED_MODE);
if (ar.size() != 1 || ar.front()->getType() == "none") {
lyxerr << "unusual contents found: " << ar << endl;
- at = MathAtom(new MathParInset);
- if (at->nargs() > 0)
- at.nucleus()->cell(0) = ar;
- else
- lyxerr << "unusual contents found: " << ar << endl;
+ at = MathAtom(new MathParInset(ar));
+ //if (at->nargs() > 0)
+ // at.nucleus()->cell(0) = ar;
+ //else
+ // lyxerr << "unusual contents found: " << ar << endl;
return true;
}
at = ar[0];
}
+string Parser::parse_verbatim_option()
+{
+ string res;
+ if (nextToken().character() == '[') {
+ Token t = getToken();
+ for (Token t = getToken(); t.character() != ']' && good(); t = getToken()) {
+ if (t.cat() == catBegin) {
+ putback();
+ res += '{' + parse_verbatim_item() + '}';
+ } else
+ res += t.asString();
+ }
+ }
+ return res;
+}
+
+
+string Parser::parse_verbatim_item()
+{
+ string res;
+ if (nextToken().cat() == catBegin) {
+ Token t = getToken();
+ for (Token t = getToken(); t.cat() != catEnd && good(); t = getToken()) {
+ if (t.cat() == catBegin) {
+ putback();
+ res += '{' + parse_verbatim_item() + '}';
+ }
+ else
+ res += t.asString();
+ }
+ }
+ return res;
+}
+
+
MathArray Parser::parse(unsigned flags, mode_type mode)
{
MathArray ar;
void Parser::parse1(MathGridInset & grid, unsigned flags,
mode_type mode, bool numbered)
{
- int limits = 0;
+ int limits = 0;
MathGridInset::row_type cellrow = 0;
MathGridInset::col_type cellcol = 0;
MathArray * cell = &grid.cell(grid.index(cellrow, cellcol));
#ifdef FILEDEBUG
lyxerr << "t: " << t << " flags: " << flags << "\n";
- //cell->dump();
+ cell->dump();
lyxerr << "\n";
#endif
else if (t.cat() == catLetter)
cell->push_back(MathAtom(new MathCharInset(t.character())));
- else if (t.cat() == catSpace && mode != MathInset::MATH_MODE)
- cell->push_back(MathAtom(new MathCharInset(t.character())));
+ else if (t.cat() == catSpace && mode != MathInset::MATH_MODE) {
+ if (cell->empty() || cell->back()->getChar() != ' ')
+ cell->push_back(MathAtom(new MathCharInset(t.character())));
+ }
else if (t.cat() == catNewline && mode != MathInset::MATH_MODE)
cell->push_back(MathAtom(new MathCharInset(t.character())));
++cellcol;
//lyxerr << " column now " << cellcol << " max: " << grid.ncols() << "\n";
if (cellcol == grid.ncols()) {
- lyxerr << "adding column " << cellcol << "\n";
+ //lyxerr << "adding column " << cellcol << "\n";
grid.addCol(cellcol - 1);
}
cell = &grid.cell(grid.index(cellrow, cellcol));
}
else if (t.cat() == catSuper || t.cat() == catSub) {
- if (mode == MathInset::VERBATIM_MODE)
- cell->push_back(MathAtom(new MathStringInset(t.asString())));
- else {
- bool up = (t.cat() == catSuper);
- // we need no new script inset if the last thing was a scriptinset,
- // which has that script already not the same script already
- if (!cell->size())
- cell->push_back(MathAtom(new MathScriptInset(up)));
- else if (cell->back()->asScriptInset() &&
- !cell->back()->asScriptInset()->has(up))
- cell->back().nucleus()->asScriptInset()->ensure(up);
- else if (cell->back()->asScriptInset())
- cell->push_back(MathAtom(new MathScriptInset(up)));
- else
- cell->back() = MathAtom(new MathScriptInset(cell->back(), up));
- MathScriptInset * p = cell->back().nucleus()->asScriptInset();
- parse(p->cell(up), FLAG_ITEM, mode);
+ bool up = (t.cat() == catSuper);
+ // we need no new script inset if the last thing was a scriptinset,
+ // which has that script already not the same script already
+ if (!cell->size())
+ cell->push_back(MathAtom(new MathScriptInset(up)));
+ else if (cell->back()->asScriptInset() &&
+ !cell->back()->asScriptInset()->has(up))
+ cell->back().nucleus()->asScriptInset()->ensure(up);
+ else if (cell->back()->asScriptInset())
+ cell->push_back(MathAtom(new MathScriptInset(up)));
+ else
+ cell->back() = MathAtom(new MathScriptInset(cell->back(), up));
+ MathScriptInset * p = cell->back().nucleus()->asScriptInset();
+ // special handling of {}-bases
+ // is this always correct?
+ if (p->nuc().size() == 1 && p->nuc().back()->asNestInset() &&
+ p->nuc().back()->extraBraces())
+ p->nuc() = p->nuc().back()->asNestInset()->cell(0);
+ parse(p->cell(up), FLAG_ITEM, mode);
+ if (limits) {
p->limits(limits);
limits = 0;
- // special handling of {}-bases
- // is this always correct?
- if (p->nuc().size() == 1 && p->nuc().back()->asNestInset() &&
- p->nuc().back()->extraBraces())
- p->nuc() = p->nuc().back()->asNestInset()->cell(0);
}
}
else if (t.character() == ']' && (flags & FLAG_BRACK_LAST)) {
- lyxerr << "finished reading option\n";
+ //lyxerr << "finished reading option\n";
return;
}
else if (t.cat() == catOther)
cell->push_back(MathAtom(new MathCharInset(t.character())));
+ else if (t.cat() == catComment) {
+ string s;
+ while (good()) {
+ Token const & t = getToken();
+ if (t.cat() == catNewline)
+ break;
+ s += t.asString();
+ }
+ cell->push_back(MathAtom(new MathCommentInset(s)));
+ skipSpaces();
+ }
+
//
// control sequences
//
cell = &grid.cell(grid.index(cellrow, cellcol));
}
-#if 1
+#if 0
else if (t.cs() == "multicolumn") {
// extract column count and insert dummy cells
MathArray count;
for (int i = 0; i < cols; ++i) {
++cellcol;
if (cellcol == grid.ncols()) {
- lyxerr << "adding column " << cellcol << "\n";
+ //lyxerr << "adding column " << cellcol << "\n";
grid.addCol(cellcol - 1);
}
cell = &grid.cell(grid.index(cellrow, cellcol));
}
else if (t.cs() == "hline") {
- if (grid.asHullInset())
- grid.asHullInset()->rowinfo(cellrow + 1);
+ grid.rowinfo(cellrow).lines_ ++;
}
else if (t.cs() == "sqrt") {
}
}
+ else if (t.cs() == "xrightarrow" || t.cs() == "xleftarrow") {
+ cell->push_back(createMathInset(t.cs()));
+ parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
+ parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
+ }
+
else if (t.cs() == "ref") {
cell->push_back(MathAtom(new RefInset));
parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
string const name = getArg('{', '}');
if (name == "array" || name == "subarray") {
- string const valign =
- asString(parse(FLAG_OPTION, MathInset::VERBATIM_MODE)) + 'c';
- string const halign =
- asString(parse(FLAG_ITEM, MathInset::VERBATIM_MODE));
+ string const valign = parse_verbatim_option() + 'c';
+ string const halign = parse_verbatim_item();
cell->push_back(MathAtom(new MathArrayInset(name, valign[0], halign)));
parse2(cell->back(), FLAG_END, mode, false);
}
parse2(cell->back(), FLAG_END, MathInset::MATH_MODE, !stared(name));
}
+ else if (name == "flalign" || name == "flalign*") {
+ cell->push_back(MathAtom(new MathHullInset("flalign")));
+ parse2(cell->back(), FLAG_END, MathInset::MATH_MODE, !stared(name));
+ }
+
else if (name == "alignat" || name == "alignat*") {
// ignore this for a while
getArg('{', '}');
#warning A hack...
#endif
string s;
- while (1) {
+ while (true) {
Token const & t = getToken();
if (!good()) {
putback();
}
else if (t.cs() == "label") {
- MathArray ar = parse(FLAG_ITEM, MathInset::VERBATIM_MODE);
+ string label = parse_verbatim_item();
if (grid.asHullInset()) {
- grid.asHullInset()->label(cellrow, asString(ar));
+ grid.asHullInset()->label(cellrow, label);
} else {
cell->push_back(createMathInset(t.cs()));
- cell->push_back(MathAtom(new MathBraceInset(ar)));
+ cell->push_back(MathAtom(new MathBraceInset(asArray(label))));
}
}
parse2(cell->back(), FLAG_ITEM, mode, false);
}
+ else if (t.cs() == "framebox") {
+ cell->push_back(createMathInset(t.cs()));
+ parse(cell->back().nucleus()->cell(0), FLAG_OPTION, mode);
+ parse(cell->back().nucleus()->cell(1), FLAG_ITEM, mode);
+ }
+
#if 0
+ else if (t.cs() == "infer") {
+ MathArray ar;
+ parse(ar, FLAG_OPTION, mode);
+ cell->push_back(createMathInset(t.cs()));
+ parse2(cell->back(), FLAG_ITEM, mode, false);
+ }
+
// Disabled
else if (1 && t.cs() == "ar") {
MathXYArrowInset * p = new MathXYArrowInset;
if (l) {
if (l->inset == "font") {
cell->push_back(createMathInset(t.cs()));
- parse(cell->back().nucleus()->cell(0), FLAG_ITEM, asMode(l->extra));
+ parse(cell->back().nucleus()->cell(0), FLAG_ITEM, asMode(mode, l->extra));
}
else if (l->inset == "oldfont") {
cell->push_back(createMathInset(t.cs()));
- parse(cell->back().nucleus()->cell(0), flags, asMode(l->extra));
+ parse(cell->back().nucleus()->cell(0), flags, asMode(mode, l->extra));
return;
}
else if (l->inset == "parbox") {
// read optional positioning and width
- MathArray pos, width;
- parse(pos, FLAG_OPTION, MathInset::VERBATIM_MODE);
-
- parse(width, FLAG_ITEM, MathInset::VERBATIM_MODE);
+ string pos = parse_verbatim_option();
+ string width = parse_verbatim_item();
cell->push_back(createMathInset(t.cs()));
parse(cell->back().nucleus()->cell(0), FLAG_ITEM, MathInset::TEXT_MODE);
- cell->back().nucleus()->asParboxInset()->setPosition(asString(pos));
- cell->back().nucleus()->asParboxInset()->setWidth(asString(width));
+ cell->back().nucleus()->asParboxInset()->setPosition(pos);
+ cell->back().nucleus()->asParboxInset()->setWidth(width);
}
else {
MathAtom at = createMathInset(t.cs());
for (MathInset::idx_type i = 0; i < at->nargs(); ++i)
- parse(at.nucleus()->cell(i), FLAG_ITEM, asMode(l->extra));
+ parse(at.nucleus()->cell(i), FLAG_ITEM, asMode(mode, l->extra));
cell->push_back(at);
}
}
MathInset::mode_type m = mode;
if (m == MathInset::UNDECIDED_MODE)
m = at->currentMode();
- for (MathInset::idx_type i = 0; i < at->nargs(); ++i)
+ MathInset::idx_type start = 0;
+ // this fails on \bigg[...\bigg]
+ //MathArray opt;
+ //parse(opt, FLAG_OPTION, MathInset::VERBATIM_MODE);
+ //if (opt.size()) {
+ // start = 1;
+ // at.nucleus()->cell(0) = opt;
+ //}
+ for (MathInset::idx_type i = start; i < at->nargs(); ++i)
parse(at.nucleus()->cell(i), FLAG_ITEM, m);
cell->push_back(at);
}
{
return Parser(lex).parse(t);
}
+
+
+void mathed_parse_normal(MathGridInset & grid, string const & str)
+{
+ istringstream is(str.c_str());
+ Parser(is).parse1(grid, 0, MathInset::MATH_MODE, false);
+}
projects / lyx.git / blobdiff