#include "InsetMathSpace.h"
#include "InsetMathSymbol.h"
#include "InsetMathUnknown.h"
+#include "MathCompletionList.h"
#include "MathData.h"
#include "MathFactory.h"
#include "MathMacro.h"
#include "support/docstream.h"
#include <algorithm>
-#include <deque>
#include <sstream>
using namespace std;
}
-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);
write(wi);
}
-bool InsetMathNest::notifyCursorLeaves(Cursor & /*cur*/)
+bool InsetMathNest::notifyCursorLeaves(Cursor const & /*old*/, Cursor & /*cur*/)
{
// FIXME: look here
#if 0
}
-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) {
// go up/down
bool up = cmd.action == LFUN_UP || cmd.action == LFUN_UP_SELECT;
bool successful = cur.upDownInMath(up);
- if (successful) {
- // notify left insets and give them chance to set update flags
- lyx::notifyCursorLeaves(cur.beforeDispatchCursor(), cur);
- cur.fixIfBroken();
+ if (successful)
break;
- }
if (cur.fixIfBroken())
// FIXME: Something bad happened. We pass the corrected Cursor
}
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;
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)
case LFUN_MATH_SIZE:
#if 0
- cur.recordUndo();
+ cur.recordUndoSelection();
cur.setSize(arg);
#endif
break;
case LFUN_SPACE_INSERT:
case LFUN_MATH_SPACE:
- cur.recordUndo();
+ cur.recordUndoSelection();
cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
break;
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())
+ 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();
return true;
}
- if (isAlphaASCII(c)) {
+ // do not finish macro for known * commands
+ MathWordList const & mwl = mathedWordList();
+ bool star_macro = c == '*'
+ && (mwl.find(name.substr(1) + "*") != mwl.end()
+ || cur.buffer().getMacro(name.substr(1) + "*", cur, true));
+ if (isAlphaASCII(c) || star_macro) {
cur.activeMacro()->setName(name + docstring(1, c));
return true;
}
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::CompletionListPtr InsetMathNest::completionList(Cursor const & cur) const
+CompletionList const *
+InsetMathNest::createCompletionList(Cursor const & cur) const
{
if (!cur.inMacroMode())
- return CompletionListPtr();
+ return 0;
- return CompletionListPtr(new MathCompletionList(cur));
+ return new MathCompletionList(cur);
}
MathCompletionList::MathCompletionList(Cursor const & cur)
{
// fill it with macros from the buffer
- Buffer::MacroNameSet macros;
+ MacroNameSet macros;
cur.buffer().listMacroNames(macros);
- Buffer::MacroNameSet::const_iterator it;
+ MacroNameSet::const_iterator it;
for (it = macros.begin(); it != macros.end(); ++it) {
if (cur.buffer().getMacro(*it, cur, false))
locals.push_back("\\" + *it);
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("\\hphantom"));
globals.push_back(from_ascii("\\phantom"));
globals.push_back(from_ascii("\\vphantom"));
- WordList const & words = mathedWordList();
- WordList::const_iterator it2;
+ MathWordList const & words = mathedWordList();
+ MathWordList::const_iterator it2;
lyxerr << "Globals completion commands: ";
for (it2 = words.begin(); it2 != words.end(); ++it2) {
globals.push_back("\\" + (*it2).first);
size_type MathCompletionList::size() const
{
- return favorites.size() + locals.size() + globals.size();
+ return locals.size() + globals.size();
}
-docstring MathCompletionList::data(size_t idx) const
+docstring const & MathCompletionList::data(size_t idx) const
{
- size_t fsize = favorites.size();
size_t lsize = locals.size();
- if (idx >= fsize + lsize)
- return globals[idx - lsize - fsize];
- else if (idx >= fsize)
- return locals[idx - fsize];
+ if (idx >= lsize)
+ return globals[idx - lsize];
else
- return favorites[idx];
+ return locals[idx];
}
{
// get the latex command
docstring cmd;
- size_t fsize = favorites.size();
size_t lsize = locals.size();
- if (idx >= fsize + lsize)
- cmd = globals[idx - lsize - fsize];
- else if (idx >= fsize)
- cmd = locals[idx - fsize];
+ if (idx >= lsize)
+ cmd = globals[idx - lsize];
else
- cmd = favorites[idx];
+ cmd = locals[idx];
// get the icon resource name by stripping the backslash
return "images/math/" + to_utf8(cmd.substr(1)) + ".png";
}
-
-
-void MathCompletionList::addToFavorites(docstring const & completion)
-{
- // remove old occurrence
- std::deque<docstring>::iterator it;
- for (it = favorites.begin(); it != favorites.end(); ++it) {
- if (*it == completion) {
- favorites.erase(it);
- break;
- }
- }
-
- // put it to the front
- favorites.push_front(completion);
- favorites.resize(min(int(favorites.size()), 10));
-}
-
-
std::vector<docstring> MathCompletionList::globals;
-std::deque<docstring> MathCompletionList::favorites;
} // namespace lyx
projects / lyx.git / blobdiff