diff --git a/toolchains/xslt-M4/compose/make-model-map.xsl b/toolchains/xslt-M4/compose/make-model-map.xsl index d1abe05b1..9bf5df434 100644 --- a/toolchains/xslt-M4/compose/make-model-map.xsl +++ b/toolchains/xslt-M4/compose/make-model-map.xsl @@ -150,6 +150,10 @@ + + + @@ -163,6 +167,7 @@ + diff --git a/toolchains/xslt-M4/converter-gen/markdown-to-supermodel-xml-converter.xsl b/toolchains/xslt-M4/converter-gen/markdown-to-supermodel-xml-converter.xsl new file mode 100644 index 000000000..09c226c08 --- /dev/null +++ b/toolchains/xslt-M4/converter-gen/markdown-to-supermodel-xml-converter.xsl @@ -0,0 +1,541 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + + + + +

+
+
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+            
+                
+                    language-{.}
+                
+                
+            
+        
+
+ + + + +

+ +

+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+
+ + ^\s*(\*|\d+\.)\s + + + + +
  • + +
    + +
    +
  • +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • + + + + + + + + +
  • +
    + + +
  • + + + + + +
  • +
    +
    +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + &amp; + &lt; + + &quot; + + &#x2A; + &#x60; + &#x7E; + &#x5E; + + + + + + + + + + + + + + + + + + + + + + + + + + "" + + !\[{{$noclosebracket}}\] + + + \(\) + `` + + \*\*\*\*\*\* + + \*\*\*\* + \*\* + ~~ + \^\^ + + + + + + < + + + + > + + + + </ + + > + + + + + + + + + + + + + + + + + + + + + + + + + + $1 + + + + param-id='$1' + + + + href='$2' + + + + + alt='$1' + + + + + src='$2' + + + + + (.*?) + + + + ([^{ @not }]*?) + + + + + { insertion } + + +

    **Markdown** and even " quoted text" and **more markdown**

    +

    **See the FedRAMP Documents page under Key Cloud Service Provider (CSP) Documents> Vulnerability Scanning Requirements** ([https://www.FedRAMP.gov/documents/](https://www.FedRAMP.gov/documents/))

    +

    **See the FedRAMP Documents page under Key Cloud Service Provider\n\t\t\t\t\t\t\t\t(CSP) Documents> Vulnerability Scanning Requirements** ([https://www.FedRAMP.gov/documents/](https://www.FedRAMP.gov/documents/))

    +

    + +Just a plain old \* star, and another \* ... + +See the FedRAMP Documents page under Key Cloud Service Provider (CSP) Documents, Plan of Action & Milestones (POA&M) Template Completion Guide [https://www.fedramp.gov/documents/](https://www.fedramp.gov/documents/) + +Paragraph, \n\nand new paragraph + +## My test file! has an & ampersand + +Bit of `code` here and there, such as one might have along with *italics*. + +no insertion here: { ac-4.4_prm_2 } + +An anchor looks like [this](this.file) or [that](that.file) + +Extra long x + y and z **strong** and **bold** + + +Here's a text with a *parameter* insertion: {{ insert }} + +{{insert-me}} + +And interesting. + +And many paragraphs! + +* One item in a list, with "quoted text" +* Another item in a list + * Sublist + * subsublist +* Item three + +```xml +<xsl:for-each ... + +... select ...> +``` + +Some paragraphs have ![images](http://www.links.com) in them, sometimes ![many](../many/links) + +And Prose! + +``` +and more code +``` + +2. List okay + 2. sublist 1 + 2. sublist 2 + with more text +2. More list okay + + * Broken list + * What? +* Levels missing + +* something or other + +And stuff. + +

    +

    Here's a markdown string.

    + +

    This `string should *break` (overlap)*

    + +

    `code` may occasionally turn up `in the middle`.

    + +

    Here's a ***really interesting*** markdown string.

    + +

    Some paragraphs might have [links elsewhere](https://link.org).

    +
    + +
    \ No newline at end of file diff --git a/toolchains/xslt-M4/converter-gen/md-converter-test.xsl b/toolchains/xslt-M4/converter-gen/md-converter-test.xsl index ee0645d31..24032803e 100644 --- a/toolchains/xslt-M4/converter-gen/md-converter-test.xsl +++ b/toolchains/xslt-M4/converter-gen/md-converter-test.xsl @@ -29,5 +29,5 @@ -->
    - + \ No newline at end of file diff --git a/toolchains/xslt-M4/converter-gen/produce-json-converter.xsl b/toolchains/xslt-M4/converter-gen/produce-json-converter.xsl index 299804929..eeaa4d8a8 100644 --- a/toolchains/xslt-M4/converter-gen/produce-json-converter.xsl +++ b/toolchains/xslt-M4/converter-gen/produce-json-converter.xsl @@ -14,11 +14,12 @@ + + + - - @@ -74,18 +75,107 @@ - + + + + + + + + + + + - + + + - - --> - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property is a flag; dropped when grabbing values + + + + + + + + + + + + + + Cf XML match=" @@ -93,4 +183,21 @@ + + + + by default, fields traverse their properties to find a value + + + + + + + + + + + + \ No newline at end of file diff --git a/toolchains/xslt-M4/converter-gen/produce-xml-converter.xsl b/toolchains/xslt-M4/converter-gen/produce-xml-converter.xsl index 8a43dbd35..ac4c4cddd 100644 --- a/toolchains/xslt-M4/converter-gen/produce-xml-converter.xsl +++ b/toolchains/xslt-M4/converter-gen/produce-xml-converter.xsl @@ -58,7 +58,7 @@ - + @@ -113,18 +113,24 @@ - + + + - + - + + + + + @@ -144,26 +150,32 @@ - + + - + - + - + + + + + + @@ -245,35 +257,35 @@ - + - + string - + boolean + + + integer positiveInteger nonNegativeInteger - - number - - decimal - + number diff --git a/toolchains/xslt-M4/converter-gen/supermodel-to-json.xsl b/toolchains/xslt-M4/converter-gen/supermodel-to-json.xsl index 4fff1b372..e5ed5c542 100644 --- a/toolchains/xslt-M4/converter-gen/supermodel-to-json.xsl +++ b/toolchains/xslt-M4/converter-gen/supermodel-to-json.xsl @@ -101,10 +101,11 @@ - + - + @@ -249,17 +248,17 @@ - + - + - string + string - boolean + boolean integer @@ -267,13 +266,11 @@ nonNegativeInteger - integer - decimal - number + number diff --git a/toolchains/xslt-M4/metapath/metapath-jsonizing-result.html b/toolchains/xslt-M4/metapath/metapath-jsonizing-result.html index a25cf070b..855e36df0 100644 --- a/toolchains/xslt-M4/metapath/metapath-jsonizing-result.html +++ b/toolchains/xslt-M4/metapath/metapath-jsonizing-result.html @@ -1,7 +1,7 @@ - Test Report for C:/Users/wap1/Documents/usnistgov/metaschema/toolchains/xslt-M4/metapath/metapath-jsonize.xsl (passed: 14 / pending: 0 / failed: 2 / total: 16) + Test Report for C:/Users/wap1/Documents/usnistgov/metaschema/toolchains/xslt-M4/metapath/metapath-jsonize.xsl (passed: 15 / pending: 0 / failed: 0 / total: 15)