* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
+//#define AUTOCORRECT
+
#include "InsetMathNest.h"
#include "InsetMathArray.h"
#include "InsetMathSpace.h"
#include "InsetMathSymbol.h"
#include "InsetMathUnknown.h"
+#ifdef AUTOCORRECT
+#include "MathAutoCorrect.h"
+#endif
+#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(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 {
- 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.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);
- return;
- }
-
- // multiple selected cells in a simple non-grid inset
- if (i1.asInsetMath()->nrows() == 0 || i1.asInsetMath()->ncols() == 0) {
- cur.recordUndoInset();
- 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(createInsetMath(font));
- 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;
+
+ // 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
- cur.recordUndoInset();
- Inset::row_type r1, r2;
- Inset::col_type c1, c2;
- cap::region(i1, i2, r1, r2, c1, c2);
- for (Inset::row_type row = r1; row <= r2; ++row) {
- for (Inset::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();
-
- // change font of cell
- cur.handleNest(createInsetMath(font));
- cur.insert(arg);
+ // 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 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();
- }
+ //
+ 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_ignore) {
- 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();
+
+ Parse::flags parseflg = Parse::QUIET;
switch (cmd.action) {
+ case LFUN_CLIPBOARD_PASTE:
+ parseflg |= Parse::VERBATIM;
+ // fall through
case LFUN_PASTE: {
+ if (cur.currentMode() == TEXT_MODE)
+ parseflg |= Parse::TEXTMODE;
cur.recordUndoSelection();
cur.message(_("Paste"));
replaceSelection(cur);
is >> n;
topaste = cap::selection(n);
}
- cur.niceInsert(topaste);
+ cur.niceInsert(topaste, parseflg);
cur.clearSelection(); // bug 393
cur.finishUndo();
break;
case LFUN_CHAR_BACKWARD_SELECT:
case LFUN_CHAR_FORWARD_SELECT: {
// are we in a selection?
- bool select = (cmd.action == LFUN_CHAR_RIGHT_SELECT
+ bool select = (cmd.action == LFUN_CHAR_RIGHT_SELECT
|| cmd.action == LFUN_CHAR_LEFT_SELECT
|| cmd.action == LFUN_CHAR_BACKWARD_SELECT
|| cmd.action == LFUN_CHAR_FORWARD_SELECT);
- // are we moving forward or backwards?
+ // are we moving forward or backwards?
// If the command was RIGHT or LEFT, then whether we're moving forward
// or backwards depends on the cursor movement mode (logical or visual):
- // * in visual mode, since math is always LTR, right -> forward,
+ // * in visual mode, since math is always LTR, right -> forward,
// left -> backwards
// * in logical mode, the mapping is determined by the
// reverseDirectionNeeded() function
-
+
bool forward;
- kb_action finish_lfun;
+ FuncCode finish_lfun;
- if (cmd.action == LFUN_CHAR_FORWARD
+ if (cmd.action == LFUN_CHAR_FORWARD
|| cmd.action == LFUN_CHAR_FORWARD_SELECT) {
forward = true;
finish_lfun = LFUN_FINISHED_FORWARD;
|| cmd.action == LFUN_CHAR_RIGHT);
if (lyxrc.visual_cursor || !reverseDirectionNeeded(cur))
forward = right;
- else
+ else
forward = !right;
if (right)
cur.macroModeClose();
break;
}
-
+
// stop/start the selection
bool select = cmd.action == LFUN_DOWN_SELECT ||
cmd.action == LFUN_UP_SELECT;
cur.selHandle(select);
-
+
// go up/down
bool up = cmd.action == LFUN_UP || cmd.action == LFUN_UP_SELECT;
bool successful = cur.upDownInMath(up);
if (successful)
break;
-
+
if (cur.fixIfBroken())
// FIXME: Something bad happened. We pass the corrected Cursor
// instead of letting things go worse.
cur.pos() = 0;
cur.idx() = 0;
cur.resetAnchor();
- cur.selection() = true;
+ cur.setSelection(true);
cur.pos() = cur.lastpos();
cur.idx() = cur.lastidx();
break;
case LFUN_WORD_BACKWARD_SELECT:
case LFUN_WORD_LEFT_SELECT:
cur.selHandle(cmd.action == LFUN_WORD_BACKWARD_SELECT ||
- cmd.action == LFUN_WORD_LEFT_SELECT ||
+ cmd.action == LFUN_WORD_LEFT_SELECT ||
cmd.action == LFUN_LINE_BEGIN_SELECT);
cur.macroModeClose();
if (cur.pos() != 0) {
break;
//case LFUN_SERVER_GET_XY:
- // sprintf(dispatch_buffer, "%d %d",);
// break;
case LFUN_SERVER_SET_XY: {
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;
case LFUN_FONT_BOLD:
+ if (currentMode() == TEXT_MODE)
+ handleFont(cur, cmd.argument(), "textbf");
+ else
+ handleFont(cur, cmd.argument(), "mathbf");
+ break;
+ case LFUN_FONT_BOLDSYMBOL:
if (currentMode() == TEXT_MODE)
handleFont(cur, cmd.argument(), "textbf");
else
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.recordUndoSelection();
- cur.setSize(arg);
-#endif
+ case LFUN_REGEXP_MODE: {
+ InsetMathHull * i = dynamic_cast<InsetMathHull *>(cur.inset().asInsetMath());
+ if (i && i->getType() == hullRegexp) {
+ cur.message(_("Already in regexp mode"));
+ break;
+ }
+ cur.macroModeClose();
+ docstring const save_selection = grabAndEraseSelection(cur);
+ selClearOrDel(cur);
+ cur.plainInsert(MathAtom(new InsetMathHull(hullRegexp)));
+ cur.posBackward();
+ cur.pushBackward(*cur.nextInset());
+ cur.niceInsert(save_selection);
+ cur.message(_("Regexp editor mode"));
+ break;
+ }
+
+ 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:
+ cur.recordUndoSelection();
+ cur.insert(MathAtom(new InsetMathSpace));
+ break;
+
case LFUN_MATH_SPACE:
cur.recordUndoSelection();
- cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
+ if (cmd.argument().empty())
+ cur.insert(MathAtom(new InsetMathSpace));
+ else {
+ string const name = cmd.getArg(0);
+ string const len = cmd.getArg(1);
+ cur.insert(MathAtom(new InsetMathSpace(name, len)));
+ }
break;
case LFUN_ERT_INSERT:
cur.recordUndoSelection();
interpretChar(cur, '^');
break;
-
+
case LFUN_MATH_MACRO_FOLD:
case LFUN_MATH_MACRO_UNFOLD: {
Cursor it = cur;
// math-insert only handles special math things like "matrix".
case LFUN_MATH_INSERT: {
cur.recordUndoSelection();
- if (cmd.argument() == "^" || cmd.argument() == "_") {
+ 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;
}
if (name == "ref") {
InsetMathRef tmp(name);
data = tmp.createDialogStr(to_utf8(name));
+ } else if (name == "mathspace") {
+ InsetMathSpace tmp;
+ data = tmp.createDialogStr();
}
cur.bv().showDialog(to_utf8(name), data);
break;
bool InsetMathNest::findMacroToFoldUnfold(Cursor & it, bool fold) const {
// look for macro to open/close, but stay in mathed
for (; !it.empty(); it.pop_back()) {
-
+
// go backward through the current cell
Inset * inset = it.nextInset();
while (inset && inset->asInsetMath()) {
// found the an macro to open/close?
if (macro->folded() != fold)
return true;
-
+
// Wrong folding state.
// If this was the first we see in this slice, look further left,
// otherwise go up.
if (inset != it.nextInset())
break;
}
-
+
// go up if this was the left most position
if (it.pos() == 0)
break;
-
+
// go left
it.pos()--;
inset = it.nextInset();
}
}
-
+
return false;
}
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:
/// We have to handle them since 1.4 blocks all unhandled actions
case LFUN_FONT_ITAL:
case LFUN_FONT_BOLD:
+ case LFUN_FONT_BOLDSYMBOL:
case LFUN_FONT_SANS:
case LFUN_FONT_EMPH:
case LFUN_FONT_TYPEWRITER:
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" || name == "mathspace");
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:
void InsetMathNest::edit(Cursor & cur, bool front, EntryDirection entry_from)
{
cur.push(*this);
- bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_RIGHT ||
+ bool enter_front = (entry_from == Inset::ENTRY_DIRECTION_RIGHT ||
(entry_from == Inset::ENTRY_DIRECTION_IGNORE && front));
cur.idx() = enter_front ? 0 : cur.lastidx();
cur.pos() = enter_front ? 0 : cur.lastpos();
// Update::FitCursor: adjust the screen to the cursor
// position if needed
// cur.result().update(): don't overwrite previously set flags.
- cur.updateFlags(Update::Decoration | Update::FitCursor
+ cur.updateFlags(Update::Decoration | Update::FitCursor
| cur.result().update());
} else if (cmd.button() == mouse_button::button2) {
if (cap::selection()) {
if (bvcur.anchor_.hasPart(cur)) {
//lyxerr << "## lfunMouseMotion: cursor: " << cur << endl;
bvcur.setCursor(cur);
- bvcur.selection() = true;
+ bvcur.setSelection(true);
//lyxerr << "MOTION " << bvcur << endl;
} else
cur.undispatched();
cur.noUpdate();
else {
Cursor & bvcur = cur.bv().cursor();
- bvcur.selection() = true;
+ bvcur.setSelection(true);
}
return;
}
}
-bool InsetMathNest::interpretChar(Cursor & cur, char_type c)
+bool InsetMathNest::interpretChar(Cursor & cur, char_type const c)
{
//lyxerr << "interpret 2: '" << c << "'" << endl;
docstring save_selection;
MathWordList const & mwl = mathedWordList();
bool star_macro = c == '*'
&& (mwl.find(name.substr(1) + "*") != mwl.end()
- || cur.buffer().getMacro(name.substr(1) + "*", cur, true));
+ || cur.buffer()->getMacro(name.substr(1) + "*", cur, true));
if (isAlphaASCII(c) || star_macro) {
cur.activeMacro()->setName(name + docstring(1, c));
return true;
cur.niceInsert(createInsetMath("textbackslash"));
else
cur.niceInsert(createInsetMath("backslash"));
+ } else if (c == '^' && currentMode() == InsetMath::MATH_MODE) {
+ cur.backspace();
+ cur.niceInsert(createInsetMath("mathcircumflex"));
} else if (c == '{') {
cur.backspace();
cur.niceInsert(MathAtom(new InsetMathBrace));
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();
// This is annoying as one has to press <space> far too often.
// Disable it.
-#if 0
+#ifdef AUTOCORRECT
// leave autocorrect mode if necessary
- if (autocorrect() && c == ' ') {
- autocorrect() = false;
+ if (cur.autocorrect() && c == ' ') {
+ cur.autocorrect() = false;
return true;
}
#endif
// just clear selection on pressing the space bar
if (cur.selection() && c == ' ') {
- cur.selection() = false;
+ cur.setSelection(false);
return true;
}
return cur.pos() != cur.lastpos();
}
- // These shouldn't work in text mode:
+ // These should be treated differently when not in text mode:
if (currentMode() != InsetMath::TEXT_MODE) {
if (c == '_') {
script(cur, false, save_selection);
cur.niceInsert(createInsetMath("sim"));
return true;
}
+ } else {
+ if (c == '^') {
+ cur.niceInsert(createInsetMath("textasciicircum"));
+ return true;
+ }
+ if (c == '~') {
+ cur.niceInsert(createInsetMath("textasciitilde"));
+ return true;
+ }
}
if (c == '{' || c == '}' || c == '&' || c == '$' || c == '#' ||
- c == '%' || c == '_' || c == '^') {
+ c == '%' || c == '_') {
cur.niceInsert(createInsetMath(docstring(1, c)));
return true;
}
+#ifdef AUTOCORRECT
// try auto-correction
- //if (autocorrect() && hasPrevAtom() && math_autocorrect(prevAtom(), c))
- // return true;
+ if (cur.autocorrect() && cur.pos() != 0 && math_autocorrect(cur.prevAtom(), c))
+ return true;
+#endif
// no special circumstances, so insert the character without any fuss
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())
return 0;
-
+
return new MathCompletionList(cur);
}
{
if (!cur.inMacroMode())
return docstring();
-
+
return cur.activeMacro()->name();
}
}
-void InsetMathNest::completionPosAndDim(Cursor const & cur, int & x, int & y,
+void InsetMathNest::completionPosAndDim(Cursor const & cur, int & x, int & y,
Dimension & dim) const
{
Inset const * inset = cur.activeMacro();
cur.pushBackward(*cur.nextAtom().nucleus());
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.push(*cur.nextAtom().nucleus());
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
+ // 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())
{
// fill it with macros from the buffer
MacroNameSet macros;
- cur.buffer().listMacroNames(macros);
+ cur.buffer()->listMacroNames(macros);
MacroNameSet::const_iterator it;
for (it = macros.begin(); it != macros.end(); ++it) {
- if (cur.buffer().getMacro(*it, cur, false))
+ if (cur.buffer()->getMacro(*it, cur, false))
locals.push_back("\\" + *it);
}
sort(locals.begin(), locals.end());
// 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("\\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());
}
}
-std::string MathCompletionList::icon(size_t idx) const
+std::string MathCompletionList::icon(size_t idx) const
{
// get the latex command
docstring cmd;
cmd = globals[idx - lsize];
else
cmd = locals[idx];
-
+
// get the icon resource name by stripping the backslash
return "images/math/" + to_utf8(cmd.substr(1)) + ".png";
}
projects / lyx.git / blobdiff