more cleanup:

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

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 11a24ffe0a52fd660bd5b332444faf58d456cbb6..5eaf34a8f32a3c9b5aac9a8ef73f1d71cbea0b7a 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -24,7 +24,9 @@
 #include "support/lstrings.h"
 
 
-using lyx::support::escape;
+namespace lyx {
+
+using support::escape;
 
 using std::string;
 using std::ostream;
@@ -46,7 +48,7 @@ void InsetRef::doDispatch(LCursor & cur, FuncRequest & cmd)
        case LFUN_MOUSE_PRESS:
                // Eventually trigger dialog with button 3 not 1
                if (cmd.button() == mouse_button::button3)
-                       lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, getContents()));
+                       lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, getParam("reference")));
                else {
                        InsetCommandMailer("ref", *this).showDialog(&cur.bv());
                        cur.undispatched();
@@ -62,64 +64,71 @@ void InsetRef::doDispatch(LCursor & cur, FuncRequest & cmd)
 }
 
 
-string const InsetRef::getScreenLabel(Buffer const &) const
+docstring const InsetRef::getScreenLabel(Buffer const &) const
 {
-       string temp;
+       docstring temp;
        for (int i = 0; !types[i].latex_name.empty(); ++i) {
                if (getCmdName() == types[i].latex_name) {
-                       // FIXME UNIOCDE
-                       temp = lyx::to_utf8(_(types[i].short_gui_name));
+                       temp = _(types[i].short_gui_name);
                        break;
                }
        }
-       temp += getContents();
+       temp += getParam("reference");
 
-       if (!isLatex && !getOptions().empty()) {
+       if (!isLatex && !getParam("name").empty()) {
                temp += "||";
-               temp += getOptions();
+               temp += getParam("name");
        }
        return temp;
 }
 
 
-int InsetRef::latex(Buffer const &, ostream & os,
+int InsetRef::latex(Buffer const &, odocstream & os,
                    OutputParams const &) const
 {
-       if (getOptions().empty())
-               os << escape(getCommand());
-       else {
-               InsetCommandParams p(getCmdName(), getContents(), "");
-               os << escape(p.getCommand());
-       }
+       // Don't output p_["name"], this is only used in docbook
+       InsetCommandParams p(getCmdName());
+       p["reference"] = getParam("reference");
+       os << escape(p.getCommand());
        return 0;
 }
 
 
-int InsetRef::plaintext(Buffer const &, ostream & os,
+int InsetRef::plaintext(Buffer const &, odocstream & os,
                    OutputParams const &) const
 {
-       os << '[' << getContents() << ']';
+       os << '[' << getParam("reference") << ']';
        return 0;
 }
 
 
-int InsetRef::docbook(Buffer const & buf, ostream & os,
+int InsetRef::docbook(Buffer const & buf, odocstream & os,
                      OutputParams const & runparams) const
 {
-       if (getOptions().empty() && runparams.flavor == OutputParams::XML) {
-               os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" />";
-       } else if (getOptions().empty()) {
-               os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, getContents()) << "\">";
+       docstring const & name = getParam("name");
+       if (name.empty()) {
+               if (runparams.flavor == OutputParams::XML) {
+                       os << "<xref linkend=\"" 
+                          << sgml::cleanID(buf, runparams, getParam("reference")) 
+                          << "\" />";
+               } else {
+                       os << "<xref linkend=\"" 
+                          << sgml::cleanID(buf, runparams, getParam("reference")) 
+                          << "\">";
+               }
        } else {
-               os << "<link linkend=\"" << sgml::cleanID(buf, runparams, getContents())
-                  << "\">" << getOptions() << "</link>";
+               os << "<link linkend=\"" 
+                  << sgml::cleanID(buf, runparams, getParam("reference"))
+                  << "\">" 
+                  << getParam("name")
+                  << "</link>";
        }
 
        return 0;
 }
 
 
-int InsetRef::textString(Buffer const & buf, ostream & os,
+int InsetRef::textString(Buffer const & buf, odocstream & os,
                       OutputParams const & op) const
 {
        return plaintext(buf, os, op);
@@ -161,3 +170,6 @@ string const & InsetRef::getName(int type)
 {
        return types[type].latex_name;
 }
+
+
+} // namespace lyx