Let getPosNearX take horizontal scrolling into account

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 8e90a3bb12637fcd647fd02998538b60344e6495..6526c57537ae53acadfef5079c6e5a31a1dd82e4 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_;
 }
@@ -107,21 +107,15 @@ FuncRequest TocItem::action() const
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocIterator Toc::item(DocIterator const & dit) const
+Toc::const_iterator TocBackend::findItem(Toc const & toc,
+                                         DocIterator const & dit)
 {
-       TocIterator last = begin();
-       TocIterator it = end();
+       Toc::const_iterator last = toc.begin();
+       Toc::const_iterator it = toc.end();
        if (it == last)
                return it;
-
        --it;
-
-       DocIterator dit_text = dit;
-       if (dit_text.inMathed()) {
-               // We are only interested in text so remove the math CursorSlice.
-               while (dit_text.inMathed())
-                       dit_text.pop_back();
-       }
+       DocIterator dit_text = dit.getInnerText();
 
        for (; it != last; --it) {
                // We verify that we don't compare contents of two
@@ -138,12 +132,12 @@ TocIterator Toc::item(DocIterator const & dit) const
 }
 
 
-Toc::iterator Toc::item(int depth, docstring const & str)
+Toc::iterator TocBackend::findItem(Toc & toc, int depth, docstring const & str)
 {
-       if (empty())
-               return end();
-       iterator it = begin();
-       iterator itend = end();
+       if (toc.empty())
+               return toc.end();
+       Toc::iterator it = toc.begin();
+       Toc::iterator itend = toc.end();
        for (; it != itend; ++it) {
                if (it->depth() == depth && it->str() == str)
                        break;
@@ -185,7 +179,7 @@ void TocBuilder::captionItem(DocIterator const & dit, docstring const & s,
                arg = "paragraph-goto " +
                        paragraph_goto_arg((*toc_)[stack_.top().pos].dit_) + ";" + arg;
        FuncRequest func(LFUN_COMMAND_SEQUENCE, arg);
-       
+
        if (!stack_.empty() && !stack_.top().is_captioned) {
                // The float we entered has not yet been assigned a caption.
                // Assign the caption string to it.
@@ -268,8 +262,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;
 
@@ -283,7 +280,7 @@ bool TocBackend::updateItem(DocIterator const & dit)
        BufferParams const & bufparams = buffer_->params();
        const int min_toclevel = bufparams.documentClass().min_toclevel();
 
-       TocIterator toc_item = item("tableofcontents", dit);
+       Toc::const_iterator toc_item = item("tableofcontents", dit);
 
        docstring tocstring;
 
@@ -333,14 +330,14 @@ void TocBackend::update(bool output_active, UpdateType utype)
 }
 
 
-TocIterator TocBackend::item(string const & type,
-               DocIterator const & dit) const
+Toc::const_iterator TocBackend::item(string const & type,
+                                     DocIterator const & dit) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
        // Is the type supported?
        // 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);
+       return findItem(*toclist_it->second, dit);
 }
 
 
@@ -349,8 +346,8 @@ void TocBackend::writePlaintextTocList(string const & type,
 {
        TocList::const_iterator cit = tocs_.find(type);
        if (cit != tocs_.end()) {
-               TocIterator ccit = cit->second->begin();
-               TocIterator end = cit->second->end();
+               Toc::const_iterator ccit = cit->second->begin();
+               Toc::const_iterator end = cit->second->end();
                for (; ccit != end; ++ccit) {
                        os << ccit->asString() << from_utf8("\n");
                        if (os.str().size() > max_length)
@@ -360,4 +357,11 @@ void TocBackend::writePlaintextTocList(string const & type,
 }
 
 
+docstring TocBackend::outlinerName(std::string const & type) const
+{
+       return translateIfPossible(
+           buffer_->params().documentClass().outlinerName(type));
+}
+
+
 } // namespace lyx