InsetBox.cpp: only shaded boxes can have multiple paragraphs when there is no inner box

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

diff --git a/src/insets/InsetLabel.cpp b/src/insets/InsetLabel.cpp
index 1177d2db5b0ae92f70a85ff24e3c63ec9fe56160..6f006a1288160d508d41bc0f50ed9b66dc68a33c 100644 (file)
--- a/src/insets/InsetLabel.cpp
+++ b/src/insets/InsetLabel.cpp
@@ -16,19 +16,25 @@
 
 #include "buffer_funcs.h"
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetIterator.h"
-#include "LyXFunc.h"
+#include "Language.h"
+#include "LyX.h"
 #include "output_xhtml.h"
 #include "ParIterator.h"
 #include "sgml.h"
 #include "Text.h"
+#include "TextClass.h"
 #include "TocBackend.h"
 
+#include "mathed/InsetMathHull.h"
+#include "mathed/InsetMathRef.h"
+
 #include "frontends/alert.h"
 
 #include "support/convert.h"
@@ -79,14 +85,22 @@ void InsetLabel::updateCommand(docstring const & new_label, bool updaterefs)
                Buffer::References::iterator end = refs.end();
                for (; it != end; ++it) {
                        buffer().undo().recordUndo(it->second);
-                       it->first->setParam("reference", label);
+                       if (it->first->lyxCode() == MATH_REF_CODE) {
+                               InsetMathHull * mi =
+                                       static_cast<InsetMathHull *>(it->first);
+                               mi->asRefInset()->changeTarget(label);
+                       } else {
+                               InsetCommand * ref =
+                                       static_cast<InsetCommand *>(it->first);
+                               ref->setParam("reference", label);
+                       }
                }
        }
        buffer().undo().endUndoGroup();
 
        // We need an update of the Buffer reference cache. This is achieved by
-       // updateLabels().
-       buffer().updateLabels();
+       // updateBuffer().
+       buffer().updateBuffer();
 }
 
 
@@ -94,7 +108,8 @@ ParamInfo const & InsetLabel::findInfo(string const & /* cmdName */)
 {
        static ParamInfo param_info_;
        if (param_info_.empty())
-               param_info_.add("name", ParamInfo::LATEX_REQUIRED);
+               param_info_.add("name", ParamInfo::LATEX_REQUIRED,
+                               ParamInfo::HANDLING_ESCAPE);
        return param_info_;
 }
 
@@ -105,7 +120,7 @@ docstring InsetLabel::screenLabel() const
 }
 
 
-void InsetLabel::updateLabels(ParIterator const &, bool)
+void InsetLabel::updateBuffer(ParIterator const & par, UpdateType utype)
 {
        docstring const & label = getParam("name");
        if (buffer().insetLabel(label)) {
@@ -115,6 +130,21 @@ void InsetLabel::updateLabels(ParIterator const &, bool)
        }
        buffer().setInsetLabel(label, this);
        screen_label_ = label;
+
+       if (utype) {
+               // save info on the active counter
+               Counters const & cnts = 
+                       buffer().masterBuffer()->params().documentClass().counters();
+               active_counter_ = cnts.currentCounter();
+               Language const * lang = par->getParLanguage(buffer().params());
+               if (lang && !active_counter_.empty()) {
+                       counter_value_ = cnts.theCounter(active_counter_, lang->code());
+                       pretty_counter_ = cnts.prettyCounter(active_counter_, lang->code());
+               } else {
+                       counter_value_ = from_ascii("??");
+                       pretty_counter_ = from_ascii("??");
+               }
+       }
 }
 
 
@@ -132,7 +162,13 @@ void InsetLabel::addToToc(DocIterator const & cpit)
        Buffer::References::const_iterator end = refs.end();
        for (; it != end; ++it) {
                DocIterator const ref_pit(it->second);
-               toc.push_back(TocItem(ref_pit, 1, it->first->screenLabel()));
+               if (it->first->lyxCode() == MATH_REF_CODE)
+                       toc.push_back(TocItem(ref_pit, 1,
+                               static_cast<InsetMathHull *>(it->first)->asRefInset()
+                                       ->screenLabel()));
+               else
+                       toc.push_back(TocItem(ref_pit, 1,
+                               static_cast<InsetRef *>(it->first)->screenLabel()));
        }
 }
 
@@ -141,7 +177,7 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
                           FuncStatus & status) const
 {
        bool enabled;
-       switch (cmd.action) {
+       switch (cmd.action()) {
        case LFUN_LABEL_INSERT_AS_REF:
        case LFUN_LABEL_COPY_AS_REF:
                enabled = true;
@@ -157,7 +193,7 @@ bool InsetLabel::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(LABEL_CODE);
@@ -195,13 +231,6 @@ void InsetLabel::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-int InsetLabel::latex(odocstream & os, OutputParams const &) const
-{
-       os << escape(getCommand());
-       return 0;
-}
-
-
 int InsetLabel::plaintext(odocstream & os, OutputParams const &) const
 {
        docstring const str = getParam("name");