From 64d1544b6443d76b02dc06719b4fb5bcee213602 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Mon, 22 Feb 2021 15:58:57 -0500
Subject: [PATCH] Addressing #31 usnistgov/OSCAL#590 usnistgov/OSCAL#814

---
 .../anthology/anthology_metaschema.xml        |  10 +-
 .../compose/metaschema-compose-debug.xpl      |   8 +-
 .../xslt-M4/compose/metaschema-reduce2.xsl    |  26 ++-
 .../xslt-M4/compose/metaschema-reduce3.xsl    | 177 ------------------
 toolchains/xslt-M4/metaschema-compose.xpl     |   8 +-
 .../xslt-M4/nist-metaschema-COMPOSE.xsl       |   8 +-
 .../nist-metaschema-MAKE-JSON-DOCS.xsl        |   2 +-
 .../xslt-M4/nist-metaschema-MAKE-JSON-MAP.xsl |   2 +-
 .../nist-metaschema-MAKE-JSON-SCHEMA.xsl      |   2 +-
 ...-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl |   2 +-
 .../xslt-M4/nist-metaschema-MAKE-XML-DOCS.xsl |   2 +-
 .../xslt-M4/nist-metaschema-MAKE-XML-MAP.xsl  |   2 +-
 .../nist-metaschema-MAKE-XML-METATRON.xsl     |   2 +-
 ...-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl |   2 +-
 .../xslt-M4/nist-metaschema-MAKE-XSD.xsl      |   2 +-
 15 files changed, 45 insertions(+), 210 deletions(-)
 delete mode 100644 toolchains/xslt-M4/compose/metaschema-reduce3.xsl

diff --git a/test-suite/worked-examples/anthology/anthology_metaschema.xml b/test-suite/worked-examples/anthology/anthology_metaschema.xml
index 47b7959d..60d31614 100644
--- a/test-suite/worked-examples/anthology/anthology_metaschema.xml
+++ b/test-suite/worked-examples/anthology/anthology_metaschema.xml
@@ -91,6 +91,11 @@ Under 'widget'
         </constraint>
    </define-assembly>
     
+    <define-field name="redundant">
+        <formal-name>Extra</formal-name>
+        <description>Discard me</description>
+    </define-field>
+    
     <define-flag name="id" as-type="NCName">
         <formal-name>Identifier</formal-name>
         <description>A distinct code</description>
@@ -253,7 +258,10 @@ Under 'widget'
     <define-assembly name="include">
         <formal-name>Include other</formal-name>
         <description>Some other sort of markup altogether</description>
-        <define-flag name="lang"/>
+        <define-flag name="lang">
+            <formal-name>Language</formal-name>
+            <description>Describing the notation used</description>
+        </define-flag>
         <model>
             <any/>
         </model>
diff --git a/toolchains/xslt-M4/compose/metaschema-compose-debug.xpl b/toolchains/xslt-M4/compose/metaschema-compose-debug.xpl
index 6008874c..50e9628b 100644
--- a/toolchains/xslt-M4/compose/metaschema-compose-debug.xpl
+++ b/toolchains/xslt-M4/compose/metaschema-compose-debug.xpl
@@ -25,10 +25,10 @@
     <p:pipe port="result" step="reduce1"/>
   </p:output>
 
-  <!--<p:serialization port="_3_reduced2" indent="true"/>
+  <p:serialization port="_3_reduced2" indent="true"/>
   <p:output        port="_3_reduced2" primary="false">
     <p:pipe port="result" step="reduce2"/>
-  </p:output>-->
+  </p:output>
 
   <p:serialization port="_3_digested" indent="true"/>
   <p:output port="_3_digested" primary="false">
@@ -57,11 +57,11 @@
     </p:input>
   </p:xslt>
   
-  <!-- No longer filtering definitions reachable from nominal root <p:xslt name="reduce2">
+   No longer filtering definitions reachable from nominal root <p:xslt name="reduce2">
     <p:input port="stylesheet">
       <p:document href="metaschema-reduce2.xsl"/>
     </p:input>
-  </p:xslt>-->
+  </p:xslt>
   
   <p:xslt name="digest">
     <p:input port="stylesheet">
