...
\[\begin{array}{ccc}
- 1 & 2\b & 3^2\\
- 4 & 5\e & 6\\
- 7 & 8 & 9
+1
+&
+
\end{array}\]
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
#include "math_parser.h"
#include "math_inset.h"
#include "math_sqrtinset.h"
#include "math_stringinset.h"
#include "math_support.h"
+#include "math_tabularinset.h"
#include "math_xyarrowinset.h"
//#include "insets/insetref.h"
namespace {
-MathInset::mode_type asMode(string const & str)
+MathInset::mode_type asMode(MathInset::mode_type oldmode, string const & str)
{
+ lyxerr << "handling mode: '" << str << "'\n";
if (str == "mathmode")
return MathInset::MATH_MODE;
if (str == "textmode" || str == "forcetext")
return MathInset::TEXT_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 if (t.cat() == catLetter)
+ os << t.character();
else
- os << "[" << t.character() << "," << t.cat() << "]";
+ os << '[' << t.character() << ',' << t.cat() << ']';
return os;
}
break;
}
}
+ // Remove the space after \end_inset
+ if (is.get(c) && c != ' ')
+ is.unget();
// tokenize buffer
tokenize(s);
string Parser::parse_verbatim_option()
{
+ skipSpaces();
string res;
if (nextToken().character() == '[') {
Token t = getToken();
if (t.cat() == catBegin) {
putback();
res += '{' + parse_verbatim_item() + '}';
- } else
+ } else
res += t.asString();
}
}
string Parser::parse_verbatim_item()
{
+ skipSpaces();
string res;
if (nextToken().cat() == catBegin) {
Token t = getToken();
putback();
res += '{' + parse_verbatim_item() + '}';
}
- else
+ else
res += t.asString();
}
}
}
-void Parser::parse2(MathAtom & at, unsigned flags, mode_type mode,
- bool numbered)
+void Parser::parse2(MathAtom & at, const unsigned flags, const mode_type mode,
+ const bool numbered)
{
parse1(*(at.nucleus()->asGridInset()), flags, mode, numbered);
}
void Parser::parse1(MathGridInset & grid, unsigned flags,
- mode_type mode, bool numbered)
+ const mode_type mode, const bool numbered)
{
int limits = 0;
MathGridInset::row_type cellrow = 0;
grid.asHullInset()->numbered(cellrow, numbered);
//dump();
+ //lyxerr << " flags: " << flags << "\n";
+ //lyxerr << " mode: " << mode << "\n";
//lyxerr << "grid: " << grid << endl;
while (good()) {
#ifdef FILEDEBUG
lyxerr << "t: " << t << " flags: " << flags << "\n";
+ lyxerr << "mode: " << mode << "\n";
cell->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;
+ parse1(grid, FLAG_BRACE_LAST, mode, numbered);
+ return;
}
// handle only this single token, leave the loop if done
- flags |= FLAG_LEAVE;
+ flags = FLAG_LEAVE;
}
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())));
+ else if (t.cat() == catNewline && mode != MathInset::MATH_MODE) {
+ if (cell->empty() || cell->back()->getChar() != ' ')
+ cell->push_back(MathAtom(new MathCharInset(' ')));
+ }
else if (t.cat() == catParameter) {
Token const & n = getToken();
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);
+ // It appears that this is wrong (Dekel)
+ //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);
// is a version for display attached?
skipSpaces();
MathArray ar2;
- if (nextToken().cat() == catBegin) {
+ if (nextToken().cat() == catBegin)
parse(ar2, FLAG_ITEM, MathInset::MATH_MODE);
- }
cell->push_back(MathAtom(new MathMacroTemplate(name, nargs, ar1, ar2)));
}
}
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() == "ref") {
- cell->push_back(MathAtom(new RefInset));
+ 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" || t.cs() == "prettyref" ||
+ t.cs() == "pageref" || t.cs() == "vpageref" || t.cs() == "vref") {
+ cell->push_back(MathAtom(new RefInset(t.cs())));
parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
}
else if (t.cs() == "left") {
+ skipSpaces();
string l = getToken().asString();
MathArray ar;
parse(ar, FLAG_RIGHT, mode);
+ skipSpaces();
string r = getToken().asString();
cell->push_back(MathAtom(new MathDelimInset(l, r, ar)));
}
parse2(cell->back(), FLAG_END, mode, false);
}
+ else if (name == "tabular") {
+ string const valign = parse_verbatim_option() + 'c';
+ string const halign = parse_verbatim_item();
+ cell->push_back(MathAtom(new MathTabularInset(name, valign[0], halign)));
+ parse2(cell->back(), FLAG_END, MathInset::TEXT_MODE, false);
+ }
+
else if (name == "split" || name == "cases" ||
name == "gathered" || name == "aligned") {
cell->push_back(createMathInset(name));
}
else {
- // lyxerr << "unknow math inset begin '" << name << "'\n";
+ dump();
+ lyxerr << "found unknown math environment '" << name << "'\n";
// create generic environment inset
cell->push_back(MathAtom(new MathEnvInset(name)));
- parse(cell->back().nucleus()->cell(0), FLAG_END, mode);
+ parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
}
}
#warning A hack...
#endif
string s;
- while (1) {
+ while (true) {
Token const & t = getToken();
if (!good()) {
putback();
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);
+ parse(cell->back().nucleus()->cell(0), FLAG_OPTION, MathInset::TEXT_MODE);
+ parse(cell->back().nucleus()->cell(1), FLAG_OPTION, MathInset::TEXT_MODE);
+ parse(cell->back().nucleus()->cell(2), FLAG_ITEM, MathInset::TEXT_MODE);
}
#if 0
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
string pos = parse_verbatim_option();
- string width = parse_verbatim_item();
+ 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(pos);
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);
}
}
else {
MathAtom at = createMathInset(t.cs());
MathInset::mode_type m = mode;
- if (m == MathInset::UNDECIDED_MODE)
+ //if (m == MathInset::UNDECIDED_MODE)
+ lyxerr << "default creation: m1: " << m << "\n";
+ if (at->currentMode() != MathInset::UNDECIDED_MODE)
m = at->currentMode();
+ lyxerr << "default creation: m2: " << m << "\n";
MathInset::idx_type start = 0;
// this fails on \bigg[...\bigg]
//MathArray opt;
istringstream is(str.c_str());
Parser(is).parse1(grid, 0, MathInset::MATH_MODE, false);
}
-
projects / lyx.git / blobdiff