Skip to content

Commit

Permalink
Revert "Addressing usnistgov#452: cleaned up character handling in XM…
Browse files Browse the repository at this point in the history
…L-to-JSON conversion. Fixed the bug this exposed in markdown->HTML conversion. Added some light unit testing."

This reverts commit 48d4c97.
  • Loading branch information
david-waltermire authored Sep 26, 2019
1 parent ebfa2d9 commit fe65791
Show file tree
Hide file tree
Showing 12 changed files with 83 additions and 1,209 deletions.
2 changes: 1 addition & 1 deletion build/metaschema/json/md-converter-test.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<xsl:template match="text()">
<!--<xsl:value-of select="."/>-->
<xsl:call-template name="parse">
<xsl:with-param name="markdown-str" select="string(.)"/>
<xsl:with-param name="str" select="string(.)"/>
</xsl:call-template><!--
<xsl:apply-templates select="." mode="parse"/>-->
</xsl:template>
Expand Down
6 changes: 2 additions & 4 deletions build/metaschema/json/md-oscal-converter.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<xsl:variable name="tag-replacements" xmlns="http://csrc.nist.gov/ns/oscal/1.0/md-convertor">
<rules>
<!-- first, literal replacements -->
<replace match="&amp;" >&amp;amp;</replace>
<!--<replace match="&amp;" >&amp;amp;</replace>-->
<replace match="&lt;" >&amp;lt;</replace>
<!-- next, explicit escape sequences -->
<replace match="\\&#34;">&amp;quot;</replace>
Expand Down Expand Up @@ -462,9 +462,7 @@
<xsl:variable name="examples" xml:space="preserve">
<p>**Markdown** and even " quoted text" and **more markdown**</p>
<p>

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

## My test file! has an &amp; ampersand
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit fe65791

Please sign in to comment.