diff --git a/toolchains/xslt-M4/compose/metaschema-reduce2.xsl b/toolchains/xslt-M4/compose/metaschema-reduce2.xsl
index 76558935..8a884606 100644
--- a/toolchains/xslt-M4/compose/metaschema-reduce2.xsl
+++ b/toolchains/xslt-M4/compose/metaschema-reduce2.xsl
@@ -15,12 +15,13 @@
     <xsl:variable name="show-warnings" as="xs:string">no</xsl:variable>
     <xsl:variable name="verbose" select="lower-case($show-warnings) = ('yes', 'y', '1', 'true')"/>
 
-    <xsl:key name="global-assembly-definition" match="METASCHEMA/define-assembly[not(@scope='local')]" use="@name"/>
-    <xsl:key name="global-field-definition"    match="METASCHEMA/define-field[not(@scope='local')]"    use="@name"/>
+    <xsl:key name="global-assembly-definition" match="METASCHEMA/define-assembly" use="@name"/>
+    <xsl:key name="global-field-definition"    match="METASCHEMA/define-field"    use="@name"/>
+    
     
     <!-- ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== -->
     <!-- Pass Three: filter definitions (2) - keep only top-level definitions that are actually
-         called by references in the models.
+         called by references in the models descending from assemblies with root-name.
          
          Note that we ignore flag definitions, which can stay,
          since all flag definitions are rewritten into local declarations,
@@ -30,8 +31,8 @@
     <xsl:mode on-no-match="shallow-copy"/>
     
     <xsl:variable name="assembly-references" as="xs:string*">
-        <xsl:for-each select="//METASCHEMA/define-assembly[not(@scope='local')]">
-                <xsl:sequence select="string(@name)"/>
+        <xsl:for-each select="/METASCHEMA/define-assembly[exists(root-name)]">
+            <xsl:sequence select="string(@name)"/>
             <xsl:apply-templates select="model" mode="collect-assembly-references">
                 <xsl:with-param name="assembly-refs" tunnel="yes" select="string(@name)"/>
             </xsl:apply-templates>
@@ -39,13 +40,13 @@
     </xsl:variable>
     
     <xsl:variable name="field-references" as="xs:string*">
-        <xsl:apply-templates select="//METASCHEMA/define-assembly[not(@scope='local')]" mode="collect-field-references">
+        <xsl:apply-templates select="/METASCHEMA/define-assembly[exists(root-name)]" mode="collect-field-references">
             <xsl:with-param name="field-refs" tunnel="yes" select="()"/>
         </xsl:apply-templates>
     </xsl:variable>
     
     <xsl:variable name="flag-references" as="xs:string*">
-        <xsl:apply-templates select="//METASCHEMA/define-assembly[not(@scope='local')]" mode="collect-flag-references">
+        <xsl:apply-templates select="/METASCHEMA/define-assembly[exists(root-name)]" mode="collect-flag-references">
             <xsl:with-param name="flag-refs" tunnel="yes" select="()"/>
         </xsl:apply-templates>
     </xsl:variable>
@@ -85,7 +86,8 @@
         </xsl:call-template>
     </xsl:template>
 
-    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->       <!-- Modes collecting sets of strings naming definitions
+    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->
+    <!-- Modes collecting sets of strings naming definitions
      we actually need, by traversing the definitions tree from the declared root;
      recursive models are accounted for. -->
     
@@ -97,12 +99,12 @@
         <xsl:apply-templates select=".//assembly" mode="#current"/>
     </xsl:template>
     
-    <xsl:template match="model[exists(@ref)]" mode="collect-assembly-references">
+    <!--<xsl:template match="model[exists(@ref)]" mode="collect-assembly-references">
         <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
         <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current">
             <xsl:with-param name="assembly-refs" tunnel="yes" select="$assembly-refs,string(@ref)"/>
         </xsl:apply-templates>
-    </xsl:template>
+    </xsl:template>-->
     
     <xsl:template match="assembly" mode="collect-assembly-references">
         <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
@@ -125,10 +127,6 @@
         <xsl:apply-templates select=".//assembly" mode="#current"/>
     </xsl:template>
     
