X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=f46b3c8418ba6c0514d5708c107cdde8f77b8873;hb=f5a7aebdfa891baaae7c15affae3006b642ae90c;hp=2b3e9c81013b225fec76fd213da9dde23303b61b;hpb=8adcffff0c1a7c681be989b8c2b77f761483b0da;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 2b3e9c8101..f46b3c8418 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -45,7 +45,8 @@ namespace lyx {
 ///////////////////////////////////////////////////////////////////////////
 
 TocItem::TocItem(DocIterator const & dit, int d, docstring const & s,
-	docstring const & t) : dit_(dit), depth_(d), str_(s), tooltip_(t)
+	bool output_active, docstring const & t) :
+  dit_(dit), depth_(d), str_(s), tooltip_(t), output_(output_active)
 {
 }
 
@@ -70,7 +71,7 @@ docstring const & TocItem::str() const
 
 docstring const & TocItem::tooltip() const
 {
-	return tooltip_;
+	return tooltip_.empty() ? str_ : tooltip_;
 }
 
 
@@ -104,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;
 }
@@ -118,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()) {
@@ -149,15 +150,15 @@ bool TocBackend::updateItem(DocIterator const & dit)
 				*static_cast<InsetArgument&>(inset).paragraphs().begin();
 			if (!par.labelString().empty())
 				tocstring = par.labelString() + ' ';
-			tocstring += inset_par.asString(AS_STR_INSETS | AS_STR_INTOC);
+			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 | AS_STR_INSETS | AS_STR_INTOC);
+			tocstring = par.asString(AS_STR_LABEL | AS_STR_INSETS);
 
 	const_cast<TocItem &>(*toc_item).str_ = tocstring;
 
@@ -166,12 +167,12 @@ bool TocBackend::updateItem(DocIterator const & dit)
 }
 
 
-void TocBackend::update()
+void TocBackend::update(bool output_active)
 {
 	tocs_.clear();
 	if (!buffer_->isInternal()) {
 		DocIterator dit;
-		buffer_->inset().addToToc(dit);
+		buffer_->inset().addToToc(dit, output_active);
 	}
 }
 
@@ -181,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);
 }
 
@@ -231,14 +233,18 @@ Toc::iterator Toc::item(int depth, docstring const & str)
 }
 
 
-void TocBackend::writePlaintextTocList(string const & type, odocstream & os) const
+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;
+		}
 	}
 }