From fe83db2e23d3ea38bd496ea34e18c762ad202710 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Tue, 17 Sep 2019 14:30:37 -0400
Subject: [PATCH] More adjustments in view of comments to #452

---
 build/metaschema/json/md-oscal-converter.xsl         | 12 +++++++-----
 .../char-handling/charstrings-test-xml-converter.xsl |  2 +-
 .../charstrings-test_okay-PASS-back.xml              |  7 ++++---
 .../char-handling/charstrings-test_okay-PASS.json    | 10 ++++++----
 .../char-handling/charstrings-test_okay-PASS.xml     |  3 ++-
 build/metaschema/xml/produce-xml-converter.xsl       | 12 +++++++-----
 6 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/build/metaschema/json/md-oscal-converter.xsl b/build/metaschema/json/md-oscal-converter.xsl
index 72d6d2b8d2..e7e9588a0f 100644
--- a/build/metaschema/json/md-oscal-converter.xsl
+++ b/build/metaschema/json/md-oscal-converter.xsl
@@ -336,10 +336,10 @@
             <!-- next, explicit escape sequences -->
             <replace match="\\&#34;">&amp;quot;</replace>
             <replace match="\\&#39;">&amp;apos;</replace>
-            <replace match="\\\*"   >&amp;#2A;</replace>
-            <replace match="\\`"    >&amp;#60;</replace>
-            <replace match="\\~"    >&amp;#7E;</replace>
-            <replace match="\\^"    >&amp;#5E;</replace>
+            <replace match="\\\*"   >&amp;#x2A;</replace>
+            <replace match="\\`"    >&amp;#x60;</replace>
+            <replace match="\\~"    >&amp;#x7E;</replace>
+            <replace match="\\^"    >&amp;#x5E;</replace>
             
             <!-- then, replacements based on $tag-specification -->
             <xsl:for-each select="$tag-specification/*">
@@ -462,7 +462,9 @@
      <xsl:variable name="examples" xml:space="preserve">
         <p>**Markdown** and even " quoted text" and **more markdown**</p>
         <p>
