Update Win installer for new dictionary links. Untested.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index c013cca03f7e2f71caa8194d868cc7dfb2dcfa2c..c0a4373923f631eb51a29688cd5051db2c927b19 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -22,7 +22,7 @@
 #include "Paragraph.h"
 #include "TextClass.h"
 
-#include "insets/InsetText.h"
+#include "insets/InsetArgument.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -43,8 +43,8 @@ namespace lyx {
 ///////////////////////////////////////////////////////////////////////////
 
 TocItem::TocItem(DocIterator const & dit, int d, docstring const & s,
-                 bool output_active, FuncRequest action)
-       : dit_(dit), depth_(d), str_(s), output_(output_active),
+                 bool output_active, bool missing, FuncRequest const & action)
+       : dit_(dit), depth_(d), str_(s), output_(output_active), missing_(missing),
          action_(action)
 {
 }
@@ -65,6 +65,9 @@ docstring const TocItem::asString() const
                prefix += cross;
                prefix += thin;
        }
+       if (missing_) {
+               prefix += _("MISSING: ");
+       }
        return prefix + str_;
 }
 
@@ -143,8 +146,8 @@ shared_ptr<Toc> TocBackend::toc(string const & type)
 
 TocBuilder & TocBackend::builder(string const & type)
 {
-       auto p = make_unique<TocBuilder>(toc(type));
-       return * builders_.insert(make_pair(type, move(p))).first->second;
+       auto p = lyx::make_unique<TocBuilder>(toc(type));
+       return * builders_.insert(make_pair(type, std::move(p))).first->second;
 }
 
 
@@ -153,8 +156,11 @@ 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_in)
+bool TocBackend::updateItem(DocIterator const & dit_in) const
 {
+       if (dit_in.buffer() && dit_in.buffer()->isInternal())
+               return false;
+
        // we need a text
        DocIterator dit = dit_in.getInnerText();
 
@@ -162,7 +168,7 @@ bool TocBackend::updateItem(DocIterator const & dit_in)
                return false;
 
        if (toc("tableofcontents")->empty()) {
-               // FIXME: should not happen, 
+               // FIXME: should not happen,
                // a call to TocBackend::update() is missing somewhere
                LYXERR0("TocBackend::updateItem called but the TOC is empty!");
                return false;
@@ -180,19 +186,15 @@ bool TocBackend::updateItem(DocIterator const & dit_in)
        //
        // 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) {
+       Paragraph const & par = toc_item->dit().paragraph();
+       for (auto const & table : par.insetList())
+               if (InsetArgument const * arg = table.inset->asInsetArgument()) {
                        tocstring = par.labelString();
                        if (!tocstring.empty())
                                tocstring += ' ';
-                       inset.asInsetText()->text().forOutliner(tocstring,TOC_ENTRY_LENGTH);
+                       arg->text().forOutliner(tocstring,TOC_ENTRY_LENGTH);
                        break;
                }
-       }
 
        int const toclevel = toc_item->dit().text()->
                getTocLevel(toc_item->dit().pit());
@@ -208,17 +210,24 @@ bool TocBackend::updateItem(DocIterator const & dit_in)
 }
 
 
-void TocBackend::update(bool output_active, UpdateType utype)
+void TocBackend::reset()
 {
-       for (TocList::iterator it = tocs_.begin(); it != tocs_.end(); ++it)
-               it->second->clear();
+       for (auto const & t: tocs_)
+               t.second->clear();
        tocs_.clear();
        builders_.clear();
        resetOutlinerNames();
-       if (!buffer_->isInternal()) {
-               DocIterator dit;
-               buffer_->inset().addToToc(dit, output_active, utype, *this);
-       }
+}
+
+
+void TocBackend::update(bool output_active, UpdateType utype)
+{
+       reset();
+       if (buffer_->isInternal())
+               return;
+
+       DocIterator dit;
+       buffer_->inset().addToToc(dit, output_active, utype, *this);
 }
 
 
@@ -276,7 +285,7 @@ void TocBackend::resetOutlinerNames()
 {
        outliner_names_.clear();
        // names from this document class
-       for (pair<string, docstring> const & name
+       for (auto const & name
                     : buffer_->params().documentClass().outlinerNames())
                addName(name.first, translateIfPossible(name.second));
        // Hardcoded types
@@ -285,9 +294,10 @@ void TocBackend::resetOutlinerNames()
        addName("senseless", _("Senseless"));
        addName("citation", _("Citations"));
        addName("label", _("Labels and References"));
+       addName("brokenrefs", _("Broken References and Citations"));
        // Customizable, but the corresponding insets have no layout definition
        addName("child", _("Child Documents"));
-       addName("graphics", _("Graphics"));
+       addName("graphics", _("Graphics[[listof]]"));
        addName("equation", _("Equations"));
        addName("external", _("External Material"));
        addName("math-macro", _("Math Macros"));