X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=fbcd9b7206a2dd4f0c51810fcabce05af22dc925;hb=f16b2cab75752e7b0fbec5520e231b068eb29072;hp=6bf3bc601f0f73ba972f114fe46b21a8ad30e7a6;hpb=11e679f73ecca718c61307973c3d67739354e1c7;p=lyx.git diff --git a/src/Text3.cpp b/src/Text3.cpp index 6bf3bc601f..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,6 +72,7 @@ #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" @@ -78,8 +80,6 @@ #include "mathed/InsetMathHull.h" #include "mathed/MathMacroTemplate.h" -#include - #include #include @@ -132,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); @@ -152,45 +152,39 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display) 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) @@ -265,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()) { @@ -340,13 +370,11 @@ 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 = buf.text().getTocLevel(distance(bgn, start)); int toclevel; @@ -383,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; @@ -393,7 +421,7 @@ 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 = buf.text().getTocLevel(distance(bgn, dest)); @@ -403,7 +431,7 @@ static void outline(OutlineOp mode, Cursor & cur) } // 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; @@ -412,17 +440,22 @@ static void outline(OutlineOp mode, Cursor & cur) 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 = 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 == (mode == OutlineIn ? - toclevel + 1 : toclevel - 1) && - start->layout().labeltype == lit->labeltype) { + if (lit->toclevel == newtoclevel && + lit->labeltype == oldlabeltype) { start->setLayout(*lit); break; } @@ -448,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) { @@ -473,6 +515,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.noScreenUpdate(); 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(); @@ -491,7 +535,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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; @@ -502,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(); @@ -521,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; } @@ -599,26 +643,15 @@ 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); @@ -637,15 +670,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } } 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); @@ -664,19 +699,21 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } } 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 { @@ -692,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 { @@ -770,7 +808,7 @@ 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(); @@ -803,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 { @@ -823,12 +862,13 @@ 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); @@ -847,19 +887,21 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } } 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 { @@ -872,12 +914,13 @@ 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); + bool const cur_moved = cursorBackwardOneWord(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); @@ -897,6 +940,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } } break; + } case LFUN_WORD_SELECT: { selectWord(cur, WHOLE_WORD); @@ -1004,22 +1048,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_CHAR_DELETE_FORWARD: if (!cur.selection()) { - bool was_separator = cur.paragraph().isEnvSeparator(cur.pos()); if (cur.pos() == cur.paragraph().size()) // Par boundary, force full-screen update singleParUpdate = false; needsUpdate |= erase(cur); cur.resetAnchor(); - if (was_separator && cur.pos() == cur.paragraph().size() - && (!cur.paragraph().layout().isEnvironment() - || cur.paragraph().size() > 0)) { - // Force full-screen update - 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; @@ -1031,18 +1064,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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 (par_boundary) singleParUpdate = false; needsUpdate |= backspace(cur); cur.resetAnchor(); - if (par_boundary && cur.pos() > 0 + if (par_boundary && !first_par && cur.pos() > 0 && cur.paragraph().isEnvSeparator(cur.pos() - 1)) { needsUpdate |= backspace(cur); cur.resetAnchor(); } - // It is possible to make it a lot faster still - // just comment out the line below... } } else { cutSelection(cur, true, false); @@ -1054,6 +1086,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cap::replaceSelection(cur); 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()) @@ -1062,28 +1096,43 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) prev = pit - 1; } if (prev < pit && cur.pos() == par.beginOfBody() - && !par.isEnvSeparator(cur.pos()) + && !par.size() && !par.isEnvSeparator(cur.pos()) && !par.layout().isCommand() && pars_[prev].layout() != par.layout() - && pars_[prev].layout().isEnvironment()) { + && 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, "parbreak")); + 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, "parbreak")); + 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; } @@ -1110,13 +1159,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) /* Paragraph & par = pars_[cur.pit()]; if (inset->lyxCode() == LABEL_CODE - && !par.layout().counter.empty() { + && !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); } */ @@ -1195,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 @@ -1232,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: @@ -1288,8 +1345,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) else if (arg == "wmf") type = Clipboard::WmfGraphicsType; else - // We used to assert, but couldn't the argument come from, say, the - // minibuffer and just be mistyped? + // we also check in getStatus() LYXERR0("Unrecognized graphics type: " << arg); pasteClipboardGraphics(cur, bv->buffer().errorList("Paste"), type); @@ -1552,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; @@ -1575,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; } @@ -1945,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()) @@ -1988,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(), break); - cur.dispatch(cmd); + case LFUN_MATH_BIGDELIM: + mathDispatch(cur, cmd); break; - } case LFUN_FONT_EMPH: { Font font(ignore_font, ignore_language); @@ -2163,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: @@ -2197,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: @@ -2260,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); @@ -2268,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 @@ -2286,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 @@ -2305,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 @@ -2324,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; } @@ -2641,11 +2718,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_CAPTION_INSERT: { code = CAPTION_CODE; string arg = cmd.getArg(0); - bool varia = arg != "LongTableNoNumber"; - if (cur.depth() > 0) { - if (&cur[cur.depth() - 1].inset()) - varia = cur[cur.depth() - 1].inset().allowsCaptionVariation(arg); - } + bool varia = arg != "LongTableNoNumber" + && cur.inset().allowsCaptionVariation(arg); // not allowed in description items, // and in specific insets enable = !inDescriptionItem(cur) @@ -2899,22 +2973,30 @@ 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); + 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; } - - // unknown argument - enable = false; + enable = theClipboard().hasGraphicsContents(type); break; - } + } case LFUN_CLIPBOARD_PASTE: case LFUN_CLIPBOARD_PASTE_SIMPLE: @@ -3005,18 +3087,30 @@ 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") { @@ -3052,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: @@ -3065,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: @@ -3118,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: