Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 31737ec1473ad7e612c604e80d2257894d63a9ac..3079faa0c97d1be8c508eb56c670f89f3a75e154 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -16,45 +16,36 @@
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
-#include "gettext.h"
+#include "support/gettext.h"
 #include "OutputParams.h"
 
 #include "support/lstrings.h"
 #include "support/docstream.h"
 
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::subst;
-
-using std::string;
-using std::ostream;
-using std::find;
-using std::replace;
-
-//FIXME: these should be lists of char_type and not char
-static char_type const chars_url[2] = {'%', '#'};
-
-static char_type const chars_name[6] = {
-       '&', '_', '$', '%', '#', '^'};
-
 
 InsetHyperlink::InsetHyperlink(InsetCommandParams const & p)
        : InsetCommand(p, "href")
 {}
 
 
-CommandInfo const * InsetHyperlink::findInfo(std::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: ");
 
@@ -73,14 +64,14 @@ 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
 {
-       //FIXME: all strings in this routine should be docstrings
        docstring url = getParam("target");
-
-       docstring backslash = from_ascii("\\");
-       docstring braces = from_ascii("{}");
+       static docstring const backslash = from_ascii("\\");
+       static docstring const braces = from_ascii("{}");
+       static char_type const chars_url[2] = {'%', '#'};
+       static char_type const chars_name[6] = {
+               '&', '_', '$', '%', '#', '^'};
 
        // The characters in chars_url[] need to be changed to a command when
        // they are in the url field.
@@ -103,11 +94,11 @@ int InsetHyperlink::latex(Buffer const &, odocstream & os,
 
                // handle the "\" character, but only when the following character
                // is not also a "\", because "\\" is valid code
-               docstring textbackslash = from_ascii("\\textbackslash{}");
+               docstring const textbackslash = from_ascii("\\textbackslash{}");
                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++) {
@@ -119,32 +110,26 @@ int InsetHyperlink::latex(Buffer const &, odocstream & os,
                }
                // replace the tilde by the \sim character as suggested in the LaTeX FAQ
                // for URLs
-               docstring sim = from_ascii("$\\sim$");
-               for (int i = 0, pos;
+               docstring const sim = from_ascii("$\\sim$");
+               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 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;
 
@@ -160,8 +145,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;"))
@@ -172,10 +156,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));
 }