Add a layout tag ForceOwnlines that assures an inset is started and terminated by...

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 2a380a74fae8c589db183783bfcedf66c3682d8a..35d5f543b8f86e4a0d32fa3799b3192c0ecd48e2 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"));
 }
 
 
@@ -95,12 +97,9 @@ void InsetLabel::updateLabelAndRefs(docstring const & new_label,
        if (label == old_label)
                return;
 
-       if (!cursor)
-               return;
-
-       cursor->recordUndo();
        buffer().undo().beginUndoGroup();
-       buffer().markDirty();
+       if (cursor)
+               cursor->recordUndo();
        setParam("name", label);
        updateReferences(old_label, label);
        buffer().undo().endUndoGroup();
@@ -110,14 +109,14 @@ 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) {
-                       InsetMathHull * mi = it->first->asInsetMath()->asHullInset();
-                       mi->asRefInset()->changeTarget(new_label);
+                       InsetMathRef * mi = it->first->asInsetMath()->asRefInset();
+                       mi->changeTarget(new_label);
                } else {
                        InsetCommand * ref = it->first->asInsetCommand();
                        ref->setParam("reference", new_label);
@@ -170,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();
@@ -186,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)->getTOCString(),
+                         output_active));
        }
 }
 
@@ -199,10 +200,17 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 {
        bool enabled;
        switch (cmd.action()) {
-       case LFUN_LABEL_INSERT_AS_REF:
-       case LFUN_LABEL_COPY_AS_REF:
+       case LFUN_LABEL_INSERT_AS_REFERENCE:
+       case LFUN_LABEL_COPY_AS_REFERENCE:
                enabled = true;
                break;
+       case LFUN_INSET_MODIFY:
+               if (cmd.getArg(0) == "changetype") {
+                       // this is handled by InsetCommand,
+                       // but not by InsetLabel.
+                       enabled = false;
+                       break;
+               }
        default:
                return InsetCommand::getStatus(cur, cmd, status);
        }
@@ -217,6 +225,12 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
+               // the only other option here is "changetype", and we
+               // do not have different types.
+               if (cmd.getArg(0) != "label") {
+                       cur.undispatched();
+                       return;
+               }
                InsetCommandParams p(LABEL_CODE);
                // FIXME UNICODE
                InsetCommand::string2params(to_utf8(cmd.argument()), p);
@@ -232,7 +246,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_LABEL_COPY_AS_REF: {
+       case LFUN_LABEL_COPY_AS_REFERENCE: {
                InsetCommandParams p(REF_CODE, "ref");
                p["reference"] = getParam("name");
                cap::clearSelection();
@@ -240,7 +254,7 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_LABEL_INSERT_AS_REF: {
+       case LFUN_LABEL_INSERT_AS_REFERENCE: {
                InsetCommandParams p(REF_CODE, "ref");
                p["reference"] = getParam("name");
                string const data = InsetCommand::params2string(p);
@@ -255,7 +269,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 << '>';