The last commit was, uhh, not what I intended.

[lyx.git] / src / insets / InsetHyperlink.cpp

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 55058dffa3ad7532a40c798d196cded2599506af..42c6240a032b572096facf9c7fdb82c4816b3a46 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -16,37 +16,36 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
-#include "gettext.h"
 #include "OutputParams.h"
 
-#include "support/lstrings.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
-using std::string;
-using std::find;
-using std::replace;
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
 
 InsetHyperlink::InsetHyperlink(InsetCommandParams const & p)
        : InsetCommand(p, "href")
 {}
 
 
-CommandInfo const * InsetHyperlink::findInfo(string const & /* cmdName */)
+ParamInfo const & InsetHyperlink::findInfo(string const & /* cmdName */)
 {
-       static const char * const paramnames[] =
-               {"name", "target", "type", ""};
-       static const bool isoptional[] = {true, false};
-       static const CommandInfo info = {3, paramnames, isoptional};
-       return &info;
+       static ParamInfo param_info_;
+       if (param_info_.empty()) {
+               param_info_.add("name", ParamInfo::LATEX_OPTIONAL);
+               param_info_.add("target", ParamInfo::LATEX_REQUIRED);
+               param_info_.add("type", ParamInfo::LATEX_REQUIRED);
+       }
+       return param_info_;
 }
 
 
-docstring const InsetHyperlink::getScreenLabel(Buffer const &) const
+docstring InsetHyperlink::screenLabel() const
 {
        docstring const temp = from_ascii("Hyperlink: ");
 
@@ -65,8 +64,7 @@ docstring const InsetHyperlink::getScreenLabel(Buffer const &) const
 }
 
 
-int InsetHyperlink::latex(Buffer const &, odocstream & os,
-                   OutputParams const & runparams) const
+int InsetHyperlink::latex(odocstream & os, OutputParams const & runparams) const
 {
        docstring url = getParam("target");
        static docstring const backslash = from_ascii("\\");
@@ -86,6 +84,15 @@ int InsetHyperlink::latex(Buffer const &, odocstream & os,
                                url.replace(pos, 1, backslash + chars_url[k]);
                        }
                }
+
+               // add "http://" when the type is web (type = empty)
+               // and no "://" or "run:" is given
+               docstring type = getParam("type");
+               if (url.find(from_ascii("://")) == string::npos
+                       && url.find(from_ascii("run:")) == string::npos
+                       && type.empty())
+                       url = from_ascii("http://") + url;
+
        } // end if (!url.empty())
 
        docstring name = getParam("name");
@@ -100,7 +107,7 @@ int InsetHyperlink::latex(Buffer const &, odocstream & os,
                for (size_t i = 0, pos;
                        (pos = name.find('\\', i)) != string::npos;
                        i = pos + 2) {
-                       if      (name[pos + 1] != '\\')
+                       if (name[pos + 1] != '\\')
                                name.replace(pos, 1, textbackslash);
                }
                for (int k = 0; k < 6; k++) {
@@ -113,31 +120,25 @@ int InsetHyperlink::latex(Buffer const &, odocstream & os,
                // replace the tilde by the \sim character as suggested in the LaTeX FAQ
                // for URLs
                docstring const sim = from_ascii("$\\sim$");
-               for (int i = 0, pos;
+               for (size_t i = 0, pos;
                        (pos = name.find('~', i)) != string::npos;
                        i = pos + 1)
                        name.replace(pos, 1, sim);
 
        }  // end if (!name.empty())
        
-       //for the case there is no name given, the target is set as name
-       docstring const urlname = url;
-       // set the hyperlink type
-       url += getParam("type");
-
        if (runparams.moving_arg)
                os << "\\protect";
-       //set the target for the name when no name is given
-       if (!name.empty())
-               os << "\\href{" << url << "}{" << name << '}';
-       else
-               os << "\\href{" << url << "}{" << urlname << '}';
+
+       //for the case there is no name given, the target is set as name
+       os << "\\href{" << getParam("type") << url << "}{"
+               << (name.empty()? url : name) << '}';
+
        return 0;
 }
 
 
-int InsetHyperlink::plaintext(Buffer const &, odocstream & os,
-                       OutputParams const &) const
+int InsetHyperlink::plaintext(odocstream & os, OutputParams const &) const
 {
        odocstringstream oss;
 
@@ -153,8 +154,7 @@ int InsetHyperlink::plaintext(Buffer const &, odocstream & os,
 }
 
 
-int InsetHyperlink::docbook(Buffer const &, odocstream & os,
-                     OutputParams const &) const
+int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 {
        os << "<ulink url=\""
           << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
@@ -165,10 +165,9 @@ int InsetHyperlink::docbook(Buffer const &, odocstream & os,
 }
 
 
-int InsetHyperlink::textString(Buffer const & buf, odocstream & os,
-                      OutputParams const & op) const
+void InsetHyperlink::textString(odocstream & os) const
 {
-       return plaintext(buf, os, op);
+       plaintext(os, OutputParams(0));
 }