X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetText.cpp;h=95d55b765b1c187d52bc0127d228c852e785019e;hb=39a9e370c71562c9b42690262698c1fc87c46b56;hp=8228fd247d48dd44a7edcfd250c48a472b4b638f;hpb=75bfed55079cab6b73fbea6ce4ae3f10d1af3b91;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index 8228fd247d..95d55b765b 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -10,6 +10,7 @@ #include +#include "InsetLayout.h" #include "InsetText.h" #include "insets/InsetArgument.h" @@ -38,33 +39,31 @@ #include "MetricsInfo.h" #include "output_docbook.h" #include "output_latex.h" -#include "output_xhtml.h" -#include "OutputParams.h" #include "output_plaintext.h" +#include "output_xhtml.h" #include "Paragraph.h" #include "ParagraphParameters.h" #include "ParIterator.h" -#include "Row.h" -#include "sgml.h" #include "TexRow.h" #include "texstream.h" #include "TextClass.h" #include "Text.h" #include "TextMetrics.h" #include "TocBackend.h" +#include "TocBuilder.h" #include "frontends/alert.h" #include "frontends/Painter.h" -#include "support/bind.h" #include "support/convert.h" #include "support/debug.h" #include "support/gettext.h" #include "support/lassert.h" #include "support/lstrings.h" -#include "support/RefChanger.h" +#include "support/Changer.h" #include +#include using namespace std; @@ -79,17 +78,18 @@ using graphics::PreviewLoader; ///////////////////////////////////////////////////////////////////// InsetText::InsetText(Buffer * buf, UsePlain type) - : Inset(buf), drawFrame_(false), frame_color_(Color_insetframe), + : Inset(buf), drawFrame_(false), is_changed_(false), intitle_context_(false), + frame_color_(Color_insetframe), text_(this, type == DefaultLayout) { } InsetText::InsetText(InsetText const & in) - : Inset(in), text_(this, in.text_) + : Inset(in), drawFrame_(in.drawFrame_), is_changed_(in.is_changed_), + intitle_context_(false), frame_color_(in.frame_color_), + text_(this, in.text_) { - drawFrame_ = in.drawFrame_; - frame_color_ = in.frame_color_; } @@ -97,7 +97,7 @@ void InsetText::setBuffer(Buffer & buf) { ParagraphList::iterator end = paragraphs().end(); for (ParagraphList::iterator it = paragraphs().begin(); it != end; ++it) - it->setBuffer(buf); + it->setInsetBuffers(buf); Inset::setBuffer(buf); } @@ -140,10 +140,10 @@ void InsetText::clear() Dimension const InsetText::dimensionHelper(BufferView const & bv) const { TextMetrics const & tm = bv.textMetrics(&text_); - Dimension dim = tm.dimension(); - dim.wid += 2 * TEXT_TO_INSET_OFFSET; - dim.des += TEXT_TO_INSET_OFFSET; - dim.asc += TEXT_TO_INSET_OFFSET; + Dimension dim = tm.dim(); + dim.wid += leftOffset(&bv) + rightOffset(&bv); + dim.des += bottomOffset(&bv); + dim.asc += topOffset(&bv); return dim; } @@ -184,15 +184,28 @@ void InsetText::read(Lexer & lex) } +void InsetText::setOuterFont(BufferView & bv, FontInfo const & outer) const +{ + TextMetrics & tm = bv.textMetrics(&text_); + FontInfo tmpfont = getFont(); + tmpfont.realize(outer); + tm.font_.fontInfo() = tmpfont; +} + + void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const { TextMetrics & tm = mi.base.bv->textMetrics(&text_); //lyxerr << "InsetText::metrics: width: " << mi.base.textwidth << endl; - // Hand font through to contained lyxtext: - tm.font_.fontInfo() = mi.base.font; - mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET; + int const horiz_offset = leftOffset(mi.base.bv) + rightOffset(mi.base.bv); + mi.base.textwidth -= horiz_offset; + + // Remember the full outer font + setOuterFont(*mi.base.bv, mi.base.font); + // and use it in these metrics computation. + mi.base.font = tm.font_.fontInfo(); // This can happen when a layout has a left and right margin, // and the view is made very narrow. We can't do better than @@ -204,10 +217,10 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const tm.metrics(mi, dim, mi.base.textwidth); else tm.metrics(mi, dim); - mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET; - dim.asc += TEXT_TO_INSET_OFFSET; - dim.des += TEXT_TO_INSET_OFFSET; - dim.wid += 2 * TEXT_TO_INSET_OFFSET; + mi.base.textwidth += horiz_offset; + dim.asc += topOffset(mi.base.bv); + dim.des += bottomOffset(mi.base.bv); + dim.wid += horiz_offset; } @@ -215,21 +228,30 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const { TextMetrics & tm = pi.base.bv->textMetrics(&text_); - int const w = tm.width() + TEXT_TO_INSET_OFFSET; - int const yframe = y - TEXT_TO_INSET_OFFSET - tm.ascent(); - int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET; - int const xframe = x + TEXT_TO_INSET_OFFSET / 2; + int const horiz_offset = leftOffset(pi.base.bv) + rightOffset(pi.base.bv); + int const w = tm.width() + (horiz_offset - horiz_offset / 2); + int const yframe = y - topOffset(pi.base.bv) - tm.ascent(); + int const h = tm.height() + topOffset(pi.base.bv) + bottomOffset(pi.base.bv); + int const xframe = x + leftOffset(pi.base.bv) / 2; bool change_drawn = false; - if (drawFrame_ || pi.full_repaint) { - if (pi.full_repaint) + if (pi.full_repaint) pi.pain.fillRectangle(xframe, yframe, w, h, pi.backgroundColor(this)); + { + Changer dummy = changeVar(pi.background_color, + pi.backgroundColor(this, false)); + // The change tracking cue must not be inherited + Changer dummy2 = changeVar(pi.change, Change()); + tm.draw(pi, x + leftOffset(pi.base.bv), y); + } + + if (drawFrame_) { // Change color of the frame in tracked changes, like for tabulars. // Only do so if the color is not custom. But do so even if RowPainter // handles the strike-through already. Color c; - if (pi.change_.changed() + if (pi.change.changed() // Originally, these are the colors with role Text, from role() in // ColorCache.cpp. The code is duplicated to avoid depending on Qt // types, and also maybe it need not match in the future. @@ -238,25 +260,18 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const || frameColor() == Color_preview || frameColor() == Color_tabularline || frameColor() == Color_previewframe)) { - c = pi.change_.color(); + c = pi.change.color(); change_drawn = true; } else c = frameColor(); - if (drawFrame_) - pi.pain.rectangle(xframe, yframe, w, h, c); - } - { - Changer dummy = make_change(pi.background_color, - pi.backgroundColor(this, false)); - // The change tracking cue must not be inherited - Changer dummy2 = make_change(pi.change_, Change()); - tm.draw(pi, x + TEXT_TO_INSET_OFFSET, y); + pi.pain.rectangle(xframe, yframe, w, h, c); } - if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change_.deleted())) + + if (canPaintChange(*pi.base.bv) && (!change_drawn || pi.change.deleted())) // Do not draw the change tracking cue if already done by RowPainter and // do not draw the cue for INSERTED if the information is already in the // color of the frame - pi.change_.paintCue(pi, xframe, yframe, xframe + w, yframe + h); + pi.change.paintCue(pi, xframe, yframe, xframe + w, yframe + h); } @@ -275,6 +290,7 @@ void InsetText::edit(Cursor & cur, bool front, EntryDirection entry_from) } cur.top().setPitPos(pit, pos); + cur.setCurrentFont(); cur.finishUndo(); } @@ -289,6 +305,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) { LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd); +#if 0 // See bug #9042, for instance. if (isPassThru()) { // Force any new text to latex_language FIXME: This @@ -300,6 +317,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) cur.current_font.setLanguage(latex_language); cur.real_current_font.setLanguage(latex_language); } +#endif switch (cmd.action()) { case LFUN_PASTE: @@ -313,21 +331,21 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) fixParagraphsFont(); break; + case LFUN_INSET_SPLIT: case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); - // cur.inset() is the tabular when this is a single cell (bug #9954) - bool const one_cell = cur.inset().nargs() == 1; - if (!main_inset && target_inset && one_cell) { + if (!main_inset && target_inset) { + UndoGroupHelper ugh(&buffer()); // Text::dissolveInset assumes that the cursor // is inside the Inset. - if (&cur.inset() != this) + if (&cur.inset() != this) { + cur.recordUndo(); cur.pushBackward(*this); - cur.beginUndoGroup(); + } text_.dispatch(cur, cmd); - cur.endUndoGroup(); } else cur.undispatched(); break; @@ -346,15 +364,14 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { switch (cmd.action()) { + case LFUN_INSET_SPLIT: case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); bool const target_inset = cmd.argument().empty() || cmd.getArg(0) == insetName(lyxCode()); - // cur.inset() is the tabular when this is a single cell (bug #9954) - bool const one_cell = cur.inset().nargs() == 1; if (target_inset) - status.setEnabled(!main_inset && one_cell); + status.setEnabled(!main_inset); return target_inset; } @@ -414,6 +431,18 @@ void InsetText::fixParagraphsFont() } +// bool InsetText::isChanged() const +// { +// ParagraphList::const_iterator pit = paragraphs().begin(); +// ParagraphList::const_iterator end = paragraphs().end(); +// for (; pit != end; ++pit) { +// if (pit->isChanged()) +// return true; +// } +// return false; +// } + + void InsetText::setChange(Change const & change) { ParagraphList::iterator pit = paragraphs().begin(); @@ -448,17 +477,25 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const { // This implements the standard way of handling the LaTeX // output of a text inset, either a command or an - // environment. Standard collapsable insets should not + // environment. Standard collapsible insets should not // redefine this, non-standard ones may call this. InsetLayout const & il = getLayout(); if (il.forceOwnlines()) os << breakln; + bool needendgroup = false; if (!il.latexname().empty()) { - if (il.latextype() == InsetLayout::COMMAND) { + if (il.latextype() == InsetLaTeXType::COMMAND) { // FIXME UNICODE // FIXME \protect should only be used for fragile // commands, but we do not provide this information yet. - if (runparams.moving_arg) + if (hasCProtectContent(runparams.moving_arg)) { + if (contains(runparams.active_chars, '^')) { + // cprotect relies on ^ being on catcode 7 + os << "\\begingroup\\catcode`\\^=7"; + needendgroup = true; + } + os << "\\cprotect"; + } else if (runparams.moving_arg) os << "\\protect"; os << '\\' << from_utf8(il.latexname()); if (!il.latexargs().empty()) @@ -466,7 +503,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const if (!il.latexparam().empty()) os << from_utf8(il.latexparam()); os << '{'; - } else if (il.latextype() == InsetLayout::ENVIRONMENT) { + } else if (il.latextype() == InsetLaTeXType::ENVIRONMENT) { if (il.isDisplay()) os << breakln; else @@ -496,24 +533,35 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const rp.pass_thru = true; if (il.isNeedProtect()) rp.moving_arg = true; + if (il.isNeedMBoxProtect()) + ++rp.inulemcmd; if (!il.passThruChars().empty()) rp.pass_thru_chars += il.passThruChars(); + if (!il.newlineCmd().empty()) + rp.newlinecmd = il.newlineCmd(); rp.par_begin = 0; rp.par_end = paragraphs().size(); // Output the contents of the inset latexParagraphs(buffer(), text_, os, rp); runparams.encoding = rp.encoding; + // Pass the post_macros upstream + runparams.post_macro = rp.post_macro; + // These need to be passed upstream as well + runparams.need_maketitle = rp.need_maketitle; + runparams.have_maketitle = rp.have_maketitle; if (!il.rightdelim().empty()) os << il.rightdelim(); if (!il.latexname().empty()) { - if (il.latextype() == InsetLayout::COMMAND) { + if (il.latextype() == InsetLaTeXType::COMMAND) { os << "}"; if (!il.postcommandargs().empty()) getArgs(os, runparams, true); - } else if (il.latextype() == InsetLayout::ENVIRONMENT) { + if (needendgroup) + os << "\\endgroup"; + } else if (il.latextype() == InsetLaTeXType::ENVIRONMENT) { // A comment environment doesn't need a % before \n\end if (il.isDisplay() || runparams.inComment) os << breakln; @@ -540,7 +588,7 @@ int InsetText::plaintext(odocstringstream & os, for (; it != end; ++it) { if (it != beg) { os << '\n'; - if (runparams.linelen > 0) + if (runparams.linelen > 0 && !getLayout().parbreakIsNewline()) os << '\n'; } odocstringstream oss; @@ -558,24 +606,143 @@ int InsetText::plaintext(odocstringstream & os, } -int InsetText::docbook(odocstream & os, OutputParams const & runparams) const + +void InsetText::docbook(XMLStream & xs, OutputParams const & rp) const { - ParagraphList::const_iterator const beg = paragraphs().begin(); + docbook(xs, rp, WriteEverything); +} + + +void InsetText::docbook(XMLStream & xs, OutputParams const & rp, XHTMLOptions opts) const +{ + // we will always want to output all our paragraphs when we are + // called this way. + OutputParams runparams = rp; + runparams.par_begin = 0; + runparams.par_end = text().paragraphs().size(); + + if (undefined()) { + xs.startDivision(false); + docbookParagraphs(text_, buffer(), xs, runparams); + xs.endDivision(); + return; + } + + InsetLayout const & il = getLayout(); + + // Maybe this is an paragraph that should not be generated at all (i.e. right now, its place is somewhere + // else, typically outside the current paragraph). + if (!rp.docbook_generate_info && il.docbookininfo() != "never") + return; + + // In some cases, the input parameters must be overridden for outer tags. + bool writeOuterTag = opts & WriteOuterTag; + if (writeOuterTag) { + // For each paragraph, if there are only Bibitems and the corresponding text, don't write the outer tags. + bool allBibitems = std::all_of(text().paragraphs().begin(), text().paragraphs().end(), [](Paragraph const & par) { + auto nInsets = std::distance(par.insetList().begin(), par.insetList().end()); + auto parSize = (size_t) par.size(); + return nInsets == 1 && parSize > 1 && par.insetList().begin()->inset->lyxCode() == BIBITEM_CODE; + }); + writeOuterTag = !allBibitems; + } + + // Detect arguments that should be output before/after the paragraph. + // Don't reuse runparams.docbook_prepended_arguments, as the same object is used in InsetArgument to determine + // whether the inset should be output or not, whatever the context (i.e. position with respect to the wrapper). + std::set prependedArguments; + for (auto const & par : paragraphs()) { + for (pos_type i = 0; i < par.size(); ++i) { + if (par.getInset(i) && par.getInset(i)->lyxCode() == ARG_CODE) { + InsetArgument const *arg = par.getInset(i)->asInsetArgument(); + if (arg->docbookargumentbeforemaintag()) + prependedArguments.insert(par.getInset(i)->asInsetArgument()); + } + } + } + + std::set appendedArguments; + for (auto const & par : paragraphs()) { + for (pos_type i = 0; i < par.size(); ++i) { + if (par.getInset(i) && par.getInset(i)->lyxCode() == ARG_CODE) { + InsetArgument const *arg = par.getInset(i)->asInsetArgument(); + if (arg->docbookargumentaftermaintag()) + appendedArguments.insert(par.getInset(i)->asInsetArgument()); + } + } + } + + // Start outputting this inset. + // - First, wrapper around the inset and its main tag. + if (writeOuterTag) { + if (!il.docbookwrappertag().empty() && il.docbookwrappertag() != "NONE" && il.docbookwrappertag() != "IGNORE") + xml::openTag(xs, il.docbookwrappertag(), il.docbookwrapperattr(), il.docbookwrappertagtype()); + + if (!il.docbooktag().empty() && il.docbooktag() != "NONE" && il.docbooktag() != "IGNORE") { + docstring attrs = docstring(); + if (!il.docbookattr().empty()) + attrs += from_ascii(il.docbookattr()); + if (il.docbooktag() == "link") + attrs += from_ascii(" xlink:href=\"") + text_.asString() + from_ascii("\""); + xml::openTag(xs, il.docbooktag(), attrs, il.docbooktagtype()); + } + } + + // - Think about the arguments before the paragraph. + OutputParams np = runparams; + np.docbook_in_par = true; + for (auto const & arg : prependedArguments) + arg->docbook(xs, np); + + // - Mark the newly generated arguments are not-to-be-generated-again. Do the same for arguments that will follow. + runparams.docbook_prepended_arguments = std::move(prependedArguments); + runparams.docbook_appended_arguments = appendedArguments; + + // - Deal with the first item. + // TODO: in things like SciPoster, this should also check if the item tag is allowed. Hard to formalise for now... + if (writeOuterTag) { + if (!il.docbookitemwrappertag().empty() && il.docbookitemwrappertag() != "NONE" && il.docbookitemwrappertag() != "IGNORE") + xml::openTag(xs, il.docbookitemwrappertag(), il.docbookitemwrapperattr(), il.docbookitemwrappertagtype()); + + if (!il.docbookitemtag().empty() && il.docbookitemtag() != "NONE" && il.docbookitemtag() != "IGNORE") + xml::openTag(xs, il.docbookitemtag(), il.docbookitemattr(), il.docbookitemtagtype()); + } + + // No need for labels that are generated from counters. They should be handled by the external DocBook processor. - if (!undefined()) - sgml::openTag(os, getLayout().latexname(), - beg->getID(buffer(), runparams) + getLayout().latexparam()); + // With respect to XHTML, paragraphs are still allowed here. + if (runparams.docbook_consider_allow_multi_par && !allowMultiPar()) + runparams.docbook_make_pars = false; + if (il.isPassThru()) + runparams.pass_thru = true; + + // - Write the main content of the inset. + xs.startDivision(false); + docbookParagraphs(text_, buffer(), xs, runparams); + xs.endDivision(); + + // - Think about the arguments after the paragraph. + for (auto const & arg : appendedArguments) + arg->docbook(xs, np); - docbookParagraphs(text_, buffer(), os, runparams); + // - Close the required tags. + if (writeOuterTag) { + if (!il.docbookitemtag().empty() && il.docbookitemtag() != "NONE" && il.docbookitemtag() != "IGNORE") + xml::closeTag(xs, il.docbookitemtag(), il.docbookitemtagtype()); - if (!undefined()) - sgml::closeTag(os, getLayout().latexname()); + if (!il.docbookitemwrappertag().empty() && il.docbookitemwrappertag() != "NONE" && il.docbookitemwrappertag() != "IGNORE") + xml::closeTag(xs, il.docbookitemwrappertag(), il.docbookitemwrappertagtype()); - return 0; + if (!il.docbooktag().empty() && il.docbooktag() != "NONE" && il.docbooktag() != "IGNORE") + xml::closeTag(xs, il.docbooktag(), il.docbooktagtype()); + + if (!il.docbookwrappertag().empty() && il.docbookwrappertag() != "NONE" && il.docbookwrappertag() != "IGNORE") + xml::closeTag(xs, il.docbookwrappertag(), il.docbookwrappertagtype()); + } } -docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) const +docstring InsetText::xhtml(XMLStream & xs, OutputParams const & runparams) const { return insetAsXHTML(xs, runparams, WriteEverything); } @@ -594,7 +761,7 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con // if so, try to close fonts, etc. // There are probably limits to how well we can do here, though, and we will // have to rely upon users not putting footnotes inside noun-type insets. -docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, +docstring InsetText::insetAsXHTML(XMLStream & xs, OutputParams const & rp, XHTMLOptions opts) const { // we will always want to output all our paragraphs when we are @@ -612,7 +779,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, InsetLayout const & il = getLayout(); if (opts & WriteOuterTag) - xs << html::StartTag(il.htmltag(), il.htmlattr()); + xs << xml::StartTag(il.htmltag(), il.htmlattr()); if ((opts & WriteLabel) && !il.counter().empty()) { BufferParams const & bp = buffer().masterBuffer()->params(); @@ -624,15 +791,15 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code()); // FIXME is this check necessary? if (!lbl.empty()) { - xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr()); + xs << xml::StartTag(il.htmllabeltag(), il.htmllabelattr()); xs << lbl; - xs << html::EndTag(il.htmllabeltag()); + xs << xml::EndTag(il.htmllabeltag()); } } } if (opts & WriteInnerTag) - xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr()); + xs << xml::StartTag(il.htmlinnertag(), il.htmlinnerattr()); // we will eventually lose information about the containing inset if (!allowMultiPar() || opts == JustText) @@ -645,10 +812,10 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, xs.endDivision(); if (opts & WriteInnerTag) - xs << html::EndTag(il.htmlinnertag()); + xs << xml::EndTag(il.htmlinnertag()); if (opts & WriteOuterTag) - xs << html::EndTag(il.htmltag()); + xs << xml::EndTag(il.htmltag()); return docstring(); } @@ -674,7 +841,7 @@ void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in, void InsetText::cursorPos(BufferView const & bv, CursorSlice const & sl, bool boundary, int & x, int & y) const { - x = bv.textMetrics(&text_).cursorX(sl, boundary) + TEXT_TO_INSET_OFFSET; + x = bv.textMetrics(&text_).cursorX(sl, boundary) + leftOffset(&bv); y = bv.textMetrics(&text_).cursorY(sl, boundary); } @@ -721,8 +888,9 @@ void InsetText::appendParagraphs(ParagraphList & plist) mergeParagraph(buffer().params(), pl, distance(pl.begin(), ins) - 1); - for_each(pit, plist.end(), - bind(&ParagraphList::push_back, ref(pl), _1)); + ParagraphList::iterator const pend = plist.end(); + for (; pit != pend; ++pit) + pl.push_back(*pit); } @@ -760,12 +928,28 @@ ParagraphList & InsetText::paragraphs() } +bool InsetText::hasCProtectContent(bool fragile) const +{ + fragile |= getLayout().isNeedProtect(); + ParagraphList const & pars = paragraphs(); + pit_type pend = pit_type(paragraphs().size()); + for (pit_type pit = 0; pit != pend; ++pit) { + Paragraph const & par = pars[size_type(pit)]; + if (par.needsCProtection(fragile)) + return true; + } + return false; +} + + bool InsetText::insetAllowed(InsetCode code) const { switch (code) { - // Arguments and (plain) quotes are also allowed in PassThru insets + // Arguments, (plain) quotes and counter insets + // are also allowed in PassThru insets case ARG_CODE: case QUOTE_CODE: + case COUNTER_CODE: return true; default: return !isPassThru(); @@ -773,7 +957,37 @@ bool InsetText::insetAllowed(InsetCode code) const } -void InsetText::updateBuffer(ParIterator const & it, UpdateType utype) +bool InsetText::allowSpellCheck() const +{ + return getLayout().spellcheck() && !getLayout().isPassThru(); +} + + +bool InsetText::allowMultiPar() const +{ + return getLayout().isMultiPar(); +} + + +bool InsetText::forcePlainLayout(idx_type) const +{ + return getLayout().forcePlainLayout(); +} + + +bool InsetText::allowParagraphCustomization(idx_type) const +{ + return getLayout().allowParagraphCustomization(); +} + + +bool InsetText::forceLocalFontSwitch() const +{ + return getLayout().forceLocalFontSwitch(); +} + + +void InsetText::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted) { ParIterator it2 = it; it2.forwardPos(); @@ -787,24 +1001,35 @@ void InsetText::updateBuffer(ParIterator const & it, UpdateType utype) cnt.clearLastLayout(); // FIXME cnt.saveLastCounter()? } - buffer().updateBuffer(it2, utype); + buffer().updateBuffer(it2, utype, deleted); if (save_layouts) { // LYXERR0("Exiting " << name()); cnt.restoreLastLayout(); // FIXME cnt.restoreLastCounter()? } + // Record if this inset is embedded in a title layout + // This is needed to decide when \maketitle is output. + intitle_context_ = it.paragraph().layout().intitle; + // Also check embedding layouts + size_t const n = it.depth(); + for (size_t i = 0; i < n; ++i) { + if (it[i].paragraph().layout().intitle) { + intitle_context_ = true; + break; + } + } } else { DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass(); // Note that we do not need to call: // tclass.counters().clearLastLayout() // since we are saving and restoring the existing counters, etc. - Counters const savecnt = tclass.counters(); + Counters savecnt = tclass.counters(); tclass.counters().reset(); // we need float information even in note insets (#9760) tclass.counters().current_float(savecnt.current_float()); tclass.counters().isSubfloat(savecnt.isSubfloat()); - buffer().updateBuffer(it2, utype); - tclass.counters() = savecnt; + buffer().updateBuffer(it2, utype, deleted); + tclass.counters() = move(savecnt); } } @@ -870,13 +1095,15 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, addtotoc_stack.push({pit, end}); } - // if we find an optarg, we'll save it for use later. + // If we find an InsetArgument that is supposed to provide the TOC caption, + // we'll save it for use later. InsetArgument const * arginset = nullptr; for (auto const & table : par.insetList()) { dit.pos() = table.pos; table.inset->addToToc(dit, doing_output, utype, backend); if (InsetArgument const * x = table.inset->asInsetArgument()) - arginset = x; + if (x->isTocCaption()) + arginset = x; } // End custom AddToToc in paragraph layouts @@ -919,7 +1146,7 @@ pit_type InsetText::openAddToTocForParagraph(pit_type pit, { Paragraph const & par = paragraphs()[pit]; TocBuilder & b = backend.builder(par.layout().tocType()); - docstring const label = par.labelString(); + docstring const & label = par.labelString(); b.pushItem(dit, label + (label.empty() ? "" : " "), output_active); return text().lastInSequence(pit); } @@ -987,7 +1214,8 @@ bool InsetText::automaticPopupCompletion() const bool InsetText::showCompletionCursor() const { - return lyxrc.completion_cursor_text; + return lyxrc.completion_cursor_text && + (lyxrc.completion_inline_text || lyxrc.completion_popup_text); } @@ -1038,7 +1266,7 @@ string InsetText::contextMenuName() const } -docstring InsetText::toolTipText(docstring prefix, size_t const len) const +docstring InsetText::toolTipText(docstring const & prefix, size_t const len) const { OutputParams rp(&buffer().params().encoding()); rp.for_tooltip = true; @@ -1053,11 +1281,15 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const for (; it != end; ++it) { if (it != beg) oss << '\n'; + if ((*it).isRTL(buffer().params())) + oss << "
"; writePlaintextParagraph(buffer(), *it, oss, rp, ref_printed, len); if (oss.tellp() >= 0 && size_t(oss.tellp()) > len) break; } docstring str = oss.str(); + if (isChanged()) + str += from_ascii("\n\n") + _("[contains tracked changes]"); support::truncateWithEllipsis(str, len); return str; } @@ -1068,4 +1300,50 @@ InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOp return static_cast((int)a1 | (int)a2); } + +bool InsetText::needsCProtection(bool const maintext, bool const fragile) const +{ + // Nested cprotect content needs \cprotect + // on each level + if (producesOutput() && hasCProtectContent(fragile)) + return true; + + // Environments generally need cprotection in fragile context + if (fragile && getLayout().latextype() == InsetLaTeXType::ENVIRONMENT) + return true; + + if (!getLayout().needsCProtect()) + return false; + + // Environments and "no latex" types (e.g., knitr chunks) + // need cprotection regardless the content + if (!maintext && getLayout().latextype() != InsetLaTeXType::COMMAND) + return true; + + // If the inset does not produce output (e.g. Note or Branch), + // we can ignore the contained paragraphs + if (!producesOutput()) + return false; + + // Commands need cprotection if they contain specific chars + int const nchars_escape = 9; + static char_type const chars_escape[nchars_escape] = { + '&', '_', '$', '%', '#', '^', '{', '}', '\\'}; + + ParagraphList const & pars = paragraphs(); + pit_type pend = pit_type(paragraphs().size()); + + for (pit_type pit = 0; pit != pend; ++pit) { + Paragraph const & par = pars[size_type(pit)]; + if (par.needsCProtection(fragile)) + return true; + docstring const par_str = par.asString(); + for (int k = 0; k < nchars_escape; k++) { + if (contains(par_str, chars_escape[k])) + return true; + } + } + return false; +} + } // namespace lyx