-    <xsl:template match="model[exists(@ref)]" mode="collect-field-references">
-        <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current"/>
-    </xsl:template>
-    
     <xsl:template match="assembly" mode="collect-field-references collect-flag-references">
         <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
         <xsl:if test="not(@ref = $assembly-refs)">
diff --git a/toolchains/xslt-M4/compose/metaschema-reduce3.xsl b/toolchains/xslt-M4/compose/metaschema-reduce3.xsl
deleted file mode 100644
index 0c059862..00000000
--- a/toolchains/xslt-M4/compose/metaschema-reduce3.xsl
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:math="http://www.w3.org/2005/xpath-functions/math"
-    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-    exclude-result-prefixes="xs math m xsi" version="3.0">
-
-    <xsl:output indent="yes"/>
-
-    <xsl:strip-space
-        elements="METASCHEMA define-flag define-field define-assembly remarks model choice"/>
-
-    <xsl:variable name="show-warnings" as="xs:string">no</xsl:variable>
-    <xsl:variable name="verbose" select="lower-case($show-warnings) = ('yes', 'y', '1', 'true')"/>
-
-    <xsl:key name="global-assembly-definition" match="METASCHEMA/define-assembly[not(@scope='local')]" use="@name"/>
-    <xsl:key name="global-field-definition"    match="METASCHEMA/define-field[not(@scope='local')]"    use="@name"/>
-    
-    
-    <!-- ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== ====== -->
-    <!-- Pass Four: filter definitions again to keep only definitions
-         reachable from definitions defined with a root-name.
-    -->
-    
-    <xsl:mode on-no-match="shallow-copy"/>
-    
-    <xsl:variable name="assembly-references" as="xs:string*">
-        <xsl:for-each select="/METASCHEMA/define-assembly[exists(root-name)]">
-                <xsl:sequence select="string(@name)"/>
-            <xsl:apply-templates select="model" mode="collect-assembly-references">
-                <xsl:with-param name="assembly-refs" tunnel="yes" select="string(@name)"/>
-            </xsl:apply-templates>
-        </xsl:for-each>
-    </xsl:variable>
-    
-    <xsl:variable name="field-references" as="xs:string*">
-        <xsl:apply-templates select="/METASCHEMA/define-assembly[exists(root-name)]" mode="collect-field-references">
-            <xsl:with-param name="field-refs" tunnel="yes" select="()"/>
-        </xsl:apply-templates>
-    </xsl:variable>
-    
-    <xsl:variable name="flag-references" as="xs:string*">
-        <xsl:apply-templates select="/METASCHEMA/define-assembly[exists(root-name)]" mode="collect-flag-references">
-            <xsl:with-param name="flag-refs" tunnel="yes" select="()"/>
-        </xsl:apply-templates>
-    </xsl:variable>
-    
-    <xsl:template match="/">
-        <xsl:if test="$verbose">
-            <xsl:comment expand-text="true">Assembly references: { $assembly-references }</xsl:comment>
-            <xsl:text>&#xA;</xsl:text>
-            <xsl:comment expand-text="true">Field references: { $field-references }</xsl:comment>
-            <xsl:text>&#xA;</xsl:text>
-            <xsl:comment expand-text="true">Flag references: { $flag-references }</xsl:comment>
-            <xsl:text>&#xA;</xsl:text>
-        </xsl:if>
-        <xsl:apply-templates/>
-    </xsl:template>
-    
-    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->    
-
-    <xsl:template match="METASCHEMA/define-assembly[not(@name=$assembly-references)]">
-        <xsl:call-template name="warning">
-            <xsl:with-param name="msg" expand-text="true">REMOVING unused assembly definition for '{ @name }' from { ancestor::METASCHEMA[1]/@module
-                }</xsl:with-param>
-        </xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="METASCHEMA/define-field[not(@name=$field-references)]">
-        <xsl:call-template name="warning">
-            <xsl:with-param name="msg" expand-text="true">REMOVING unused field definition for '{ @name }' from { ancestor::METASCHEMA[1]/@module
-                }</xsl:with-param>
-        </xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="METASCHEMA/define-flag[not(@name=$flag-references)]">
-        <xsl:call-template name="warning">
-            <xsl:with-param name="msg" expand-text="true">REMOVING unused flag definition for '{ @name }' from { ancestor::METASCHEMA[1]/@module
-                }</xsl:with-param>
-        </xsl:call-template>
-    </xsl:template>
-
-    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->       <!-- Modes collecting sets of strings naming definitions
-     we actually need, by traversing the definitions tree from the declared root;
-     recursive models are accounted for. -->
-    
-    <xsl:template match="define-assembly" mode="collect-assembly-references">
-        <xsl:apply-templates select="model" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="model" mode="collect-assembly-references">
-        <xsl:apply-templates select=".//assembly" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="model[exists(@ref)]" mode="collect-assembly-references">
-        <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
-        <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current">
-            <xsl:with-param name="assembly-refs" tunnel="yes" select="$assembly-refs,string(@ref)"/>
-        </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template match="assembly" mode="collect-assembly-references">
-        <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
-        <xsl:if test="not(@ref = $assembly-refs)">
-            <xsl:sequence select="string(@ref)"/>
-            <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current">
-                <xsl:with-param name="assembly-refs" tunnel="yes" select="$assembly-refs,string(@ref)"/>
-            </xsl:apply-templates>
-        </xsl:if>
-    </xsl:template>
-
-    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->   
-
-    <xsl:template match="define-assembly" mode="collect-field-references">
-        <xsl:apply-templates select="model" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="model" mode="collect-field-references">
-        <xsl:apply-templates select=".//field" mode="#current"/>
-        <xsl:apply-templates select=".//assembly" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="model[exists(@ref)]" mode="collect-field-references">
-        <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="assembly" mode="collect-field-references collect-flag-references">
-        <xsl:param name="assembly-refs" tunnel="yes" select="()"/>
-        <xsl:if test="not(@ref = $assembly-refs)">
-            <xsl:apply-templates select="key('global-assembly-definition',@ref)" mode="#current">
-                <xsl:with-param name="assembly-refs" tunnel="yes" select="$assembly-refs,string(@ref)"/>
-            </xsl:apply-templates>
-        </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="field" mode="collect-field-references">
-        <xsl:sequence select="string(@ref)"/>
-    </xsl:template>
-
-    <!-- 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -->   
-    
-    <xsl:template match="define-assembly | define-field" mode="collect-flag-references">
-        <xsl:apply-templates select="flag" mode="#current"/>
-        <xsl:apply-templates select="model" mode="#current"/>
-    </xsl:template>
-    
-    <xsl:template match="model" mode="collect-flag-references">
-        <xsl:apply-templates select=".//field" mode="#current"/>
-        <xsl:apply-templates select=".//define-field/flag" mode="#current"/>
-        <xsl:apply-templates select=".//assembly" mode="#current"/>
-        <xsl:apply-templates select=".//define-assembly/flag" mode="#current"/>
-    </xsl:template>
-    
-    <!-- Match for 'assembly' appears above -->
-    <xsl:template match="field" mode="collect-flag-references">
-            <xsl:apply-templates select="key('global-field-definition',@ref)" mode="#current"/>        
-    </xsl:template>
-    
-    <xsl:template match="flag" mode="collect-flag-references">
-        <xsl:sequence select="string(@ref)"/>
-    </xsl:template>
-    
-    <xsl:template name="warning">
-        <xsl:param name="msg"/>
-        <xsl:if test="$verbose">
-            <xsl:comment>
-                <xsl:copy-of select="$msg"/>
-            </xsl:comment>
-            <xsl:message>
-                <xsl:copy-of select="$msg"/>
-            </xsl:message>
-        </xsl:if>
-    </xsl:template>
-    
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/metaschema-compose.xpl b/toolchains/xslt-M4/metaschema-compose.xpl
index 40b97de7..00f45d0e 100644
--- a/toolchains/xslt-M4/metaschema-compose.xpl
+++ b/toolchains/xslt-M4/metaschema-compose.xpl
@@ -25,10 +25,10 @@
     <p:pipe port="result" step="reduce1"/>
   </p:output>
 
