Update ANNOUNCE

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 8e90a3bb12637fcd647fd02998538b60344e6495..9bd435f2f209283245b5ae9d7ad2ef9c7115a5ff 100644 (file)
--- 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,6 +32,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
@@ -68,14 +70,12 @@ 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_;
 }
@@ -268,8 +268,11 @@ shared_ptr<TocBuilder> TocBackend::builder(string const & type)
 // 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)
+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;
 
@@ -360,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