Add known citation packages to LaTeXFeatures:

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 2da31fca17f278015c03bc2e0757ceda2983be08..e3dcca1d0e59a201b268d397f91f9772561e2aa2 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -25,7 +25,7 @@
 #include "ParIterator.h"
 #include "TextClass.h"
 
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -44,8 +44,8 @@ namespace lyx {
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocItem::TocItem(DocIterator const & dit, int d, docstring const & s)
-       : dit_(dit), depth_(d), str_(s)
+TocItem::TocItem(DocIterator const & dit, int d, docstring const & s,
+       docstring const & t) : dit_(dit), depth_(d), str_(s), tooltip_(t)
 {
 }
 
@@ -68,12 +68,24 @@ docstring const & TocItem::str() const
 }
 
 
+docstring const & TocItem::tooltip() const
+{
+       return tooltip_.empty() ? str_ : tooltip_;
+}
+
+
 docstring const TocItem::asString() const
 {
        return docstring(4 * depth_, ' ') + str_;
 }
 
 
+DocIterator const & TocItem::dit() const
+{
+       return dit_;
+}
+
+
 FuncRequest TocItem::action() const
 {
        string const arg = convert<string>(dit_.paragraph().id())
@@ -106,7 +118,7 @@ Toc & TocBackend::toc(string const & type)
 
 bool TocBackend::updateItem(DocIterator const & dit)
 {
-       if (dit.paragraph().layout().toclevel == Layout::NOT_IN_TOC)
+       if (dit.text()->getTocLevel(dit.pit()) == Layout::NOT_IN_TOC)
                return false;
 
        if (toc("tableofcontents").empty()) {
@@ -130,22 +142,22 @@ bool TocBackend::updateItem(DocIterator const & dit)
        InsetList::const_iterator end = par.insetList().end();
        for (; it != end; ++it) {
                Inset & inset = *it->inset;
-               if (inset.lyxCode() == OPTARG_CODE) {
+               if (inset.lyxCode() == ARG_CODE) {
                        if (!tocstring.empty())
                                break;
                        Paragraph const & inset_par =
-                               *static_cast<InsetOptArg&>(inset).paragraphs().begin();
+                               *static_cast<InsetArgument&>(inset).paragraphs().begin();
                        if (!par.labelString().empty())
                                tocstring = par.labelString() + ' ';
-                       tocstring += inset_par.asString();
+                       tocstring += inset_par.asString(AS_STR_INSETS);
                        break;
                }
        }
 
-       int const toclevel = par.layout().toclevel;
+       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);
+                       tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
 
        const_cast<TocItem &>(*toc_item).str_ = tocstring;
 
@@ -157,8 +169,10 @@ bool TocBackend::updateItem(DocIterator const & dit)
 void TocBackend::update()
 {
        tocs_.clear();
-       DocIterator dit;
-       buffer_->inset().addToToc(dit);
+       if (!buffer_->isInternal()) {
+               DocIterator dit;
+               buffer_->inset().addToToc(dit);
+       }
 }
 
 
@@ -203,13 +217,13 @@ TocIterator Toc::item(DocIterator const & dit) const
 }
 
 
-TocIterator Toc::item(int depth, docstring const & str) const
+Toc::iterator Toc::item(int depth, docstring const & str)
 {
        if (empty())
                return end();
-       TocIterator it = begin();
-       TocIterator itend = end();
-       for (; it != itend; --it) {
+       iterator it = begin();
+       iterator itend = end();
+       for (; it != itend; ++it) {
                if (it->depth() == depth && it->str() == str)
                        break;
        }