* 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 <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_casesinset.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 "lyxlex.h"
+#include "debug.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;
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_BOX = 1 << 5, // we are in a box
FLAG_ITEM = 1 << 7, // read a (possibly braced token)
FLAG_BLOCK = 1 << 8, // next block 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_;
};
+bool Token::isCR() const
+{
+ return cs_ == "\\" || cs_ == "cr" || cs_ == "crcr";
+}
+
string Token::asString() const
{
return cs_.size() ? cs_ : string(1, char_);
&& s.cat() == t.cat() && s.cs() == t.cs();
}
-bool operator!=(Token const & s, Token const & t)
-{
- return !(s == t);
-}
+// Angus' compiler says this is not needed
+//bool operator!=(Token const & s, Token const & t)
+//{
+// return !(s == t);
+//}
ostream & operator<<(ostream & os, Token const & t)
{
Token const & nextToken() const;
///
Token const & getToken();
+ /// skips spaces if any
+ void skipSpaces();
+ /// 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_] << '\n';
return good() ? tokens_[pos_++] : dummy;
}
+void Parser::skipSpaces()
+{
+ while (nextToken().cat() == catSpace)
+ getToken();
+}
+
+
+int Parser::readHLines()
+{
+ int num = 0;
+ skipSpaces();
+ while (nextToken().cs() == "hline") {
+ getToken();
+ ++num;
+ skipSpaces();
+ }
+ return num;
+}
+
+
void Parser::putback()
{
--pos_;
return false;
}
- const int cols = p->ncols();
+ MathInset::col_type const 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) {
+ for (MathInset::col_type col = 0; col < cols; ++col) {
//lyxerr << "reading cell " << row << " " << col << "\n";
parse_into(p->cell(col + row * cols), FLAG_BLOCK);
- // 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}";
-
- while (nextToken().cat() == catSpace)
- getToken();
+ skipSpaces();
if (getToken().cs() != "newcommand") {
lyxerr << "\\newcommand expected\n";
}
if (getToken().cat() != catBegin) {
- lyxerr << "'{' expected\n";
+ lyxerr << "'{' in \\newcommand expected (1)\n";
return name;
}
string arg = getArg('[', ']');
int narg = arg.empty() ? 0 : atoi(arg.c_str());
+
+ if (getToken().cat() != catBegin) {
+ lyxerr << "'{' in \\newcommand expected (2)\n";
+ return name;
+ }
+
MathArray ar;
- parse_into(ar, FLAG_BRACE | FLAG_BRACE_LAST);
+ parse_into(ar, FLAG_BRACE_LAST);
MathMacroTable::create(name, narg, ar);
-
return name;
}
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)
{
- MathTextCodes yyvarcode = LM_TC_MIN;
-
bool panic = false;
int limits = 0;
}
}
- 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.cs() == "\\")
- return;
- if (t.cs() == "end") {
- getArg('{', '}');
+ if (t.cat() == catAlign || t.isCR() || t.cs() == "end") {
+ 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(), yyvarcode);
+ add(array, t.character(), code);
- else if (t.cat() == catSpace &&
- (yyvarcode == LM_TC_TEXTRM || code == LM_TC_TEXTRM))
- add(array, ' ', yyvarcode);
+ 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);
+ 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.size() == 2 && ar.back()->asScriptInset())) {
+ 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";
add(array, '}', LM_TC_TEX);
}
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(), yyvarcode);
+ 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") {
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(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 if (name == "cases") {
+ array.push_back(MathAtom(new MathCasesInset));
+ parse_lines(array.back(), false, 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();
- } else {
- // not found -> use everything as "numerator"
- p->cell(0).swap(array);
- parse_into(p->cell(1), FLAG_BLOCK);
- }
- array.push_back(MathAtom(p));
+ array.swap(p->cell(0));
+ parse_into(p->cell(1), flags, code);
+ array.push_back(p);
+ return;
}
-/*
// Disabled
+#if 0
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);
}
-*/
+#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
//lyxerr << "ending font\n";
}
- else if (l->token == LM_TK_OLDFONT)
- yyvarcode = static_cast<MathTextCodes>(l->id);
+ else if (l->token == LM_TK_OLDFONT) {
+ 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 {
MathAtom p = createMathInset(t.cs());
projects / lyx.git / blobdiff