#include "InsetMathSpace.h"
#include "InsetMathSymbol.h"
#include "InsetMathUnknown.h"
+#include "MathCompletionList.h"
#include "MathData.h"
#include "MathFactory.h"
#include "MathMacro.h"
#include "frontends/Painter.h"
#include "frontends/Selection.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include "support/gettext.h"
#include "support/lstrings.h"
// to touch all (math)inset's draw() methods. Right now, we'll store
// absolute value, and make them here relative, only to make them
// absolute again when actually drawing the cursor. What a mess.
- BOOST_ASSERT(&sl.inset() == this);
+ LASSERT(&sl.inset() == this, /**/);
MathData const & ar = sl.cell();
CoordCache const & coord_cache = bv.coordCache();
if (!coord_cache.getArrays().has(&ar)) {
bool InsetMathNest::idxNext(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (cur.idx() == cur.lastidx())
return false;
++cur.idx();
bool InsetMathNest::idxPrev(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (cur.idx() == 0)
return false;
--cur.idx();
bool InsetMathNest::idxFirst(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (nargs() == 0)
return false;
cur.idx() = 0;
bool InsetMathNest::idxLast(Cursor & cur) const
{
- BOOST_ASSERT(&cur.inset() == this);
+ LASSERT(&cur.inset() == this, /**/);
if (nargs() == 0)
return false;
cur.idx() = cur.lastidx();
void InsetMathNest::write(WriteStream & os) const
{
- os << '\\' << name().c_str();
+ ModeSpecifier specifier(os, currentMode());
+ docstring const latex_name = name();
+ os << '\\' << latex_name;
for (size_t i = 0; i < nargs(); ++i)
os << '{' << cell(i) << '}';
if (nargs() == 0)
void InsetMathNest::normalize(NormalStream & os) const
{
- os << '[' << name().c_str();
+ os << '[' << name();
for (size_t i = 0; i < nargs(); ++i)
os << ' ' << cell(i);
os << ']';
}
-int InsetMathNest::latex(Buffer const &, odocstream & os,
- OutputParams const & runparams) const
+int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const
{
- WriteStream wi(os, runparams.moving_arg, true);
+ WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun,
+ runparams.encoding);
write(wi);
return wi.line();
}
}
-void InsetMathNest::handleFont
- (Cursor & cur, docstring const & arg, docstring const & font)
+void InsetMathNest::handleFont(Cursor & cur, docstring const & arg,
+ docstring const & font)
{
+ cur.recordUndoSelection();
+
// this whole function is a hack and won't work for incremental font
// changes...
-
- if (cur.inset().asInsetMath()->name() == font) {
- cur.recordUndoInset();
+ if (cur.inset().asInsetMath()->name() == font)
cur.handleFont(to_utf8(font));
- } else {
- cur.recordUndo();
- cur.handleNest(createInsetMath(font));
+ else
+ handleNest(cur, createInsetMath(font), arg);
+}
+
+
+void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest)
+{
+ handleNest(cur, nest, docstring());
+}
+
+
+void InsetMathNest::handleNest(Cursor & cur, MathAtom const & nest,
+ docstring const & arg)
+{
+ CursorSlice i1 = cur.selBegin();
+ CursorSlice i2 = cur.selEnd();
+ if (!i1.inset().asInsetMath())
+ return;
+ if (i1.idx() == i2.idx()) {
+ // the easy case where only one cell is selected
+ cur.handleNest(nest);
cur.insert(arg);
+ return;
+ }
+
+ // multiple selected cells in a simple non-grid inset
+ if (i1.asInsetMath()->nrows() == 0 || i1.asInsetMath()->ncols() == 0) {
+ for (idx_type i = i1.idx(); i <= i2.idx(); ++i) {
+ // select cell
+ cur.idx() = i;
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.pos() = cur.lastpos();
+ cur.setSelection();
+
+ // change font of cell
+ cur.handleNest(nest);
+ cur.insert(arg);
+
+ // cur is in the font inset now. If the loop continues,
+ // we need to get outside again for the next cell
+ if (i + 1 <= i2.idx())
+ cur.pop_back();
+ }
+ return;
+ }
+
+ // the complicated case with multiple selected cells in a grid
+ row_type r1, r2;
+ col_type c1, c2;
+ cap::region(i1, i2, r1, r2, c1, c2);
+ for (row_type row = r1; row <= r2; ++row) {
+ for (col_type col = c1; col <= c2; ++col) {
+ // select cell
+ cur.idx() = i1.asInsetMath()->index(row, col);
+ cur.pos() = 0;
+ cur.resetAnchor();
+ cur.pos() = cur.lastpos();
+ cur.setSelection();
+
+ //
+ cur.handleNest(nest);
+ cur.insert(arg);
+
+ // cur is in the font inset now. If the loop continues,
+ // we need to get outside again for the next cell
+ if (col + 1 <= c2 || row + 1 <= r2)
+ cur.pop_back();
+ }
}
}
void InsetMathNest::handleFont2(Cursor & cur, docstring const & arg)
{
- cur.recordUndo();
+ cur.recordUndoSelection();
Font font;
bool b;
font.fromString(to_utf8(arg), b);
- if (font.fontInfo().color() != Color_inherit) {
- MathAtom at = MathAtom(new InsetMathColor(true, font.fontInfo().color()));
- cur.handleNest(at, 0);
- }
+ if (font.fontInfo().color() != Color_inherit &&
+ font.fontInfo().color() != Color_ignore)
+ handleNest(cur, MathAtom(new InsetMathColor(true, font.fontInfo().color())));
+
+ // FIXME: support other font changes here as well?
}
void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
{
//lyxerr << "InsetMathNest: request: " << cmd << endl;
- //CursorSlice sl = cur.current();
switch (cmd.action) {
case LFUN_PASTE: {
- cur.recordUndo();
+ cur.recordUndoSelection();
cur.message(_("Paste"));
replaceSelection(cur);
docstring topaste;
size_t n = 0;
idocstringstream is(cmd.argument());
is >> n;
- topaste = cap::getSelection(cur.buffer(), n);
+ topaste = cap::selection(n);
}
cur.niceInsert(topaste);
cur.clearSelection(); // bug 393
// reverseDirectionNeeded() function
bool forward;
- kb_action finish_lfun;
+ FuncCode finish_lfun;
if (cmd.action == LFUN_CHAR_FORWARD
|| cmd.action == LFUN_CHAR_FORWARD_SELECT) {
}
break;
- case LFUN_SCREEN_UP_SELECT:
- cmd = FuncRequest(LFUN_FINISHED_BACKWARD);
- cur.undispatched();
- break;
-
- case LFUN_SCREEN_DOWN_SELECT:
- cmd = FuncRequest(LFUN_FINISHED_FORWARD);
- cur.undispatched();
- break;
-
case LFUN_CELL_FORWARD:
cur.updateFlags(Update::Decoration | Update::FitCursor);
cur.inset().idxNext(cur);
// May affect external cell:
cur.recordUndoInset();
else
- cur.recordUndo();
+ cur.recordUndoSelection();
// if the inset can not be removed from within, delete it
if (!cur.backspace()) {
FuncRequest cmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD);
// May affect external cell:
cur.recordUndoInset();
else
- cur.recordUndo();
+ cur.recordUndoSelection();
// if the inset can not be removed from within, delete it
if (!cur.erase()) {
FuncRequest cmd = FuncRequest(LFUN_CHAR_DELETE_FORWARD);
case LFUN_SELF_INSERT:
if (cmd.argument().size() != 1) {
- cur.recordUndo();
+ cur.recordUndoSelection();
docstring const arg = cmd.argument();
if (!interpretString(cur, arg))
cur.insert(arg);
// A side effect is that an undo before the macro is finished
// undoes the complete macro, not only the last character.
if (!cur.inMacroMode())
- cur.recordUndo();
+ cur.recordUndoSelection();
// spacial handling of space. If we insert an inset
// via macro mode, we want to put the cursor inside it
if (cmd.argument().empty()) {
// do superscript if LyX handles
// deadkeys
- cur.recordUndo();
+ cur.recordUndoSelection();
script(cur, true, grabAndEraseSelection(cur));
}
break;
break;
// Math fonts
- case LFUN_FONT_FREE_APPLY:
- case LFUN_FONT_FREE_UPDATE:
+ case LFUN_TEXTSTYLE_APPLY:
+ case LFUN_TEXTSTYLE_UPDATE:
handleFont2(cur, cmd.argument());
break;
if (currentMode() == TEXT_MODE)
handleFont(cur, cmd.argument(), "textbf");
else
- handleFont(cur, cmd.argument(), "mathbf");
+ handleFont(cur, cmd.argument(), "boldsymbol");
break;
case LFUN_FONT_SANS:
if (currentMode() == TEXT_MODE)
else
handleFont(cur, cmd.argument(), "mathbb");
break;
- /*
- case LFUN_FONT_FREE_APPLY:
- handleFont(cur, cmd.argument(), "textrm");
- break;
- */
case LFUN_FONT_DEFAULT:
handleFont(cur, cmd.argument(), "textnormal");
break;
// ignore math-mode on when already in math mode
if (currentMode() == Inset::MATH_MODE && cmd.argument() == "on")
break;
+ cur.recordUndoSelection();
cur.macroModeClose();
docstring const save_selection = grabAndEraseSelection(cur);
selClearOrDel(cur);
cur.niceInsert(save_selection);
#else
if (currentMode() == Inset::TEXT_MODE) {
+ cur.recordUndoSelection();
cur.niceInsert(MathAtom(new InsetMathHull("simple")));
cur.message(_("create new math text environment ($...$)"));
} else {
break;
}
- case LFUN_MATH_SIZE:
-#if 0
- cur.recordUndo();
- cur.setSize(arg);
-#endif
+ case LFUN_MATH_SIZE: {
+ FuncRequest fr = FuncRequest(LFUN_MATH_INSERT, cmd.argument());
+ doDispatch(cur, fr);
break;
+ }
case LFUN_MATH_MATRIX: {
cur.recordUndo();
}
case LFUN_SPACE_INSERT:
- case LFUN_MATH_SPACE:
- cur.recordUndo();
+ cur.recordUndoSelection();
cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
break;
+ case LFUN_MATH_SPACE:
+ cur.recordUndoSelection();
+ if (cmd.argument().empty())
+ cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
+ else
+ cur.insert(MathAtom(new InsetMathSpace(cmd.argument())));
+ break;
+
case LFUN_ERT_INSERT:
// interpret this as if a backslash was typed
cur.recordUndo();
case LFUN_MATH_SUBSCRIPT:
// interpret this as if a _ was typed
- cur.recordUndo();
+ cur.recordUndoSelection();
interpretChar(cur, '_');
break;
case LFUN_MATH_SUPERSCRIPT:
// interpret this as if a ^ was typed
- cur.recordUndo();
+ cur.recordUndoSelection();
interpretChar(cur, '^');
break;
case LFUN_QUOTE_INSERT:
// interpret this as if a straight " was typed
- cur.recordUndo();
+ cur.recordUndoSelection();
interpretChar(cur, '\"');
break;
// handling such that "self-insert" works on "arbitrary stuff" too, and
// math-insert only handles special math things like "matrix".
case LFUN_MATH_INSERT: {
- cur.recordUndo();
- if (cmd.argument() == "^" || cmd.argument() == "_") {
+ cur.recordUndoSelection();
+ if (cmd.argument() == "^" || cmd.argument() == "_")
interpretChar(cur, cmd.argument()[0]);
- } else
- cur.niceInsert(cmd.argument());
+ else {
+ MathData ar;
+ asArray(cmd.argument(), ar);
+ if (ar.size() == 1 && ar[0]->asNestInset()
+ && ar[0]->asNestInset()->nargs() > 1)
+ handleNest(cur, ar[0]);
+ else
+ cur.niceInsert(cmd.argument());
+ }
break;
}
case LFUN_INSET_INSERT: {
MathData ar;
if (createInsetMath_fromDialogStr(cmd.argument(), ar)) {
- cur.recordUndo();
+ cur.recordUndoSelection();
cur.insert(ar);
} else
cur.undispatched();
string const arg = to_utf8(cmd.argument());
switch (cmd.action) {
case LFUN_TABULAR_FEATURE:
- flag.enabled(false);
+ flag.setEnabled(false);
break;
#if 0
case LFUN_TABULAR_FEATURE:
case LFUN_FONT_NOUN:
case LFUN_FONT_ROMAN:
case LFUN_FONT_DEFAULT:
- flag.enabled(true);
+ flag.setEnabled(true);
break;
case LFUN_MATH_MUTATE:
//flag.setOnOff(mathcursor::formula()->hullType() == to_utf8(cmd.argument()));
case LFUN_MATH_SPACE:
case LFUN_MATH_LIMITS:
case LFUN_MATH_EXTERN:
- flag.enabled(true);
+ flag.setEnabled(true);
break;
case LFUN_FONT_FRAK:
- flag.enabled(currentMode() != TEXT_MODE);
+ flag.setEnabled(currentMode() != TEXT_MODE);
break;
case LFUN_MATH_INSERT: {
arg == "\\textsl" || arg == "\\textup" ||
arg == "\\texttt" || arg == "\\textbb" ||
arg == "\\textnormal";
- flag.enabled(currentMode() != TEXT_MODE || textarg);
+ flag.setEnabled(currentMode() != TEXT_MODE || textarg);
break;
}
case LFUN_MATH_MATRIX:
- flag.enabled(currentMode() == MATH_MODE);
+ flag.setEnabled(currentMode() == MATH_MODE);
break;
case LFUN_INSET_INSERT: {
// getStatus is not called with a valid reference and the
// dialog would not be applyable.
string const name = cmd.getArg(0);
- flag.enabled(name == "ref");
+ flag.setEnabled(name == "ref");
break;
}
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM:
// Don't do this with multi-cell selections
- flag.enabled(cur.selBegin().idx() == cur.selEnd().idx());
+ flag.setEnabled(cur.selBegin().idx() == cur.selEnd().idx());
break;
case LFUN_MATH_MACRO_FOLD:
case LFUN_MATH_MACRO_UNFOLD: {
Cursor it = cur;
bool found = findMacroToFoldUnfold(it, cmd.action == LFUN_MATH_MACRO_FOLD);
- flag.enabled(found);
+ flag.setEnabled(found);
break;
}
case LFUN_SPECIALCHAR_INSERT:
// FIXME: These would probably make sense in math-text mode
- flag.enabled(false);
+ flag.setEnabled(false);
break;
case LFUN_INSET_DISSOLVE:
- flag.enabled(!asHullInset());
+ flag.setEnabled(!asHullInset());
break;
default:
cur.backspace();
cur.niceInsert(MathAtom(new InsetMathComment));
} else if (c == '#') {
- BOOST_ASSERT(cur.activeMacro());
+ LASSERT(cur.activeMacro(), /**/);
cur.activeMacro()->setName(name + docstring(1, c));
} else {
cur.backspace();
return true;
}
- selClearOrDel(cur);
-
if (c == '\\') {
//lyxerr << "starting with macro" << endl;
- cur.insert(MathAtom(new InsetMathUnknown(from_ascii("\\"), false)));
+ bool reduced = cap::reduceSelectionToOneCell(cur);
+ if (reduced || !cur.selection()) {
+ docstring const safe = cap::grabAndEraseSelection(cur);
+ cur.insert(MathAtom(new InsetMathUnknown(from_ascii("\\"), safe, false)));
+ }
return true;
}
+ selClearOrDel(cur);
+
if (c == '\n') {
if (currentMode() == InsetMath::TEXT_MODE)
cur.insert(c);
}
+bool InsetMathNest::script(Cursor & cur, bool up)
+{
+ return script(cur, up, docstring());
+}
+
+
bool InsetMathNest::script(Cursor & cur, bool up,
docstring const & save_selection)
{
}
-Inset::CompletionList const *
+CompletionList const *
InsetMathNest::createCompletionList(Cursor const & cur) const
{
if (!cur.inMacroMode())
cur.inset().idxFirst(cur);
return true;
}
- if (cur.posForward() || idxForward(cur) || cur.selection())
+ if (cur.posForward() || idxForward(cur))
return true;
// try to pop forwards --- but don't pop out of math! leave that to
// the FINISH lfuns
cur.inset().idxLast(cur);
return true;
}
- if (cur.posBackward() || idxBackward(cur) || cur.selection())
+ if (cur.posBackward() || idxBackward(cur))
return true;
// try to pop backwards --- but don't pop out of math! leave that to
// the FINISH lfuns
// fill in global macros
macros.clear();
MacroTable::globalMacros().getMacroNames(macros);
- lyxerr << "Globals completion macros: ";
+ //lyxerr << "Globals completion macros: ";
for (it = macros.begin(); it != macros.end(); ++it) {
- lyxerr << "\\" + *it << " ";
+ //lyxerr << "\\" + *it << " ";
globals.push_back("\\" + *it);
}
- lyxerr << std::endl;
+ //lyxerr << std::endl;
// fill in global commands
globals.push_back(from_ascii("\\boxed"));
globals.push_back(from_ascii("\\alignedat"));
globals.push_back(from_ascii("\\cases"));
globals.push_back(from_ascii("\\substack"));
+ globals.push_back(from_ascii("\\xymatrix"));
globals.push_back(from_ascii("\\subarray"));
globals.push_back(from_ascii("\\array"));
globals.push_back(from_ascii("\\sqrt"));
globals.push_back(from_ascii("\\stackrel"));
globals.push_back(from_ascii("\\binom"));
globals.push_back(from_ascii("\\choose"));
- globals.push_back(from_ascii("\\choose"));
+ globals.push_back(from_ascii("\\brace"));
+ globals.push_back(from_ascii("\\brack"));
globals.push_back(from_ascii("\\frac"));
globals.push_back(from_ascii("\\over"));
globals.push_back(from_ascii("\\nicefrac"));
globals.push_back(from_ascii("\\atop"));
globals.push_back(from_ascii("\\lefteqn"));
globals.push_back(from_ascii("\\boldsymbol"));
+ globals.push_back(from_ascii("\\bm"));
globals.push_back(from_ascii("\\color"));
globals.push_back(from_ascii("\\normalcolor"));
globals.push_back(from_ascii("\\textcolor"));
globals.push_back(from_ascii("\\vphantom"));
MathWordList const & words = mathedWordList();
MathWordList::const_iterator it2;
- lyxerr << "Globals completion commands: ";
+ //lyxerr << "Globals completion commands: ";
for (it2 = words.begin(); it2 != words.end(); ++it2) {
globals.push_back("\\" + (*it2).first);
- lyxerr << "\\" + (*it2).first << " ";
+ //lyxerr << "\\" + (*it2).first << " ";
}
- lyxerr << std::endl;
+ //lyxerr << std::endl;
sort(globals.begin(), globals.end());
}