From 3a1eff90b9707f1961e81f654a423f67b418e2ff Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Sun, 8 Jan 2017 13:38:48 -0500
Subject: [PATCH] Escape link name for DocBook.

Thanks to Martin Brown for pointing out the bug, and the obvious
solution.

(cherry picked from commit 06e2669b354561ebafcd69c24d0319d47ba1d279)
---
 src/insets/InsetHyperlink.cpp | 3 ++-
 status.22x                    | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index 54f1f2c765..039f553d1b 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -22,6 +22,7 @@
 #include "LaTeXFeatures.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "sgml.h"
 
 #include "support/docstream.h"
 #include "support/FileName.h"
@@ -232,7 +233,7 @@ int InsetHyperlink::docbook(odocstream & os, OutputParams const &) const
 	os << "<ulink url=\""
 	   << subst(getParam("target"), from_ascii("&"), from_ascii("&amp;"))
 	   << "\">"
-	   << getParam("name")
+	   << sgml::escapeString(getParam("name"))
 	   << "</ulink>";
 	return 0;
 }
diff --git a/status.22x b/status.22x
index 62bb7ff4f0..261968292e 100644
--- a/status.22x
+++ b/status.22x
@@ -112,6 +112,10 @@ What's new
     set to [None] or OT1 but the global default is T1.
   # Quote type ignored for LyXHTML: always "English" quotes used. 
 
+- Output correct identifier for DocBook XML.
+
+- Correctly escape hyperlinks for DocBook output.
+
 
 * LYX2LYX