X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=2ede8d0d5fa10e562cb046451c28af4c196a7803;hb=bb514884352902846365b02696ed5d56b5c5c34c;hp=d5c1051080f85566edc0938071a51a744abfd385;hpb=371ed5aff5cd0de3bb0e7ba1e8265780137cd8c4;p=lyx.git diff --git a/src/Text3.cpp b/src/Text3.cpp index d5c1051080..2ede8d0d5f 100644 --- a/src/Text3.cpp +++ b/src/Text3.cpp @@ -156,7 +156,7 @@ static void mathDispatch(Cursor & cur, FuncRequest const & cmd, bool display) istringstream is(to_utf8(sel)); Lexer lex(0, 0); lex.setStream(is); - formula->read(cur.buffer(), lex); + formula->read(lex); if (formula->getType() == hullNone) // Don't create pseudo formulas if // delimiters are left out @@ -219,10 +219,8 @@ static bool doInsertInset(Cursor & cur, Text * text, InsetText * insetText = dynamic_cast(inset); if (insetText && !insetText->allowMultiPar() || cur.lastpit() == 0) { // reset first par to default - LayoutPtr const layout = insetText->useEmptyLayout() - ? bparams.getTextClass().emptyLayout() - : bparams.getTextClass().defaultLayout(); - cur.text()->paragraphs().begin()->layout(layout); + cur.text()->paragraphs().begin() + ->setEmptyOrDefaultLayout(bparams.documentClass()); cur.pos() = 0; cur.pit() = 0; // Merge multiple paragraphs -- hack @@ -231,8 +229,8 @@ static bool doInsertInset(Cursor & cur, Text * text, } else { // reset surrounding par to default docstring const layoutname = insetText->useEmptyLayout() - ? bparams.getTextClass().emptyLayoutName() - : bparams.getTextClass().defaultLayoutName(); + ? bparams.documentClass().emptyLayoutName() + : bparams.documentClass().defaultLayoutName(); cur.leaveInset(*inset); text->setLayout(cur, layoutname); } @@ -268,40 +266,38 @@ static void outline(OutlineOp mode, Cursor & cur) ParagraphList::iterator finish = start; ParagraphList::iterator end = pars.end(); - TextClass::const_iterator lit = - buf.params().getTextClass().begin(); - TextClass::const_iterator const lend = - buf.params().getTextClass().end(); + DocumentClass const & tc = buf.params().documentClass(); - int const thistoclevel = start->layout()->toclevel; + int const thistoclevel = start->layout().toclevel; int toclevel; + + // Move out (down) from this section header + if (finish != end) + ++finish; + // Seek the one (on same level) below + for (; finish != end; ++finish) { + toclevel = finish->layout().toclevel; + if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) { + break; + } + } + switch (mode) { case OutlineUp: { - // Move out (down) from this section header - if (finish != end) - ++finish; - // Seek the one (on same level) below - for (; finish != end; ++finish) { - toclevel = finish->layout()->toclevel; - if (toclevel != Layout::NOT_IN_TOC - && toclevel <= thistoclevel) { - break; - } - } ParagraphList::iterator dest = start; // Move out (up) from this header if (dest == bgn) - break; + return; // Search previous same-level header above do { --dest; - toclevel = dest->layout()->toclevel; + toclevel = dest->layout().toclevel; } while(dest != bgn && (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel)); // Not found; do nothing if (toclevel == Layout::NOT_IN_TOC || toclevel > thistoclevel) - break; + return; pit_type const newpit = distance(bgn, dest); pit_type const len = distance(start, finish); pit_type const deletepit = pit + len; @@ -310,30 +306,10 @@ static void outline(OutlineOp mode, Cursor & cur) start = boost::next(pars.begin(), deletepit); pit = newpit; pars.erase(start, finish); - break; + return; } case OutlineDown: { - // Go down out of current header: - if (finish != end) - ++finish; - // Find next same-level header: - for (; finish != end; ++finish) { - toclevel = finish->layout()->toclevel; - if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) - break; - } ParagraphList::iterator dest = finish; - // Go one down from *this* header: - if (dest != end) - ++dest; - else - break; - // Go further down to find header to insert in front of: - for (; dest != end; ++dest) { - toclevel = dest->layout()->toclevel; - if (toclevel != Layout::NOT_IN_TOC && toclevel <= thistoclevel) - break; - } // One such was found: pit_type newpit = distance(bgn, dest); pit_type const len = distance(start, finish); @@ -342,30 +318,46 @@ static void outline(OutlineOp mode, Cursor & cur) start = boost::next(bgn, pit); pit = newpit - len; pars.erase(start, finish); - break; + return; } - case OutlineIn: - buf.undo().recordUndo(cur); - for (; lit != lend; ++lit) { - if ((*lit)->toclevel == thistoclevel + 1 && - start->layout()->labeltype == (*lit)->labeltype) { - start->layout((*lit)); - break; + case OutlineIn: { + 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; - case OutlineOut: - buf.undo().recordUndo(cur); - for (; lit != lend; ++lit) { - if ((*lit)->toclevel == thistoclevel - 1 && - start->layout()->labeltype == (*lit)->labeltype) { - start->layout((*lit)); - break; + return; + } + 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; - default: - break; + return; + } } } @@ -374,7 +366,7 @@ void Text::number(Cursor & cur) { FontInfo font = ignore_font; font.setNumber(FONT_TOGGLE); - toggleAndShow(cur, this, Font(font)); + toggleAndShow(cur, this, Font(font, ignore_language)); } @@ -388,14 +380,17 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) { LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd); + BufferView * bv = &cur.bv(); + TextMetrics & tm = bv->textMetrics(this); + if (!tm.contains(cur.pit())) + lyx::dispatch(FuncRequest(LFUN_SCREEN_RECENTER)); + // FIXME: We use the update flag to indicates wether a singlePar or a // full screen update is needed. We reset it here but shall we restore it // at the end? cur.noUpdate(); BOOST_ASSERT(cur.text() == this); - BufferView * bv = &cur.bv(); - TextMetrics & tm = cur.bv().textMetrics(this); CursorSlice oldTopSlice = cur.top(); bool oldBoundary = cur.boundary(); bool sel = cur.selection(); @@ -406,10 +401,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // Signals that a full-screen update is required bool needsUpdate = !(lyxaction.funcHasFlag(cmd.action, LyXAction::NoUpdate) || singleParUpdate); - // Remember the old paragraph metric (_outer_ paragraph!) - ParagraphMetrics const & pm = cur.bv().parMetrics( - cur.bottom().text(), cur.bottom().pit()); - Dimension olddim = pm.dim(); switch (cmd.action) { @@ -591,10 +582,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) bool up = cmd.action == LFUN_UP_SELECT || cmd.action == LFUN_UP; bool const successful = cur.upDownInText(up, needsUpdate); if (successful) { - // notify insets which were left and get their update flags - notifyCursorLeaves(cur.beforeDispatchCursor(), cur); - cur.fixIfBroken(); - // redraw if you leave mathed (for the decorations) needsUpdate |= cur.beforeDispatchCursor().inMathed(); } else @@ -615,25 +602,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) needsUpdate |= cursorDownParagraph(cur); break; - case LFUN_SCREEN_UP_SELECT: - needsUpdate |= cur.selHandle(true); - if (cur.pit() == 0 && cur.textRow().pos() == 0) - cur.undispatched(); - else { - tm.cursorPrevious(cur); - } - break; - - case LFUN_SCREEN_DOWN_SELECT: - needsUpdate |= cur.selHandle(true); - if (cur.pit() == cur.lastpit() - && cur.textRow().endpos() == cur.lastpos()) - cur.undispatched(); - else { - tm.cursorNext(cur); - } - break; - case LFUN_LINE_BEGIN: case LFUN_LINE_BEGIN_SELECT: needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT); @@ -857,7 +825,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) /* Paragraph & par = pars_[cur.pit()]; if (inset->lyxCode() == LABEL_CODE - && par.layout()->labeltype == LABEL_COUNTER) { + && par.layout().labeltype == LABEL_COUNTER) { // Go to the end of the paragraph // Warning: Because of Change-Tracking, the last // position is 'size()' and not 'size()-1': @@ -869,7 +837,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) */ if (cur.selection()) cutSelection(cur, true, false); - insertInset(cur, inset); + cur.insert(inset); cur.posForward(); } break; @@ -879,12 +847,20 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) needsUpdate |= dissolveInset(cur); break; - case LFUN_INSET_SETTINGS: + case LFUN_INSET_SETTINGS: { + // if there is an inset at cursor, access this + Inset * inset = cur.nextInset(); + if (inset) { + inset->showInsetDialog(bv); + break; + } + // if not work, access the underlying inset. cur.inset().showInsetDialog(bv); break; + } case LFUN_SPACE_INSERT: - if (cur.paragraph().layout()->free_spacing) + if (cur.paragraph().layout().free_spacing) insertChar(cur, ' '); else { doInsertInset(cur, this, cmd, false, false); @@ -950,7 +926,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) pasteFromStack(cur, bv->buffer().errorList("Paste"), convert(arg)); } else { - Clipboard::GraphicsType type; + Clipboard::GraphicsType type = Clipboard::AnyGraphicsType; if (arg == "pdf") type = Clipboard::PdfGraphicsType; else if (arg == "png") @@ -1010,7 +986,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_SERVER_GET_LAYOUT: - cur.message(cur.paragraph().layout()->name()); + cur.message(cur.paragraph().layout().name()); break; case LFUN_LAYOUT: { @@ -1018,8 +994,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout)); Paragraph const & para = cur.paragraph(); - docstring const old_layout = para.layout()->name(); - TextClass const & tclass = bv->buffer().params().getTextClass(); + docstring const old_layout = para.layout().name(); + DocumentClass const & tclass = bv->buffer().params().documentClass(); if (layout.empty()) layout = tclass.defaultLayoutName(); @@ -1041,7 +1017,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // If the entry is obsolete, use the new one instead. if (hasLayout) { - docstring const & obs = tclass[layout]->obsoleted_by(); + docstring const & obs = tclass[layout].obsoleted_by(); if (!obs.empty()) layout = obs; } @@ -1060,7 +1036,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) pit_type spit = cur.selBegin().pit(); pit_type epit = cur.selEnd().pit() + 1; while (spit != epit) { - if (pars_[spit].layout()->name() != old_layout) { + if (pars_[spit].layout().name() != old_layout) { change_layout = true; break; } @@ -1105,8 +1081,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) Paragraph & par = cur.paragraph(); pos_type pos = cur.pos(); BufferParams const & bufparams = bv->buffer().params(); - LayoutPtr const & style = par.layout(); - if (!style->pass_thru + Layout const & style = par.layout(); + if (!style.pass_thru && par.getFontSettings(bufparams, pos).language()->lang() != "hebrew") { // this avoids a double undo // FIXME: should not be needed, ideally @@ -1122,14 +1098,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) else c = par.getChar(pos - 1); string arg = to_utf8(cmd.argument()); - if (arg == "single") - cur.insert(new InsetQuotes(c, - bufparams.quotes_language, - InsetQuotes::SingleQ)); - else - cur.insert(new InsetQuotes(c, - bufparams.quotes_language, - InsetQuotes::DoubleQ)); + cur.insert(new InsetQuotes(c, bufparams.quotes_language, + (arg == "single") ? InsetQuotes::SingleQuotes + : InsetQuotes::DoubleQuotes)); cur.posForward(); } else @@ -1342,7 +1313,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) docstring ds = cur.selectionAsString(false); cutSelection(cur, true, false); static_cast(inset)->setInfo(to_utf8(ds)); - static_cast(inset)->updateInfo(cur.bv().buffer()); + static_cast(inset)->updateInfo(); } insertInset(cur, inset); cur.posForward(); @@ -1350,7 +1321,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) } #if 0 case LFUN_LIST_INSERT: - case LFUN_THEOREM_INSERT: #endif case LFUN_CAPTION_INSERT: case LFUN_FOOTNOTE_INSERT: @@ -1392,16 +1362,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) cur.posForward(); ParagraphList & pars = cur.text()->paragraphs(); - TextClass const & tclass = bv->buffer().params().getTextClass(); + DocumentClass const & tclass = bv->buffer().params().documentClass(); // add a separate paragraph for the caption inset pars.push_back(Paragraph()); pars.back().setInsetOwner(pars[0].inInset()); - if (pars.back().useEmptyLayout()) - pars.back().layout(tclass.emptyLayout()); - else - pars.back().layout(tclass.defaultLayout()); - + pars.back().setEmptyOrDefaultLayout(tclass); int cap_pit = pars.size() - 1; // if an empty inset was created, we create an additional empty @@ -1410,10 +1376,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) if (!content) { pars.push_back(Paragraph()); pars.back().setInsetOwner(pars[0].inInset()); - if (pars.back().useEmptyLayout()) - pars.back().layout(tclass.emptyLayout()); - else - pars.back().layout(tclass.defaultLayout()); + pars.back().setEmptyOrDefaultLayout(tclass); } // reposition the cursor to the caption @@ -1453,7 +1416,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INDEX_PRINT: case LFUN_NOMENCL_PRINT: case LFUN_TOC_INSERT: - case LFUN_HFILL_INSERT: case LFUN_LINE_INSERT: case LFUN_NEWPAGE_INSERT: case LFUN_PAGEBREAK_INSERT: @@ -1690,7 +1652,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) break; case LFUN_FLOAT_LIST: { - TextClass const & tclass = bv->buffer().params().getTextClass(); + DocumentClass const & tclass = bv->buffer().params().documentClass(); if (tclass.floats().typeExist(to_utf8(cmd.argument()))) { cur.recordUndo(); if (cur.selection()) @@ -1820,16 +1782,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd) // FIXME: the following code should go in favor of fine grained // update flag treatment. if (singleParUpdate) { - // Inserting characters does not change par height - ParagraphMetrics const & pms - = cur.bv().parMetrics(cur.bottom().text(), cur.bottom().pit()); - if (pms.dim().height() == olddim.height()) { - // if so, update _only_ this paragraph - cur.updateFlags(Update::SinglePar | - Update::FitCursor); - return; - } - needsUpdate = true; + // Inserting characters does not change par height in general. So, try + // to update _only_ this paragraph. BufferView will detect if a full + // metrics update is needed anyway. + cur.updateFlags(Update::SinglePar | Update::FitCursor); + return; } if (!needsUpdate @@ -1877,7 +1834,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_BIBITEM_INSERT: - enable = (cur.paragraph().layout()->labeltype == LABEL_BIBLIO + enable = (cur.paragraph().layout().labeltype == LABEL_BIBLIO && cur.pos() == 0); break; @@ -1914,6 +1871,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, code = NOTE_CODE; else if (cmd.argument() == "ref") code = REF_CODE; + else if (cmd.argument() == "space") + code = SPACE_CODE; else if (cmd.argument() == "toc") code = TOC_CODE; else if (cmd.argument() == "vspace") @@ -1928,7 +1887,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, code = ERT_CODE; break; case LFUN_LISTING_INSERT: - code = LISTINGS_CODE; + code = LISTINGS_CODE; break; case LFUN_FOOTNOTE_INSERT: code = FOOT_CODE; @@ -1953,24 +1912,25 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_LIST_INSERT: code = LIST_CODE; break; - case LFUN_THEOREM_INSERT: - code = THEOREM_CODE; - break; #endif case LFUN_CAPTION_INSERT: code = CAPTION_CODE; break; case LFUN_NOTE_INSERT: code = NOTE_CODE; + // in commands (sections etc., only Notes are allowed) + enable = (cmd.argument().empty() || cmd.getArg(0) == "Note" || + !cur.paragraph().layout().isCommand()); break; case LFUN_FLEX_INSERT: { code = FLEX_CODE; string s = cmd.getArg(0); - InsetLayout il = cur.buffer().params().getTextClass().insetlayout(from_utf8(s)); - if (il.lyxtype != "charstyle" && - il.lyxtype != "custom" && - il.lyxtype != "element" && - il.lyxtype != "standard") + InsetLayout il = + cur.buffer().params().documentClass().insetLayout(from_utf8(s)); + if (il.lyxtype() != "charstyle" && + il.lyxtype() != "custom" && + il.lyxtype() != "element" && + il.lyxtype ()!= "standard") enable = false; break; } @@ -1991,7 +1951,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_OPTIONAL_INSERT: code = OPTARG_CODE; enable = cur.paragraph().insetList().count(OPTARG_CODE) - < cur.paragraph().layout()->optionalargs; + < cur.paragraph().layout().optionalargs; break; case LFUN_ENVIRONMENT_INSERT: code = BOX_CODE; @@ -2018,7 +1978,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, // always allow this, since we will inset a raw quote // if an inset is not allowed. break; - case LFUN_HFILL_INSERT: case LFUN_SPECIALCHAR_INSERT: code = SPECIALCHAR_CODE; break; @@ -2117,7 +2076,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, if (!cmd.argument().empty()) { InsetLayout il = cur.inset().getLayout(cur.buffer().params()); enable = cur.inset().lyxCode() == FLEX_CODE - && il.lyxtype == to_utf8(cmd.argument()); + && il.lyxtype() == to_utf8(cmd.argument()); } else { enable = !isMainText(cur.bv().buffer()) && cur.inset().nargs() == 1; @@ -2139,7 +2098,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_OUTLINE_DOWN: case LFUN_OUTLINE_IN: case LFUN_OUTLINE_OUT: - enable = (cur.paragraph().layout()->toclevel != Layout::NOT_IN_TOC); + enable = (cur.paragraph().layout().toclevel != Layout::NOT_IN_TOC); break; case LFUN_WORD_DELETE_FORWARD: @@ -2163,8 +2122,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_DOWN_SELECT: case LFUN_PARAGRAPH_UP_SELECT: case LFUN_PARAGRAPH_DOWN_SELECT: - case LFUN_SCREEN_UP_SELECT: - case LFUN_SCREEN_DOWN_SELECT: case LFUN_LINE_BEGIN_SELECT: case LFUN_LINE_END_SELECT: case LFUN_WORD_FORWARD_SELECT: