#include "InsetMathNest.h"
#include "InsetMathArray.h"
+#include "InsetMathAMSArray.h"
#include "InsetMathBig.h"
#include "InsetMathBox.h"
#include "InsetMathBrace.h"
#include "Encoding.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "LyXFunc.h"
+#include "LyX.h"
#include "LyXRC.h"
#include "OutputParams.h"
#include "Text.h"
using cap::selClearOrDel;
-InsetMathNest::InsetMathNest(idx_type nargs)
- : cells_(nargs), lock_(false), mouse_hover_(false)
-{}
+InsetMathNest::InsetMathNest(Buffer * buf, idx_type nargs)
+ : InsetMath(buf), cells_(nargs), lock_(false), mouse_hover_(false)
+{
+ setBuffer(*buf);
+}
InsetMathNest::InsetMathNest(InsetMathNest const & inset)
}
+void InsetMathNest::setBuffer(Buffer & buffer)
+{
+ InsetMath::setBuffer(buffer);
+ for (idx_type i = 0, n = nargs(); i != n; ++i) {
+ MathData & data = cell(i);
+ for (size_t j = 0; j != data.size(); ++j)
+ data[j].nucleus()->setBuffer(buffer);
+ }
+}
+
+
InsetMath::idx_type InsetMathNest::nargs() const
{
return cells_.size();
}
+void InsetMathNest::updateLabels(ParIterator const & it, UpdateType utype)
+{
+ for (idx_type i = 0, n = nargs(); i != n; ++i)
+ cell(i).updateLabels(it, utype);
+}
+
+
+
bool InsetMathNest::idxNext(Cursor & cur) const
{
LASSERT(&cur.inset() == this, /**/);
int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const
{
- WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun,
- runparams.encoding);
+ WriteStream wi(os, runparams.moving_arg, true,
+ runparams.dryrun ? WriteStream::wsDryrun : WriteStream::wsDefault,
+ runparams.encoding);
write(wi);
return wi.line();
}
if (cur.inset().asInsetMath()->name() == font)
cur.handleFont(to_utf8(font));
else
- handleNest(cur, createInsetMath(font), arg);
+ handleNest(cur, createInsetMath(font, cur.buffer()), arg);
}
font.fromString(to_utf8(arg), b);
if (font.fontInfo().color() != Color_inherit &&
font.fontInfo().color() != Color_ignore)
- handleNest(cur, MathAtom(new InsetMathColor(true, font.fontInfo().color())));
+ handleNest(cur, MathAtom(new InsetMathColor(buffer_, true, font.fontInfo().color())));
// FIXME: support other font changes here as well?
}
void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
{
- //lyxerr << "InsetMathNest: request: " << cmd << endl;
+ //LYXERR0("InsetMathNest: request: " << cmd);
Parse::flags parseflg = Parse::QUIET | Parse::USETEXT;
is >> n;
topaste = cap::selection(n);
}
- cur.niceInsert(topaste, parseflg);
+ cur.niceInsert(topaste, parseflg, false);
cur.clearSelection(); // bug 393
+ // FIXME audit setBuffer/updateLabels calls
+ cur.buffer()->updateLabels();
cur.finishUndo();
break;
}
// Prevent stale position >= size crash
// Probably not necessary anymore, see eraseSelection (gb 2005-10-09)
cur.normalize();
+ // FIXME audit setBuffer/updateLabels calls
+ cur.buffer()->updateLabels();
break;
case LFUN_COPY:
cur.insert(arg);
break;
}
- // Don't record undo steps if we are in macro mode and
+ // Don't record undo steps if we are in macro mode and thus
// cmd.argument is the next character of the macro name.
// Otherwise we'll get an invalid cursor if we undo after
// the macro was finished and the macro is a known command,
// InsetMathFrac -> a pos value > 0 is invalid.
// A side effect is that an undo before the macro is finished
// undoes the complete macro, not only the last character.
- if (!cur.inMacroMode()) {
- MathMacro const * macro = 0;
- if (cur.pos() > 0 && cmd.argument() != "\\")
- macro = cur.inset().asInsetMath()->asMacro();
-
- if (!macro)
- cur.recordUndoSelection();
- }
+ // At the time we hit '\' we are not in macro mode, still.
+ if (!cur.inMacroMode())
+ cur.recordUndoSelection();
// spacial handling of space. If we insert an inset
// via macro mode, we want to put the cursor inside it
handleFont(cur, cmd.argument(), "textnormal");
break;
+ case LFUN_FONT_UNDERLINE:
+ cur.recordUndo();
+ cur.handleNest(createInsetMath("underline", cur.buffer()));
+ break;
case LFUN_MATH_MODE: {
#if 1
// ignore math-mode on when already in math mode
selClearOrDel(cur);
//cur.plainInsert(MathAtom(new InsetMathMBox(cur.bv())));
if (currentMode() <= Inset::TEXT_MODE)
- cur.plainInsert(MathAtom(new InsetMathEnsureMath));
+ cur.plainInsert(MathAtom(new InsetMathEnsureMath(buffer_)));
else
- cur.plainInsert(MathAtom(new InsetMathBox(from_ascii("mbox"))));
+ cur.plainInsert(MathAtom(new InsetMathBox(buffer_, from_ascii("mbox"))));
cur.posBackward();
cur.pushBackward(*cur.nextInset());
cur.niceInsert(save_selection);
+ // FIXME audit setBuffer/updateLabels calls
+ cur.buffer()->updateLabels();
#else
if (currentMode() == Inset::TEXT_MODE) {
cur.recordUndoSelection();
- cur.niceInsert(MathAtom(new InsetMathHull("simple")));
+ cur.niceInsert(MathAtom(new InsetMathHull("simple", cur.buffer())));
cur.message(_("create new math text environment ($...$)"));
} else {
handleFont(cur, cmd.argument(), "textrm");
case LFUN_REGEXP_MODE: {
InsetMathHull * i = dynamic_cast<InsetMathHull *>(cur.inset().asInsetMath());
if (i && i->getType() == hullRegexp) {
- cur.message(_("Already in regexp mode"));
+ cur.message(_("Already in regular expression mode"));
break;
}
cur.macroModeClose();
docstring const save_selection = grabAndEraseSelection(cur);
selClearOrDel(cur);
- cur.plainInsert(MathAtom(new InsetMathHull(hullRegexp)));
+ cur.plainInsert(MathAtom(new InsetMathHull(buffer_, hullRegexp)));
cur.posBackward();
cur.pushBackward(*cur.nextInset());
cur.niceInsert(save_selection);
- cur.message(_("Regexp editor mode"));
+ cur.message(_("Regular expression editor mode"));
break;
}
if (n < 1)
n = 1;
v_align += 'c';
+ cur.niceInsert(MathAtom(new InsetMathArray(buffer_,
+ from_ascii("array"), m, n, (char)v_align[0], h_align)));
+ break;
+ }
+
+ case LFUN_MATH_AMS_MATRIX: {
+ cur.recordUndo();
+ unsigned int m = 1;
+ unsigned int n = 1;
+ docstring name;
+ idocstringstream is(cmd.argument());
+ is >> m >> n >> name;
+ if (m < 1)
+ m = 1;
+ if (n < 1)
+ n = 1;
cur.niceInsert(
- MathAtom(new InsetMathArray(from_ascii("array"), m, n, (char)v_align[0], h_align)));
+ MathAtom(new InsetMathAMSArray(buffer_, name, m, n)));
break;
}
if (rs.empty())
rs = ')';
cur.recordUndo();
- cur.handleNest(MathAtom(new InsetMathDelim(ls, rs)));
+ cur.handleNest(MathAtom(new InsetMathDelim(buffer_, ls, rs)));
break;
}
docstring const & name = cmd.argument();
string data;
if (name == "ref") {
- InsetMathRef tmp(name);
+ InsetMathRef tmp(buffer_, name);
data = tmp.createDialogStr(to_utf8(name));
} else if (name == "mathspace") {
InsetMathSpace tmp;
if (createInsetMath_fromDialogStr(cmd.argument(), ar)) {
cur.recordUndoSelection();
cur.insert(ar);
+ // FIXME audit setBuffer/updateLabels calls
+ cur.buffer()->updateLabels();
} else
cur.undispatched();
break;
bool ret = true;
string const arg = to_utf8(cmd.argument());
switch (cmd.action) {
- case LFUN_TABULAR_FEATURE:
+ case LFUN_INSET_MODIFY:
flag.setEnabled(false);
break;
#if 0
- case LFUN_TABULAR_FEATURE:
+ case LFUN_INSET_MODIFY:
// FIXME: check temporarily disabled
// valign code
char align = mathcursor::valign();
flag.setEnabled(true);
break;
+ case LFUN_FONT_UNDERLINE:
case LFUN_FONT_FRAK:
flag.setEnabled(currentMode() != TEXT_MODE);
break;
flag.setEnabled(currentMode() != TEXT_MODE);
break;
+ case LFUN_MATH_AMS_MATRIX:
case LFUN_MATH_MATRIX:
flag.setEnabled(currentMode() == MATH_MODE);
break;
save_selection = grabAndEraseSelection(cur);
cur.clearTargetX();
+ Buffer * buf = cur.buffer();
// handle macroMode
if (cur.inMacroMode()) {
if (c == '\\') {
cur.backspace();
if (currentMode() <= InsetMath::TEXT_MODE)
- cur.niceInsert(createInsetMath("textbackslash"));
+ cur.niceInsert(createInsetMath("textbackslash", buf));
else
- cur.niceInsert(createInsetMath("backslash"));
+ cur.niceInsert(createInsetMath("backslash", buf));
} else if (c == '^' && currentMode() == InsetMath::MATH_MODE) {
cur.backspace();
- cur.niceInsert(createInsetMath("mathcircumflex"));
+ cur.niceInsert(createInsetMath("mathcircumflex", buf));
} else if (c == '{') {
cur.backspace();
- cur.niceInsert(MathAtom(new InsetMathBrace));
+ cur.niceInsert(MathAtom(new InsetMathBrace(buf)));
} else if (c == '%') {
cur.backspace();
- cur.niceInsert(MathAtom(new InsetMathComment));
+ cur.niceInsert(MathAtom(new InsetMathComment(buf)));
} else if (c == '#') {
LASSERT(cur.activeMacro(), /**/);
cur.activeMacro()->setName(name + docstring(1, c));
} else {
cur.backspace();
- cur.niceInsert(createInsetMath(docstring(1, c)));
+ cur.niceInsert(createInsetMath(docstring(1, c), buf));
}
return true;
}
}
}
if (c == '{')
- cur.niceInsert(MathAtom(new InsetMathBrace));
+ cur.niceInsert(MathAtom(new InsetMathBrace(buf)));
else if (c != ' ')
interpretChar(cur, c);
return true;
selClearOrDel(cur);
- MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
- if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED) {
- // resume macro_mode
- docstring const & s = macro->name();
- cur.leaveInset(*macro);
- cur.plainErase();
- docstring safe = grabAndEraseSelection(cur);
- cur.insert(MathAtom(new InsetMathUnknown("\\" + s + c, safe, false)));
- return true;
- }
-
if (c == '\n') {
if (currentMode() <= InsetMath::TEXT_MODE)
cur.insert(c);
return true;
}
if (c == '~') {
- cur.niceInsert(createInsetMath("sim"));
+ cur.niceInsert(createInsetMath("sim", buf));
return true;
}
if (currentMode() == InsetMath::MATH_MODE && !isAsciiOrMathAlpha(c)) {
- MathAtom at = createInsetMath("text");
+ MathAtom at = createInsetMath("text", buf);
at.nucleus()->cell(0).push_back(MathAtom(new InsetMathChar(c)));
cur.niceInsert(at);
cur.posForward();
}
} else {
if (c == '^') {
- cur.niceInsert(createInsetMath("textasciicircum"));
+ cur.niceInsert(createInsetMath("textasciicircum", buf));
return true;
}
if (c == '~') {
- cur.niceInsert(createInsetMath("textasciitilde"));
+ cur.niceInsert(createInsetMath("textasciitilde", buf));
return true;
}
}
if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' ||
c == '%' || c == '_') {
- cur.niceInsert(createInsetMath(docstring(1, c)));
+ cur.niceInsert(createInsetMath(docstring(1, c), buf));
return true;
}
//lyxerr << "handling script: up: " << up << endl;
if (cur.inMacroMode() && cur.macroName() == "\\") {
if (up)
- cur.niceInsert(createInsetMath("mathcircumflex"));
+ cur.niceInsert(createInsetMath("mathcircumflex", cur.buffer()));
else
interpretChar(cur, '_');
return true;
// one if in the very first position of the array
if (cur.pos() == 0) {
//lyxerr << "new scriptinset" << endl;
- cur.insert(new InsetMathScript(up));
+ cur.insert(new InsetMathScript(buffer_, up));
} else {
//lyxerr << "converting prev atom " << endl;
- cur.prevAtom() = MathAtom(new InsetMathScript(cur.prevAtom(), up));
+ cur.prevAtom() = MathAtom(new InsetMathScript(buffer_, cur.prevAtom(), up));
}
--cur.pos();
InsetMathScript * inset = cur.nextAtom().nucleus()->asScriptInset();
if (cur.pos() != cur.lastpos() && cur.openable(cur.nextAtom())) {
cur.pushBackward(*cur.nextAtom().nucleus());
cur.inset().idxFirst(cur);
- MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
- if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED)
- // editing macros is only possible at lastpos
- cur.pos() = cur.lastpos();
return true;
}
if (cur.posForward() || idxForward(cur))
cur.inset().idxLast(cur);
return true;
}
- MathMacro const * macro = cur.inset().asInsetMath()->asMacro();
- int s = cur.depth() - 2;
- if (macro && macro->displayMode() == MathMacro::DISPLAY_UNFOLDED
- && s >= 0 && cur[s].inset().asInsetMath())
- // editing macros is only possible at lastpos
- return cur.popBackward();
-
if (cur.posBackward() || idxBackward(cur))
return true;
// try to pop backwards --- but don't pop out of math! leave that to
// the FINISH lfuns
+ int s = cur.depth() - 2;
if (s >= 0 && cur[s].inset().asInsetMath())
return cur.popBackward();
return false;
projects / features.git / blobdiff