X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=fbcd9b7206a2dd4f0c51810fcabce05af22dc925;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=7a7269668fe87cd43c724f909d66b53fdbaf5a53;hpb=99f84aab9515ff7a3da6fdd0ad6e4ac9395b6e8d;p=lyx.git diff --git a/src/Text3.cpp b/src/Text3.cpp index 7a7269668f..fbcd9b7206 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -17,7 +17,6 @@ #include "Text.h" -#include "Bidi.h" #include "BranchList.h" #include "FloatList.h" #include "FuncStatus.h" @@ -45,8 +44,10 @@ #include "SpellChecker.h" #include "TextClass.h" #include "TextMetrics.h" +#include "Thesaurus.h" #include "WordLangTuple.h" +#include "frontends/alert.h" #include "frontends/Application.h" #include "frontends/Clipboard.h" #include "frontends/Selection.h" @@ -71,14 +72,14 @@ #include "support/gettext.h" #include "support/lassert.h" #include "support/lstrings.h" +#include "support/lyxalgo.h" #include "support/lyxtime.h" #include "support/os.h" +#include "support/regex.h" #include "mathed/InsetMathHull.h" #include "mathed/MathMacroTemplate.h" -#include - #include #include @@ -131,7 +132,7 @@ static void finishChange(Cursor & cur, bool selecting) } -static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display) +static void mathDispatch(Cursor & cur, FuncRequest const & cmd) { cur.recordUndo(); docstring sel = cur.selectionAsString(false); @@ -148,48 +149,42 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display) #endif cur.insert(new InsetMathHull(cur.buffer(), hullSimple)); #ifdef ENABLE_ASSERTIONS - LASSERT(old_pos == cur.pos(), /**/); + LATTEST(old_pos == cur.pos()); #endif cur.nextInset()->edit(cur, true); - // don't do that also for LFUN_MATH_MODE - // unless you want end up with always changing - // to mathrm when opening an inlined inset -- - // I really hate "LyXfunc overloading"... - if (display) - cur.dispatch(FuncRequest(LFUN_MATH_DISPLAY)); - // Avoid an unnecessary undo step if cmd.argument - // is empty - if (!cmd.argument().empty()) - cur.dispatch(FuncRequest(LFUN_MATH_INSERT, - cmd.argument())); + if (cmd.action() != LFUN_MATH_MODE) + // LFUN_MATH_MODE has a different meaning in math mode + cur.dispatch(cmd); } else { - // create a macro if we see "\\newcommand" - // somewhere, and an ordinary formula - // otherwise - if (sel.find(from_ascii("\\newcommand")) == string::npos - && sel.find(from_ascii("\\newlyxcommand")) == string::npos - && sel.find(from_ascii("\\def")) == string::npos) - { - InsetMathHull * formula = new InsetMathHull(cur.buffer()); - string const selstr = to_utf8(sel); - istringstream is(selstr); - Lexer lex; + InsetMathHull * formula = new InsetMathHull(cur.buffer()); + string const selstr = to_utf8(sel); + istringstream is(selstr); + Lexer lex; + lex.setStream(is); + if (!formula->readQuiet(lex)) { + // No valid formula, let's try with delims + is.str("$" + selstr + "$"); lex.setStream(is); if (!formula->readQuiet(lex)) { - // No valid formula, let's try with delims - is.str("$" + selstr + "$"); - lex.setStream(is); - if (!formula->readQuiet(lex)) { - // Still not valid, leave it as is - valid = false; - delete formula; - cur.insert(sel); - } else - cur.insert(formula); - } else - cur.insert(formula); - } else { - cur.insert(new MathMacroTemplate(cur.buffer(), sel)); + // Still not valid, leave it as is + valid = false; + delete formula; + cur.insert(sel); + } + } + if (valid) { + cur.insert(formula); + cur.nextInset()->edit(cur, true); + LASSERT(cur.inMathed(), return); + cur.pos() = 0; + cur.resetAnchor(); + cur.setSelection(true); + cur.pos() = cur.lastpos(); + if (cmd.action() != LFUN_MATH_MODE) + // LFUN_MATH_MODE has a different meaning in math mode + cur.dispatch(cmd); + cur.clearSelection(); + cur.pos() = cur.lastpos(); } } if (valid) @@ -264,6 +259,42 @@ static bool doInsertInset(Cursor & cur, Text * text, } return true; } + else if (cmd.action() == LFUN_ARGUMENT_INSERT) { + bool cotextinsert = false; + InsetArgument const * const ia = static_cast(inset); + Layout const & lay = cur.paragraph().layout(); + Layout::LaTeXArgMap args = lay.args(); + Layout::LaTeXArgMap::const_iterator const lait = args.find(ia->name()); + if (lait != args.end()) + cotextinsert = (*lait).second.insertcotext; + else { + InsetLayout const & il = cur.inset().getLayout(); + args = il.args(); + Layout::LaTeXArgMap::const_iterator const ilait = args.find(ia->name()); + if (ilait != args.end()) + cotextinsert = (*ilait).second.insertcotext; + } + // The argument requests to insert a copy of the co-text to the inset + if (cotextinsert) { + docstring ds; + // If we have a selection within a paragraph, use this + if (cur.selection() && cur.selBegin().pit() == cur.selEnd().pit()) + ds = cur.selectionAsString(false); + // else use the whole paragraph + else + ds = cur.paragraph().asString(); + text->insertInset(cur, inset); + if (edit) + inset->edit(cur, true); + // Now put co-text into inset + Font const f(inherit_font, cur.current_font.language()); + if (!ds.empty()) { + cur.text()->insertStringAsLines(cur, ds, f); + cur.leaveInset(*inset); + } + return true; + } + } bool gotsel = false; if (cur.selection()) { @@ -295,6 +326,8 @@ static bool doInsertInset(Cursor & cur, Text * text, // Merge multiple paragraphs -- hack while (cur.lastpit() > 0) mergeParagraph(bparams, cur.text()->paragraphs(), 0); + if (cmd.action() == LFUN_FLEX_INSERT) + return true; Cursor old = cur; cur.leaveInset(*inset); if (cmd.action() == LFUN_PREVIEW_INSERT @@ -337,14 +370,12 @@ static void outline(OutlineOp mode, Cursor & cur) ParagraphList & pars = buf.text().paragraphs(); ParagraphList::iterator const bgn = pars.begin(); // The first paragraph of the area to be copied: - ParagraphList::iterator start = boost::next(bgn, pit); + ParagraphList::iterator start = lyx::next(bgn, pit); // The final paragraph of area to be copied: ParagraphList::iterator finish = start; ParagraphList::iterator const end = pars.end(); - DocumentClass const & tc = buf.params().documentClass(); - - int const thistoclevel = start->layout().toclevel; + int const thistoclevel = buf.text().getTocLevel(distance(bgn, start)); int toclevel; // Move out (down) from this section header @@ -353,7 +384,7 @@ static void outline(OutlineOp mode, Cursor & cur) // Seek the one (on same level) below for (; finish != end; ++finish) { - toclevel = finish->layout().toclevel; + toclevel = buf.text().getTocLevel(distance(bgn, finish)); if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) break; } @@ -370,7 +401,7 @@ static void outline(OutlineOp mode, Cursor & cur) // Search previous same-level header above do { --dest; - toclevel = dest->layout().toclevel; + toclevel = buf.text().getTocLevel(distance(bgn, dest)); } while(dest != bgn && (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)); @@ -380,7 +411,7 @@ static void outline(OutlineOp mode, Cursor & cur) pit_type const newpit = distance(bgn, dest); pit_type const len = distance(start, finish); pit_type const deletepit = pit + len; - buf.undo().recordUndo(cur, ATOMIC_UNDO, newpit, deletepit - 1); + buf.undo().recordUndo(cur, newpit, deletepit - 1); pars.splice(dest, start, finish); cur.pit() = newpit; break; @@ -390,34 +421,41 @@ static void outline(OutlineOp mode, Cursor & cur) // Nothing to move. return; // Go one down from *this* header: - ParagraphList::iterator dest = boost::next(finish, 1); + ParagraphList::iterator dest = next(finish, 1); // Go further down to find header to insert in front of: for (; dest != end; ++dest) { - toclevel = dest->layout().toclevel; + toclevel = buf.text().getTocLevel(distance(bgn, dest)); if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) break; } // One such was found: pit_type newpit = distance(bgn, dest); - buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, newpit - 1); + buf.undo().recordUndo(cur, pit, newpit - 1); pit_type const len = distance(start, finish); pars.splice(dest, start, finish); cur.pit() = newpit - len; break; } - case OutlineIn: { + case OutlineIn: + case OutlineOut: { pit_type const len = distance(start, finish); - buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1); + buf.undo().recordUndo(cur, pit, pit + len - 1); for (; start != finish; ++start) { - toclevel = start->layout().toclevel; + toclevel = buf.text().getTocLevel(distance(bgn, start)); if (toclevel == Layout::NOT_IN_TOC) continue; + + DocumentClass const & tc = buf.params().documentClass(); DocumentClass::const_iterator lit = tc.begin(); DocumentClass::const_iterator len = tc.end(); + int const newtoclevel = + (mode == OutlineIn ? toclevel + 1 : toclevel - 1); + LabelType const oldlabeltype = start->layout().labeltype; + for (; lit != len; ++lit) { - if (lit->toclevel == toclevel + 1 && - start->layout().labeltype == lit->labeltype) { + if (lit->toclevel == newtoclevel && + lit->labeltype == oldlabeltype) { start->setLayout(*lit); break; } @@ -425,25 +463,6 @@ static void outline(OutlineOp mode, Cursor & cur) } break; } - case OutlineOut: { - pit_type const len = distance(start, finish); - buf.undo().recordUndo(cur, ATOMIC_UNDO, pit, pit + len - 1); - for (; start != finish; ++start) { - toclevel = start->layout().toclevel; - if (toclevel == Layout::NOT_IN_TOC) - continue; - DocumentClass::const_iterator lit = tc.begin(); - DocumentClass::const_iterator len = tc.end(); - for (; lit != len; ++lit) { - if (lit->toclevel == toclevel - 1 && - start->layout().labeltype == lit->labeltype) { - start->setLayout(*lit); - break; - } - } - } - break; - } } } @@ -462,6 +481,15 @@ bool Text::isRTL(Paragraph const & par) const return par.isRTL(buffer.params()); } + +namespace { + + Language const * getLanguage(Cursor const & cur, string const & lang) { + return lang.empty() ? cur.getFont().language() : languages.getLanguage(lang); + } + +} + void Text::dispatch(Cursor & cur, FuncRequest & cmd) { @@ -486,7 +514,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // at the end? cur.noScreenUpdate(); - LASSERT(cur.text() == this, /**/); + LBUFERR(this == cur.text()); + + // NOTE: This should NOT be a reference. See commit 94a5481a. CursorSlice const oldTopSlice = cur.top(); bool const oldBoundary = cur.boundary(); bool const oldSelection = cur.selection(); @@ -499,13 +529,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) LyXAction::NoUpdate) || singleParUpdate); bool const last_misspelled = lyxrc.spellcheck_continuously && cur.paragraph().isMisspelled(cur.pos(), true); - + FuncCode const act = cmd.action(); switch (act) { case LFUN_PARAGRAPH_MOVE_DOWN: { pit_type const pit = cur.pit(); - recUndo(cur, pit, pit + 1); + cur.recordUndo(pit, pit + 1); cur.finishUndo(); pars_.swap(pit, pit + 1); needsUpdate = true; @@ -516,7 +546,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_PARAGRAPH_MOVE_UP: { pit_type const pit = cur.pit(); - recUndo(cur, pit - 1, pit); + cur.recordUndo(pit - 1, pit); cur.finishUndo(); pars_.swap(pit, pit - 1); --cur.pit(); @@ -535,7 +565,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // FIXME: this don't work for multipart document! for (pit_type tmp = 0, end = pars_.size(); tmp != end; ++tmp) { if (pars_[tmp].params().startOfAppendix()) { - recUndo(cur, tmp); + cur.recordUndo(tmp, tmp); pars_[tmp].params().startOfAppendix(false); break; } @@ -565,7 +595,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) finishChange(cur, false); break; - case LFUN_LINE_DELETE: + case LFUN_LINE_DELETE_FORWARD: if (cur.selection()) cutSelection(cur, true, false); else @@ -613,92 +643,77 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.screenUpdateFlags(Update::FitCursor); break; - case LFUN_INSET_SELECT_ALL: - if (cur.depth() == 1 || !cur.selection() || !cur.selBegin().at_begin() - || !cur.selEnd().at_end()) { - needsUpdate |= cur.selHandle(false); - needsUpdate |= cursorTop(cur); - needsUpdate |= cur.selHandle(true); - needsUpdate |= cursorBottom(cur); - } else - cur.undispatched(); - cur.screenUpdateFlags(Update::FitCursor); - break; - case LFUN_CHAR_FORWARD: - case LFUN_CHAR_FORWARD_SELECT: + case LFUN_CHAR_FORWARD_SELECT: { //LYXERR0(" LFUN_CHAR_FORWARD[SEL]:\n" << cur); needsUpdate |= cur.selHandle(act == LFUN_CHAR_FORWARD_SELECT); - needsUpdate |= cursorForward(cur); + bool const cur_moved = cursorForward(cur); + needsUpdate |= cur_moved; - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_FORWARD); - + // we will probably be moving out the inset, so we should execute - // the depm-mechanism, but only when the cursor has a place to + // the depm-mechanism, but only when the cursor has a place to // go outside this inset, i.e. in a slice above. - if (cur.depth() > 1 && cur.pos() == cur.lastpos() + if (cur.depth() > 1 && cur.pos() == cur.lastpos() && cur.pit() == cur.lastpit()) { - // The cursor hasn't changed yet. To give the + // The cursor hasn't changed yet. To give the // DEPM the possibility of doing something we must // provide it with two different cursors. Cursor dummy = cur; dummy.pos() = dummy.pit() = 0; - if (cur.bv().checkDepm(dummy, cur)) { + if (cur.bv().checkDepm(dummy, cur)) cur.forceBufferUpdate(); - // DEPM may have requested a screen update - cur.screenUpdateFlags( - cur.screenUpdate() | dummy.screenUpdate()); - } } } break; + } case LFUN_CHAR_BACKWARD: - case LFUN_CHAR_BACKWARD_SELECT: + case LFUN_CHAR_BACKWARD_SELECT: { //lyxerr << "handle LFUN_CHAR_BACKWARD[_SELECT]:\n" << cur << endl; needsUpdate |= cur.selHandle(act == LFUN_CHAR_BACKWARD_SELECT); - needsUpdate |= cursorBackward(cur); + bool const cur_moved = cursorBackward(cur); + needsUpdate |= cur_moved; - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_BACKWARD); // we will probably be moving out the inset, so we should execute - // the depm-mechanism, but only when the cursor has a place to + // the depm-mechanism, but only when the cursor has a place to // go outside this inset, i.e. in a slice above. if (cur.depth() > 1 && cur.pos() == 0 && cur.pit() == 0) { - // The cursor hasn't changed yet. To give the + // The cursor hasn't changed yet. To give the // DEPM the possibility of doing something we must // provide it with two different cursors. Cursor dummy = cur; dummy.pos() = cur.lastpos(); dummy.pit() = cur.lastpit(); - if (cur.bv().checkDepm(dummy, cur)) { + if (cur.bv().checkDepm(dummy, cur)) cur.forceBufferUpdate(); - // DEPM may have requested a screen update - cur.screenUpdateFlags( - cur.screenUpdate() | dummy.screenUpdate()); - } } } break; + } case LFUN_CHAR_LEFT: case LFUN_CHAR_LEFT_SELECT: if (lyxrc.visual_cursor) { needsUpdate |= cur.selHandle(act == LFUN_CHAR_LEFT_SELECT); - needsUpdate |= cursorVisLeft(cur); - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + bool const cur_moved = cursorVisLeft(cur); + needsUpdate |= cur_moved; + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_LEFT); } } else { - if (reverseDirectionNeeded(cur)) { + if (cur.reverseDirectionNeeded()) { cmd.setAction(cmd.action() == LFUN_CHAR_LEFT_SELECT ? LFUN_CHAR_FORWARD_SELECT : LFUN_CHAR_FORWARD); } else { @@ -714,14 +729,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_CHAR_RIGHT_SELECT: if (lyxrc.visual_cursor) { needsUpdate |= cur.selHandle(cmd.action() == LFUN_CHAR_RIGHT_SELECT); - needsUpdate |= cursorVisRight(cur); - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + bool const cur_moved = cursorVisRight(cur); + needsUpdate |= cur_moved; + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT); } } else { - if (reverseDirectionNeeded(cur)) { + if (cur.reverseDirectionNeeded()) { cmd.setAction(cmd.action() == LFUN_CHAR_RIGHT_SELECT ? LFUN_CHAR_BACKWARD_SELECT : LFUN_CHAR_BACKWARD); } else { @@ -747,15 +763,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) bool const atFirstOrLastRow = cur.atFirstOrLastRow(up); if (!atFirstOrLastRow) { - needsUpdate |= cur.selHandle(select); - cur.selHandle(select); + needsUpdate |= cur.selHandle(select); cur.upDownInText(up, needsUpdate); needsUpdate |= cur.beforeDispatchCursor().inMathed(); } else { // if the cursor cannot be moved up or down do not remove // the selection right now, but wait for the next dispatch. if (select) - needsUpdate |= cur.selHandle(select); + needsUpdate |= cur.selHandle(select); cur.upDownInText(up, needsUpdate); cur.undispatched(); } @@ -793,12 +808,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) ParagraphList & pars = buf.text().paragraphs(); ParagraphList::iterator bgn = pars.begin(); // The first paragraph of the area to be selected: - ParagraphList::iterator start = boost::next(bgn, pit); + ParagraphList::iterator start = lyx::next(bgn, pit); // The final paragraph of area to be selected: ParagraphList::iterator finish = start; ParagraphList::iterator end = pars.end(); - int const thistoclevel = start->layout().toclevel; + int const thistoclevel = buf.text().getTocLevel(distance(bgn, start)); if (thistoclevel == Layout::NOT_IN_TOC) break; @@ -812,12 +827,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // Seek the one (on same level) below for (; finish != end; ++finish, ++cur.pit()) { - int const toclevel = finish->layout().toclevel; + int const toclevel = buf.text().getTocLevel(distance(bgn, finish)); if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) break; } cur.pos() = cur.lastpos(); - + needsUpdate |= cur != old_cur; break; } @@ -826,14 +841,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_WORD_RIGHT_SELECT: if (lyxrc.visual_cursor) { needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_RIGHT_SELECT); - needsUpdate |= cursorVisRightOneWord(cur); - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + bool const cur_moved = cursorVisRightOneWord(cur); + needsUpdate |= cur_moved; + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_RIGHT); } } else { - if (reverseDirectionNeeded(cur)) { + if (cur.reverseDirectionNeeded()) { cmd.setAction(cmd.action() == LFUN_WORD_RIGHT_SELECT ? LFUN_WORD_BACKWARD_SELECT : LFUN_WORD_BACKWARD); } else { @@ -846,47 +862,46 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_WORD_FORWARD: - case LFUN_WORD_FORWARD_SELECT: + case LFUN_WORD_FORWARD_SELECT: { needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_FORWARD_SELECT); - needsUpdate |= cursorForwardOneWord(cur); + bool const cur_moved = cursorForwardOneWord(cur); + needsUpdate |= cur_moved; - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_FORWARD); - + // we will probably be moving out the inset, so we should execute - // the depm-mechanism, but only when the cursor has a place to + // the depm-mechanism, but only when the cursor has a place to // go outside this inset, i.e. in a slice above. - if (cur.depth() > 1 && cur.pos() == cur.lastpos() + if (cur.depth() > 1 && cur.pos() == cur.lastpos() && cur.pit() == cur.lastpit()) { - // The cursor hasn't changed yet. To give the + // The cursor hasn't changed yet. To give the // DEPM the possibility of doing something we must // provide it with two different cursors. Cursor dummy = cur; dummy.pos() = dummy.pit() = 0; - if (cur.bv().checkDepm(dummy, cur)) { + if (cur.bv().checkDepm(dummy, cur)) cur.forceBufferUpdate(); - // DEPM may have requested a screen update - cur.screenUpdateFlags( - cur.screenUpdate() | dummy.screenUpdate()); - } } } break; + } case LFUN_WORD_LEFT: case LFUN_WORD_LEFT_SELECT: if (lyxrc.visual_cursor) { needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_LEFT_SELECT); - needsUpdate |= cursorVisLeftOneWord(cur); - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + bool const cur_moved = cursorVisLeftOneWord(cur); + needsUpdate |= cur_moved; + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_LEFT); } } else { - if (reverseDirectionNeeded(cur)) { + if (cur.reverseDirectionNeeded()) { cmd.setAction(cmd.action() == LFUN_WORD_LEFT_SELECT ? LFUN_WORD_FORWARD_SELECT : LFUN_WORD_FORWARD); } else { @@ -899,35 +914,33 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_WORD_BACKWARD: - case LFUN_WORD_BACKWARD_SELECT: + case LFUN_WORD_BACKWARD_SELECT: { needsUpdate |= cur.selHandle(cmd.action() == LFUN_WORD_BACKWARD_SELECT); - needsUpdate |= cursorBackwardOneWord(cur); - - if (!needsUpdate && oldTopSlice == cur.top() - && cur.boundary() == oldBoundary) { + bool const cur_moved = cursorBackwardOneWord(cur); + needsUpdate |= cur_moved; + + if (!cur_moved && oldTopSlice == cur.top() + && cur.boundary() == oldBoundary) { cur.undispatched(); cmd = FuncRequest(LFUN_FINISHED_BACKWARD); - + // we will probably be moving out the inset, so we should execute - // the depm-mechanism, but only when the cursor has a place to + // the depm-mechanism, but only when the cursor has a place to // go outside this inset, i.e. in a slice above. - if (cur.depth() > 1 && cur.pos() == 0 + if (cur.depth() > 1 && cur.pos() == 0 && cur.pit() == 0) { - // The cursor hasn't changed yet. To give the + // The cursor hasn't changed yet. To give the // DEPM the possibility of doing something we must // provide it with two different cursors. Cursor dummy = cur; dummy.pos() = cur.lastpos(); dummy.pit() = cur.lastpit(); - if (cur.bv().checkDepm(dummy, cur)) { + if (cur.bv().checkDepm(dummy, cur)) cur.forceBufferUpdate(); - // DEPM may have requested a screen update - cur.screenUpdateFlags( - cur.screenUpdate() | dummy.screenUpdate()); - } } } break; + } case LFUN_WORD_SELECT: { selectWord(cur, WHOLE_WORD); @@ -938,15 +951,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_NEWLINE_INSERT: { InsetNewlineParams inp; docstring arg = cmd.argument(); - // this avoids a double undo - // FIXME: should not be needed, ideally - if (!cur.selection()) - cur.recordUndo(); - cap::replaceSelection(cur); if (arg == "linebreak") inp.kind = InsetNewlineParams::LINEBREAK; else inp.kind = InsetNewlineParams::NEWLINE; + cap::replaceSelection(cur); + cur.recordUndo(); cur.insert(new InsetNewline(inp)); cur.posForward(); moveCursor(cur, false); @@ -962,8 +972,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.recordUndoSelection(); pit_type const pit_end = cur.selEnd().pit(); for (pit_type pit = cur.selBegin().pit(); pit <= pit_end; pit++) { - pars_[pit].insertChar(0, '\t', - bv->buffer().params().trackChanges); + pars_[pit].insertChar(0, '\t', + bv->buffer().params().track_changes); // Update the selection pos to make sure the selection does not // change as the inserted tab will increase the logical pos. if (cur.realAnchor().pit() == pit) @@ -976,13 +986,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // Maybe we shouldn't allow tabs within a line, because they // are not (yet) aligned as one might do expect. FuncRequest cmd(LFUN_SELF_INSERT, from_ascii("\t")); - dispatch(cur, cmd); + dispatch(cur, cmd); } break; } case LFUN_TAB_DELETE: { - bool const tc = bv->buffer().params().trackChanges; + bool const tc = bv->buffer().params().track_changes; if (cur.selection()) { // If there is a selection, a tab (if present) is removed from // the beginning of each paragraph. @@ -996,11 +1006,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) if (c == '\t' || c == ' ') { // remove either 1 tab or 4 spaces. int const n = (c == ' ' ? 4 : 1); - for (int i = 0; i < n + for (int i = 0; i < n && !par.empty() && par.getChar(0) == c; ++i) { if (cur.pit() == pit) cur.posBackward(); - if (cur.realAnchor().pit() == pit + if (cur.realAnchor().pit() == pit && cur.realAnchor().pos() > 0 ) cur.realAnchor().backwardPos(); par.eraseChar(0, tc); @@ -1009,23 +1019,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } cur.finishUndo(); } else { - // If there is no selection, try to remove a tab or some spaces + // If there is no selection, try to remove a tab or some spaces // before the position of the cursor. Paragraph & par = paragraphs()[cur.pit()]; pos_type const pos = cur.pos(); - + if (pos == 0) break; - + char_type const c = par.getChar(pos - 1); cur.recordUndo(); if (c == '\t') { cur.posBackward(); par.eraseChar(cur.pos(), tc); } else - for (int n_spaces = 0; + for (int n_spaces = 0; cur.pos() > 0 - && par.getChar(cur.pos() - 1) == ' ' + && par.getChar(cur.pos() - 1) == ' ' && n_spaces < 4; ++n_spaces) { cur.posBackward(); @@ -1043,8 +1053,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) singleParUpdate = false; needsUpdate |= erase(cur); cur.resetAnchor(); - // It is possible to make it a lot faster still - // just comment out the line below... } else { cutSelection(cur, true, false); singleParUpdate = false; @@ -1055,13 +1063,18 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_CHAR_DELETE_BACKWARD: if (!cur.selection()) { if (bv->getIntl().getTransManager().backspace()) { + bool par_boundary = cur.pos() == 0; + bool first_par = cur.pit() == 0; // Par boundary, full-screen update - if (cur.pos() == 0) + if (par_boundary) singleParUpdate = false; needsUpdate |= backspace(cur); cur.resetAnchor(); - // It is possible to make it a lot faster still - // just comment out the line below... + if (par_boundary && !first_par && cur.pos() > 0 + && cur.paragraph().isEnvSeparator(cur.pos() - 1)) { + needsUpdate |= backspace(cur); + cur.resetAnchor(); + } } } else { cutSelection(cur, true, false); @@ -1069,11 +1082,59 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } break; - case LFUN_PARAGRAPH_BREAK: + case LFUN_PARAGRAPH_BREAK: { cap::replaceSelection(cur); - breakParagraph(cur, cmd.argument() == "inverse"); + pit_type pit = cur.pit(); + Paragraph const & par = pars_[pit]; + bool lastpar = (pit == pit_type(pars_.size() - 1)); + Paragraph const & nextpar = lastpar ? par : pars_[pit + 1]; + pit_type prev = pit; + if (pit > 0) { + if (!pars_[pit - 1].layout().isEnvironment()) + prev = depthHook(pit, par.getDepth()); + else if (pars_[pit - 1].getDepth() >= par.getDepth()) + prev = pit - 1; + } + if (prev < pit && cur.pos() == par.beginOfBody() + && !par.size() && !par.isEnvSeparator(cur.pos()) + && !par.layout().isCommand() + && pars_[prev].layout() != par.layout() + && pars_[prev].layout().isEnvironment() + && !nextpar.isEnvSeparator(nextpar.beginOfBody())) { + if (par.layout().isEnvironment() + && pars_[prev].getDepth() == par.getDepth()) { + docstring const layout = par.layout().name(); + DocumentClass const & tc = bv->buffer().params().documentClass(); + lyx::dispatch(FuncRequest(LFUN_LAYOUT, tc.plainLayout().name())); + lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "plain")); + lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse")); + lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout)); + } else { + lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "plain")); + breakParagraph(cur); + } + Font const f(inherit_font, cur.current_font.language()); + pars_[cur.pit() - 1].resetFonts(f); + } else { + if (par.isEnvSeparator(cur.pos())) + cur.posForward(); + breakParagraph(cur, cmd.argument() == "inverse"); + } cur.resetAnchor(); + // If we have a list and autoinsert item insets, + // insert them now. + Layout::LaTeXArgMap args = par.layout().args(); + Layout::LaTeXArgMap::const_iterator lait = args.begin(); + Layout::LaTeXArgMap::const_iterator const laend = args.end(); + for (; lait != laend; ++lait) { + Layout::latexarg arg = (*lait).second; + if (arg.autoinsert && prefixIs((*lait).first, "item:")) { + FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first); + lyx::dispatch(cmd); + } + } break; + } case LFUN_INSET_INSERT: { cur.recordUndo(); @@ -1098,13 +1159,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) /* Paragraph & par = pars_[cur.pit()]; if (inset->lyxCode() == LABEL_CODE - && par.layout().labeltype == LABEL_COUNTER) { + && !par.layout().counter.empty()) { // Go to the end of the paragraph // Warning: Because of Change-Tracking, the last // position is 'size()' and not 'size()-1': cur.pos() = par.size(); // Insert a new paragraph - FuncRequest fr(LFUN_BREAK_PARAGRAPH); + FuncRequest fr(LFUN_PARAGRAPH_BREAK); dispatch(cur, fr); } */ @@ -1183,6 +1244,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) specialChar(cur, InsetSpecialChar::END_OF_SENTENCE); else if (name == "menu-separator") specialChar(cur, InsetSpecialChar::MENU_SEPARATOR); + else if (name == "lyx") + specialChar(cur, InsetSpecialChar::PHRASE_LYX); + else if (name == "tex") + specialChar(cur, InsetSpecialChar::PHRASE_TEX); + else if (name == "latex") + specialChar(cur, InsetSpecialChar::PHRASE_LATEX); + else if (name == "latex2e") + specialChar(cur, InsetSpecialChar::PHRASE_LATEX2E); else if (name.empty()) lyxerr << "LyX function 'specialchar-insert' needs an argument." << endl; else @@ -1220,15 +1289,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_WORD_UPCASE: - changeCase(cur, text_uppercase); + changeCase(cur, text_uppercase, cmd.getArg(0) == "partial"); break; case LFUN_WORD_LOWCASE: - changeCase(cur, text_lowercase); + changeCase(cur, text_lowercase, cmd.getArg(0) == "partial"); break; case LFUN_WORD_CAPITALIZE: - changeCase(cur, text_capitalization); + changeCase(cur, text_capitalization, cmd.getArg(0) == "partial"); break; case LFUN_CHARS_TRANSPOSE: @@ -1237,23 +1306,30 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_PASTE: { cur.message(_("Paste")); - LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), /**/); + LASSERT(cur.selBegin().idx() == cur.selEnd().idx(), break); cap::replaceSelection(cur); // without argument? string const arg = to_utf8(cmd.argument()); if (arg.empty()) { + bool tryGraphics = true; if (theClipboard().isInternal()) pasteFromStack(cur, bv->buffer().errorList("Paste"), 0); - else if (theClipboard().hasGraphicsContents() - && !theClipboard().hasTextContents()) + else if (theClipboard().hasTextContents()) { + if (pasteClipboardText(cur, bv->buffer().errorList("Paste"), + true, Clipboard::AnyTextType)) + tryGraphics = false; + } + if (tryGraphics && theClipboard().hasGraphicsContents()) pasteClipboardGraphics(cur, bv->buffer().errorList("Paste")); - else - pasteClipboardText(cur, bv->buffer().errorList("Paste")); } else if (isStrUnsignedInt(arg)) { // we have a numerical argument pasteFromStack(cur, bv->buffer().errorList("Paste"), convert(arg)); + } else if (arg == "html" || arg == "latex") { + Clipboard::TextType type = (arg == "html") ? + Clipboard::HtmlTextType : Clipboard::LaTeXTextType; + pasteClipboardText(cur, bv->buffer().errorList("Paste"), true, type); } else { Clipboard::GraphicsType type = Clipboard::AnyGraphicsType; if (arg == "pdf") @@ -1268,9 +1344,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) type = Clipboard::EmfGraphicsType; else if (arg == "wmf") type = Clipboard::WmfGraphicsType; - else - LASSERT(false, /**/); + // we also check in getStatus() + LYXERR0("Unrecognized graphics type: " << arg); pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type); } @@ -1372,6 +1448,53 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) if (change_layout) setLayout(cur, layout); + Layout::LaTeXArgMap args = tclass[layout].args(); + Layout::LaTeXArgMap::const_iterator lait = args.begin(); + Layout::LaTeXArgMap::const_iterator const laend = args.end(); + for (; lait != laend; ++lait) { + Layout::latexarg arg = (*lait).second; + if (arg.autoinsert) { + FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first); + lyx::dispatch(cmd); + } + } + + break; + } + + case LFUN_ENVIRONMENT_SPLIT: { + bool const outer = cmd.argument() == "outer"; + Paragraph const & para = cur.paragraph(); + docstring layout = para.layout().name(); + depth_type split_depth = cur.paragraph().params().depth(); + if (outer) { + // check if we have an environment in our nesting hierarchy + pit_type pit = cur.pit(); + Paragraph cpar = pars_[pit]; + while (true) { + if (pit == 0 || cpar.params().depth() == 0) + break; + --pit; + cpar = pars_[pit]; + if (cpar.params().depth() < split_depth + && cpar.layout().isEnvironment()) { + layout = cpar.layout().name(); + split_depth = cpar.params().depth(); + } + } + } + if (cur.pos() > 0) + lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK)); + if (outer) { + while (cur.paragraph().params().depth() > split_depth) + lyx::dispatch(FuncRequest(LFUN_DEPTH_DECREMENT)); + } + DocumentClass const & tc = bv->buffer().params().documentClass(); + lyx::dispatch(FuncRequest(LFUN_LAYOUT, tc.plainLayout().name())); + lyx::dispatch(FuncRequest(LFUN_SEPARATOR_INSERT, "plain")); + lyx::dispatch(FuncRequest(LFUN_PARAGRAPH_BREAK, "inverse")); + lyx::dispatch(FuncRequest(LFUN_LAYOUT, layout)); + break; } @@ -1419,25 +1542,25 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_QUOTE_INSERT: { - // this avoids a double undo - // FIXME: should not be needed, ideally - if (!cur.selection()) - cur.recordUndo(); cap::replaceSelection(cur); + cur.recordUndo(); Paragraph const & par = cur.paragraph(); pos_type pos = cur.pos(); + // Ignore deleted text before cursor + while (pos > 0 && par.isDeleted(pos - 1)) + --pos; BufferParams const & bufparams = bv->buffer().params(); - bool const hebrew = + bool const hebrew = par.getFontSettings(bufparams, pos).language()->lang() == "hebrew"; bool const allow_inset_quote = !(par.isPassThru() || hebrew); - + + string const arg = to_utf8(cmd.argument()); if (allow_inset_quote) { char_type c = ' '; if (pos > 0 && (!cur.prevInset() || !cur.prevInset()->isSpace())) c = par.getChar(pos - 1); - string const arg = to_utf8(cmd.argument()); InsetQuotes::QuoteTimes const quote_type = (arg == "single") ? InsetQuotes::SingleQuotes : InsetQuotes::DoubleQuotes; cur.insert(new InsetQuotes(cur.buffer(), c, quote_type)); @@ -1445,8 +1568,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } else { // The cursor might have been invalidated by the replaceSelection. cur.buffer()->changed(true); - lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, "\"")); - } + string const quote_string = (arg == "single") ? "'" : "\""; + lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, quote_string)); + } break; } @@ -1470,7 +1594,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_MOUSE_DOUBLE: if (cmd.button() == mouse_button::button1) { - selectWord(cur, WHOLE_WORD_STRICT); + selectWord(cur, WHOLE_WORD); bv->cursor() = cur; } break; @@ -1484,17 +1608,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case mouse_button::button1: // Set the cursor if (!bv->mouseSetCursor(cur, cmd.argument() == "region-select")) - cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); if (bvcur.wordSelection()) selectWord(bvcur, WHOLE_WORD); break; case mouse_button::button2: - // Middle mouse pasting. - bv->mouseSetCursor(cur); - lyx::dispatch( - FuncRequest(LFUN_COMMAND_ALTERNATIVES, - "selection-paste ; primary-selection-paste paragraph")); + if (lyxrc.mouse_middlebutton_paste) { + // Middle mouse pasting. + bv->mouseSetCursor(cur); + lyx::dispatch( + FuncRequest(LFUN_COMMAND_ALTERNATIVES, + "selection-paste ; primary-selection-paste paragraph")); + } cur.noScreenUpdate(); break; @@ -1507,7 +1633,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) return; } if (!bv->mouseSetCursor(cur, false)) - cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); + cur.screenUpdateFlags(Update::FitCursor); break; } @@ -1628,16 +1754,47 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; } - case LFUN_HYPERLINK_INSERT: { - InsetCommandParams p(HYPERLINK_CODE); - docstring content; + case LFUN_HREF_INSERT: { + // FIXME If we're actually given an argument, shouldn't + // we use it, whether or not we have a selection? + docstring content = cmd.argument(); if (cur.selection()) { content = cur.selectionAsString(false); cutSelection(cur, true, false); } - p["target"] = (cmd.argument().empty()) ? - content : cmd.argument(); + + InsetCommandParams p(HYPERLINK_CODE); + if (!content.empty()){ + // if it looks like a link, we'll put it as target, + // otherwise as name (bug #8792). + + // We can't do: + // regex_match(to_utf8(content), matches, link_re) + // because smatch stores pointers to the substrings rather + // than making copies of them. And those pointers become + // invalid after regex_match returns, since it is then + // being given a temporary object. (Thanks to Georg for + // figuring that out.) + regex const link_re("^([a-z]+):.*"); + smatch matches; + string const c = to_utf8(lowercase(content)); + + if (c.substr(0,7) == "mailto:") { + p["target"] = content; + p["type"] = from_ascii("mailto:"); + } else if (regex_match(c, matches, link_re)) { + p["target"] = content; + string protocol = matches.str(1); + if (protocol == "file") + p["type"] = from_ascii("file:"); + } else + p["name"] = content; + } string const data = InsetCommand::params2string(p); + + // we need to have a target. if we already have one, then + // that gets used at the default for the name, too, which + // is probably what is wanted. if (p["target"].empty()) { bv->showDialog("href", data); } else { @@ -1685,7 +1842,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_CAPTION_INSERT: case LFUN_FOOTNOTE_INSERT: case LFUN_NOTE_INSERT: - case LFUN_FLEX_INSERT: case LFUN_BOX_INSERT: case LFUN_BRANCH_INSERT: case LFUN_PHANTOM_INSERT: @@ -1706,6 +1862,37 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.forceBufferUpdate(); break; + case LFUN_FLEX_INSERT: { + // Open the inset, and move the current selection + // inside it. + bool const sel = cur.selection(); + doInsertInset(cur, this, cmd, true, true); + // Insert auto-insert arguments + bool autoargs = false; + Layout::LaTeXArgMap args = cur.inset().getLayout().latexargs(); + Layout::LaTeXArgMap::const_iterator lait = args.begin(); + Layout::LaTeXArgMap::const_iterator const laend = args.end(); + for (; lait != laend; ++lait) { + Layout::latexarg arg = (*lait).second; + if (arg.autoinsert) { + // The cursor might have been invalidated by the replaceSelection. + cur.buffer()->changed(true); + FuncRequest cmd(LFUN_ARGUMENT_INSERT, (*lait).first); + lyx::dispatch(cmd); + autoargs = true; + } + } + if (!autoargs) { + if (sel) + cur.leaveInset(cur.inset()); + cur.posForward(); + } + // Some insets are numbered, others are shown in the outline pane so + // let's update the labels and the toc backend. + cur.forceBufferUpdate(); + break; + } + case LFUN_TABULAR_INSERT: // if there were no arguments, just open the dialog if (doInsertInset(cur, this, cmd, false, true)) @@ -1790,7 +1977,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) dispatch(cur, fr); break; } - + case LFUN_NOMENCL_PRINT: case LFUN_NEWPAGE_INSERT: // do nothing fancy @@ -1798,6 +1985,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.posForward(); break; + case LFUN_SEPARATOR_INSERT: { + doInsertInset(cur, this, cmd, false, false); + cur.posForward(); + // remove a following space + Paragraph & par = cur.paragraph(); + if (cur.pos() != cur.lastpos() && par.isLineSeparator(cur.pos())) + par.eraseChar(cur.pos(), cur.buffer()->params().track_changes); + break; + } + case LFUN_DEPTH_DECREMENT: changeDepth(cur, DEC_DEPTH); break; @@ -1806,22 +2003,38 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) changeDepth(cur, INC_DEPTH); break; - case LFUN_MATH_DISPLAY: - mathDispatch(cur, cmd, true); - break; - case LFUN_REGEXP_MODE: regexpDispatch(cur, cmd); break; - case LFUN_MATH_MODE: - if (cmd.argument() == "on") + case LFUN_MATH_MODE: { + if (cmd.argument() == "on" || cmd.argument() == "") { // don't pass "on" as argument // (it would appear literally in the first cell) - mathDispatch(cur, FuncRequest(LFUN_MATH_MODE), false); - else - mathDispatch(cur, cmd, false); + docstring sel = cur.selectionAsString(false); + MathMacroTemplate * macro = new MathMacroTemplate(cur.buffer()); + // create a macro template if we see "\\newcommand" somewhere, and + // an ordinary formula otherwise + if (!sel.empty() + && (sel.find(from_ascii("\\newcommand")) != string::npos + || sel.find(from_ascii("\\newlyxcommand")) != string::npos + || sel.find(from_ascii("\\def")) != string::npos) + && macro->fromString(sel)) { + cur.recordUndo(); + replaceSelection(cur); + cur.insert(macro); + } else { + // no meaningful macro template was found + delete macro; + mathDispatch(cur,FuncRequest(LFUN_MATH_MODE)); + } + } else + // The argument is meaningful + // We replace cmd with LFUN_MATH_INSERT because LFUN_MATH_MODE + // has a different meaning in math mode + mathDispatch(cur, FuncRequest(LFUN_MATH_INSERT,cmd.argument())); break; + } case LFUN_MATH_MACRO: if (cmd.argument().empty()) @@ -1849,27 +2062,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } break; - // passthrough hat and underscore outside mathed: + case LFUN_MATH_DISPLAY: case LFUN_MATH_SUBSCRIPT: - mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "_"), false); - break; case LFUN_MATH_SUPERSCRIPT: - mathDispatch(cur, FuncRequest(LFUN_SELF_INSERT, "^"), false); - break; - case LFUN_MATH_INSERT: case LFUN_MATH_AMS_MATRIX: case LFUN_MATH_MATRIX: case LFUN_MATH_DELIM: - case LFUN_MATH_BIGDELIM: { - cur.recordUndo(); - cap::replaceSelection(cur); - cur.insert(new InsetMathHull(cur.buffer(), hullSimple)); - checkAndActivateInset(cur, true); - LASSERT(cur.inMathed(), /**/); - cur.dispatch(cmd); + case LFUN_MATH_BIGDELIM: + mathDispatch(cur, cmd); break; - } case LFUN_FONT_EMPH: { Font font(ignore_font, ignore_language); @@ -1934,14 +2136,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; } - case LFUN_FONT_UULINE: { + case LFUN_FONT_UNDERUNDERLINE: { Font font(ignore_font, ignore_language); font.fontInfo().setUuline(FONT_TOGGLE); toggleAndShow(cur, this, font); break; } - case LFUN_FONT_UWAVE: { + case LFUN_FONT_UNDERWAVE: { Font font(ignore_font, ignore_language); font.fontInfo().setUwave(FONT_TOGGLE); toggleAndShow(cur, this, font); @@ -2024,6 +2226,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_FINISHED_BACKWARD: LYXERR(Debug::DEBUG, "handle LFUN_FINISHED_BACKWARD:\n" << cur); + cur.setCurrentFont(); break; case LFUN_FINISHED_FORWARD: @@ -2058,6 +2261,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_ACCENT_GRAVE: case LFUN_ACCENT_ACUTE: case LFUN_ACCENT_TILDE: + case LFUN_ACCENT_PERISPOMENI: case LFUN_ACCENT_CEDILLA: case LFUN_ACCENT_MACRON: case LFUN_ACCENT_DOT: @@ -2121,6 +2325,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_THESAURUS_ENTRY: { + Language const * language = cur.getFont().language(); docstring arg = cmd.argument(); if (arg.empty()) { arg = cur.selectionAsString(false); @@ -2129,16 +2334,33 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // Get word or selection selectWordWhenUnderCursor(cur, WHOLE_WORD); arg = cur.selectionAsString(false); - arg += " lang=" + from_ascii(cur.getFont().language()->lang()); + arg += " lang=" + from_ascii(language->lang()); + } + } else { + string lang = cmd.getArg(1); + // This duplicates the code in GuiThesaurus::initialiseParams + if (prefixIs(lang, "lang=")) { + language = languages.getLanguage(lang.substr(5)); + if (!language) + language = cur.getFont().language(); } } + string lang = language->code(); + if (lyxrc.thesaurusdir_path.empty() && !thesaurus.thesaurusInstalled(from_ascii(lang))) { + LYXERR(Debug::ACTION, "Command " << cmd << ". Thesaurus not found for language " << lang); + frontend::Alert::warning(_("Path to thesaurus directory not set!"), + _("The path to the thesaurus directory has not been specified.\n" + "The thesaurus is not functional.\n" + "Please refer to sec. 6.15.1 of the User's Guide for setup\n" + "instructions.")); + } bv->showDialog("thesaurus", to_utf8(arg)); break; } case LFUN_SPELLING_ADD: { + Language const * language = getLanguage(cur, cmd.getArg(1)); docstring word = from_utf8(cmd.getArg(0)); - Language * lang; if (word.empty()) { word = cur.selectionAsString(false); // FIXME @@ -2147,17 +2369,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else - lang = const_cast(languages.getLanguage(cmd.getArg(1))); - WordLangTuple wl(word, lang); + } + WordLangTuple wl(word, language); theSpellChecker()->insert(wl); break; } case LFUN_SPELLING_IGNORE: { + Language const * language = getLanguage(cur, cmd.getArg(1)); docstring word = from_utf8(cmd.getArg(0)); - Language * lang; if (word.empty()) { word = cur.selectionAsString(false); // FIXME @@ -2166,17 +2386,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else - lang = const_cast(languages.getLanguage(cmd.getArg(1))); - WordLangTuple wl(word, lang); + } + WordLangTuple wl(word, language); theSpellChecker()->accept(wl); break; } case LFUN_SPELLING_REMOVE: { + Language const * language = getLanguage(cur, cmd.getArg(1)); docstring word = from_utf8(cmd.getArg(0)); - Language * lang; if (word.empty()) { word = cur.selectionAsString(false); // FIXME @@ -2185,10 +2403,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else - lang = const_cast(languages.getLanguage(cmd.getArg(1))); - WordLangTuple wl(word, lang); + } + WordLangTuple wl(word, language); theSpellChecker()->remove(wl); break; } @@ -2252,6 +2468,33 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) needsUpdate = true; break; + case LFUN_SERVER_GET_STATISTICS: + { + DocIterator from, to; + if (cur.selection()) { + from = cur.selectionBegin(); + to = cur.selectionEnd(); + } else { + from = doc_iterator_begin(cur.buffer()); + to = doc_iterator_end(cur.buffer()); + } + + cur.buffer()->updateStatistics(from, to); + string const arg0 = cmd.getArg(0); + if (arg0 == "words") { + cur.message(convert(cur.buffer()->wordCount())); + } else if (arg0 == "chars") { + cur.message(convert(cur.buffer()->charCount(false))); + } else if (arg0 == "chars-space") { + cur.message(convert(cur.buffer()->charCount(true))); + } else { + cur.message(convert(cur.buffer()->wordCount()) + " " + + convert(cur.buffer()->charCount(false)) + " " + + convert(cur.buffer()->charCount(true))); + } + } + break; + default: LYXERR(Debug::ACTION, "Command " << cmd << " not DISPATCHED by Text"); cur.undispatched(); @@ -2317,7 +2560,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - LASSERT(cur.text() == this, /**/); + LBUFERR(this == cur.text()); FontInfo const & fontinfo = cur.real_current_font.fontInfo(); bool enable = true; @@ -2336,7 +2579,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_APPENDIX: // FIXME We really should not allow this to be put, e.g., - // in a footnote, or in ERT. But it would make sense in a + // in a footnote, or in ERT. But it would make sense in a // branch, so I'm not sure what to do. flag.setOnOff(cur.paragraph().params().startOfAppendix()); break; @@ -2371,6 +2614,10 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, code = INDEX_CODE; else if (cmd.argument() == "index_print") code = INDEX_PRINT_CODE; + else if (cmd.argument() == "listings") + code = LISTINGS_CODE; + else if (cmd.argument() == "mathspace") + code = MATH_HULL_CODE; else if (cmd.argument() == "nomenclature") code = NOMENCL_CODE; else if (cmd.argument() == "nomencl_print") @@ -2393,8 +2640,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, code = VSPACE_CODE; else if (cmd.argument() == "wrap") code = WRAP_CODE; - else if (cmd.argument() == "listings") - code = LISTINGS_CODE; break; case LFUN_ERT_INSERT: @@ -2470,11 +2715,17 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, } break; } - case LFUN_CAPTION_INSERT: + case LFUN_CAPTION_INSERT: { code = CAPTION_CODE; - // not allowed in description items - enable = !inDescriptionItem(cur); + string arg = cmd.getArg(0); + bool varia = arg != "LongTableNoNumber" + && cur.inset().allowsCaptionVariation(arg); + // not allowed in description items, + // and in specific insets + enable = !inDescriptionItem(cur) + && (varia || arg.empty() || arg == "Standard"); break; + } case LFUN_NOTE_INSERT: code = NOTE_CODE; // in commands (sections etc.) and description items, @@ -2525,21 +2776,43 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; } Layout const & lay = cur.paragraph().layout(); - Layout::LaTeXArgMap args = lay.latexargs(); + Layout::LaTeXArgMap args = lay.args(); Layout::LaTeXArgMap::const_iterator const lait = - args.find(convert(arg)); + args.find(arg); if (lait != args.end()) { enable = true; - InsetList::const_iterator it = cur.paragraph().insetList().begin(); - InsetList::const_iterator end = cur.paragraph().insetList().end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == ARG_CODE) { - InsetArgument const * ins = - static_cast(it->inset); - if (ins->name() == arg) { - // we have this already - enable = false; + pit_type pit = cur.pit(); + pit_type lastpit = cur.pit(); + if (lay.isEnvironment() && !prefixIs(arg, "item:")) { + // In a sequence of "merged" environment layouts, we only allow + // non-item arguments once. + lastpit = cur.lastpit(); + // get the first paragraph in sequence with this layout + depth_type const current_depth = cur.paragraph().params().depth(); + while (true) { + if (pit == 0) break; + Paragraph cpar = pars_[pit - 1]; + if (cpar.layout() == lay && cpar.params().depth() == current_depth) + --pit; + else + break; + } + } + for (; pit <= lastpit; ++pit) { + if (pars_[pit].layout() != lay) + break; + InsetList::const_iterator it = pars_[pit].insetList().begin(); + InsetList::const_iterator end = pars_[pit].insetList().end(); + for (; it != end; ++it) { + if (it->inset->lyxCode() == ARG_CODE) { + InsetArgument const * ins = + static_cast(it->inset); + if (ins->name() == arg) { + // we have this already + enable = false; + break; + } } } } @@ -2567,7 +2840,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, // not allowed in description items enable = !inDescriptionItem(cur); break; - case LFUN_HYPERLINK_INSERT: + case LFUN_HREF_INSERT: if (cur.selIsMultiCell() || cur.selIsMultiLine()) { enable = false; break; @@ -2686,22 +2959,44 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; } - // explicit graphics type? - Clipboard::GraphicsType type = Clipboard::AnyGraphicsType; - if ((arg == "pdf" && (type = Clipboard::PdfGraphicsType)) - || (arg == "png" && (type = Clipboard::PngGraphicsType)) - || (arg == "jpeg" && (type = Clipboard::JpegGraphicsType)) - || (arg == "linkback" && (type = Clipboard::LinkBackGraphicsType)) - || (arg == "emf" && (type = Clipboard::EmfGraphicsType)) - || (arg == "wmf" && (type = Clipboard::WmfGraphicsType))) { - enable = theClipboard().hasGraphicsContents(type); + // explicit text type? + if (arg == "html") { + // Do not enable for PlainTextType, since some tidying in the + // frontend is needed for HTML, which is too unsafe for plain text. + enable = theClipboard().hasTextContents(Clipboard::HtmlTextType); + break; + } else if (arg == "latex") { + // LaTeX is usually not available on the clipboard with + // the correct MIME type, but in plain text. + enable = theClipboard().hasTextContents(Clipboard::PlainTextType) || + theClipboard().hasTextContents(Clipboard::LaTeXTextType); break; } - // unknown argument - enable = false; + Clipboard::GraphicsType type = Clipboard::AnyGraphicsType; + if (arg == "pdf") + type = Clipboard::PdfGraphicsType; + else if (arg == "png") + type = Clipboard::PngGraphicsType; + else if (arg == "jpeg") + type = Clipboard::JpegGraphicsType; + else if (arg == "linkback") + type = Clipboard::LinkBackGraphicsType; + else if (arg == "emf") + type = Clipboard::EmfGraphicsType; + else if (arg == "wmf") + type = Clipboard::WmfGraphicsType; + else { + // unknown argument + LYXERR0("Unrecognized graphics type: " << arg); + // we don't want to assert if the user just mistyped the LFUN + LATTEST(cmd.origin() != FuncRequest::INTERNAL); + enable = false; + break; + } + enable = theClipboard().hasGraphicsContents(type); break; - } + } case LFUN_CLIPBOARD_PASTE: case LFUN_CLIPBOARD_PASTE_SIMPLE: @@ -2745,12 +3040,18 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_OUTLINE_OUT: // FIXME: LyX is not ready for outlining within inset. enable = isMainText() - && cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC; + && cur.buffer()->text().getTocLevel(cur.pit()) != Layout::NOT_IN_TOC; break; case LFUN_NEWLINE_INSERT: // LaTeX restrictions (labels or empty par) - enable = (cur.pos() > cur.paragraph().beginOfBody()); + enable = !cur.paragraph().isPassThru() + && cur.pos() > cur.paragraph().beginOfBody(); + break; + + case LFUN_SEPARATOR_INSERT: + // Always enabled for now + enable = true; break; case LFUN_TAB_INSERT: @@ -2786,19 +3087,57 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; case LFUN_PARAGRAPH_BREAK: - enable = cur.inset().getLayout().isMultiPar(); + enable = inset().allowMultiPar(); break; - + case LFUN_SPELLING_ADD: case LFUN_SPELLING_IGNORE: case LFUN_SPELLING_REMOVE: - enable = theSpellChecker(); + enable = theSpellChecker() != NULL; + if (enable && !cmd.getArg(1).empty()) { + // validate explicitly given language + Language const * const lang = const_cast(languages.getLanguage(cmd.getArg(1))); + enable &= lang != NULL; + } break; - case LFUN_LAYOUT: - enable = !cur.inset().forcePlainLayout(); + case LFUN_LAYOUT: { + DocumentClass const & tclass = cur.buffer()->params().documentClass(); + docstring layout = cmd.argument(); + if (layout.empty()) + layout = tclass.defaultLayoutName(); + enable = !cur.inset().forcePlainLayout() && tclass.hasLayout(layout); + + flag.setOnOff(layout == cur.paragraph().layout().name()); break; - + } + + case LFUN_ENVIRONMENT_SPLIT: { + if (cmd.argument() == "outer") { + // check if we have an environment in our nesting hierarchy + bool res = false; + depth_type const current_depth = cur.paragraph().params().depth(); + pit_type pit = cur.pit(); + Paragraph cpar = pars_[pit]; + while (true) { + if (pit == 0 || cpar.params().depth() == 0) + break; + --pit; + cpar = pars_[pit]; + if (cpar.params().depth() < current_depth) + res = cpar.layout().isEnvironment(); + } + enable = res; + break; + } + else if (cur.paragraph().layout().isEnvironment()) { + enable = true; + break; + } + enable = false; + break; + } + case LFUN_LAYOUT_PARAGRAPH: case LFUN_PARAGRAPH_PARAMS: case LFUN_PARAGRAPH_PARAMS_APPLY: @@ -2807,6 +3146,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; // FIXME: why are accent lfuns forbidden with pass_thru layouts? + // Because they insert COMBINING DIACRITICAL Unicode characters, + // that cannot be handled by LaTeX but must be converted according + // to the definition in lib/unicodesymbols? case LFUN_ACCENT_ACUTE: case LFUN_ACCENT_BREVE: case LFUN_ACCENT_CARON: @@ -2820,6 +3162,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_ACCENT_OGONEK: case LFUN_ACCENT_TIE: case LFUN_ACCENT_TILDE: + case LFUN_ACCENT_PERISPOMENI: case LFUN_ACCENT_UMLAUT: case LFUN_ACCENT_UNDERBAR: case LFUN_ACCENT_UNDERDOT: @@ -2829,8 +3172,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_FONT_STATE: case LFUN_FONT_UNDERLINE: case LFUN_FONT_STRIKEOUT: - case LFUN_FONT_UULINE: - case LFUN_FONT_UWAVE: + case LFUN_FONT_UNDERUNDERLINE: + case LFUN_FONT_UNDERWAVE: case LFUN_TEXTSTYLE_APPLY: case LFUN_TEXTSTYLE_UPDATE: enable = !cur.paragraph().isPassThru(); @@ -2838,7 +3181,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_WORD_DELETE_FORWARD: case LFUN_WORD_DELETE_BACKWARD: - case LFUN_LINE_DELETE: + case LFUN_LINE_DELETE_FORWARD: case LFUN_WORD_FORWARD: case LFUN_WORD_BACKWARD: case LFUN_WORD_RIGHT: @@ -2873,7 +3216,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_INSET_END: case LFUN_INSET_BEGIN_SELECT: case LFUN_INSET_END_SELECT: - case LFUN_INSET_SELECT_ALL: case LFUN_PARAGRAPH_UP: case LFUN_PARAGRAPH_DOWN: case LFUN_LINE_BEGIN: @@ -2891,6 +3233,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_UNICODE_INSERT: case LFUN_THESAURUS_ENTRY: case LFUN_ESCAPE: + case LFUN_SERVER_GET_STATISTICS: // these are handled in our dispatch() enable = true; break; @@ -2913,7 +3256,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, } if (code != NO_CODE - && (cur.empty() + && (cur.empty() || !cur.inset().insetAllowed(code) || (cur.paragraph().layout().pass_thru && !allow_in_passthru))) enable = false;