more cleanup:

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

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index ffceee1cf92e2821b444d48d0e44d4295ee8c638..4bd7f5765a8d581e512c828af431d7aafdd426ab 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -22,8 +22,10 @@
 
 #include "support/std_ostream.h"
 
-using lyx::docstring;
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::subst;
 
 using std::string;
 using std::ostream;
@@ -39,59 +41,60 @@ docstring const InsetUrl::getScreenLabel(Buffer const &) const
        docstring const temp =
                (getCmdName() == "url") ? _("Url: ") : _("HtmlUrl: ");
 
-       string url;
+       docstring url;
 
-       if (!getOptions().empty())
-               url += getOptions();
+       if (!getParam("name").empty())
+               url += getParam("name");
        else
-               url += getContents();
+               url += getParam("target");
 
        // elide if long
        if (url.length() > 30) {
                url = url.substr(0, 10) + "..."
                        + url.substr(url.length() - 17, url.length());
        }
-       // FIXME UNICODE
-       return temp + lyx::from_utf8(url);
+       return temp + url;
 }
 
 
-int InsetUrl::latex(Buffer const &, ostream & os,
+int InsetUrl::latex(Buffer const &, odocstream & os,
                    OutputParams const & runparams) const
 {
-       if (!getOptions().empty())
-               os << getOptions() + ' ';
+       docstring const & name = getParam("name");
+       if (!name.empty())
+               os << name + ' ';
        if (runparams.moving_arg)
                os << "\\protect";
-       os << "\\url{" << getContents() << '}';
+       os << "\\url{" << getParam("target") << '}';
        return 0;
 }
 
 
-int InsetUrl::plaintext(Buffer const &, lyx::odocstream & os,
+int InsetUrl::plaintext(Buffer const &, odocstream & os,
                    OutputParams const &) const
 {
-       // FIXME UNICODE
-       os << '[' << lyx::from_utf8(getContents());
-       if (getOptions().empty())
+       os << '[' << getParam("target");
+       if (getParam("name").empty())
                os << ']';
        else
-               // FIXME UNICODE
-               os << "||" << lyx::from_utf8(getOptions()) << ']';
+               os << "||" << getParam("name") << ']';
        return 0;
 }
 
 
-int InsetUrl::docbook(Buffer const &, ostream & os,
+int InsetUrl::docbook(Buffer const &, odocstream & os,
                      OutputParams const &) const
 {
-       os << "<ulink url=\"" << subst(getContents(),"&","&amp;")
-          << "\">" << getOptions() << "</ulink>";
+       os << "<ulink url=\"" 
+          << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
+          << "\">" 
+          << getParam("name")
+          << "</ulink>";
        return 0;
 }
 
 
-int InsetUrl::textString(Buffer const & buf, lyx::odocstream & os,
+int InsetUrl::textString(Buffer const & buf, odocstream & os,
                       OutputParams const & op) const
 {
        return plaintext(buf, os, op);
@@ -102,3 +105,6 @@ void InsetUrl::validate(LaTeXFeatures & features) const
 {
        features.require("url");
 }
+
+
+} // namespace lyx