* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / insetlabel.C

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 816821f9c792737bda6ab0d8bbc8b53e90eaabc4..3d995c3ea0085da9053c82672d54dbf8df5de48e 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -20,14 +20,16 @@
 #include "lyxtext.h"
 #include "paragraph.h"
 #include "pariterator.h"
-
-#include "frontends/LyXView.h"
+#include "sgml.h"
 
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/std_ostream.h"
 
-using lyx::support::escape;
+
+namespace lyx {
+
+using support::escape;
 
 using std::string;
 using std::ostream;
@@ -39,84 +41,51 @@ InsetLabel::InsetLabel(InsetCommandParams const & p)
 {}
 
 
-std::auto_ptr<InsetBase> InsetLabel::clone() const
+std::auto_ptr<InsetBase> InsetLabel::doClone() const
 {
        return std::auto_ptr<InsetBase>(new InsetLabel(params()));
 }
 
 
-void InsetLabel::getLabelList(Buffer const &, std::vector<string> & list) const
-{
-       list.push_back(getContents());
-}
-
-
-string const InsetLabel::getScreenLabel(Buffer const &) const
+void InsetLabel::getLabelList(Buffer const &, std::vector<docstring> & list) const
 {
-       return getContents();
+       list.push_back(getParam("name"));
 }
 
 
-namespace {
-
-void changeRefsIfUnique(BufferView & bv, string const & from, string const & to)
+docstring const InsetLabel::getScreenLabel(Buffer const &) const
 {
-       // Check if the label 'from' appears more than once
-       vector<string> labels;
-       bv.buffer()->getLabelList(labels);
-
-       if (lyx::count(labels.begin(), labels.end(), from) > 1)
-               return;
-
-       InsetBase::Code code = InsetBase::REF_CODE;
-
-       ParIterator it = bv.buffer()->par_iterator_begin();
-       ParIterator end = bv.buffer()->par_iterator_end();
-       for ( ; it != end; ++it) {
-               bool changed_inset = false;
-               for (InsetList::iterator it2 = it->insetlist.begin();
-                    it2 != it->insetlist.end(); ++it2) {
-                       if (it2->inset->lyxCode() == code) {
-                               InsetCommand * inset = static_cast<InsetCommand *>(it2->inset);
-                               if (inset->getContents() == from) {
-                                       inset->setContents(to);
-                                       //inset->setButtonLabel();
-                                       changed_inset = true;
-                               }
-                       }
-               }
-       }
+       return getParam("name");
 }
 
-} // namespace anon
-
 
-void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd)
+void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
        case LFUN_INSET_MODIFY: {
-               InsetCommandParams p;
-               InsetCommandMailer::string2params("label", cmd.argument, p);
+               InsetCommandParams p("label");
+               // FIXME UNICODE
+               InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
-                       cur.undispatched();
+                       cur.noUpdate();
                        break;
                }
-               if (p.getContents() != params().getContents())
-                       changeRefsIfUnique(cur.bv(), params().getContents(),
-                                                      p.getContents());
+               if (p["name"] != params()["name"])
+                       cur.bv().buffer()->changeRefsIfUnique(params()["name"],
+                                       p["name"], InsetBase::REF_CODE);
                setParams(p);
                break;
        }
 
        default:
-               InsetCommand::priv_dispatch(cur, cmd);
+               InsetCommand::doDispatch(cur, cmd);
                break;
        }
 }
 
 
-int InsetLabel::latex(Buffer const &, ostream & os,
+int InsetLabel::latex(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
        os << escape(getCommand());
@@ -124,25 +93,22 @@ int InsetLabel::latex(Buffer const &, ostream & os,
 }
 
 
-int InsetLabel::plaintext(Buffer const &, ostream & os,
+int InsetLabel::plaintext(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
-       os << '<' << getContents()  << '>';
+       os << '<' << getParam("name") << '>';
        return 0;
 }
 
 
-int InsetLabel::linuxdoc(Buffer const &, ostream & os,
-                        OutputParams const &) const
+int InsetLabel::docbook(Buffer const & buf, odocstream & os,
+                       OutputParams const & runparams) const
 {
-       os << "<label id=\"" << getContents() << "\" >";
+       os << "<!-- anchor id=\""
+           << sgml::cleanID(buf, runparams, getParam("name"))
+           << "\" -->";
        return 0;
 }
 
 
-int InsetLabel::docbook(Buffer const &, ostream & os,
-                       OutputParams const &) const
-{
-       os << "<!-- anchor id=\"" << getContents() << "\" -->";
-       return 0;
-}
+} // namespace lyx