#5502 add binding for full screen toggle on mac

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 4ffa35571b5c2cc7d682a0c716191e7bb42b2cca..f46b3c8418ba6c0514d5708c107cdde8f77b8873 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,9 @@ 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,
+       bool output_active, docstring const & t) :
+  dit_(dit), depth_(d), str_(s), tooltip_(t), output_(output_active)
 {
 }
 
@@ -68,12 +69,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())
@@ -92,7 +105,7 @@ Toc const & TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
-       LASSERT(it != tocs_.end(), /**/);
+       LASSERT(it != tocs_.end(), { static Toc dummy; return dummy; });
 
        return it->second;
 }
@@ -106,7 +119,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 +143,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;
 
@@ -154,11 +167,13 @@ bool TocBackend::updateItem(DocIterator const & dit)
 }
 
 
-void TocBackend::update()
+void TocBackend::update(bool output_active)
 {
        tocs_.clear();
-       DocIterator dit;
-       buffer_->inset().addToToc(dit);
+       if (!buffer_->isInternal()) {
+               DocIterator dit;
+               buffer_->inset().addToToc(dit, output_active);
+       }
 }
 
 
@@ -167,7 +182,8 @@ TocIterator TocBackend::item(string const & type,
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
-       LASSERT(toclist_it != tocs_.end(), /**/);
+       // We will try to make the best of it in release mode
+       LASSERT(toclist_it != tocs_.end(), toclist_it = tocs_.begin());
        return toclist_it->second.item(dit);
 }
 
@@ -203,14 +219,32 @@ TocIterator Toc::item(DocIterator const & dit) const
 }
 
 
-void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const
+Toc::iterator Toc::item(int depth, docstring const & str)
+{
+       if (empty())
+               return end();
+       iterator it = begin();
+       iterator itend = end();
+       for (; it != itend; ++it) {
+               if (it->depth() == depth && it->str() == str)
+                       break;
+       }
+       return it;
+}
+
+
+void TocBackend::writePlaintextTocList(string const & type,
+        odocstringstream & os, size_t max_length) const
 {
        TocList::const_iterator cit = tocs_.find(type);
        if (cit != tocs_.end()) {
                TocIterator ccit = cit->second.begin();
                TocIterator end = cit->second.end();
-               for (; ccit != end; ++ccit)
+               for (; ccit != end; ++ccit) {
                        os << ccit->asString() << from_utf8("\n");
+                       if (os.str().size() > max_length)
+                               break;
+               }
        }
 }