From 128cf4d27d71c50e677a8d87a6461b41ad35fbff Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lloyd@lmckenzie.com>
Date: Wed, 6 Dec 2023 13:24:50 -0700
Subject: [PATCH] Fixed JSON escaping issue

---
 README.md            |  1 -
 tools/xmlToJson.xslt | 26 ++++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 67128b7be..c0b58d49a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@ This project manages the artifacts, pages, and other lists associated with all H
 
 Read more about it here: <https://confluence.hl7.org/display/HL7/Configuring+Specification+Feedback>
 
-
 To make pull requests against this project, create a fork in your personal Github space and submit a pull request from there.  (Most users will not have permission to create branches directly within this project.)
 
 Source content is found in the `xml` folder:
diff --git a/tools/xmlToJson.xslt b/tools/xmlToJson.xslt
index fce79069b..6022fcd46 100644
--- a/tools/xmlToJson.xslt
+++ b/tools/xmlToJson.xslt
@@ -86,15 +86,37 @@
     <xsl:for-each select="@*[not(contains(name(.), ':'))]">
       <xsl:choose>
         <xsl:when test="local-name(.)=('deprecated')">
-          <xsl:value-of select="concat('&quot;', local-name(.), '&quot;:', .)"/>
+          <xsl:value-of select="concat('&quot;', local-name(.), '&quot;:')"/>
+          <xsl:call-template name="escapeText">
+            <xsl:with-param name="text" select="."/>
+          </xsl:call-template>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="concat('&quot;', local-name(.), '&quot;:&quot;', ., '&quot;')"/>
+          <xsl:value-of select="concat('&quot;', local-name(.), '&quot;:&quot;')"/>
+          <xsl:call-template name="escapeText">
+            <xsl:with-param name="text" select="."/>
+          </xsl:call-template>
+          <xsl:text>"</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:if test="position()!=last()">,</xsl:if>
     </xsl:for-each>
 	</xsl:template>
+  <xsl:template name="escapeText">
+    <xsl:param name="text"/>
+    <xsl:choose>
+      <xsl:when test="contains($text, '&quot;')">
+        <xsl:value-of select="substring-before($text, '&quot;')"/>
+        <xsl:text>\"</xsl:text>
+        <xsl:call-template name="escapeText">
+          <xsl:with-param name="text" select="substring-after($text, '&quot;')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$text"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
   <xsl:template name="doNamedArray">
     <xsl:param name="name"/>
     <xsl:value-of select="concat('&quot;', $name, '&quot;:')"/>