From 1727e5fb2ac6dfc94599700388f496e548b30cc9 Mon Sep 17 00:00:00 2001
From: F K <54195004+fredjk-gh@users.noreply.github.com>
Date: Sat, 20 Nov 2021 09:21:11 -0500
Subject: [PATCH] Preserve inner XML when setting a voice style (#37)

The former method lost any XML markup (such as say-as tags, etc) embedded within the voice tag. In the future if support for setting voice speed is added, it can be inserted here easily as well.
---
 ObservatoryHerald/AzureSpeechManager.cs | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/ObservatoryHerald/AzureSpeechManager.cs b/ObservatoryHerald/AzureSpeechManager.cs
index c25c05a..d6c11e8 100644
--- a/ObservatoryHerald/AzureSpeechManager.cs
+++ b/ObservatoryHerald/AzureSpeechManager.cs
@@ -195,30 +195,20 @@ namespace Observatory.Herald
             var ssmlNamespace = ssmlDoc.DocumentElement.NamespaceURI;
             XmlNamespaceManager ssmlNs = new(ssmlDoc.NameTable);
             ssmlNs.AddNamespace("ssml", ssmlNamespace);
-
+            ssmlNs.AddNamespace("mstts", "http://www.w3.org/2001/mstts");
 
             var voiceNode = ssmlDoc.SelectSingleNode("/ssml:speak/ssml:voice", ssmlNs);
 
             voiceNode.Attributes.GetNamedItem("name").Value = voiceName;
 
-            string ssmlResult;
-
             if (!string.IsNullOrWhiteSpace(styleName))
             {
-                voiceNode.InnerText = $"<mstts:express-as style=\"{styleName}\">" + voiceNode.InnerText + "</mstts:express-as>";
-
-                // This is a kludge but I don't feel like dealing with System.Xml and namespaces
-                ssmlResult = ssmlDoc.OuterXml
-                    .Replace(" xmlns=", " xmlns:mstts=\"https://www.w3.org/2001/mstts\" xmlns=")
-                    .Replace($"&lt;mstts:express-as style=\"{styleName}\"&gt;", $"<mstts:express-as style=\"{styleName}\">")
-                    .Replace("&lt;/mstts:express-as&gt;", "</mstts:express-as>");
+                var expressAsNode = ssmlDoc.CreateElement("express-as", "http://www.w3.org/2001/mstts");
+                expressAsNode.SetAttribute("style", styleName);
+                expressAsNode.InnerXml = voiceNode.InnerXml;
+                voiceNode.InnerXml = expressAsNode.OuterXml;
             }
-            else
-            {
-                ssmlResult = ssmlDoc.OuterXml;
-            }
-
-            return ssmlResult;
+            return ssmlDoc.OuterXml;
         }
 
         private static string GetAzureKey(HeraldSettings settings, HttpClient httpClient)