X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulabase.C;h=18e1c97ba2a17f4b24e8e18d7bab9366309457b4;hb=30705f0927e5e2a3542ff328847014c43a11e32f;hp=49db390786cbc6aafa54276a34eb1e08371daeaf;hpb=4a40b711f2fe6ce8638a15f5bc7644a581cab016;p=lyx.git diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C index 49db390786..18e1c97ba2 100644 --- a/src/mathed/formulabase.C +++ b/src/mathed/formulabase.C @@ -33,12 +33,13 @@ #include "gettext.h" #include "LaTeXFeatures.h" #include "debug.h" -#include "support/LOstream.h" +#include "support/lstrings.h" #include "LyXView.h" #include "Painter.h" #include "font.h" #include "math_arrayinset.h" #include "math_spaceinset.h" +#include "math_macrotable.h" #include "support/lyxlib.h" #include "mathed/support.h" #include "undo_funcs.h" @@ -49,9 +50,7 @@ using std::vector; extern char const * latex_special_chars; -int greek_kb_flag = 0; extern char const * latex_mathenv[]; -LyXFont * Math_Fonts = 0; MathCursor * mathcursor = 0; @@ -72,15 +71,15 @@ string nicelabel(string const & label) void handleFont(BufferView * bv, MathTextCodes t) { - if (mathcursor->Selection()) + if (mathcursor->selection()) bv->lockedInsetStoreUndo(Undo::EDIT); mathcursor->handleFont(t); } -void handleAccent(BufferView * bv, string const & name, int code) +void handleAccent(BufferView * bv, string const & name) { bv->lockedInsetStoreUndo(Undo::EDIT); - mathcursor->handleAccent(name, code); + mathcursor->handleAccent(name); } void handleDelim(BufferView * bv, int l, int r) @@ -104,154 +103,25 @@ bool openNewInset(BufferView * bv, UpdatableInset * new_inset) } -} // namespaces - - - -LyXFont WhichFont(short type, int size) -{ - LyXFont f; - - if (!Math_Fonts) - mathed_init_fonts(); - - switch (type) { - case LM_TC_SYMB: - f = Math_Fonts[2]; - break; - - case LM_TC_BSYM: - f = Math_Fonts[2]; - break; - - case LM_TC_VAR: - case LM_TC_IT: - f = Math_Fonts[0]; - break; - - case LM_TC_BF: - f = Math_Fonts[3]; - break; - - case LM_TC_SF: - f = Math_Fonts[7]; - break; - - case LM_TC_CAL: - f = Math_Fonts[4]; - break; - - case LM_TC_TT: - f = Math_Fonts[5]; - break; - - case LM_TC_SPECIAL: //f = Math_Fonts[0]; break; - case LM_TC_TEXTRM: - case LM_TC_TEX: - case LM_TC_RM: - f = Math_Fonts[6]; - break; - - default: - f = Math_Fonts[1]; - break; - } - - switch (size) { - case LM_ST_DISPLAY: - if (type == LM_TC_BSYM) { - f.incSize(); - f.incSize(); - } - break; - - case LM_ST_TEXT: - break; - - case LM_ST_SCRIPT: - f.decSize(); - break; - - case LM_ST_SCRIPTSCRIPT: - f.decSize(); - f.decSize(); - break; - - default: - lyxerr << "Math Error: wrong font size: " << size << endl; - break; - } - - if (type != LM_TC_TEXTRM) - f.setColor(LColor::math); - - if (type == LM_TC_TEX) - f.setColor(LColor::latex); - - return f; -} - - -namespace { - -void mathed_init_fonts() -{ - Math_Fonts = new LyXFont[8]; //DEC cxx cannot initialize all fonts - //at once (JMarc) rc - - for (int i = 0 ; i < 8 ; ++i) { - Math_Fonts[i] = LyXFont(LyXFont::ALL_SANE); - } - - Math_Fonts[0].setShape(LyXFont::ITALIC_SHAPE); - - Math_Fonts[1].setFamily(LyXFont::SYMBOL_FAMILY); - - Math_Fonts[2].setFamily(LyXFont::SYMBOL_FAMILY); - Math_Fonts[2].setShape(LyXFont::ITALIC_SHAPE); - - Math_Fonts[3].setSeries(LyXFont::BOLD_SERIES); - - Math_Fonts[4].setFamily(LyXFont::SANS_FAMILY); - Math_Fonts[4].setShape(LyXFont::ITALIC_SHAPE); - - Math_Fonts[5].setFamily(LyXFont::TYPEWRITER_FAMILY); - - Math_Fonts[6].setFamily(LyXFont::ROMAN_FAMILY); - - Math_Fonts[7].setFamily(LyXFont::SANS_FAMILY); -} - - -// returns the nearest enclosing matrix +// returns the nearest enclosing grid MathArrayInset * matrixpar(int & idx) { idx = 0; - return - static_cast - (mathcursor ? mathcursor->enclosing(LM_OT_MATRIX, idx) : 0); + return (mathcursor ? mathcursor->enclosingArray(idx) : 0); } } // namespace anon -InsetFormulaBase::InsetFormulaBase(MathInset * par) - : par_(par) -{} - - -InsetFormulaBase::InsetFormulaBase(InsetFormulaBase const & f) - : UpdatableInset(f), par_(static_cast(f.par_->clone())) -{} - -InsetFormulaBase::~InsetFormulaBase() +InsetFormulaBase::InsetFormulaBase() { #ifdef WITH_WARNINGS -#warning leak this for a while... +#warning This is needed as long the math parser is not re-entrant #endif - //delete par_; + MathMacroTable::builtinMacros(); + //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n"; } @@ -260,6 +130,7 @@ void InsetFormulaBase::read(Buffer const *, LyXLex & lex) read(lex); } + void InsetFormulaBase::write(Buffer const *, ostream & os) const { write(os); @@ -306,7 +177,7 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int) if (!bv->lockInset(this)) lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl; - par_->Metrics(LM_ST_TEXT); + metrics(); //bv->updateInset(this, false); if (x == 0) mathcursor->first(); @@ -318,25 +189,31 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int) } +void InsetFormulaBase::edit(BufferView * bv, bool front) +{ + edit(bv, front ? 0 : 1, 0, 0); +} + + void InsetFormulaBase::insetUnlock(BufferView * bv) { if (mathcursor) { - if (mathcursor->InMacroMode()) { - mathcursor->MacroModeClose(); - updateLocal(bv); + if (mathcursor->inMacroMode()) { + mathcursor->macroModeClose(); + updateLocal(bv, true); } delete mathcursor; + mathcursor = 0; } - mathcursor = 0; bv->updateInset(this, false); } void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const { - mathcursor->GetPos(x, y); - x -= par_->xo(); - y -= par_->yo(); + mathcursor->getPos(x, y); + x -= par()->xo(); + y -= par()->yo(); } @@ -350,14 +227,12 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv) else { int x; int y; - mathcursor->GetPos(x, y); - //x -= par_->xo(); - y -= par_->yo(); - - LyXFont font = WhichFont(LM_TC_TEXTRM, LM_ST_TEXT); - int const asc = lyxfont::maxAscent(font); - int const desc = lyxfont::maxDescent(font); - + mathcursor->getPos(x, y); + //x -= par()->xo(); + y -= par()->yo(); + int asc; + int desc; + math_font_max_dim(LM_TC_TEXTRM, LM_ST_TEXT, asc, desc); bv->showLockedInsetCursor(x, y, asc, desc); } @@ -371,12 +246,12 @@ void InsetFormulaBase::showInsetCursor(BufferView * bv, bool) if (mathcursor) { int x; int y; - mathcursor->GetPos(x, y); - x -= par_->xo(); - y -= par_->yo(); - LyXFont font = WhichFont(LM_TC_TEXTRM, LM_ST_TEXT); - int const asc = lyxfont::maxAscent(font); - int const desc = lyxfont::maxDescent(font); + mathcursor->getPos(x, y); + x -= par()->xo(); + y -= par()->yo(); + int asc; + int desc; + math_font_max_dim(LM_TC_TEXTRM, LM_ST_TEXT, asc, desc); bv->fitLockedInsetCursor(x, y, asc, desc); } toggleInsetCursor(bv); @@ -393,10 +268,8 @@ void InsetFormulaBase::hideInsetCursor(BufferView * bv) void InsetFormulaBase::toggleInsetSelection(BufferView * bv) { - if (!mathcursor) - return; - - bv->updateInset(this, false); + if (mathcursor) + bv->updateInset(this, false); } @@ -406,10 +279,10 @@ vector const InsetFormulaBase::getLabelList() const } -void InsetFormulaBase::updateLocal(BufferView * bv) +void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty) { - par_->Metrics(LM_ST_TEXT); - bv->updateInset(this, true); + metrics(); + bv->updateInset(this, dirty); } @@ -418,9 +291,9 @@ void InsetFormulaBase::insetButtonRelease(BufferView * bv, { if (mathcursor) { hideInsetCursor(bv); - x += par_->xo(); - y += par_->yo(); - mathcursor->SetPos(x, y); + x += par()->xo(); + y += par()->yo(); + mathcursor->setPos(x, y); showInsetCursor(bv); if (sel_flag) { sel_flag = false; @@ -438,8 +311,8 @@ void InsetFormulaBase::insetButtonPress(BufferView * bv, sel_flag = false; sel_x = x; sel_y = y; - if (mathcursor && mathcursor->Selection()) { - mathcursor->SelClear(); + if (mathcursor && mathcursor->selection()) { + mathcursor->selClear(); bv->updateInset(this, false); } } @@ -451,17 +324,17 @@ void InsetFormulaBase::insetMotionNotify(BufferView * bv, if (sel_x && sel_y && abs(x-sel_x) > 4 && !sel_flag) { sel_flag = true; hideInsetCursor(bv); - mathcursor->SetPos(sel_x + par_->xo(), sel_y + par_->yo()); - mathcursor->SelStart(); + mathcursor->setPos(sel_x + par()->xo(), sel_y + par()->yo()); + mathcursor->selStart(); showInsetCursor(bv); - mathcursor->GetPos(sel_x, sel_y); + mathcursor->getPos(sel_x, sel_y); } else if (sel_flag) { hideInsetCursor(bv); - x += par_->xo(); - y += par_->yo(); - mathcursor->SetPos(x, y); + x += par()->xo(); + y += par()->yo(); + mathcursor->setPos(x, y); showInsetCursor(bv); - mathcursor->GetPos(x, y); + mathcursor->getPos(x, y); if (sel_x != x || sel_y != y) bv->updateInset(this, false); sel_x = x; @@ -472,8 +345,7 @@ void InsetFormulaBase::insetMotionNotify(BufferView * bv, void InsetFormulaBase::insetKeyPress(XKeyEvent *) { - lyxerr[Debug::MATHED] - << "Used InsetFormulaBase::InsetKeyPress." << endl; + lyxerr[Debug::MATHED] << "Used InsetFormulaBase::InsetKeyPress." << endl; } @@ -485,13 +357,15 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, //lyxerr << "InsetFormulaBase::LocalDispatch: act: " << action // << " arg: '" << arg << "' cursor: " << mathcursor << "\n"; + static int greek_kb_flag = 0; + if (!mathcursor) return UNDISPATCHED; MathTextCodes varcode = LM_TC_MIN; - bool was_macro = mathcursor->InMacroMode(); + bool was_macro = mathcursor->inMacroMode(); bool sel = false; - bool was_selection = mathcursor->Selection(); + bool was_selection = mathcursor->selection(); RESULT result = DISPATCHED; hideInsetCursor(bv); @@ -509,8 +383,8 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, sel = true; // fall through... case LFUN_RIGHT: - result = DISPATCH_RESULT(mathcursor->Right(sel)); - updateLocal(bv); + result = DISPATCH_RESULT(mathcursor->right(sel)); + updateLocal(bv, false); break; @@ -518,8 +392,8 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, sel = true; // fall through case LFUN_LEFT: - result = DISPATCH_RESULT(mathcursor->Left(sel)); - updateLocal(bv); + result = DISPATCH_RESULT(mathcursor->left(sel)); + updateLocal(bv, false); break; @@ -527,8 +401,8 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, sel = true; case LFUN_UP: - result = DISPATCH_RESULT(mathcursor->Up(sel)); - updateLocal(bv); + result = DISPATCH_RESULT(mathcursor->up(sel)); + updateLocal(bv, false); break; @@ -536,56 +410,51 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, sel = true; case LFUN_DOWN: - result = DISPATCH_RESULT(mathcursor->Down(sel)); - updateLocal(bv); + result = DISPATCH_RESULT(mathcursor->down(sel)); + updateLocal(bv, false); break; case LFUN_HOME: - mathcursor->Home(); - updateLocal(bv); + mathcursor->home(); + updateLocal(bv, false); break; case LFUN_END: - mathcursor->End(); - updateLocal(bv); + mathcursor->end(); + updateLocal(bv, false); break; case LFUN_DELETE_LINE_FORWARD: bv->lockedInsetStoreUndo(Undo::DELETE); - mathcursor->DelLine(); - updateLocal(bv); + mathcursor->delLine(); + updateLocal(bv, true); break; case LFUN_TAB: mathcursor->idxNext(); - updateLocal(bv); + updateLocal(bv, false); break; case LFUN_SHIFT_TAB: mathcursor->idxPrev(); - updateLocal(bv); + updateLocal(bv, false); break; case LFUN_TABINSERT: bv->lockedInsetStoreUndo(Undo::EDIT); mathcursor->splitCell(); - updateLocal(bv); + updateLocal(bv, true); break; case LFUN_BACKSPACE: - if (!mathcursor->InMacroMode() && mathcursor->pos() == 0) { - bv->lockedInsetStoreUndo(Undo::DELETE); - mathcursor->pullArg(); - bv->updateInset(this, true); - break; - } - if (!mathcursor->Left()) - break; - // fall through... + bv->lockedInsetStoreUndo(Undo::DELETE); + mathcursor->backspace(); + bv->updateInset(this, true); + break; case LFUN_DELETE: bv->lockedInsetStoreUndo(Undo::DELETE); - mathcursor->Delete(); + mathcursor->erase(); bv->updateInset(this, true); break; @@ -602,30 +471,29 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, int y1; istringstream is(arg.c_str()); is >> x >> y; - par_->GetXY(x1, y1); - mathcursor->SetPos(x1 + x, y1 + y); - updateLocal(bv); + par()->getXY(x1, y1); + mathcursor->setPos(x1 + x, y1 + y); + updateLocal(bv, false); } break; - // cursor selection ---------------------------- case LFUN_PASTE: if (was_macro) - mathcursor->MacroModeClose(); + mathcursor->macroModeClose(); bv->lockedInsetStoreUndo(Undo::INSERT); - mathcursor->SelPaste(); - updateLocal(bv); + mathcursor->selPaste(); + updateLocal(bv, true); break; case LFUN_CUT: bv->lockedInsetStoreUndo(Undo::DELETE); - mathcursor->SelCut(); - updateLocal(bv); + mathcursor->selCut(); + updateLocal(bv, true); break; case LFUN_COPY: - mathcursor->SelCopy(); + mathcursor->selCopy(); break; case LFUN_HOMESEL: @@ -636,16 +504,16 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, // --- accented characters ------------------------------ - case LFUN_UMLAUT: handleAccent(bv, "ddot", LM_ddot); break; - case LFUN_CIRCUMFLEX: handleAccent(bv, "hat", LM_hat); break; - case LFUN_GRAVE: handleAccent(bv, "grave", LM_grave); break; - case LFUN_ACUTE: handleAccent(bv, "acute", LM_acute); break; - case LFUN_TILDE: handleAccent(bv, "tilde", LM_tilde); break; - case LFUN_MACRON: handleAccent(bv, "bar", LM_bar); break; - case LFUN_DOT: handleAccent(bv, "dot", LM_dot); break; - case LFUN_CARON: handleAccent(bv, "check", LM_check); break; - case LFUN_BREVE: handleAccent(bv, "breve", LM_breve); break; - case LFUN_VECTOR: handleAccent(bv, "vec", LM_vec); break; + case LFUN_UMLAUT: handleAccent(bv, "ddot"); break; + case LFUN_CIRCUMFLEX: handleAccent(bv, "hat"); break; + case LFUN_GRAVE: handleAccent(bv, "grave"); break; + case LFUN_ACUTE: handleAccent(bv, "acute"); break; + case LFUN_TILDE: handleAccent(bv, "tilde"); break; + case LFUN_MACRON: handleAccent(bv, "bar"); break; + case LFUN_DOT: handleAccent(bv, "dot"); break; + case LFUN_CARON: handleAccent(bv, "check"); break; + case LFUN_BREVE: handleAccent(bv, "breve"); break; + case LFUN_VECTOR: handleAccent(bv, "vec"); break; // Greek mode case LFUN_GREEK: @@ -678,87 +546,100 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, //bv->owner()->message(_("math text mode toggled")); break; -#ifndef NO_LATEX - case LFUN_TEX: - if (!mathcursor->Selection()) { - mathcursor->handleFont(LM_TC_TEX); - //bv->owner()->message(_("TeX mode toggled")); - } - break; -#endif - case LFUN_MATH_LIMITS: bv->lockedInsetStoreUndo(Undo::INSERT); if (mathcursor->toggleLimits()) - updateLocal(bv); + updateLocal(bv, true); break; case LFUN_MATH_SIZE: if (!arg.empty()) { bv->lockedInsetStoreUndo(Undo::INSERT); latexkeys const * l = in_word_set(arg); - mathcursor->SetSize(MathStyles(l ? l->id : static_cast(-1))); - updateLocal(bv); + mathcursor->setSize(MathStyles(l ? l->id : static_cast(-1))); + updateLocal(bv, true); } break; case LFUN_INSERT_MATRIX: if (!arg.empty()) { bv->lockedInsetStoreUndo(Undo::INSERT); - mathcursor->Interpret("matrix " + arg); - updateLocal(bv); + mathcursor->interpret("matrix " + arg); + updateLocal(bv, true); } break; case LFUN_INSERT_MATH: if (!arg.empty()) { bv->lockedInsetStoreUndo(Undo::INSERT); - mathcursor->Interpret(arg); - updateLocal(bv); + mathcursor->interpret(arg); + updateLocal(bv, true); } break; + case LFUN_MATH_SPACE: + { + bv->lockedInsetStoreUndo(Undo::EDIT); + MathSpaceInset * p = mathcursor->prevSpaceInset(); + if (p) + p->incSpace(); + else + mathcursor->insert(new MathSpaceInset(1)); + updateLocal(bv, true); + break; + } + case LFUN_MATH_DELIM: { bv->lockedInsetStoreUndo(Undo::INSERT); - int ilt = '('; - int irt = '.'; static const string vdelim("(){}[]./|"); //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n"; if (arg.empty()) break; + // try to read integers first + int ilt = '('; + int irt = '.'; istringstream is(arg.c_str()); - string lt; - string rt; - is >> lt >> rt; - //lyxerr << "formulabase::LFUN_MATH_DELIM, lt: '" << lt << "'\n"; - //lyxerr << "formulabase::LFUN_MATH_DELIM, rt: '" << rt << "'\n"; - - if (lt.size() > 1) { - latexkeys const * l = in_word_set(lt); - if (l) - ilt = l->id; - } else if (vdelim.find(lt[0]) != string::npos) - ilt = lt[0]; - - if (rt.size() > 1) { - latexkeys const * l = in_word_set(rt); - if (l) - irt = l->id; - } else if (vdelim.find(rt[0]) != string::npos) - irt = rt[0]; + is >> ilt >> irt; + + if (!is) { // ok, the beasties are no integers... try something else + ilt = '('; + irt = '.'; + + istringstream is(arg.c_str()); + string lt; + string rt; + is >> lt >> rt; + //lyxerr << "formulabase::LFUN_MATH_DELIM, lt: '" << lt << "'\n"; + //lyxerr << "formulabase::LFUN_MATH_DELIM, rt: '" << rt << "'\n"; + + if (lt.size() > 1) { + latexkeys const * l = in_word_set(lt); + if (l) + ilt = l->id; + } else if (vdelim.find(lt[0]) != string::npos) + ilt = lt[0]; + + if (rt.size() > 1) { + latexkeys const * l = in_word_set(rt); + if (l) + irt = l->id; + } else if (vdelim.find(rt[0]) != string::npos) + irt = rt[0]; + } handleDelim(bv, ilt, irt); - updateLocal(bv); + updateLocal(bv, true); break; } case LFUN_PROTECTEDSPACE: + //lyxerr << " called LFUN_PROTECTEDSPACE\n"; bv->lockedInsetStoreUndo(Undo::INSERT); mathcursor->insert(new MathSpaceInset(1)); - updateLocal(bv); + updateLocal(bv, true); break; case LFUN_UNDO: @@ -775,7 +656,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->halign(arg.size() ? arg[0] : 'c', p->col(idx)); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -788,7 +669,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->valign(arg.size() ? arg[0] : 'c'); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -801,7 +682,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->addRow(p->row(idx)); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -814,7 +695,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->delRow(p->row(idx)); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -826,7 +707,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->addCol(p->col(idx)); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -838,7 +719,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (!p) break; p->delCol(p->col(idx)); - updateLocal(bv); + updateLocal(bv, true); break; } @@ -849,7 +730,10 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, default: if ((action == -1 || action == LFUN_SELFINSERT) && !arg.empty()) { unsigned char c = arg[0]; - //lyxerr << "char: '" << c << "' int: " << int(c) << endl; + + lyxerr << "Action: " << action << endl; + + lyxerr << "char: '" << c << "' int: " << int(c) << endl; //owner_->getIntl()->getTrans().TranslateAndInsert(c, lt); //lyxerr << "trans: '" << c << "' int: " << int(c) << endl; bv->lockedInsetStoreUndo(Undo::INSERT); @@ -861,11 +745,11 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, if (isalpha(c)) { if (mathcursor->getLastCode() == LM_TC_TEX) { - mathcursor->MacroModeOpen(); + mathcursor->macroModeOpen(); mathcursor->clearLastCode(); varcode = LM_TC_MIN; } else if (!varcode) { - short f = mathcursor->getLastCode() ? + MathTextCodes f = mathcursor->getLastCode() ? mathcursor->getLastCode() : mathcursor->nextCode(); varcode = MathIsAlphaFont(f) ? @@ -879,7 +763,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, char greek[26] = {'A', 'B', 'X', 0 , 'E', 0 , 0 , 'H', 'I', 0 , 'K', 0 , 'M', 'N', 'O', 0 , 0 , 'P', 0 , 'T', - 'Y', 0, 0, 0, 0 , 'Z' }; + 0, 0, 0, 0, 0 , 'Z' }; if ('A' <= c && c <= 'Z' && greek[c - 'A']) { char_code = LM_TC_RM; @@ -890,7 +774,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, mathcursor->insert(c, char_code); - if (greek_kb_flag && char_code == LM_TC_RM ) + if (greek_kb_flag && char_code == LM_TC_RM) mathcursor->setLastCode(LM_TC_VAR); varcode = LM_TC_MIN; @@ -902,7 +786,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, mathcursor->insert(c, LM_TC_TEX); if (c == '{') { mathcursor->insert('}', LM_TC_TEX); - mathcursor->Left(); + mathcursor->left(); } mathcursor->clearLastCode(); // varcode = LM_TC_MIN; @@ -911,7 +795,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, mathcursor->clearLastCode(); // varcode = LM_TC_MIN; } else if ('0' <= c && c <= '9' && (varcode == LM_TC_TEX||was_macro)) { - mathcursor->MacroModeOpen(); + mathcursor->macroModeOpen(); mathcursor->clearLastCode(); mathcursor->insert(c, LM_TC_MIN); } else if (('0' <= c && c <= '9') || strchr(";:!|[]().,?", c)) { @@ -933,35 +817,35 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, char s[2]; s[0] = c; s[1] = 0; - mathcursor->Interpret(s); - } else if (c == ' ') { + mathcursor->interpret(s); + } else if (c == ' ') { if (!varcode) { - short f = (mathcursor->getLastCode()) ? + MathTextCodes f = (mathcursor->getLastCode()) ? mathcursor->getLastCode() : mathcursor->nextCode(); - varcode = MathIsAlphaFont(f) ? - static_cast(f) : - LM_TC_VAR; + varcode = MathIsAlphaFont(f) ? f : LM_TC_VAR; } - if (varcode == LM_TC_TEXTRM) { + if (varcode == LM_TC_TEXTRM) mathcursor->insert(c, LM_TC_TEXTRM); - } else if (was_macro) { - mathcursor->MacroModeClose(); - } else { - if (!mathcursor->pop()) - result = FINISHED; + else if (was_macro) + mathcursor->macroModeClose(); + else if (mathcursor->pop()) mathcursor->plainRight(); + else { + // this would not work if the inset is in an table! + //bv->text->cursorRight(bv, true); + result = FINISHED; } } else if (c == '\'' || c == '@') { - mathcursor->insert (c, LM_TC_VAR); + mathcursor->insert(c, LM_TC_VAR); } else if (c == '\\') { if (was_macro) - mathcursor->MacroModeClose(); + mathcursor->macroModeClose(); bv->owner()->message(_("TeX mode")); mathcursor->setLastCode(LM_TC_TEX); } - updateLocal(bv); + updateLocal(bv, true); } else if (action == LFUN_MATH_PANEL) { result = UNDISPATCHED; } else { @@ -972,15 +856,11 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, mathcursor->normalize(); - if (mathcursor && was_macro != mathcursor->InMacroMode() - && action >= 0 - && action != LFUN_BACKSPACE) - updateLocal(bv); + if (was_macro != mathcursor->inMacroMode() + && action >= 0 && action != LFUN_BACKSPACE) + updateLocal(bv, true); - //if (mathcursor) - // updateLocal(bv); - - if (mathcursor && (mathcursor->Selection() || was_selection)) + if (mathcursor->selection() || was_selection) toggleInsetSelection(bv); if (result == DISPATCHED || result == DISPATCHED_NOUPDATE || @@ -993,68 +873,12 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action, } - -/* FIXME: math-greek-toggle seems to work OK, but math-greek doesn't turn - * on greek mode */ -bool math_insert_greek(BufferView * bv, char c) -{ - if (!bv->available()) - return false; - - if (!isalpha(c)) - return false; - - string tmp; - tmp = c; - if (!bv->theLockingInset() || bv->theLockingInset()->isTextInset()) { - int greek_kb_flag_save = greek_kb_flag; - InsetFormula * new_inset = new InsetFormula(); - bv->beforeChange(bv->text); - if (!bv->insertInset(new_inset)) { - delete new_inset; - return false; - } - //Update(1);//BUG - new_inset->edit(bv, 0, 0, 0); - new_inset->localDispatch(bv, LFUN_SELFINSERT, tmp); - if (greek_kb_flag_save < 2) { - bv->unlockInset(new_inset); // bv->theLockingInset()); - bv->text->cursorRight(bv, true); - } - } else - if (bv->theLockingInset()->lyxCode() == Inset::MATH_CODE || - bv->theLockingInset()->lyxCode() == Inset::MATHMACRO_CODE) - static_cast(bv->theLockingInset())->localDispatch(bv, LFUN_SELFINSERT, tmp); - else - lyxerr << "Math error: attempt to write on a wrong " - "class of inset." << endl; - return true; -} - - - Inset::Code InsetFormulaBase::lyxCode() const { return Inset::MATH_CODE; } -LyXFont const InsetFormulaBase::convertFont(LyXFont const & f) const -{ - // We have already discussed what was here - LyXFont font(f); -#ifndef NO_LATEX - font.setLatex(LyXFont::OFF); -#endif - return font; -} - -MathInset * InsetFormulaBase::par() const -{ - return par_; -} - - void mathDispatchCreation(BufferView * bv, string const & arg, bool display) { if (bv->available()) { @@ -1104,10 +928,10 @@ void mathDispatchMathImportSelection(BufferView * bv, string const & arg) void mathDispatchMathMacro(BufferView * bv, string const & arg) { if (bv->available()) { - string s(arg); - if (s.empty()) + if (arg.empty()) bv->owner()->getLyXFunc()->setErrorMessage(N_("Missing argument")); else { + string s(arg); string const s1 = token(s, ' ', 1); int const na = s1.empty() ? 0 : lyx::atoi(s1); openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), na)); @@ -1135,12 +959,10 @@ void mathDispatchInsertMatrix(BufferView * bv, string const & arg) void mathDispatchInsertMath(BufferView * bv, string const & arg) { if (bv->available()) { - if (arg.size() && arg[0] == '\\') { - InsetFormula * f = new InsetFormula(arg); - openNewInset(bv, f); - } else { + if (arg.size() && arg[0] == '\\') + openNewInset(bv, new InsetFormula(arg)); + else mathDispatchMathMode(bv, arg); - } } }