Updating to latest metaschema toolchain. Small cleanup of content con…

…verters.

build/ci-cd/copy-and-convert-content.sh

@@ -157,7 +157,7 @@ post_process_content() {
       # Remove extra slashes
       perl -pi -e 's,\\/,/,g' "${target_file}"
       # translate OSCAL mime types
-      perl -pi -e 's,(application/oscal\.[a-z]+\+)xml\",\1json\",g' "${target_file}"
+      perl -pi -e 's,(application/(oscal\.)?[a-z]+\+)xml\",\1json\",g' "${target_file}"
       # relative content paths
       # translate path names for local references
       perl -pi -e 's,((?:\.\./)+(?:(?!xml/)[^\s/"'']+/)+)xml/((?:(?!.xml)[^\s"'']+)+).xml,\1json/\2.json,g' "${target_file}"

xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl

@@ -4911,11 +4911,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_assessment-results_json-to-xml-converter.xsl

@@ -9386,11 +9386,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_catalog_json-to-xml-converter.xsl

@@ -2967,11 +2967,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_complete_json-to-xml-converter.xsl

@@ -28856,11 +28856,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_component_json-to-xml-converter.xsl

@@ -2781,11 +2781,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_poam_json-to-xml-converter.xsl

@@ -5967,11 +5967,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_profile_json-to-xml-converter.xsl

@@ -3213,11 +3213,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>

xml/convert/oscal_ssp_json-to-xml-converter.xsl

@@ -5331,11 +5331,11 @@
       <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
    </xsl:template>
    <xsl:template name="parse-markdown">
-
+        
 <!-- First, group according to ``` delimiters btw codeblocks and not
         within codeblock, escape & and < (only)
         within not-codeblock split lines at \n\s*\n
-
+        
         -->
         <!-- $str may be passed in, or we can process the current node -->
       <xsl:param name="markdown-str" as="xs:string" required="yes"/>