X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetText.cpp;h=db6b744deb833dcc815bb8d6d2c8baddd8409116;hb=ed7d3a33abad4e1b5141b2ec626b542d1603782c;hp=b67f6b494802bee53430d9d29db8686d0ea30b0b;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp index b67f6b4948..db6b744deb 100644 --- a/src/insets/InsetText.cpp +++ b/src/insets/InsetText.cpp @@ -27,7 +27,6 @@ #include "ErrorList.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "InsetCaption.h" #include "InsetList.h" #include "Intl.h" #include "Language.h" @@ -138,7 +137,7 @@ void InsetText::clear() } -Dimension const InsetText::dimension(BufferView const & bv) const +Dimension const InsetText::dimensionHelper(BufferView const & bv) const { TextMetrics const & tm = bv.textMetrics(&text_); Dimension dim = tm.dimension(); @@ -227,8 +226,8 @@ void InsetText::draw(PainterInfo & pi, int x, int y) const pi.backgroundColor(this)); // 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. + // 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() // Originally, these are the colors with role Text, from role() in @@ -291,7 +290,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd) LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd); // See bug #9042, for instance. - if (isPassThru() && lyxCode() != ARG_CODE) { + if (isPassThru()) { // Force any new text to latex_language FIXME: This // should only be necessary in constructor, but new // paragraphs that are created by pressing enter at @@ -613,7 +612,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, runparams.par_end = text().paragraphs().size(); if (undefined()) { + xs.startDivision(false); xhtmlParagraphs(text_, buffer(), xs, runparams); + xs.endDivision(); return docstring(); } @@ -647,7 +648,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp, if (il.isPassThru()) runparams.pass_thru = true; + xs.startDivision(false); xhtmlParagraphs(text_, buffer(), xs, runparams); + xs.endDivision(); if (opts & WriteInnerTag) xs << html::EndTag(il.htmlinnertag()); @@ -765,8 +768,9 @@ ParagraphList & InsetText::paragraphs() bool InsetText::insetAllowed(InsetCode code) const { switch (code) { - // Arguments are also allowed in PassThru insets + // Arguments and (plain) quotes are also allowed in PassThru insets case ARG_CODE: + case QUOTE_CODE: return true; default: return !isPassThru(); @@ -847,13 +851,29 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, // can't hurt too much to do it again bool const doing_output = output_active && producesOutput(); - // For each paragraph, traverse its insets and let them add - // their toc items + // For each paragraph, + // * Add a toc item for the paragraph if it is AddToToc--merging adjacent + // paragraphs as needed. + // * Traverse its insets and let them add their toc items + // * Compute the main table of contents (this is hardcoded) + // * Add the list of changes ParagraphList const & pars = paragraphs(); pit_type pend = paragraphs().size(); + // Record pairs {start,end} of where a toc item was opened for a paragraph + // and where it must be closed + stack> addtotoc_stack; + for (pit_type pit = 0; pit != pend; ++pit) { Paragraph const & par = pars[pit]; dit.pit() = pit; + dit.pos() = 0; + + // Custom AddToToc in paragraph layouts (i.e. theorems) + if (par.layout().addToToc() && text().isFirstInSequence(pit)) { + pit_type end = openAddToTocForParagraph(pit, dit, output_active); + 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(); @@ -866,7 +886,16 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, if (inset.lyxCode() == ARG_CODE) arginset = inset.asInsetText(); } - // now the toc entry for the paragraph + + // 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.pop(); + } + + // now the toc entry for the paragraph in the main table of contents int const toclevel = text().getTocLevel(pit); if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) { // insert this into the table of contents @@ -891,6 +920,31 @@ void InsetText::iterateForToc(DocIterator const & cdit, bool output_active, } +pit_type InsetText::openAddToTocForParagraph(pit_type pit, + DocIterator const & dit, + bool output_active) const +{ + Paragraph const & par = paragraphs()[pit]; + TocBuilder & b = buffer().tocBackend().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 +{ + Paragraph const & par = paragraphs()[start]; + TocBuilder & b = buffer().tocBackend().builder(par.layout().tocType()); + if (par.layout().isTocCaption()) { + docstring str; + text().forOutliner(str, TOC_ENTRY_LENGTH, start, end); + b.argumentItem(str); + } + b.pop(); +} + + bool InsetText::notifyCursorLeaves(Cursor const & old, Cursor & cur) { if (buffer().isClean()) @@ -1015,52 +1069,6 @@ docstring InsetText::toolTipText(docstring prefix, size_t const len) const } -InsetCaption const * InsetText::getCaptionInset() const -{ - ParagraphList::const_iterator pit = paragraphs().begin(); - for (; pit != paragraphs().end(); ++pit) { - InsetList::const_iterator it = pit->insetList().begin(); - for (; it != pit->insetList().end(); ++it) { - Inset & inset = *it->inset; - if (inset.lyxCode() == CAPTION_CODE) { - InsetCaption const * ins = - static_cast(it->inset); - return ins; - } - } - } - return 0; -} - - -docstring InsetText::getCaptionText(OutputParams const & runparams) const -{ - InsetCaption const * ins = getCaptionInset(); - if (ins == 0) - return docstring(); - - odocstringstream ods; - ins->getCaptionAsPlaintext(ods, runparams); - return ods.str(); -} - - -docstring InsetText::getCaptionHTML(OutputParams const & runparams) const -{ - InsetCaption const * ins = getCaptionInset(); - if (ins == 0) - return docstring(); - - odocstringstream ods; - XHTMLStream xs(ods); - docstring def = ins->getCaptionAsHTML(xs, runparams); - if (!def.empty()) - // should already have been escaped - xs << XHTMLStream::ESCAPE_NONE << def << '\n'; - return ods.str(); -} - - InsetText::XHTMLOptions operator|(InsetText::XHTMLOptions a1, InsetText::XHTMLOptions a2) { return static_cast((int)a1 | (int)a2);