X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=0f4619a99470fa24b6ab3b3aa068420f5e08fa65;hb=88e5e5fd345c280b0927ad84785657cbc9e55f77;hp=db6b744deb833dcc815bb8d6d2c8baddd8409116;hpb=425c190d623daeb6d05bce1aa2244b548225305a;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index db6b744deb..0f4619a994 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -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); } @@ -195,7 +195,7 @@ void InsetText::metrics(MetricsInfo & mi, Dimension & dim) const mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET; // 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 + // and the view is made very narrow. We can't do better than // to draw it partly out of view (bug 5890). if (mi.base.textwidth < 1) mi.base.textwidth = 1; @@ -220,11 +220,19 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET; int const xframe = x + TEXT_TO_INSET_OFFSET / 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 = 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); + } + + 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. @@ -242,16 +250,9 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const 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())) // 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 @@ -315,7 +316,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); - bool const target_inset = cmd.argument().empty() + 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; @@ -336,7 +337,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) default: text_.dispatch(cur, cmd); } - + if (!cur.result().dispatched()) Inset::doDispatch(cur, cmd); } @@ -348,7 +349,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action()) { case LFUN_INSET_DISSOLVE: { bool const main_inset = text_.isMainText(); - bool const target_inset = cmd.argument().empty() + 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; @@ -371,22 +372,14 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, Layout::LaTeXArgMap::const_iterator const lait = args.find(arg); if (lait != args.end()) { status.setEnabled(true); - ParagraphList::const_iterator pit = paragraphs().begin(); - for (; pit != paragraphs().end(); ++pit) { - InsetList::const_iterator it = pit->insetList().begin(); - InsetList::const_iterator end = pit->insetList().end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == ARG_CODE) { - InsetArgument const * ins = - static_cast(it->inset); + for (Paragraph const & par : paragraphs()) + for (auto const & table : par.insetList()) + if (InsetArgument const * ins = table.inset->asInsetArgument()) if (ins->name() == arg) { // we have this already status.setEnabled(false); return true; } - } - } - } } else status.setEnabled(false); return true; @@ -398,7 +391,7 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd, bool ret = false; if (cur.text() == &text_) ret = text_.getStatus(cur, cmd, status); - + if (!ret) ret = Inset::getStatus(cur, cmd, status); return ret; @@ -456,7 +449,7 @@ 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()) @@ -466,7 +459,9 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const // 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)) + os << "\\cprotect"; + else if (runparams.moving_arg) os << "\\protect"; os << '\\' << from_utf8(il.latexname()); if (!il.latexargs().empty()) @@ -599,7 +594,7 @@ docstring InsetText::xhtml(XHTMLStream & xs, OutputParams const & runparams) con // One solution would be to make the footnote , but the problem is // completely general, and so we'd have to make absolutely everything into // span. What I think will work is to check if we're about to write "div" and, -// if so, try to close fonts, etc. +// 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, @@ -610,7 +605,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, OutputParams runparams = rp; runparams.par_begin = 0; runparams.par_end = text().paragraphs().size(); - + if (undefined()) { xs.startDivision(false); xhtmlParagraphs(text_, buffer(), xs, runparams); @@ -628,7 +623,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, cntrs.step(il.counter(), OutputUpdate); // FIXME: translate to paragraph language if (!il.htmllabel().empty()) { - docstring const lbl = + docstring const lbl = cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code()); // FIXME is this check necessary? if (!lbl.empty()) { @@ -661,6 +656,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, return docstring(); } + void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in, bool const post) const { @@ -670,9 +666,11 @@ void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in, if (isPassThru()) runparams.pass_thru = true; if (post) - latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().postcommandargs(), "post:"); + latexArgInsetsForParent(paragraphs(), os, runparams, + getLayout().postcommandargs(), "post:"); else - latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs()); + latexArgInsetsForParent(paragraphs(), os, runparams, + getLayout().latexargs()); } @@ -765,6 +763,19 @@ ParagraphList & InsetText::paragraphs() } +bool InsetText::hasCProtectContent(bool const fragile) const +{ + ParagraphList const & pars = paragraphs(); + pit_type pend = paragraphs().size(); + for (pit_type pit = 0; pit != pend; ++pit) { + Paragraph const & par = pars[pit]; + if (par.needsCProtection(fragile)) + return true; + } + return false; +} + + bool InsetText::insetAllowed(InsetCode code) const { switch (code) { @@ -830,20 +841,20 @@ void InsetText::forOutliner(docstring & os, size_t const maxlen, void InsetText::addToToc(DocIterator const & cdit, bool output_active, - UpdateType utype) const + UpdateType utype, TocBackend & backend) const { DocIterator dit = cdit; dit.push_back(CursorSlice(const_cast(*this))); - iterateForToc(dit, output_active, utype); + iterateForToc(dit, output_active, utype, backend); } void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, - UpdateType utype) const + UpdateType utype, TocBackend & backend) const { DocIterator dit = cdit; // This also ensures that any document has a table of contents - shared_ptr toc = buffer().tocBackend().toc("tableofcontents"); + shared_ptr toc = backend.toc("tableofcontents"); BufferParams const & bufparams = buffer_->params(); int const min_toclevel = bufparams.documentClass().min_toclevel(); @@ -870,28 +881,27 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, // Custom AddToToc in paragraph layouts (i.e. theorems) if (par.layout().addToToc() && text().isFirstInSequence(pit)) { - pit_type end = openAddToTocForParagraph(pit, dit, output_active); + pit_type end = + openAddToTocForParagraph(pit, dit, output_active, backend); addtotoc_stack.push({pit, end}); } - // if we find an optarg, we'll save it for use later. - InsetText const * arginset = 0; - InsetList::const_iterator it = par.insetList().begin(); - InsetList::const_iterator end = par.insetList().end(); - for (; it != end; ++it) { - Inset & inset = *it->inset; - dit.pos() = it->pos; - //lyxerr << (void*)&inset << " code: " << inset.lyxCode() << std::endl; - inset.addToToc(dit, doing_output, utype); - if (inset.lyxCode() == ARG_CODE) - arginset = inset.asInsetText(); + // 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()) + if (x->isTocCaption()) + arginset = x; } // End custom AddToToc in paragraph layouts while (!addtotoc_stack.empty() && addtotoc_stack.top().second == pit) { // execute the closing function closeAddToTocForParagraph(addtotoc_stack.top().first, - addtotoc_stack.top().second); + addtotoc_stack.top().second, backend); addtotoc_stack.pop(); } @@ -915,27 +925,29 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, } // And now the list of changes. - par.addChangesToToc(dit, buffer(), doing_output); + par.addChangesToToc(dit, buffer(), doing_output, backend); } } pit_type InsetText::openAddToTocForParagraph(pit_type pit, DocIterator const & dit, - bool output_active) const + bool output_active, + TocBackend & backend) const { Paragraph const & par = paragraphs()[pit]; - TocBuilder & b = buffer().tocBackend().builder(par.layout().tocType()); + TocBuilder & b = backend.builder(par.layout().tocType()); docstring const label = par.labelString(); b.pushItem(dit, label + (label.empty() ? "" : " "), output_active); return text().lastInSequence(pit); } -void InsetText::closeAddToTocForParagraph(pit_type start, pit_type end) const +void InsetText::closeAddToTocForParagraph(pit_type start, pit_type end, + TocBackend & backend) const { Paragraph const & par = paragraphs()[start]; - TocBuilder & b = buffer().tocBackend().builder(par.layout().tocType()); + TocBuilder & b = backend.builder(par.layout().tocType()); if (par.layout().isTocCaption()) { docstring str; text().forOutliner(str, TOC_ENTRY_LENGTH, start, end); @@ -949,7 +961,7 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur) { if (buffer().isClean()) return Inset::notifyCursorLeaves(old, cur); - + // find text inset in old cursor Cursor insetCur = old; int scriptSlice = insetCur.find(this); @@ -958,10 +970,10 @@ bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur) LASSERT(scriptSlice != -1, return true); insetCur.cutOff(scriptSlice); LASSERT(&insetCur.inset() == this, return true); - + // update the old paragraph's words insetCur.paragraph().updateWords(); - + return Inset::notifyCursorLeaves(old, cur); } @@ -1021,7 +1033,7 @@ bool InsetText::insertCompletion(Cursor & cur, docstring const & s, } -void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, +void InsetText::completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const { TextMetrics const & tm = cur.bv().textMetrics(&text_); @@ -1033,7 +1045,7 @@ string InsetText::contextMenu(BufferView const &, int, int) const { string context_menu = contextMenuName(); if (context_menu != InsetText::contextMenuName()) - context_menu += ";" + InsetText::contextMenuName(); + context_menu += ";" + InsetText::contextMenuName(); return context_menu; } @@ -1074,4 +1086,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() == InsetLayout::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() != InsetLayout::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 = paragraphs().size(); + + for (pit_type pit = 0; pit != pend; ++pit) { + Paragraph const & par = pars[pit]; + if (par.needsCProtection(fragile)) + return true; + docstring const pars = par.asString(); + for (int k = 0; k < nchars_escape; k++) { + if (contains(pars, chars_escape[k])) + return true; + } + } + return false; +} + } // namespace lyx