Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index b688b22aca3a071f963fc96486f2638cd24368bb..e87103ac13a757efb1a5d32a5dab69c1d6243350 100644 (file)
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -35,7 +35,7 @@ namespace lyx {
 
 
 InsetHyperlink::InsetHyperlink(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "href")
+       : InsetCommand(buf, p)
 {}
 
 
@@ -100,19 +100,16 @@ bool InsetHyperlink::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetHyperlink::viewTarget() const
 {
-       if (getParam("type").empty()) 
-               formats.viewURL(to_ascii(getParam("target")));
-
-       else if (getParam("type") == "file:") {
+       if (getParam("type") == "file:") {
                FileName url = makeAbsPath(to_utf8(getParam("target")), buffer().filePath());
-               string format = formats.getFormatFromFile(url);
+               string const format = formats.getFormatFromFile(url);
                formats.view(buffer(), url, format);
        }
 }
 
 
-int InsetHyperlink::latex(odocstream & os,
-                         OutputParams const & runparams) const
+void InsetHyperlink::latex(otexstream & os,
+                          OutputParams const & runparams) const
 {
        docstring url = getParam("target");
        docstring name = getParam("name");
@@ -196,8 +193,6 @@ int InsetHyperlink::latex(odocstream & os,
 
        // output the ready \href command
        os << "\\href{" << getParam("type") << url << "}{" << name << '}';
-
-       return 0;
 }
 
 
@@ -230,7 +225,8 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-       docstring const & target = getParam("target");
+       docstring const & target = 
+               html::htmlize(getParam("target"), XHTMLStream::ESCAPE_AND);
        docstring const & name   = getParam("name");
        xs << html::StartTag("a", to_utf8("href=\"" + target + "\""));
        xs << (name.empty() ? target : name);
@@ -239,12 +235,23 @@ docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetHyperlink::tocString(odocstream & os) const
+void InsetHyperlink::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }
 
 
+void InsetHyperlink::forToc(docstring & os, size_t) const
+{
+       docstring const & n = getParam("name");
+       if (!n.empty()) {
+               os += n;
+               return;
+       }
+       os += getParam("target");
+}
+
+
 docstring InsetHyperlink::toolTip(BufferView const & /*bv*/, int /*x*/, int /*y*/) const
 {
        docstring url = getParam("target");
@@ -264,7 +271,7 @@ void InsetHyperlink::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetHyperlink::contextMenu(BufferView const &, int, int) const
+docstring InsetHyperlink::contextMenuName() const
 {
        return from_ascii("context-hyperlink");
 }