* BufferParams:

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

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 57c245056667e2527f012d21f88334c17de15b67..bdac8f43a1ed6eb7c3897cfb451a670bce4c4cb7 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -65,15 +65,15 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p("label");
+               // FIXME UNICODE
                InsetCommandMailer::string2params("label", to_utf8(cmd.argument()), p);
                if (p.getCmdName().empty()) {
                        cur.noUpdate();
                        break;
                }
                if (p["name"] != params()["name"])
-                       // FIXME UNICODE
-                       cur.bv().buffer()->changeRefsIfUnique(to_utf8(params()["name"]),
-                                                      to_utf8(p["name"]), InsetBase::REF_CODE);
+                       cur.bv().buffer()->changeRefsIfUnique(params()["name"],
+                                       p["name"], InsetBase::REF_CODE);
                setParams(p);
                break;
        }
@@ -86,7 +86,7 @@ void InsetLabel::doDispatch(LCursor & cur, FuncRequest & cmd)
 
 
 int InsetLabel::latex(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+                      OutputParams const &) const
 {
        os << escape(getCommand());
        return 0;
@@ -94,19 +94,19 @@ int InsetLabel::latex(Buffer const &, odocstream & os,
 
 
 int InsetLabel::plaintext(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+                          OutputParams const &) const
 {
-       os << '<' << getParam("name") << '>';
-       return 0;
+       docstring const str = getParam("name");
+       os << '<' << str << '>';
+       return 2 + str.size();
 }
 
 
 int InsetLabel::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
-        // FIXME UNICODE
        os << "<!-- anchor id=\""
-           << from_ascii(sgml::cleanID(buf, runparams, lyx::to_ascii(getParam("name"))))
+           << sgml::cleanID(buf, runparams, getParam("name"))
            << "\" -->";
        return 0;
 }