#include "math_factory.h"
#include "math_kerninset.h"
#include "math_macro.h"
+#include "math_macroarg.h"
#include "math_macrotemplate.h"
-#include "math_parboxinset.h"
#include "math_parinset.h"
#include "math_rootinset.h"
#include "math_scriptinset.h"
#include "ref_inset.h"
#include "lyxlex.h"
-#include "support/std_sstream.h"
#include "debug.h"
+#include "support/convert.h"
+#include <sstream>
+
+using std::endl;
+using std::fill;
+
+using std::string;
+using std::ios;
using std::istream;
using std::istringstream;
using std::ostream;
-using std::ios;
-using std::endl;
-using std::fill;
using std::vector;
-using std::atoi;
//#define FILEDEBUG
}
+/*!
+ * Add the row \p cellrow to \p grid.
+ * \returns wether the row could be added. Adding a row can fail for
+ * environments like "equation" that have a fixed number of rows.
+ */
+bool addRow(MathGridInset & grid, MathGridInset::row_type & cellrow,
+ string const & vskip)
+{
+ ++cellrow;
+ if (cellrow == grid.nrows()) {
+ //lyxerr << "adding row " << cellrow << endl;
+ grid.addRow(cellrow - 1);
+ if (cellrow == grid.nrows()) {
+ // We can't add a row to this grid, so let's
+ // append the content of this cell to the previous
+ // one.
+ // This does not happen in well formed .lyx files,
+ // but LyX versions 1.3.x and older could create
+ // such files and tex2lyx can still do that.
+ --cellrow;
+ lyxerr << "ignoring extra row";
+ if (!vskip.empty())
+ lyxerr << " with extra space " << vskip;
+ lyxerr << '.' << endl;
+ return false;
+ }
+ }
+ grid.vcrskip(LyXLength(vskip), cellrow - 1);
+ return true;
+}
+
+
+/*!
+ * Add the column \p cellcol to \p grid.
+ * \returns wether the column could be added. Adding a column can fail for
+ * environments like "eqnarray" that have a fixed number of columns.
+ */
+bool addCol(MathGridInset & grid, MathGridInset::col_type & cellcol)
+{
+ ++cellcol;
+ if (cellcol == grid.ncols()) {
+ //lyxerr << "adding column " << cellcol << endl;
+ grid.addCol(cellcol - 1);
+ if (cellcol == grid.ncols()) {
+ // We can't add a column to this grid, so let's
+ // append the content of this cell to the previous
+ // one.
+ // This does not happen in well formed .lyx files,
+ // but LyX versions 1.3.x and older could create
+ // such files and tex2lyx can still do that.
+ --cellcol;
+ lyxerr << "ignoring extra column." << endl;
+ return false;
+ }
+ }
+ return true;
+}
+
+
// These are TeX's catcodes
enum CatCode {
catEscape, // 0 backslash
enum {
- FLAG_BRACE_LAST = 1 << 1, // last closing brace ends the parsing
+ FLAG_ALIGN = 1 << 0, // next & or \\ ends the parsing process
+ FLAG_BRACE_LAST = 1 << 1, // next closing brace ends the parsing
FLAG_RIGHT = 1 << 2, // next \\right ends the parsing process
FLAG_END = 1 << 3, // next \\end ends the parsing process
FLAG_BRACK_LAST = 1 << 4, // next closing bracket ends the parsing
};
-void catInit()
-{
- fill(theCatcode, theCatcode + 256, catOther);
- fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter);
- fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter);
-
- theCatcode[int('\\')] = catEscape;
- theCatcode[int('{')] = catBegin;
- theCatcode[int('}')] = catEnd;
- theCatcode[int('$')] = catMath;
- theCatcode[int('&')] = catAlign;
- theCatcode[int('\n')] = catNewline;
- theCatcode[int('#')] = catParameter;
- theCatcode[int('^')] = catSuper;
- theCatcode[int('_')] = catSub;
- theCatcode[int(0x7f)] = catIgnore;
- theCatcode[int(' ')] = catSpace;
- theCatcode[int('\t')] = catSpace;
- theCatcode[int('\r')] = catNewline;
- theCatcode[int('~')] = catActive;
- theCatcode[int('%')] = catComment;
-}
-
-
-
//
// Helper class for parsing
//
class Parser {
-
public:
///
typedef MathInset::mode_type mode_type;
void Parser::tokenize(string const & buffer)
{
- static bool init_done = false;
-
- if (!init_done) {
- catInit();
- init_done = true;
- }
-
- istringstream is(buffer.c_str(), ios::in | ios::binary);
+ istringstream is(buffer, ios::in | ios::binary);
char c;
while (is.get(c)) {
if (flags & FLAG_ITEM) {
- if (t.cat() == catBegin) {
+ if (t.cat() == catBegin) {
// skip the brace and collect everything to the next matching
// closing brace
parse1(grid, FLAG_BRACE_LAST, mode, numbered);
if (flags & FLAG_BRACE_LAST)
return;
error("found '}' unexpectedly");
- //lyx::Assert(0);
+ //BOOST_ASSERT(false);
//add(cell, '}', LM_TC_TEX);
}
else if (t.cat() == catAlign) {
- ++cellcol;
- //lyxerr << " column now " << cellcol << " max: " << grid.ncols() << endl;
- if (cellcol == grid.ncols()) {
- //lyxerr << "adding column " << cellcol << endl;
- grid.addCol(cellcol - 1);
- }
- cell = &grid.cell(grid.index(cellrow, cellcol));
+ //lyxerr << " column now " << (cellcol + 1)
+ // << " max: " << grid.ncols() << endl;
+ if (flags & FLAG_ALIGN)
+ return;
+ if (addCol(grid, cellcol))
+ cell = &grid.cell(grid.index(cellrow, cellcol));
}
else if (t.cat() == catSuper || t.cat() == catSub) {
//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);
+ parse(p->cell(p->idxOfScript(up)), FLAG_ITEM, mode);
if (limits) {
p->limits(limits);
limits = 0;
return;
}
- string arg = getArg('[', ']');
+ string const arg = getArg('[', ']');
if (!arg.empty())
- nargs = atoi(arg.c_str());
+ nargs = convert<int>(arg);
}
}
else if (t.cs() == "\\") {
- grid.vcrskip(LyXLength(getArg('[', ']')), cellrow);
- ++cellrow;
- cellcol = 0;
- if (cellrow == grid.nrows())
- grid.addRow(cellrow - 1);
- if (grid.asHullInset())
- grid.asHullInset()->numbered(cellrow, numbered);
- cell = &grid.cell(grid.index(cellrow, cellcol));
+ if (flags & FLAG_ALIGN)
+ return;
+ if (addRow(grid, cellrow, getArg('[', ']'))) {
+ cellcol = 0;
+ if (grid.asHullInset())
+ grid.asHullInset()->numbered(
+ cellrow, numbered);
+ cell = &grid.cell(grid.index(cellrow,
+ cellcol));
+ }
}
#if 0
}
// resize the table if necessary
for (int i = 0; i < cols; ++i) {
- ++cellcol;
- if (cellcol == grid.ncols()) {
- //lyxerr << "adding column " << cellcol << endl;
- grid.addCol(cellcol - 1);
+ if (addCol(grid, cellcol)) {
+ cell = &grid.cell(grid.index(
+ cellrow, cellcol));
+ // mark this as dummy
+ grid.cellinfo(grid.index(
+ cellrow, cellcol)).dummy_ = true;
}
- cell = &grid.cell(grid.index(cellrow, cellcol));
- // mark this as dummy
- grid.cellinfo(grid.index(cellrow, cellcol)).dummy_ = true;
}
- // the last cell is the real thng, not a dummy
+ // the last cell is the real thing, not a dummy
grid.cellinfo(grid.index(cellrow, cellcol)).dummy_ = false;
// read special alignment
}
else if (name == "split" || name == "cases" ||
- name == "gathered" || name == "aligned") {
+ name == "gathered" || name == "aligned" ||
+ name == "alignedat") {
cell->push_back(createMathInset(name));
parse2(cell->back(), FLAG_END, mode, false);
}
return;
}
+ else if (t.cs() == "color") {
+ MathAtom at = createMathInset(t.cs());
+ parse(at.nucleus()->cell(0), FLAG_ITEM, MathInset::TEXT_MODE);
+ parse(at.nucleus()->cell(1), flags, mode);
+ cell->push_back(at);
+ return;
+ }
+
else if (t.cs() == "substack") {
cell->push_back(createMathInset(t.cs()));
parse2(cell->back(), FLAG_ITEM, mode, false);
// Disabled
else if (1 && t.cs() == "ar") {
- MathXYArrowInset * p = new MathXYArrowInset;
+ auto_ptr<MathXYArrowInset> p(new MathXYArrowInset);
// try to read target
parse(p->cell(0), FLAG_OTPTION, mode);
// try to read label
//lyxerr << "read label: " << p->cell(1) << endl;
}
- cell->push_back(MathAtom(p));
+ cell->push_back(MathAtom(p.release()));
//lyxerr << "read cell: " << cell << endl;
}
#endif
if (l) {
if (l->inset == "font") {
cell->push_back(createMathInset(t.cs()));
- parse(cell->back().nucleus()->cell(0), FLAG_ITEM, asMode(mode, 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(mode, l->extra));
- return;
+ parse(cell->back().nucleus()->cell(0),
+ flags | FLAG_ALIGN, asMode(mode, l->extra));
+ if (prevToken().cat() != catAlign &&
+ prevToken().cs() != "\\")
+ return;
+ putback();
}
else if (l->inset == "style") {
cell->push_back(createMathInset(t.cs()));
- parse(cell->back().nucleus()->cell(0), flags, mode);
- return;
- }
-
- else if (l->inset == "parbox") {
- // read optional positioning and width
- 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(pos);
- cell->back().nucleus()->asParboxInset()->setWidth(width);
+ parse(cell->back().nucleus()->cell(0),
+ flags | FLAG_ALIGN, mode);
+ if (prevToken().cat() != catAlign &&
+ prevToken().cs() != "\\")
+ return;
+ putback();
}
else {
MathAtom at = createMathInset(t.cs());
for (MathInset::idx_type i = 0; i < at->nargs(); ++i)
- parse(at.nucleus()->cell(i), FLAG_ITEM, asMode(mode, l->extra));
+ parse(at.nucleus()->cell(i),
+ FLAG_ITEM, asMode(mode, l->extra));
cell->push_back(at);
}
}
// start = 1;
// at.nucleus()->cell(0) = opt;
//}
- for (MathInset::idx_type i = start; i < at->nargs(); ++i)
+ for (MathInset::idx_type i = start; i < at->nargs(); ++i) {
parse(at.nucleus()->cell(i), FLAG_ITEM, m);
+ skipSpaces();
+ }
cell->push_back(at);
}
}
void mathed_parse_cell(MathArray & ar, string const & str)
{
- istringstream is(str.c_str());
+ istringstream is(str);
mathed_parse_cell(ar, is);
}
bool mathed_parse_normal(MathAtom & t, string const & str)
{
- istringstream is(str.c_str());
+ istringstream is(str);
return Parser(is).parse(t);
}
void mathed_parse_normal(MathGridInset & grid, string const & str)
{
- istringstream is(str.c_str());
+ istringstream is(str);
Parser(is).parse1(grid, 0, MathInset::MATH_MODE, false);
}
+
+
+void initParser()
+{
+ fill(theCatcode, theCatcode + 256, catOther);
+ fill(theCatcode + 'a', theCatcode + 'z' + 1, catLetter);
+ fill(theCatcode + 'A', theCatcode + 'Z' + 1, catLetter);
+
+ theCatcode[int('\\')] = catEscape;
+ theCatcode[int('{')] = catBegin;
+ theCatcode[int('}')] = catEnd;
+ theCatcode[int('$')] = catMath;
+ theCatcode[int('&')] = catAlign;
+ theCatcode[int('\n')] = catNewline;
+ theCatcode[int('#')] = catParameter;
+ theCatcode[int('^')] = catSuper;
+ theCatcode[int('_')] = catSub;
+ theCatcode[int(0x7f)] = catIgnore;
+ theCatcode[int(' ')] = catSpace;
+ theCatcode[int('\t')] = catSpace;
+ theCatcode[int('\r')] = catNewline;
+ theCatcode[int('~')] = catActive;
+ theCatcode[int('%')] = catComment;
+}
projects / lyx.git / blobdiff