- 
+
+Just a plain old \* star, and another \* ...
+
 See the FedRAMP Documents page under Key Cloud Service Provider (CSP) Documents, Plan of Action &amp; Milestones (POA&amp;M) Template Completion Guide [https://www.fedramp.gov/documents/](https://www.fedramp.gov/documents/)
  
 Paragraph, \n\nand new paragraph
diff --git a/build/metaschema/unit-testing/char-handling/charstrings-test-xml-converter.xsl b/build/metaschema/unit-testing/char-handling/charstrings-test-xml-converter.xsl
index 950ad1dbdd..cb450aae02 100644
--- a/build/metaschema/unit-testing/char-handling/charstrings-test-xml-converter.xsl
+++ b/build/metaschema/unit-testing/char-handling/charstrings-test-xml-converter.xsl
@@ -17,7 +17,7 @@
    <!-- Pass $diagnostic as 'rough' for first pass, 'rectified' for second pass -->
    <xsl:param name="diagnostic" as="xs:string">no</xsl:param>
    <xsl:template match="text()" mode="md #default">
-      <xsl:value-of select="."/>
+      <xsl:value-of select="replace(., '([`~\^\*''&#34;])', '\\$1')"/>
    </xsl:template>
    <xsl:variable name="write-options" as="map(*)" expand-text="true">
       <xsl:map>
diff --git a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS-back.xml b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS-back.xml
index 99c71f4b7c..a9b0b1eda2 100644
--- a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS-back.xml
+++ b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS-back.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <examples xmlns="http://csrc.nist.gov/ns/metaschema/unit-test/datatypes-dateTime">
-   <charstring>Here's a string including punctuation ' " \ . $</charstring>
-   <charstring>Here's a string with an ampersand &amp;</charstring>
+   <charstring>Here\'s a string including punctuation \' \" \ . $</charstring>
+   <charstring>Here\'s a string with an ampersand &amp;</charstring>
    <charstring>Less-than and greater-than, as &lt;delimiters&gt; ...</charstring>
-   <charstring>The star aka asterisk * may be magical and maybe also the tick `</charstring>
+   <charstring>The star aka asterisk \* may be magical and maybe also the tick \`</charstring>
    <markupline>Also, occasionally we have <a href="w3.org">links</a> and <em>other markup</em>.</markupline>
+   <markupline>And *sometimes*, we have \*very confusing stuff\* as well.</markupline>
 </examples>
diff --git a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.json b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.json
index 23a0a98cb0..4e7c0b86d6 100644
--- a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.json
+++ b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.json
@@ -1,8 +1,10 @@
 
   { "examples" : 
     { "character-strings" : 
-      [ "Here's a string including punctuation ' \" \\ . $",
-        "Here's a string with an ampersand &",
+      [ "Here\\'s a string including punctuation \\' \\\" \\ . $",
+        "Here\\'s a string with an ampersand &",
         "Less-than and greater-than, as <delimiters> ...",
-        "The star aka asterisk * may be magical and maybe also the tick `" ],
-      "markup-lines" : "Also, occasionally we have [links](w3.org) and *other markup*." } }
\ No newline at end of file
+        "The star aka asterisk \\* may be magical and maybe also the tick \\`" ],
+      "markup-lines" : 
+      [ "Also, occasionally we have [links](w3.org) and *other markup*.",
+        "And *sometimes*, we have \\*very confusing stuff\\* as well." ] } }
\ No newline at end of file
diff --git a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.xml b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.xml
index 9a8f9beb3e..6cf216cdf0 100644
--- a/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.xml
+++ b/build/metaschema/unit-testing/char-handling/charstrings-test_okay-PASS.xml
@@ -6,5 +6,6 @@
   <charstring>Here's a string with an ampersand &amp;</charstring>
   <charstring>Less-than and greater-than, as &lt;delimiters> ...</charstring>
   <charstring>The star aka asterisk * may be magical and maybe also the tick `</charstring>
-  <markupline>Also, occasionally we have <a href="w3.org">links</a> and <em>other markup</em>.</markupline>    
+  <markupline>Also, occasionally we have <a href="w3.org">links</a> and <em>other markup</em>.</markupline>
+  <markupline>And <em>sometimes</em>, we have *very confusing stuff* as well.</markupline>
 </examples>
\ No newline at end of file
diff --git a/build/metaschema/xml/produce-xml-converter.xsl b/build/metaschema/xml/produce-xml-converter.xsl
index 206c1f3b3d..9cfb5fc0c7 100644
--- a/build/metaschema/xml/produce-xml-converter.xsl
+++ b/build/metaschema/xml/produce-xml-converter.xsl
@@ -52,8 +52,8 @@
             <xsl:text>&#xA;</xsl:text>
             
             <XSLT:character-map name="delimiters">
-                <!--<XSLT:output-character character="&lt;" string="\u003c"/>
-                <XSLT:output-character character="&gt;" string="\u003e"/>-->
+               <!-- Rewrites Unicode PUA char E0000 to reverse solidus -->
+               <!--<XSLT:output-character character="&#xE0000;" string="\"/>-->
             </XSLT:character-map>
             
             <XSLT:param name="json-indent" as="xs:string">no</XSLT:param>
@@ -65,9 +65,11 @@
             -->
             <XSLT:template match="text()" mode="md #default">
                 <!-- Escapes go here       -->
-                <!--<XSLT:value-of select="replace(.,'\s+',' ') ! replace(.,'([`~\^\*])','\\$1')"/>-->
-                <!--<XSLT:value-of select="replace(., '([`~\^\*''&quot;])', '\\$1')"/>-->
-                <XSLT:value-of select="."/>
+                <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
+                <!--<XSLT:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
+                <!-- prefixes ` ~ ^ * ' " with backward solidus -->
+                <XSLT:value-of select="replace(., '([`~\^\*&quot;])', '\\$1')"/>
+                <!--<XSLT:value-of select="."/>-->
             </XSLT:template>
             
             <XSLT:variable name="write-options" as="map(*)" expand-text="true">