Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repairing bug in round trip handling of quote marks " #7

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions build/metaschema/json/md-oscal-converter.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

<xsl:template name="xsl:initial-template" match="/">
<!--<xsl:copy-of select="$tag-replacements"/>-->
<!--<xsl:call-template name="parse">
<xsl:call-template name="parse">
<xsl:with-param name="str" select="string($examples)"/>
</xsl:call-template>-->
<xsl:for-each select="$line-example">
</xsl:call-template>
<!--<xsl:for-each select="$line-example">
<xsl:apply-templates select="text()" mode="infer-inlines"/>
</xsl:for-each>
</xsl:for-each>-->
</xsl:template>

<!-- Markdown pseudoparser in XSLT -->
Expand Down Expand Up @@ -331,6 +331,7 @@
<replace match="&lt;" >&amp;lt;</replace>
<!-- 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>
Expand Down Expand Up @@ -359,6 +360,7 @@
<tag-spec>
<!-- The XML notation represents the substitution by showing both delimiters and tags -->
<!-- Note that text contents are regex notation for matching so * must be \* -->

<q>"<text/>"</q>

<img alt="!\[{{$text}}\]" src="\({{$text}}\)"/>
Expand Down Expand Up @@ -411,21 +413,21 @@
</xsl:template>

<xsl:template match="m:insert/@param-id" mode="write-replace">
<xsl:text> param-id="$1"</xsl:text>
<xsl:text> param-id='$1'</xsl:text>
</xsl:template>

<xsl:template match="m:a/@href" mode="write-replace">
<xsl:text> href="$2"</xsl:text>
<xsl:text> href='$2'</xsl:text>
<!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
</xsl:template>

<xsl:template match="m:img/@alt" mode="write-replace">
<xsl:text> alt="$1"</xsl:text>
<xsl:text> alt='$1'</xsl:text>
<!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
</xsl:template>

<xsl:template match="m:img/@src" mode="write-replace">
<xsl:text> src="$2"</xsl:text>
<xsl:text> src='$2'</xsl:text>
<!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
</xsl:template>

Expand All @@ -436,7 +438,7 @@
<xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>

<xsl:variable name="examples" xml:space="preserve">
<p>**Markdown**</p>
<p>**Markdown** and even " quoted text"</p>
<p>
## My test file!

Expand All @@ -456,7 +458,7 @@ And interesting.

And many paragraphs!

* One item in a list
* One item in a list, with "quoted text"
* Another item in a list
* Sublist
* subsublist
Expand Down
3 changes: 2 additions & 1 deletion build/metaschema/xml/produce-xml-converter.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@

<XSLT:template match="text()" mode="md">
<!-- Escapes go here -->
<XSLT:value-of select="replace(.,'\s+',' ') ! replace(.,'([`~\^\*])','\\$1')"/>
<!--<XSLT:value-of select="replace(.,'\s+',' ') ! replace(.,'([`~\^\*])','\\$1')"/>-->
<XSLT:value-of select="replace(.,'([`~\^\*''&quot;])','\\$1')"/>
</XSLT:template>


Expand Down
3 changes: 1 addition & 2 deletions src/content/fedramp.gov/xml/FedRAMP_LOW-baseline_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<metadata>
<title>FedRAMP Low Baseline</title>
<author>FedRAMP PMO</author>
<last-modified-date>
2019-06-03T11:41:23.26-04:00</last-modified-date>
<last-modified-date>2019-06-03T11:41:23.26-04:00</last-modified-date>
<version>1.1</version>
<oscal-version>1.0-M1</oscal-version>
<party>
Expand Down