* 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 "InsetMathSpace.h"
#include "InsetMathSymbol.h"
#include "InsetMathUnknown.h"
+#include "MathAutoCorrect.h"
#include "MathCompletionList.h"
#include "MathData.h"
#include "MathFactory.h"
int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const
{
- WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun);
+ WriteStream wi(os, runparams.moving_arg, true, runparams.dryrun,
+ runparams.encoding);
write(wi);
return wi.line();
}
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) {
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())
}
return;
}
-
+
// the complicated case with multiple selected cells in a grid
row_type r1, r2;
col_type c1, c2;
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)
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?
}
{
//lyxerr << "InsetMathNest: request: " << cmd << endl;
+ 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;
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)
}
// Now that we know exactly what we want to do, let's do it!
cur.selHandle(select);
- cur.autocorrect() = false;
cur.clearTargetX();
cur.macroModeClose();
// try moving forward or backwards as necessary...
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;
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
// 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_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_FONT_STYLE: {
+ FuncRequest fr = FuncRequest(LFUN_MATH_INSERT, '\\' + cmd.argument());
+ doDispatch(cur, fr);
+ break;
+ }
+
case LFUN_MATH_SIZE: {
FuncRequest fr = FuncRequest(LFUN_MATH_INSERT, cmd.argument());
doDispatch(cur, fr);
case LFUN_SPACE_INSERT:
cur.recordUndoSelection();
- cur.insert(MathAtom(new InsetMathSpace(from_ascii(","))));
+ cur.insert(MathAtom(new InsetMathSpace));
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())));
+ 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;
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;
}
/// 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:
flag.setEnabled(currentMode() != TEXT_MODE);
break;
- case LFUN_MATH_INSERT: {
+ case LFUN_MATH_FONT_STYLE: {
bool const textarg =
- arg == "\\textbf" || arg == "\\textsf" ||
- arg == "\\textrm" || arg == "\\textmd" ||
- arg == "\\textit" || arg == "\\textsc" ||
- arg == "\\textsl" || arg == "\\textup" ||
- arg == "\\texttt" || arg == "\\textbb" ||
- arg == "\\textnormal";
+ arg == "textbf" || arg == "textsf" ||
+ arg == "textrm" || arg == "textmd" ||
+ arg == "textit" || arg == "textsc" ||
+ arg == "textsl" || arg == "textup" ||
+ arg == "texttt" || arg == "textbb" ||
+ arg == "textnormal";
flag.setEnabled(currentMode() != TEXT_MODE || textarg);
break;
}
+ case LFUN_MATH_INSERT:
+ flag.setEnabled(currentMode() != TEXT_MODE);
+ break;
+
case LFUN_MATH_MATRIX:
flag.setEnabled(currentMode() == MATH_MODE);
break;
// getStatus is not called with a valid reference and the
// dialog would not be applyable.
string const name = cmd.getArg(0);
- flag.setEnabled(name == "ref");
+ flag.setEnabled(name == "ref" || name == "mathspace");
break;
}
// Don't do this with multi-cell selections
flag.setEnabled(cur.selBegin().idx() == cur.selEnd().idx());
break;
-
+
case LFUN_MATH_MACRO_FOLD:
case LFUN_MATH_MACRO_UNFOLD: {
Cursor it = cur;
flag.setEnabled(found);
break;
}
-
+
case LFUN_SPECIALCHAR_INSERT:
// FIXME: These would probably make sense in math-text mode
flag.setEnabled(false);
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));
return true;
}
- // This is annoying as one has to press <space> far too often.
- // Disable it.
-#if 0
- // leave autocorrect mode if necessary
- if (autocorrect() && c == ' ') {
- autocorrect() = false;
- return true;
- }
-#endif
+ // leave autocorrect mode if necessary
+ if (lyxrc.autocorrection_math && c == ' ' && cur.autocorrect()) {
+ cur.autocorrect() = false;
+ cur.message(_("Autocorrect Off ('!' to enter)"));
+ return true;
+ }
+ if (lyxrc.autocorrection_math && c == '!' && !cur.autocorrect()) {
+ cur.autocorrect() = true;
+ cur.message(_("Autocorrect On (<space> to exit)"));
+ return true;
+ }
// 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;
}
// try auto-correction
- //if (autocorrect() && hasPrevAtom() && math_autocorrect(prevAtom(), c))
- // return true;
+ if (lyxrc.autocorrection_math && cur.autocorrect() && cur.pos() != 0
+ && math_autocorrect(cur.prevAtom(), c))
+ return true;
// no special circumstances, so insert the character without any fuss
cur.insert(c);
- cur.autocorrect() = true;
+ if (lyxrc.autocorrection_math) {
+ if (!cur.autocorrect())
+ cur.message(_("Autocorrect Off ('!' to enter)"));
+ else
+ cur.message(_("Autocorrect On (<space> to exit)"));
+ }
return true;
}
{
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))
return true;
// try to pop forwards --- but don't pop out of math! leave that to
cur.push(*cur.nextAtom().nucleus());
cur.inset().idxLast(cur);
return true;
- }
+ }
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("\\color"));
globals.push_back(from_ascii("\\normalcolor"));
globals.push_back(from_ascii("\\textcolor"));
+ globals.push_back(from_ascii("\\cfrac"));
globals.push_back(from_ascii("\\dfrac"));
globals.push_back(from_ascii("\\tfrac"));
globals.push_back(from_ascii("\\dbinom"));
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