X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=9bd435f2f209283245b5ae9d7ad2ef9c7115a5ff;hb=d2ec79beac9a539770ddf5a7010621ab629eace6;hp=f0750c61bda9ac16a2a84a73ce3158ebf5b366d9;hpb=d5a5fbb8ee87d4a8ae1c55f9ba72819251bb6fb7;p=lyx.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index f0750c61bd..9bd435f2f2 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -17,6 +17,7 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
+#include "Cursor.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
@@ -31,8 +32,9 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
-
+#include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
 
 using namespace std;
 
@@ -68,18 +70,18 @@ docstring const & TocItem::tooltip() const
 
 docstring const TocItem::asString() const
 {
-	// U+2327 X IN A RECTANGLE BOX
-	// char_type const cross = 0x2327;
-	// U+274E NEGATIVE SQUARED CROSS MARK
-	char_type const cross = 0x274e;
+	static char_type const cross = 0x2716; // ✖ U+2716 HEAVY MULTIPLICATION X
+	static char_type const thin = 0x2009; // U+2009 THIN SPACE
 	docstring prefix;
 	if (!output_) {
 		prefix += cross;
-		prefix += " ";
+		prefix += thin;
 	}
 	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,8 +263,16 @@ shared_ptr<TocBuilder> TocBackend::builder(string const & type)
 }
 
 
-bool TocBackend::updateItem(DocIterator const & dit)
+// 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_in)
 {
+	// we need a text
+	DocIterator dit = dit_in.getInnerText();
+
 	if (dit.text()->getTocLevel(dit.pit()) == Layout::NOT_IN_TOC)
 		return false;
 
@@ -280,28 +292,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);
@@ -349,4 +363,11 @@ void TocBackend::writePlaintextTocList(string const & type,
 }
 
 
+docstring TocBackend::outlinerName(std::string const & type) const
+{
+	return translateIfPossible(
+	    buffer_->params().documentClass().outlinerName(type));
+}
+
+
 } // namespace lyx