X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathNest.cpp;h=829bbc0a52188b8f4c4bf5caae43bc917eef725f;hb=c56d524cd6af5d0ed0d50fef51ab434ce418d1e0;hp=151690f6542246ab1878a1dc02ba6ccc00cfd907;hpb=108a67ed433821fba346ddc0adb28483a0154e2a;p=lyx.git diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 151690f654..829bbc0a52 100644 --- a/src/mathed/InsetMathNest.cpp +++ b/src/mathed/InsetMathNest.cpp @@ -80,23 +80,32 @@ using cap::selClearOrDel; InsetMathNest::InsetMathNest(Buffer * buf, idx_type nargs) - : InsetMath(buf), cells_(nargs), lock_(false), mouse_hover_(false) + : InsetMath(buf), cells_(nargs), lock_(false) { setBuffer(*buf); } InsetMathNest::InsetMathNest(InsetMathNest const & inset) - : InsetMath(inset), cells_(inset.cells_), lock_(inset.lock_), - mouse_hover_(false) + : InsetMath(inset), cells_(inset.cells_), lock_(inset.lock_) {} +InsetMathNest::~InsetMathNest() +{ + map::iterator it = mouse_hover_.begin(); + map::iterator end = mouse_hover_.end(); + for (; it != end; ++it) + if (it->second) + it->first->clearLastInset(this); +} + + InsetMathNest & InsetMathNest::operator=(InsetMathNest const & inset) { cells_ = inset.cells_; lock_ = inset.lock_; - mouse_hover_ = false; + mouse_hover_.clear(); InsetMath::operator=(inset); return *this; } @@ -362,6 +371,7 @@ MathData InsetMathNest::glue() const void InsetMathNest::write(WriteStream & os) const { + MathEnsurer ensurer(os, currentMode() == MATH_MODE); ModeSpecifier specifier(os, currentMode(), lockedMode()); docstring const latex_name = name(); os << '\\' << latex_name; @@ -385,19 +395,29 @@ void InsetMathNest::normalize(NormalStream & os) const } -int InsetMathNest::latex(odocstream & os, OutputParams const & runparams) const +void InsetMathNest::latex(otexstream & os, OutputParams const & runparams) const { - WriteStream wi(os, runparams.moving_arg, true, + WriteStream wi(os.os(), runparams.moving_arg, true, runparams.dryrun ? WriteStream::wsDryrun : WriteStream::wsDefault, runparams.encoding); + wi.canBreakLine(os.canBreakLine()); write(wi); - return wi.line(); + os.canBreakLine(wi.canBreakLine()); + + int lf = wi.line(); + if (lf > 0 && runparams.lastid != -1) { + --lf; + os.texrow().newline(); + os.texrow().start(runparams.lastid, runparams.lastpos); + } + os.texrow().newlines(lf); } -bool InsetMathNest::setMouseHover(bool mouse_hover) +bool InsetMathNest::setMouseHover(BufferView const * bv, bool mouse_hover) + const { - mouse_hover_ = mouse_hover; + mouse_hover_[bv] = mouse_hover; return true; } @@ -565,8 +585,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) } cur.niceInsert(topaste, parseflg, false); cur.clearSelection(); // bug 393 - // FIXME audit setBuffer/updateBuffer calls - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); cur.finishUndo(); break; } @@ -578,8 +597,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) // Prevent stale position >= size crash // Probably not necessary anymore, see eraseSelection (gb 2005-10-09) cur.normalize(); - // FIXME audit setBuffer/updateBuffer calls - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); break; case LFUN_COPY: @@ -614,7 +632,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_CHAR_LEFT: case LFUN_CHAR_BACKWARD: case LFUN_CHAR_FORWARD: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); case LFUN_CHAR_RIGHT_SELECT: case LFUN_CHAR_LEFT_SELECT: case LFUN_CHAR_BACKWARD_SELECT: @@ -674,7 +692,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_DOWN: case LFUN_UP: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); case LFUN_DOWN_SELECT: case LFUN_UP_SELECT: { // close active macro @@ -688,6 +706,10 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) act == LFUN_UP_SELECT; cur.selHandle(select); + // handle autocorrect: + cur.autocorrect() = false; + cur.message(_("Autocorrect Off ('!' to enter)")); + // go up/down bool up = act == LFUN_UP || act == LFUN_UP_SELECT; bool successful = cur.upDownInMath(up); @@ -707,6 +729,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MOUSE_DOUBLE: case LFUN_MOUSE_TRIPLE: case LFUN_WORD_SELECT: + case LFUN_INSET_SELECT_ALL: cur.pos() = 0; cur.idx() = 0; cur.resetAnchor(); @@ -717,7 +740,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_PARAGRAPH_UP: case LFUN_PARAGRAPH_DOWN: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); case LFUN_PARAGRAPH_UP_SELECT: case LFUN_PARAGRAPH_DOWN_SELECT: break; @@ -725,7 +748,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_LINE_BEGIN: case LFUN_WORD_BACKWARD: case LFUN_WORD_LEFT: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); case LFUN_LINE_BEGIN_SELECT: case LFUN_WORD_BACKWARD_SELECT: case LFUN_WORD_LEFT_SELECT: @@ -750,7 +773,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_WORD_FORWARD: case LFUN_WORD_RIGHT: case LFUN_LINE_END: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); case LFUN_WORD_FORWARD_SELECT: case LFUN_WORD_RIGHT_SELECT: case LFUN_LINE_END_SELECT: @@ -774,12 +797,12 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_CELL_FORWARD: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); cur.inset().idxNext(cur); break; case LFUN_CELL_BACKWARD: - cur.updateFlags(Update::Decoration | Update::FitCursor); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor); cur.inset().idxPrev(cur); break; @@ -788,7 +811,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) if (cur.pos() == 0) // May affect external cell: cur.recordUndoInset(); - else + else if (!cur.inMacroMode()) cur.recordUndoSelection(); // if the inset can not be removed from within, delete it if (!cur.backspace()) { @@ -854,7 +877,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) // if relevant. Think typing "\frac". if (cmd.argument()[0] == ' ' && cur.inMacroMode() && cur.macroName() != "\\" - && cur.macroModeClose()) { + && cur.macroModeClose() && cur.pos() > 0) { MathAtom const atom = cur.prevAtom(); if (atom->asNestInset() && atom->isActive()) { cur.posBackward(); @@ -989,8 +1012,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) cur.posBackward(); cur.pushBackward(*cur.nextInset()); cur.niceInsert(save_selection); - // FIXME audit setBuffer/updateBuffer calls - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); #else if (currentMode() == Inset::TEXT_MODE) { cur.recordUndoSelection(); @@ -1005,10 +1027,13 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_REGEXP_MODE: { - InsetMathHull * i = dynamic_cast(cur.inset().asInsetMath()); - if (i && i->getType() == hullRegexp) { - cur.message(_("Already in regular expression mode")); - break; + InsetMath * im = cur.inset().asInsetMath(); + if (im) { + InsetMathHull * i = im->asHullInset(); + if (i && i->getType() == hullRegexp) { + cur.message(_("Already in regular expression mode")); + break; + } } cur.macroModeClose(); docstring const save_selection = grabAndEraseSelection(cur); @@ -1100,20 +1125,48 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) if (have_l) cur.insert(MathAtom(new InsetMathBig(lname, ldelim))); - cur.niceInsert(selection); - if (have_r) + // first insert the right delimiter and then go back + // and re-insert the selection (bug 7088) + if (have_r) { cur.insert(MathAtom(new InsetMathBig(rname, rdelim))); + cur.posBackward(); + } + cur.niceInsert(selection); } // Don't call cur.undispatched() if we did nothing, this would // lead to infinite recursion via Text::dispatch(). break; } - case LFUN_SPACE_INSERT: + case LFUN_SPACE_INSERT: { cur.recordUndoSelection(); - cur.insert(MathAtom(new InsetMathSpace)); + string const name = cmd.getArg(0); + if (name == "normal") + cur.insert(MathAtom(new InsetMathSpace(" ", ""))); + else if (name == "protected") + cur.insert(MathAtom(new InsetMathSpace("~", ""))); + else if (name == "thin" || name == "med" || name == "thick") + cur.insert(MathAtom(new InsetMathSpace(name + "space", ""))); + else if (name == "hfill*") + cur.insert(MathAtom(new InsetMathSpace("hspace*{\\fill}", ""))); + else if (name == "quad" || name == "qquad" || + name == "enspace" || name == "enskip" || + name == "negthinspace" || name == "negmedspace" || + name == "negthickspace" || name == "hfill") + cur.insert(MathAtom(new InsetMathSpace(name, ""))); + else if (name == "hspace" || name == "hspace*") { + string const len = cmd.getArg(1); + if (len.empty() || !isValidLength(len)) { + lyxerr << "LyX function 'space-insert " << name << "' " + "needs a valid length argument." << endl; + break; + } + cur.insert(MathAtom(new InsetMathSpace(name, len))); + } else + cur.insert(MathAtom(new InsetMathSpace)); break; + } case LFUN_MATH_SPACE: cur.recordUndoSelection(); @@ -1184,14 +1237,30 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) cur.niceInsert(cmd.argument()); } break; + } + + case LFUN_UNICODE_INSERT: { + if (cmd.argument().empty()) + break; + docstring hexstring = cmd.argument(); + if (isHex(hexstring)) { + char_type c = hexToInt(hexstring); + if (c >= 32 && c < 0x10ffff) { + docstring s = docstring(1, c); + FuncCode code = currentMode() == MATH_MODE ? + LFUN_MATH_INSERT : LFUN_SELF_INSERT; + lyx::dispatch(FuncRequest(code, s)); + } } + break; + } case LFUN_DIALOG_SHOW_NEW_INSET: { docstring const & name = cmd.argument(); string data; if (name == "ref") { InsetMathRef tmp(buffer_, name); - data = tmp.createDialogStr(to_utf8(name)); + data = tmp.createDialogStr(); cur.bv().showDialog(to_utf8(name), data); } else if (name == "mathspace") { cur.bv().showDialog(to_utf8(name)); @@ -1204,8 +1273,7 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd) if (createInsetMath_fromDialogStr(cmd.argument(), ar)) { cur.recordUndoSelection(); cur.insert(ar); - // FIXME audit setBuffer/updateBuffer calls - cur.buffer()->updateBuffer(); + cur.forceBufferUpdate(); } else cur.undispatched(); break; @@ -1305,7 +1373,6 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd, // we just need to be in math mode to enable that case LFUN_MATH_SIZE: case LFUN_MATH_SPACE: - case LFUN_MATH_LIMITS: case LFUN_MATH_EXTERN: flag.setEnabled(true); break; @@ -1327,6 +1394,12 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd, break; } + case LFUN_MATH_MODE: + // forbid "math-mode on" in math mode to prevent irritating + // behaviour of menu entries (bug 6709) + flag.setEnabled(currentMode() == TEXT_MODE || arg != "on"); + break; + case LFUN_MATH_INSERT: flag.setEnabled(currentMode() != TEXT_MODE); break; @@ -1345,6 +1418,14 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd, break; } + case LFUN_DIALOG_SHOW_NEW_INSET: { + docstring const & name = cmd.argument(); + if (name == "space") + flag.setEnabled(false); + break; + } + + case LFUN_MATH_DELIM: case LFUN_MATH_BIGDELIM: // Don't do this with multi-cell selections @@ -1360,10 +1441,22 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd, } case LFUN_SPECIALCHAR_INSERT: + case LFUN_SCRIPT_INSERT: // FIXME: These would probably make sense in math-text mode flag.setEnabled(false); break; + case LFUN_CAPTION_INSERT: + flag.setEnabled(false); + break; + + case LFUN_SPACE_INSERT: { + docstring const & name = cmd.argument(); + if (name == "visible") + flag.setEnabled(false); + break; + } + case LFUN_INSET_DISSOLVE: flag.setEnabled(!asHullInset()); break; @@ -1419,6 +1512,15 @@ void InsetMathNest::lfunMousePress(Cursor & cur, FuncRequest & cmd) { //lyxerr << "## lfunMousePress: buttons: " << cmd.button() << endl; BufferView & bv = cur.bv(); + if (cmd.button() == mouse_button::button3) { + // Don't do anything if we right-click a + // selection, a context menu will popup. + if (bv.cursor().selection() && cur >= bv.cursor().selectionBegin() + && cur < bv.cursor().selectionEnd()) { + cur.noScreenUpdate(); + return; + } + } bool do_selection = cmd.button() == mouse_button::button1 && cmd.argument() == "region-select"; bv.mouseSetCursor(cur, do_selection); @@ -1432,8 +1534,8 @@ void InsetMathNest::lfunMousePress(Cursor & cur, FuncRequest & cmd) // 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.result().update()); + cur.screenUpdateFlags(Update::Decoration | Update::FitCursor + | cur.result().screenUpdate()); } else if (cmd.button() == mouse_button::button2) { if (cap::selection()) { // See comment in Text::dispatch why we do this @@ -1471,7 +1573,7 @@ void InsetMathNest::lfunMouseRelease(Cursor & cur, FuncRequest & cmd) if (cmd.button() == mouse_button::button1) { if (!cur.selection()) - cur.noUpdate(); + cur.noScreenUpdate(); else { Cursor & bvcur = cur.bv().cursor(); bvcur.setSelection(true); @@ -1612,8 +1714,12 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) //lyxerr << "starting with macro" << endl; bool reduced = cap::reduceSelectionToOneCell(cur); if (reduced || !cur.selection()) { + cur.recordUndoInset(); docstring const safe = cap::grabAndEraseSelection(cur); - cur.insert(MathAtom(new InsetMathUnknown(from_ascii("\\"), safe, false))); + if (!cur.inRegexped()) + cur.insert(MathAtom(new InsetMathUnknown(from_ascii("\\"), safe, false))); + else + cur.niceInsert(createInsetMath("backslash", buf)); } return true; } @@ -1638,7 +1744,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) // visual box corners that define the inset. If we know for // sure that we stay within the same cell we can optimize for // that using: - //cur.updateFlags(Update::SinglePar | Update::FitCursor); + //cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); } return true; } @@ -1648,7 +1754,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) // visual box corners that define the inset. If we know for // sure that we stay within the same cell we can optimize for // that using: - //cur.updateFlags(Update::SinglePar | Update::FitCursor); + //cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); return true; } @@ -1657,7 +1763,7 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) // visual box corners that define the inset. If we know for // sure that we stay within the same cell we can optimize for // that using: - //cur.updateFlags(Update::FitCursor); + //cur.screenUpdateFlags(Update::FitCursor); return true; } @@ -1666,7 +1772,29 @@ bool InsetMathNest::interpretChar(Cursor & cur, char_type const c) } // These should be treated differently when not in text mode: - if (currentMode() != InsetMath::TEXT_MODE) { + if (cur.inRegexped()) { + switch (c) { + case '\\': + cur.niceInsert(createInsetMath("backslash", buf)); + break; + case '^': + cur.niceInsert(createInsetMath("mathcircumflex", buf)); + break; + case '{': + case '}': + case '#': + case '%': + case '_': + cur.niceInsert(createInsetMath(docstring(1, c), buf)); + break; + case '~': + cur.niceInsert(createInsetMath("sim", buf)); + break; + default: + cur.insert(c); + } + return true; + } else if (currentMode() != InsetMath::TEXT_MODE) { if (c == '_') { script(cur, false, save_selection); return true; @@ -1945,7 +2073,7 @@ MathCompletionList::MathCompletionList(Cursor const & cur) } sort(locals.begin(), locals.end()); - if (globals.size() > 0) + if (!globals.empty()) return; // fill in global macros @@ -1973,12 +2101,14 @@ MathCompletionList::MathCompletionList(Cursor const & cur) globals.push_back(from_ascii("\\cases")); globals.push_back(from_ascii("\\substack")); globals.push_back(from_ascii("\\xymatrix")); + globals.push_back(from_ascii("\\Diagram")); globals.push_back(from_ascii("\\subarray")); globals.push_back(from_ascii("\\array")); globals.push_back(from_ascii("\\sqrt")); globals.push_back(from_ascii("\\root")); globals.push_back(from_ascii("\\tabular")); globals.push_back(from_ascii("\\stackrel")); + globals.push_back(from_ascii("\\stackrelthree")); globals.push_back(from_ascii("\\binom")); globals.push_back(from_ascii("\\choose")); globals.push_back(from_ascii("\\brace")); @@ -2008,6 +2138,14 @@ MathCompletionList::MathCompletionList(Cursor const & cur) globals.push_back(from_ascii("\\hphantom")); globals.push_back(from_ascii("\\phantom")); globals.push_back(from_ascii("\\vphantom")); + globals.push_back(from_ascii("\\cancel")); + globals.push_back(from_ascii("\\bcancel")); + globals.push_back(from_ascii("\\xcancel")); + globals.push_back(from_ascii("\\cancelto")); + globals.push_back(from_ascii("\\smash")); + globals.push_back(from_ascii("\\mathclap")); + globals.push_back(from_ascii("\\mathllap")); + globals.push_back(from_ascii("\\mathrlap")); MathWordList const & words = mathedWordList(); MathWordList::const_iterator it2; //lyxerr << "Globals completion commands: ";