Cmake export tests: Create concatenated labels in the form 'export:reverted:examples...

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index f0750c61bda9ac16a2a84a73ce3158ebf5b366d9..8e90a3bb12637fcd647fd02998538b60344e6495 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -31,8 +31,8 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
-
 #include "support/lassert.h"
+#include "support/lstrings.h"
 
 using namespace std;
 
@@ -80,6 +80,8 @@ docstring const TocItem::asString() const
        return prefix + str_;
 }
 
+namespace {
+
 // convert a DocIterator into an argument to LFUN_PARAGRAPH_GOTO 
 docstring paragraph_goto_arg(DocIterator const & dit)
 {
@@ -88,6 +90,8 @@ docstring paragraph_goto_arg(DocIterator const & dit)
                convert<docstring>(s.pos());
 }
 
+} // namespace anon
+
 FuncRequest TocItem::action() const
 {
        if (action_.action() == LFUN_UNKNOWN_ACTION) {
@@ -155,7 +159,7 @@ Toc::iterator Toc::item(int depth, docstring const & str)
 ///////////////////////////////////////////////////////////////////////////
 
 TocBuilder::TocBuilder(shared_ptr<Toc> toc)
-       : toc_(toc ? toc : make_shared<Toc>()),
+       : toc_(toc ? toc : lyx::make_shared<Toc>()),
          stack_()
 {
        LATTEST(toc);
@@ -221,7 +225,7 @@ shared_ptr<TocBuilder> TocBuilderStore::get(string const & type,
        map_t::const_iterator it = map_.find(type);
        if (it == map_.end()) {
                it = map_.insert(std::make_pair(type,
-                                                                               make_shared<TocBuilder>(toc))).first;
+                                                                       lyx::make_shared<TocBuilder>(toc))).first;
        }
        return it->second;
 }
@@ -238,7 +242,7 @@ shared_ptr<Toc const> TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
-       LASSERT(it != tocs_.end(), { return make_shared<Toc>(); });
+       LASSERT(it != tocs_.end(), { return lyx::make_shared<Toc>(); });
        return it->second;
 }
 
@@ -247,7 +251,7 @@ shared_ptr<Toc> TocBackend::toc(string const & type)
 {
        TocList::const_iterator it = tocs_.find(type);
        if (it == tocs_.end()) {
-               it = tocs_.insert(std::make_pair(type, make_shared<Toc>())).first;
+               it = tocs_.insert(std::make_pair(type, lyx::make_shared<Toc>())).first;
        }
        return it->second;
 }
@@ -259,6 +263,11 @@ shared_ptr<TocBuilder> TocBackend::builder(string const & type)
 }
 
 
+// FIXME: This function duplicates functionality from InsetText::iterateForToc.
+// Both have their own way of computing the TocItem for "tableofcontents". The
+// TocItem creation and update should be made in a dedicated function and
+// updateItem should be rewritten to uniformly update the matching items from
+// all TOCs.
 bool TocBackend::updateItem(DocIterator const & dit)
 {
        if (dit.text()->getTocLevel(dit.pit()) == Layout::NOT_IN_TOC)
@@ -280,28 +289,30 @@ bool TocBackend::updateItem(DocIterator const & dit)
 
        // For each paragraph, traverse its insets and let them add
        // their toc items
+       //
+       // FIXME: This is supposed to accomplish the same as the body of
+       // InsetText::iterateForToc(), probably
        Paragraph & par = toc_item->dit_.paragraph();
        InsetList::const_iterator it = par.insetList().begin();
        InsetList::const_iterator end = par.insetList().end();
        for (; it != end; ++it) {
                Inset & inset = *it->inset;
                if (inset.lyxCode() == ARG_CODE) {
+                       tocstring = par.labelString();
                        if (!tocstring.empty())
-                               break;
-                       Paragraph const & inset_par =
-                               *static_cast<InsetArgument&>(inset).paragraphs().begin();
-                       if (!par.labelString().empty())
-                               tocstring = par.labelString() + ' ';
-                       tocstring += inset_par.asString(AS_STR_INSETS);
+                               tocstring += ' ';
+                       inset.asInsetText()->text().forOutliner(tocstring,TOC_ENTRY_LENGTH);
                        break;
                }
        }
 
-       int const toclevel = toc_item->dit_.text()->getTocLevel(toc_item->dit_.pit());
+       int const toclevel = toc_item->dit_.text()->
+               getTocLevel(toc_item->dit_.pit());
        if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel
                && tocstring.empty())
-                       tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
+               par.forOutliner(tocstring, TOC_ENTRY_LENGTH);
 
+       support::truncateWithEllipsis(tocstring, TOC_ENTRY_LENGTH);
        const_cast<TocItem &>(*toc_item).str(tocstring);
 
        buffer_->updateTocItem("tableofcontents", dit);