X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=3f48d19f4503be17425bcc7d9675d667e7db9d35;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=3a93ed23d59cb74ef745d3a6bc5d6fa2078706f0;hpb=580947bfe01ef8529256243166b372e9daadf948;p=lyx.git diff --git a/src/Text3.cpp b/src/Text3.cpp index 3a93ed23d5..3f48d19f45 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,6 +44,7 @@ #include "SpellChecker.h" #include "TextClass.h" #include "TextMetrics.h" +#include "Thesaurus.h" #include "WordLangTuple.h" #include "frontends/alert.h" @@ -97,6 +97,7 @@ using cap::replaceSelection; using cap::grabAndEraseSelection; using cap::selClearOrDel; using cap::pasteSimpleText; +using frontend::Clipboard; // globals... static Font freefont(ignore_font, ignore_language); @@ -132,7 +133,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 +153,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.selection(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) @@ -376,7 +371,7 @@ 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 = 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(); @@ -487,6 +482,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) { @@ -710,7 +714,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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 { @@ -734,7 +738,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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 { @@ -805,7 +809,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 = 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(); @@ -846,7 +850,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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 { @@ -898,7 +902,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) 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 { @@ -1045,22 +1049,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; @@ -1072,12 +1065,13 @@ 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(); @@ -1093,6 +1087,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()) @@ -1101,25 +1097,28 @@ 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(); @@ -1609,7 +1608,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) switch (cmd.button()) { case mouse_button::button1: // Set the cursor - if (!bv->mouseSetCursor(cur, cmd.argument() == "region-select")) + if (!bv->mouseSetCursor(cur, cmd.modifier() == ShiftModifier)) cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); if (bvcur.wordSelection()) selectWord(bvcur, WHOLE_WORD); @@ -1635,7 +1634,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; } @@ -1663,6 +1662,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) tm->setCursorFromCoordinates(cur, cmd.x(), y); cur.setTargetX(cmd.x()); + // Don't allow selecting a separator inset + if (cur.pos() && cur.paragraph().isEnvSeparator(cur.pos() - 1)) + cur.posBackward(); if (cmd.y() >= wh) lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT)); else if (cmd.y() < 0) @@ -1677,7 +1679,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // We continue with our existing selection or start a new one, so don't // reset the anchor. bvcur.setCursor(cur); - bvcur.setSelection(true); + bvcur.selection(true); if (cur.top() == old) { // We didn't move one iota, so no need to update the screen. cur.screenUpdateFlags(Update::SinglePar | Update::FitCursor); @@ -2005,22 +2007,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()) @@ -2043,32 +2061,21 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.push(*inset); cur.top().pos() = cur.top().lastpos(); cur.resetAnchor(); - cur.setSelection(true); + cur.selection(true); cur.top().pos() = 0; } 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); @@ -2223,6 +2230,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: @@ -2257,6 +2265,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: @@ -2320,6 +2329,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); @@ -2328,10 +2338,20 @@ 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(); } } - if (lyxrc.thesaurusdir_path.empty()) { + 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" @@ -2343,8 +2363,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } 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 @@ -2353,22 +2373,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else if (cmd.getArg(1).empty()) { - // optional language argument is missing - // use the language at cursor position - 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 @@ -2377,20 +2390,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else if (cmd.getArg(1).empty()) { - 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 @@ -2399,13 +2407,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) selectWordWhenUnderCursor(cur, WHOLE_WORD); word = cur.selectionAsString(false); } - lang = const_cast(cur.getFont().language()); - } else if (cmd.getArg(1).empty()) { - 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; } @@ -2434,7 +2437,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_ESCAPE: if (cur.selection()) { - cur.setSelection(false); + cur.selection(false); } else { cur.undispatched(); // This used to be LFUN_FINISHED_RIGHT, I think FORWARD is more @@ -2719,7 +2722,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_CAPTION_INSERT: { code = CAPTION_CODE; string arg = cmd.getArg(0); - bool varia = arg != "LongTableNoNumber" + bool varia = arg != "Unnumbered" && cur.inset().allowsCaptionVariation(arg); // not allowed in description items, // and in specific insets @@ -3103,13 +3106,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, break; case LFUN_LAYOUT: { - enable = !cur.inset().forcePlainLayout(); - + DocumentClass const & tclass = cur.buffer()->params().documentClass(); docstring layout = cmd.argument(); - if (layout.empty()) { - DocumentClass const & tclass = cur.buffer()->params().documentClass(); + if (layout.empty()) layout = tclass.defaultLayoutName(); - } + enable = !owner_->forcePlainLayout() && tclass.hasLayout(layout); + flag.setOnOff(layout == cur.paragraph().layout().name()); break; } @@ -3144,10 +3146,13 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_PARAGRAPH_PARAMS: case LFUN_PARAGRAPH_PARAMS_APPLY: case LFUN_PARAGRAPH_UPDATE: - enable = cur.inset().allowParagraphCustomization(); + enable = owner_->allowParagraphCustomization(); 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: @@ -3161,6 +3166,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: