Some master/child biblio fixes.

[lyx.git] / src / insets / InsetText.cpp

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 1c3689f627d81c1be78248329b45aad95c721913..db6b744deb833dcc815bb8d6d2c8baddd8409116 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -137,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();
@@ -768,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();
@@ -850,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<pair<pit_type, pit_type>> 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();
@@ -869,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
@@ -894,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())