-  <!--<p:serialization port="_3_reduced2" indent="true"/>
+  <p:serialization port="_3_reduced2" indent="true"/>
   <p:output        port="_3_reduced2" primary="false">
     <p:pipe port="result" step="reduce2"/>
-  </p:output>-->
+  </p:output>
 
   <p:serialization port="_3_digested" indent="true"/>
   <p:output port="_3_digested" primary="false">
@@ -57,11 +57,11 @@
     </p:input>
   </p:xslt>
   
-  <!--<p:xslt name="reduce2">
+  <p:xslt name="reduce2">
     <p:input port="stylesheet">
       <p:document href="compose/metaschema-reduce2.xsl"/>
     </p:input>
-  </p:xslt>-->
+  </p:xslt>
   
   <p:xslt name="digest">
     <p:input port="stylesheet">
diff --git a/toolchains/xslt-M4/nist-metaschema-COMPOSE.xsl b/toolchains/xslt-M4/nist-metaschema-COMPOSE.xsl
index 3cfb6468..cb35e981 100644
--- a/toolchains/xslt-M4/nist-metaschema-COMPOSE.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-COMPOSE.xsl
@@ -31,10 +31,16 @@
     
     <!-- The $transformation-sequence declares transformations to be applied in order. -->
     <xsl:variable name="transformation-sequence">
