Add Nomenclature to the TOC.

[lyx.git] / src / insets / InsetLabel.cpp

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index c483f9488374731b21e4bf4e36c0bd1590290011..4dfbc96448a628fb8e34c1bea7a9fd1cd4fd1d47 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -55,9 +55,11 @@ InsetLabel::InsetLabel(Buffer * buf, InsetCommandParams const & p)
 
 void InsetLabel::initView()
 {
-       // FIXME: This seems to be used only for inset creation so
-       // we probably just need to call updateLabel() here.
-       updateLabelAndRefs(getParam("name"));
+       // This seems to be used only for inset creation.
+       // Therefore we do not update refs here, since this would
+       // erroneously change refs from existing duplicate labels
+       // (#8141).
+       updateLabel(getParam("name"));
 }
 
 
@@ -107,11 +109,11 @@ void InsetLabel::updateLabelAndRefs(docstring const & new_label,
 void InsetLabel::updateReferences(docstring const & old_label,
                docstring const & new_label)
 {
-       Buffer::References & refs = buffer().references(old_label);
-       Buffer::References::iterator it = refs.begin();
-       Buffer::References::iterator end = refs.end();
+       Buffer::References const & refs = buffer().references(old_label);
+       Buffer::References::const_iterator it = refs.begin();
+       Buffer::References::const_iterator end = refs.end();
        for (; it != end; ++it) {
-               buffer().undo().recordUndo(it->second);
+               buffer().undo().recordUndo(CursorData(it->second));
                if (it->first->lyxCode() == MATH_REF_CODE) {
                        InsetMathRef * mi = it->first->asInsetMath()->asRefInset();
                        mi->changeTarget(new_label);
@@ -167,15 +169,15 @@ void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
 }
 
 
-void InsetLabel::addToToc(DocIterator const & cpit) const
+void InsetLabel::addToToc(DocIterator const & cpit, bool output_active) const
 {
        docstring const & label = getParam("name");
        Toc & toc = buffer().tocBackend().toc("label");
        if (buffer().insetLabel(label) != this) {
-               toc.push_back(TocItem(cpit, 0, screen_label_));
+               toc.push_back(TocItem(cpit, 0, screen_label_, output_active));
                return;
        }
-       toc.push_back(TocItem(cpit, 0, screen_label_));
+       toc.push_back(TocItem(cpit, 0, screen_label_, output_active));
        Buffer::References const & refs = buffer().references(label);
        Buffer::References::const_iterator it = refs.begin();
        Buffer::References::const_iterator end = refs.end();
@@ -183,10 +185,12 @@ void InsetLabel::addToToc(DocIterator const & cpit) const
                DocIterator const ref_pit(it->second);
                if (it->first->lyxCode() == MATH_REF_CODE)
                        toc.push_back(TocItem(ref_pit, 1,
-                               it->first->asInsetMath()->asRefInset()->screenLabel()));
+                               it->first->asInsetMath()->asRefInset()->screenLabel(),
+                               output_active));
                else
                        toc.push_back(TocItem(ref_pit, 1,
-                               static_cast<InsetRef *>(it->first)->screenLabel()));
+                               static_cast<InsetRef *>(it->first)->screenLabel(),
+                         output_active));
        }
 }
 
@@ -252,7 +256,8 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-int InsetLabel::plaintext(odocstream & os, OutputParams const &) const
+int InsetLabel::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
        docstring const str = getParam("name");
        os << '<' << str << '>';