insetcharstyle drawing cosmetics

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

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 75644d4295218ecf0173ccedf95a742acf9bdadb..c3643f5b95a33fc3c36420ef5a8c00a4fa0559dc 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -17,9 +17,10 @@
 #include "dispatchresult.h"
 #include "funcrequest.h"
 #include "InsetList.h"
-#include "iterators.h"
 #include "lyxtext.h"
 #include "paragraph.h"
+#include "pariterator.h"
+#include "sgml.h"
 
 #include "frontends/LyXView.h"
 
@@ -91,7 +92,7 @@ void changeRefsIfUnique(BufferView & bv, string const & from, string const & to)
 } // namespace anon
 
 
-void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
 
@@ -99,7 +100,7 @@ void InsetLabel::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
                InsetCommandParams p;
                InsetCommandMailer::string2params("label", cmd.argument, p);
                if (p.getCmdName().empty()) {
-                       cur.notdispatched();
+                       cur.undispatched();
                        break;
                }
                if (p.getContents() != params().getContents())
@@ -135,7 +136,7 @@ int InsetLabel::plaintext(Buffer const &, ostream & os,
 int InsetLabel::linuxdoc(Buffer const &, ostream & os,
                         OutputParams const &) const
 {
-       os << "<label id=\"" << getContents() << "\" >";
+       os << "<label id=\"" << sgml::cleanID(getContents()) << "\" >";
        return 0;
 }
 
@@ -143,6 +144,6 @@ int InsetLabel::linuxdoc(Buffer const &, ostream & os,
 int InsetLabel::docbook(Buffer const &, ostream & os,
                        OutputParams const &) const
 {
-       os << "<anchor id=\"" << getContents() << "\">";
+       os << "<!-- anchor id=\"" << sgml::cleanID(getContents()) << "\" -->";
        return 0;
 }