diff --git a/toolchains/oscal-m2/json/produce-json-converter.xsl b/toolchains/oscal-m2/json/produce-json-converter.xsl
index a256924a..5275d90e 100644
--- a/toolchains/oscal-m2/json/produce-json-converter.xsl
+++ b/toolchains/oscal-m2/json/produce-json-converter.xsl
@@ -44,7 +44,7 @@
http://csrc.nist.gov/ns/oscal/1.0/md-convertor
- OSCAL { @root} conversion stylesheet supports JSON->XML conversion
+ OSCAL { @root } conversion stylesheet supports JSON->XML conversion
@@ -73,7 +73,7 @@
- 000 Handling flag "{ ../@name}/@{ @name }" 000
+ *** Handling flag "{ ../@name}/@{ @name }" ***
*[@key='{@name}']
@@ -83,7 +83,7 @@
*[@key='{@name}']/{$match-step}
| *[@key='{ . }']/{$match-step}
- | array[@key='{ . }']/*/{$match-step}
+ | *[@key='{ . }']/*/{$match-step}
@@ -100,7 +100,7 @@
- 000 Handling flag @{ @name } 000
+ *** Handling flag @{ @name } ***
@@ -178,7 +178,7 @@
*[@key='{@name}']
-
+
{ $field-match }
@@ -207,15 +207,12 @@
*[@key='{@name}']
-
+
-
- 000 Handling field "{ @name }" 000
- 000 NB - template matching 'array' overrides this one 000
+
+ *** Handling field "{ @name }" ***
{ $field-match }
+ *** NB - template matching 'array' overrides this one ***
+
-
+ Flag '{ @flag-name }' is the key on an assembly or field (map) with a json-key.
+
-
+
-
+
+
+ To supervene template priority="5" matching "{ $field-match }" in the case of an object grouped
+ in a map, by virtue of json-key assignments to flags on that object...
+
+
+
+
+
+
+
+
@@ -390,8 +407,8 @@
- 000 Handling assembly "{ @name }" 000
- 000 NB - template matching 'array' overrides this one 000
+ *** Handling assembly "{ @name }" ***
+ *** NB - template matching 'array' overrides this one ***
diff --git a/toolchains/oscal-m2/xml/produce-xml-converter.xsl b/toolchains/oscal-m2/xml/produce-xml-converter.xsl
index 6aa68051..2121c4cc 100644
--- a/toolchains/oscal-m2/xml/produce-xml-converter.xsl
+++ b/toolchains/oscal-m2/xml/produce-xml-converter.xsl
@@ -307,6 +307,9 @@
+
+
+
@@ -398,9 +401,10 @@
+
-
+