+        
+<!-- Collects metaschema modules and renames definitions scoped locally to their modules -->
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
+<!-- Removes overwritten definitions (imported but subsequently rewritten) -->
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+<!-- Removes unused definitions (not descended from an assembly defined for the root) -->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
+<!-- Flattens, normalizes and (to come) expands examples -->
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+        
     </xsl:variable>
     
     <xsl:function name="nm:compose-metaschema">
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-DOCS.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-DOCS.xsl
index 4aaf64d9..79de60f5 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-DOCS.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-DOCS.xsl
@@ -29,7 +29,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">document/json/json-docs-hugo-uswds.xsl</nm:transform>
     </xsl:variable>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-MAP.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-MAP.xsl
index 76813fe6..feeb75e5 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-MAP.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-MAP.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>
         <nm:transform version="3.0">compose/unfold-model-map.xsl</nm:transform>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl
index f6e17e88..01e83a6b 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-SCHEMA.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">schema-gen/make-json-schema-metamap.xsl</nm:transform>
         <nm:transform version="3.0">lib/xpath-json-to-json.xsl</nm:transform>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl
index 0f2c6a83..34b8ed80 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl
@@ -63,7 +63,7 @@
     <!-- first compose the metaschema -->
     <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
     <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-    <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+    <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
     <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
     
     <!-- next produce definition map -->
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-DOCS.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-DOCS.xsl
index a0a8eebc..364c5ee7 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-DOCS.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-DOCS.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">document/xml/xml-docs-hugo-uswds.xsl</nm:transform>
     </xsl:variable>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-MAP.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-MAP.xsl
index d452805e..269cc416 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-MAP.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-MAP.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>
         <nm:transform version="3.0">compose/unfold-model-map.xsl</nm:transform>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-METATRON.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-METATRON.xsl
index 80c24666..3bcf8433 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-METATRON.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-METATRON.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">schema-gen/make-metaschema-metatron.xsl</nm:transform>
     </xsl:variable>
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl
index 50ca5cc5..2ff4a8c1 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl
@@ -57,7 +57,7 @@
     <!-- first compose the metaschema -->
     <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
     <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-    <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+    <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
     <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
     
     <!-- next produce definition map -->
diff --git a/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl b/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl
index b9f35ed4..be49ffbd 100644
--- a/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl
+++ b/toolchains/xslt-M4/nist-metaschema-MAKE-XSD.xsl
@@ -30,7 +30,7 @@
     <xsl:variable name="transformation-sequence">
         <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-reduce1.xsl</nm:transform>
-        <!--<nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>-->
+        <nm:transform version="3.0">compose/metaschema-reduce2.xsl</nm:transform>
         <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
         <nm:transform version="3.0">schema-gen/make-metaschema-xsd.xsl</nm:transform>
         <nm:transform version="3.0">schema-gen/configure-namespaces.xsl</nm:transform>