From b389ce6b1d5f6560c9d1ec0ed3fe5fcd9b59e436 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Wed, 25 Nov 2009 22:19:59 +0000
Subject: [PATCH] Restore XHTML output for InsetHyperlink.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32209 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetHyperlink.cpp | 12 +++++-------
 src/insets/InsetHyperlink.h   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 7338141ba8..6351f15322 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -17,6 +17,7 @@
 #include "FuncRequest.h"
 #include "LaTeXFeatures.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
 
 #include "support/docstream.h"
 #include "support/gettext.h"
@@ -181,14 +182,11 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-docstring InsetHyperlink::xhtml(odocstream & os, OutputParams const &) const
+docstring InsetHyperlink::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	os << "<a href=\""
-			// FIXME Do we need to do more escaping than this?
-	   << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
-	   << "\">"
-	   << getParam("name")
-	   << "</a>";
+	xs << StartTag("a", to_utf8("href=\"" + getParam("target") + "\""));
+	xs << getParam("name");
+	xs << EndTag("a");
 	return docstring();
 }
 
diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h
index bbcd6f9fe7..54850611ac 100644
--- a/src/insets/InsetHyperlink.h
+++ b/src/insets/InsetHyperlink.h
@@ -41,7 +41,7 @@ public:
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	/// the string that is passed to the TOC
 	void tocString(odocstream &) const;
 	///
-- 
2.39.2