From 3415998d5986a44ffb706026b6d58ade2e914e03 Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Thu, 27 May 2021 11:10:26 -0400
Subject: [PATCH 1/2] Now displaying constraints in documentation at point of
 definition; WIP on constraint path matching logic

---
 .../xslt-M4/document/common-reference.xsl     | 134 +++++++++++-------
 toolchains/xslt-M4/metapath/docs-metapath.xsl |  85 ++++++++---
 2 files changed, 147 insertions(+), 72 deletions(-)

diff --git a/toolchains/xslt-M4/document/common-reference.xsl b/toolchains/xslt-M4/document/common-reference.xsl
index 91af58a1e..a17499ba7 100644
--- a/toolchains/xslt-M4/document/common-reference.xsl
+++ b/toolchains/xslt-M4/document/common-reference.xsl
@@ -7,38 +7,87 @@
    xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
    exclude-result-prefixes="#all">
    
+   <!-- Silencing constraint allocation logic -->
    <!--<xsl:import href="../metapath/docs-metapath.xsl"/>-->
    
-  
-   
    <xsl:template mode="produce-matching-constraints" match="constraint">
-      <!-- $applying-to is the node to which the constraint applies (or not) - 
+      <xsl:apply-templates mode="produce-constraint"/>
+   </xsl:template>
+   
+   <!--<xsl:template match="require" mode="produce">
+      <div class="constraint-set">
+         <p>When <code><xsl:value-of select="@when"/></code></p>
+         <xsl:apply-templates mode="#current"/>
+      </div>
+   </xsl:template>-->
+   
+   <!--<xsl:template mode="produce-matching-constraints" match="constraint">
+      <!-\- $applying-to is the node to which the constraint applies (or not) - 
            by default the parent of the constraint
-           but the template will be called for all the constraint's descendants as well -->
-      <xsl:param name="applying-to" select="parent::*"/>
-      <xsl:variable name="constraints" select=".//allowed-values | .//matches | .//has-cardinality | .//is-unique | .//index-has-key | .//index"/>
-      <xsl:where-populated>
-<!--      <details>
-         <summary>Constraints</summary>
-         <xsl:apply-templates mode="produce-matching-constraints" select="$constraints">
-            <xsl:with-param name="applying-to" select="$applying-to"/>
-         </xsl:apply-templates>
-      </details>-->
--->      </xsl:where-populated>
-      
+           but the template will be called for all the constraint's descendants as well -\->
+      <xsl:param name="applying-to" tunnel="true" required="true"/>
+      <!-\- b/c of intermediate 'requires' steps, we go straight to descendants -\->
+      <xsl:variable name="constraints" select="descendant::allowed-values | descendant::matches | descendant::has-cardinality | descendant::is-unique | descendant::index-has-key | descendant::index | descendant::expect"/>
+      <xsl:variable name="matching-constraints-description" as="element()*">
+         <xsl:apply-templates mode="produce-matching-constraints" select="$constraints"/>
+      </xsl:variable>
+      <xsl:if test="exists($matching-constraints-description)">
+         <details>
+            <summary>Constraints</summary>
+            <xsl:sequence select="$matching-constraints-description"/>
+         </details>
+      </xsl:if>
    </xsl:template>
    
-   <!--<xsl:template match="constraint//*" mode="produce-matching-constraints" expand-text="true">
-      <xsl:param name="applying-to" select="parent::*"/>
-      <xsl:variable name="apply-to-path" select="$applying-to/@_tree-xml-id/m:express-targets(.)"/>
-      <xsl:variable name="target-path" select="(ancestor::constraint/parent::*/@_tree-xml-id, (@target,'.')[1]) => string-join('/')"/>
+   <xsl:template match="constraint//*" mode="produce-matching-constraints" expand-text="true">
+      <xsl:param name="applying-to" as="element()" tunnel="true" required="true"/>
+      
+      <!-\-<xsl:message expand-text="true">matching '{ name() }'</xsl:message>-\->
+      
+      <xsl:variable name="apply-to-path" select="$applying-to/@_tree-xml-id/string(.)"/>
+      <!-\- extra wrapper parens in case target has a|b|c we want path/to/(a|b|c)    -\->
+      <!-\-<xsl:variable name="given-target" select="'(' || (@target,'.')[1] || ')'"/>-\->
+      <xsl:variable name="given-target" select="(@target,'.')[1]"/>
+
+      <!-\- the constraint wrappers' parents are elements, attributes, objects, strings ... all addressed via @_tree-xml-id for these purposes -\->
+      <xsl:variable name="target-path" select="(ancestor::constraint/parent::*/@_tree-xml-id, $given-target) => string-join('/')"/>
 
-      <xsl:if test="m:any-match($apply-to-path, $target-path)">
+        
+      <xsl:message expand-text="true">trying '{ $target-path }' on '{ $apply-to-path}': '{ m:match-paths($apply-to-path,$target-path) }'</xsl:message>
+      <xsl:if test="m:match-paths($apply-to-path, $target-path)">
          <xsl:apply-templates select="." mode="produce"/>
       </xsl:if>
    </xsl:template>-->
    
-   <xsl:template match="constraint" mode="produce" expand-text="true">
+   <xsl:template match="description" mode="produce">
+      <xsl:where-populated>
+         <p class="description">
+            <xsl:apply-templates mode="cast-to-html"/>
+         </p>
+      </xsl:where-populated>
+      <xsl:on-empty>
+         <xsl:message expand-text="true">Empty description on { name(..) }</xsl:message>
+      </xsl:on-empty>
+   </xsl:template>
+   
+   <xsl:template match="remarks" mode="produce">
+      <div class="remarks{ @class ! (' ' || .)}">
+         <xsl:if test="@class='in-use'"><p class="nb">(In use)</p></xsl:if>
+         <xsl:apply-templates mode="cast-to-html"/>
+      </div>
+   </xsl:template>
+   
+   <!-- Cast to XHTML namespace -->
+   <xsl:template match="description//* | remarks//*" mode="cast-to-html">
+      <xsl:element name="{ local-name() }" namespace="http://www.w3.org/1999/xhtml">
+         <xsl:apply-templates mode="#current"/>
+      </xsl:element>
+   </xsl:template>
+   
+   <!-- Shouldn't match in this mode but just in case. -->
+   <xsl:template match="constraint" mode="produce"/>
+   
+   <!--<xsl:template match="constraint" mode="produce" expand-text="true">
       <xsl:variable name="constraints" select=".//allowed-values | .//matches | .//has-cardinality | .//is-unique | .//index-has-key | .//index"/>
       <xsl:for-each-group select="$constraints" group-by="true()">
          <details  open="open" class="constraint-set">
@@ -46,9 +95,9 @@
             <xsl:apply-templates select="current-group()" mode="#current"/>
          </details>
       </xsl:for-each-group>
-   </xsl:template>
+   </xsl:template>-->
    
-   <xsl:template mode="produce" priority="2" match="allowed-values" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="allowed-values" expand-text="true">
       <xsl:variable name="enums" select="enum"/>
       <div class="constraint">
          <p><span class="cnstr-tag">Allowed value{ 's'[count($enums) gt 1] }</span>
@@ -77,11 +126,11 @@
       <span class="path">{ ancestor::constraint/../@_tree-xml-id }</span>
    </xsl:template>
    
-   <xsl:template match="allowed-values/enum" mode="produce">
+   <xsl:template match="allowed-values/enum" mode="produce-constraint">
       <li><strong><xsl:value-of select="@value"/></strong><xsl:if test="node()">: <xsl:apply-templates mode="#current"/></xsl:if></li>     
    </xsl:template>
    
-   <xsl:template mode="produce" priority="2" match="matches[@regex]" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="matches[@regex]" expand-text="true">
       <xsl:variable name="target" select="@target[not(.=('.','value()'))]"/>
       <div class="constraint">
          <p>
@@ -93,7 +142,7 @@
    </xsl:template>
    
    
-   <xsl:template mode="produce" priority="2" match="matches[@datatype]" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="matches[@datatype]" expand-text="true">
       <div class="constraint">
          <p>
             <span class="usa-tag">constraint</span>
@@ -103,7 +152,7 @@
       </div>
    </xsl:template>
    
-   <xsl:template mode="produce" priority="2" match="is-unique">
+   <xsl:template mode="produce-constraint" priority="2" match="is-unique">
       <xsl:variable name="target" select="@target[not(.=('.','value()'))]"/>
       <div class="constraint">
          <p>
@@ -115,7 +164,7 @@
       </div>
    </xsl:template>
    
-   <xsl:template mode="produce" priority="2" match="has-cardinality" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="has-cardinality" expand-text="true">
       <div class="constraint">
          <p>
             <span class="usa-tag">constraint</span>
@@ -130,7 +179,7 @@
       </div>
    </xsl:template>
    
-   <xsl:template mode="produce" priority="2" match="index-has-key" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="index-has-key" expand-text="true">
       <xsl:variable name="target" select="@target[not(.=('.','value()'))]"/>
       <div class="constraint">
          <p>
@@ -150,7 +199,7 @@
       </div>
    </xsl:template>
    
-   <xsl:template mode="produce" priority="2" match="index" expand-text="true">
+   <xsl:template mode="produce-constraint" priority="2" match="index" expand-text="true">
       <div class="constraint">
          <p>
             <span class="usa-tag">constraint</span>
@@ -171,31 +220,6 @@
       </div>
    </xsl:template>
    
-   <xsl:template match="description" mode="produce">
-      <xsl:where-populated>
-         <p class="description">
-            <xsl:apply-templates mode="cast-to-html"/>
-         </p>
-      </xsl:where-populated>
-      <xsl:on-empty>
-         <xsl:message expand-text="true">Empty description on { name(..) }</xsl:message>
-      </xsl:on-empty>
-   </xsl:template>
-   
-   <xsl:template match="remarks" mode="produce">
-      <div class="remarks{ @class ! (' ' || .)}">
-         <xsl:if test="@class='in-use'"><p class="nb">(In use)</p></xsl:if>
-         <xsl:apply-templates mode="cast-to-html"/>
-      </div>
-   </xsl:template>
-   
-   <!-- Cast to XHTML namespace -->
-   <xsl:template match="description//* | remarks//*" mode="cast-to-html">
-      <xsl:element name="{ local-name() }" namespace="http://www.w3.org/1999/xhtml">
-         <xsl:apply-templates mode="#current"/>
-      </xsl:element>
-   </xsl:template>
-   
    <!-- XXX consolidate this w/ JSON code? -->
    <xsl:template mode="occurrence-code" match="*">
       <xsl:param name="require-member" select="false()"/>
diff --git a/toolchains/xslt-M4/metapath/docs-metapath.xsl b/toolchains/xslt-M4/metapath/docs-metapath.xsl
index a2568b62a..1c77f795f 100644
--- a/toolchains/xslt-M4/metapath/docs-metapath.xsl
+++ b/toolchains/xslt-M4/metapath/docs-metapath.xsl
@@ -10,8 +10,6 @@
 
     <xsl:output indent="yes"/>
 
-    <xsl:mode on-no-match="shallow-skip"/>
-
 <!-- 1. reduce target paths to their minimized form accounting for axes, removing predicates etc.
           cast wildcards 'node()' 'element()' and 'attribute' to '*'
           normalize away child:: and attribute::
@@ -23,7 +21,7 @@
      
     -->
     
-    <xsl:variable as="xs:string" name="t">control[a=b]/part//./part/prop[@name='label'] | a/c</xsl:variable>
+    <xsl:variable as="xs:string" name="t">a / (b|c|d)</xsl:variable>
     <!--<xsl:variable as="xs:string" name="t">control[a=b]/part//./part/prop[@name='label'] | a/(b|c)</xsl:variable>-->
     <xsl:variable name="tests" as="element()*">
         <test context="part/prop"
@@ -36,20 +34,20 @@
     </xsl:variable>
     
 <!-- Run this XSLT on itself to see test results -->
-    <xsl:template match="/" mode="test">
+    <xsl:template match="/">
         <test-results>
-            <IN>
+            <!--<IN>
             <xsl:copy-of select="$tests[m:any-match(@context,@target)]"/>
             </IN>
             <OUT>
                 <xsl:copy-of select="$tests[not(m:any-match(@context,@target))]"/>
                 
-            </OUT>
-            <!--<xsl:for-each expand-text="true" select="m:express-targets($t)">
+            </OUT>-->
+            <xsl:for-each expand-text="true" select="m:express-targets($t)">
                 <path>{ . }</path>
-            </xsl:for-each>-->
-            <!--<xsl:sequence select="m:reduce-path-expr($t)"/>
-            <xsl:sequence select="p:parse-XPath($t)"/>-->
+            </xsl:for-each>
+            <xsl:sequence select="m:reduce-path-expr($t)"/>
+            <xsl:sequence select="p:parse-XPath($t)"/>
         </test-results>
     </xsl:template>
 
@@ -60,7 +58,7 @@
       self axis is dropped
       child and attribute axis are unified
         so '/path/to//deep[$true]/@in' becomes 'deep/in'
-        'any/where | you|want' becomes 'any/where' and 'you/want' (two targets)
+        'any/where | you/want' becomes 'any/where' and 'you/want' (two targets)
         a path that does not parse should be empty (TODO) or come back '*' (match everything)?
     -->
     <xsl:function name="m:express-targets" as="xs:string*">
@@ -71,6 +69,22 @@
     
     <!-- m:reduce-path-expr accepts a path, parses it, and returns a 'reduced' and rewritten path
          easier to rewrite than the raw parse tree -->
+    <xsl:function name="m:expand-path-expr" as="node()*">
+        <xsl:param name="expr" as="xs:string"/>
+        <xsl:variable name="parse.tree" select="p:parse-XPath($expr)"/>
+        <xsl:variable name="reduced.tree">
+          <xsl:apply-templates select="$parse.tree" mode="reduce-path"/>
+        </xsl:variable>
+        <!-- each tree returns a sequence of paths as strings, expanded  -->
+        <!-- so (a|b)/(c|d) comes back a/c, a/d, b/c, b/d etc. -->
+        <xsl:apply-templates select="$reduced.tree" mode="expand"/>
+    </xsl:function>
+    
+    <xsl:mode name="expand" on-no-match="shallow-copy"/>
+    
+    
+    
+    
     <xsl:function name="m:reduce-path-expr" as="node()*">
         <xsl:param name="expr" as="xs:string"/>
         <xsl:variable name="parse.tree" select="p:parse-XPath($expr)"/>
@@ -82,7 +96,7 @@
         <xsl:param name="context-path" as="xs:string"/><!-- a/b/c -->
         <xsl:param name="target-expr"  as="xs:string"/><!-- a[1]/b/c[3] | d/e[$n]/f -->
         <xsl:sequence select="some $t in m:express-targets($target-expr) satisfies
-            m:match-paths($t,$context-path)"/>
+            m:match-paths($context-path,$t)"/>
     </xsl:function>
     
     <xsl:function name="m:match-paths" as="xs:boolean">
@@ -100,24 +114,51 @@
             ( ($cs[$p],$ts[$p])='*' or $cs[$p]=$ts[$p] )"/>
     </xsl:function>
     
+    <!--<xsl:template mode="refine-path" match="m:metapath" as="xs:string*">
+        <xsl:variable name="unified" as="element()">
+            <xsl:apply-templates mode="#current"/>
+        </xsl:variable>
+        
+    </xsl:template>-->
+    
+    <xsl:template mode="refine-path" match="m:alternative[exists(m:alternative)]">
+        <xsl:apply-templates mode="#current"/>
+    </xsl:template>
     
     <xsl:template mode="refine-path" match="m:alternative" as="xs:string">
-        <xsl:value-of separator="/">
+        <xsl:variable name="steps" as="xs:string*">
             <xsl:apply-templates select="m:step" mode="#current"/>
+        </xsl:variable>
+        <xsl:value-of select="$steps" separator="/"/>
+    </xsl:template>
+    
+    <xsl:template mode="refine-path" match="m:choice" as="xs:string">
+        <xsl:value-of>
+            <xsl:text>(</xsl:text>
+            <xsl:variable name="alternatives" as="xs:string*">
+                <xsl:apply-templates select="m:alternative" mode="#current"/>
+            </xsl:variable>
+            <xsl:value-of select="$alternatives" separator=" | "/>
+            <xsl:text>)</xsl:text>
         </xsl:value-of>
     </xsl:template>
     
+    <xsl:template mode="refine-path" match="m:choice[count(m:alternative)=1]" priority="2" as="xs:string">
+        <xsl:apply-templates select="m:alternative" mode="#current"/>
+    </xsl:template>
+    
     <xsl:template mode="refine-path" match="m:step[(.|following-sibling::m:step)/m:axis='descendant-or-self']"/>
     <xsl:template mode="refine-path" match="m:step[(following-sibling::m:step)/m:axis='descendant']"/>
-    <xsl:template mode="refine-path" priority="2" match="m:step[m:axis='self']"/>
-    <xsl:template mode="refine-path" priority="2" match="m:step[empty(*)]"/>
+    <!--<xsl:template mode="refine-path" priority="2" match="m:step[m:axis='self']"/>-->
+    <!--<xsl:template mode="refine-path" priority="2" match="m:step[empty(*)]"/>-->
     
-    <xsl:template mode="refine-path" match="m:step" as="xs:string">
+    <xsl:template mode="refine-path" match="m:step">
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
     
     <xsl:template mode="refine-path" match="m:axis"/>
     <xsl:template mode="refine-path" match="m:node[.='node()']">*</xsl:template>
+    <!--<xsl:template mode="refine-path" match="m:step[m:axis='self'][empty(preceding-sibling::*)]" priority="3">.</xsl:template>-->
     
     
     <xsl:template mode="reduce-path" match="PredicateList"/>
@@ -131,7 +172,13 @@
         </m:metapath>
     </xsl:template>
     
-    <xsl:template match="XPath/UnionExpr/UnaryExpr" mode="reduce-path">
+    <xsl:template match="UnionExpr" mode="reduce-path">
+        <m:choice>
+            <xsl:apply-templates mode="#current"/>
+        </m:choice>
+    </xsl:template>
+    
+    <xsl:template match="UnionExpr/UnaryExpr" mode="reduce-path">
         <m:alternative>
             <xsl:apply-templates mode="#current"/>
         </m:alternative>
@@ -162,6 +209,10 @@
         <m:node>node()</m:node>
     </xsl:template>
     
+    <xsl:template match="FilterExpr[normalize-space(.)='.']" mode="reduce-path">
+        <m:step>.</m:step>
+    </xsl:template>
+    
     <xsl:template match="text()" mode="reduce-path"/>
     
     <xsl:template match="ForwardAxis" mode="reduce-path">

From dc9c1b1c7fe8042d2f3eff9613f8aa57dfe9596e Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Thu, 27 May 2021 12:53:27 -0400
Subject: [PATCH 2/2] Updating convertor generator and other pipelines to
 latest XSLT sequence.

---
 toolchains/xslt-M4/compose/make-model-map.xsl | 135 ++++++---
 .../xslt-M4/compose/make-model-map2.xsl       | 269 ------------------
 .../xslt-M4/document/hugo-css-emulator.xsl    |   5 +-
 .../document/json/object-reference-html.xsl   |  35 ++-
 .../xslt-M4/make-any-metaschema-docs.xpl      |   2 +-
 .../xslt-M4/make-hugo-metaschema-docs.xpl     |   2 +-
 ...-metaschema-MAKE-JSON-TO-XML-CONVERTER.xsl |  15 +-
 ...-metaschema-MAKE-XML-TO-JSON-CONVERTER.xsl |  15 +-
 .../testing/test-xml-json-roundtrip.xpl       |   2 +-
 .../xslt-M4/write-hugo-metaschema-docs.xpl    |   2 +-
 10 files changed, 148 insertions(+), 334 deletions(-)
 delete mode 100644 toolchains/xslt-M4/compose/make-model-map2.xsl

diff --git a/toolchains/xslt-M4/compose/make-model-map.xsl b/toolchains/xslt-M4/compose/make-model-map.xsl
index a7b5252e9..3b0bce441 100644
--- a/toolchains/xslt-M4/compose/make-model-map.xsl
+++ b/toolchains/xslt-M4/compose/make-model-map.xsl
@@ -9,6 +9,7 @@
     exclude-result-prefixes="#all"
     version="3.0">
     
+    <xsl:output indent="true"/>
     <xsl:mode on-no-match="shallow-copy"/>
     
     <xsl:template match="/METASCHEMA">
@@ -19,38 +20,47 @@
         </map>
     </xsl:template>
     
-    <xsl:key name="global-assemblies" match="METASCHEMA/define-assembly" use="@name"/>
-    <xsl:key name="global-fields"     match="METASCHEMA/define-field"    use="@name"/>
-    <xsl:key name="global-flags"      match="METASCHEMA/define-flag"     use="@name"/>
+    <xsl:key name="global-assemblies" match="METASCHEMA/define-assembly" use="@_key-name"/>
+    <xsl:key name="global-fields"     match="METASCHEMA/define-field"    use="@_key-name"/>
+    <xsl:key name="global-flags"      match="METASCHEMA/define-flag"     use="@_key-name"/>
     
     <xsl:template match="define-assembly | define-field" mode="build">
-        <xsl:param name="minOccurs" select="(@min-occurs,'0')[1]"/>
-        <xsl:param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
-        <xsl:param name="using-name" select="()"/>
-        <xsl:param name="group-name" select="group-as/@name"/>
-        <xsl:param name="group-json" select="group-as/@in-json"/>
-        <xsl:param name="group-xml" select="group-as/@in-xml"/>
-        <xsl:param name="in-xml" select="()"/>
         <xsl:param name="visited" select="()" tunnel="true"/>
-        <xsl:param name="with-remarks" select="()"/>
-        <xsl:variable name="type" select="replace(local-name(),'^define\-','')"/>
+        <xsl:param name="reference" select="."/>
+        
+        <!-- properties can be given on the reference or on the definition itself, and a reference
+             can overload its definition -->
+        <xsl:variable name="minOccurs"    select="($reference/@min-occurs,@min-occurs,'0')[1]"/>
+        <xsl:variable name="maxOccurs"    select="($reference/@max-occurs,@max-occurs,'1')[1]"/>
+        <xsl:variable name="type"         select="$reference => local-name() => replace('^define-','')"/>
+        <xsl:variable name="using-name"   select="$reference/@_using-name"/>
+        <xsl:variable name="group-name"   select="($reference/group-as/@name,group-as/@name)[1]"/>
+        <xsl:variable name="group-json"   select="($reference/group-as/@in-json,group-as/@in-json)[1]"/>
+        <xsl:variable name="group-xml"    select="($reference/group-as/@in-xml,group-as/@in-xml)[1]"/>
+        <xsl:variable name="in-xml"       select="$reference/@in-xml"/>
+        <xsl:variable name="with-remarks" select="$reference/remarks"/>
+        
         
         <xsl:element name="{ $type }" namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
             <xsl:for-each select="self::define-assembly[empty(model)]">
                 <xsl:attribute name="as-type">empty</xsl:attribute>
             </xsl:for-each>
             <xsl:attribute name="scope" select="if (exists(parent::METASCHEMA)) then 'global' else 'local'"/>
-            <xsl:if test="@name = $visited">
+            <xsl:if test="@_key-name = $visited">
                 <xsl:attribute name="recursive">true</xsl:attribute>
             </xsl:if>
-            <xsl:apply-templates select="@*" mode="build"/>
-            <xsl:if test="not(@in-xml='UNWRAPPED')">
+            
+            <xsl:apply-templates select="@*"            mode="build"/>
+            <xsl:apply-templates select="$reference/@*" mode="build"/>
+            
+            <xsl:if test="not($in-xml='UNWRAPPED')">
               <xsl:attribute name="gi"  select="($using-name, root-name, use-name,@name)[1]"/>
             </xsl:if>
             <xsl:attribute name="key" select="($using-name, root-name, use-name,@name)[1]"/>
+            
             <xsl:attribute name="min-occurs" select="$minOccurs"/>
             <xsl:attribute name="max-occurs" select="$maxOccurs"/>
-            <xsl:if test="exists(root-name) and not(@name=$visited)">
+            <xsl:if test="exists(root-name) and not(@_key-name=$visited)">
                 <xsl:attribute name="min-occurs" select="'1'"/>
             </xsl:if>
             <xsl:for-each select="$in-xml"><!-- UNWRAPPED or WITH_WRAPPER - supports unwrapped markup-multiline fields -->
@@ -62,18 +72,25 @@
             <xsl:for-each select="$group-json"><!-- ARRAY (default), SINGLETON_OR_ARRAY, BY_KEY --> 
                 <xsl:attribute name="group-json" select="."/>
             </xsl:for-each>
-            <xsl:apply-templates select="json-key" mode="build"/>
+            <xsl:apply-templates select="($reference/json-key,json-key)[1]" mode="build"/>
+            <xsl:apply-templates select="($reference/json-value-key,json-value-key)[1]" mode="build"/>
             <xsl:for-each select="$group-name">
                 <xsl:attribute name="group-name" select="."/>
             </xsl:for-each>
-            <xsl:if test="not(@name = $visited)">
-                <xsl:apply-templates select="formal-name | description"/>
+            <xsl:apply-templates select="formal-name | description"/>
+            <xsl:if test="not(@_key-name = $visited)">
                 <xsl:apply-templates select="define-flag | flag" mode="build"/>
                 <xsl:apply-templates select="model" mode="build">
-                    <xsl:with-param name="visited" tunnel="true" select="$visited, string(@name)"/>
+                    <xsl:with-param name="visited" tunnel="true" select="$visited, string(@_key-name)"/>
                 </xsl:apply-templates>
+                <xsl:variable name="value-keyname">
+                    <xsl:apply-templates select="." mode="value-keyname"/>
+                </xsl:variable>
                 <xsl:for-each select="self::define-field">
                     <value as-type="{(@as-type,'string')[1]}">
+                        <xsl:for-each select="(@_metaschema-xml-id|@_metaschema-json-id)">
+                            <xsl:attribute name="{ name(.) }" select=". || '/' || $value-keyname"/>
+                        </xsl:for-each>
                         <xsl:apply-templates select="." mode="value-key"/>
                     </value>
                 </xsl:for-each>
@@ -84,18 +101,25 @@
     </xsl:template>
     
     <xsl:template match="define-flag" mode="build">
-        <xsl:param name="given-type" select="()"/>
-        <xsl:param name="required" select="@required='yes'"/>
-        <xsl:param name="using-name" select="()"/>
-        <xsl:param name="with-remarks" select="()"/>
-        <flag max-occurs="1" min-occurs="{if ($required) then 1 else 0}" as-type="{ ($given-type,@as-type, 'string')[1] }">
-            <xsl:apply-templates select="@*" mode="build"/>
+        <xsl:param   name="reference" select="."/>
+        
+        <xsl:variable name="given-type"   select="$reference/@as-type"/>
+        <xsl:variable name="is-required"  select="($reference/@required | @required) ='yes'"/>
+        <xsl:variable name="using-name"   select="$reference/(use-name,@ref)[1]"/>
+        <xsl:variable name="with-remarks" select="$reference/with-remarks"/>
+        
+        <flag max-occurs="1" min-occurs="{if ($is-required) then 1 else 0}" as-type="{ ($given-type,@as-type, 'string')[1] }">
+            
+            <xsl:apply-templates select="@*"            mode="build"/>
+            <xsl:apply-templates select="$reference/@*" mode="build"/>
+            
             <xsl:for-each select="parent::METASCHEMA">
                 <xsl:attribute name="scope">global</xsl:attribute>
             </xsl:for-each>
-            <xsl:attribute name="gi" select="($using-name,use-name,@name,@ref)[1]"/>
+            
+            <xsl:attribute name="gi"  select="($using-name,use-name,@name,@ref)[1]"/>
             <xsl:attribute name="key" select="($using-name,use-name,@name,@ref)[1]"/>
-            <xsl:attribute name="link" select="(@ref,../@name)[1]"/>
+            
             <xsl:apply-templates select="formal-name | description"/>
             <xsl:apply-templates select="constraint"/>
             <xsl:apply-templates select="$with-remarks, remarks"/>
@@ -138,6 +162,24 @@
     </xsl:template>
     
     <xsl:template mode="build" match="model//assembly">
+        <xsl:apply-templates mode="build" select="key('global-assemblies', @_key-ref)">
+            <xsl:with-param name="reference" select="."/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template mode="build" match="model//field">
+        <xsl:apply-templates mode="build" select="key('global-fields', @_key-ref)">
+            <xsl:with-param name="reference" select="."/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template mode="build" match="flag">
+        <xsl:apply-templates mode="build" select="key('global-flags', @_key-ref)">
+            <xsl:with-param name="reference" select="."/>
+        </xsl:apply-templates>
+    </xsl:template>
+    
+    <!--<xsl:template mode="build" match="model//assembly">
         <xsl:apply-templates mode="build" select="key('global-assemblies', @ref)">
             <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
             <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
@@ -148,9 +190,10 @@
             <xsl:with-param name="using-name" select="use-name"/>
             <xsl:with-param name="with-remarks" select="remarks"/>
         </xsl:apply-templates>
-    </xsl:template>
+    </xsl:template>-->
     
-    <xsl:template mode="build" match="model//field">
+    
+    <!--<xsl:template mode="build" match="model//field">
         <xsl:apply-templates mode="build" select="key('global-fields', @ref)">
             <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
             <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
@@ -161,9 +204,9 @@
             <xsl:with-param name="using-name" select="use-name"/>
             <xsl:with-param name="with-remarks" select="remarks"/>
         </xsl:apply-templates>
-    </xsl:template>
+    </xsl:template>-->
     
-    <xsl:template mode="build" match="flag">
+    <!--<xsl:template mode="build" match="flag">
         <xsl:apply-templates mode="build" select="key('global-flags', @ref)">
             <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
             <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
@@ -175,7 +218,7 @@
             <xsl:with-param name="with-remarks" select="remarks"/>
             <xsl:with-param name="given-type" select="@as-type"/>
         </xsl:apply-templates>
-    </xsl:template>
+    </xsl:template>-->
     
     <xsl:template match="constraint" mode="build">
         <xsl:copy>
@@ -196,23 +239,31 @@
 
     <!-- When a field has no flags not designated as a json-value-flag, it is 'naked'; its value is given without a key
          (in target JSON it will be the value of a (scalar) property, not a value on a property of an object property. -->
+    
     <xsl:template mode="value-key" priority="3" match="define-field[empty(flag[not(@ref=../json-value-key/@flag-name)] | define-flag[not(@ref=../json-value-key/@flag-name)])]"/>
     
-    <xsl:template priority="2" match="define-field[exists(json-value-key)]" mode="value-key">
-        <xsl:attribute name="key" select="json-value-key"/>
+    <xsl:template match="define-field" mode="value-key">
+        <xsl:attribute name="key">
+          <xsl:apply-templates select="." mode="value-keyname"/>
+        </xsl:attribute>
     </xsl:template>
     
-    <xsl:template match="define-field[@as-type='markup-line']" mode="value-key">
-        <xsl:attribute name="key" select="$markdown-value-label"/>
+    <xsl:template priority="2" match="define-field[exists(json-value-key)]" mode="value-keyname">
+        <xsl:value-of select="json-value-key"/>
     </xsl:template>
     
-    <xsl:template match="define-field[@as-type='markup-multiline']" mode="value-key">
-        <xsl:attribute name="key" select="$markdown-multiline-label"/>
+    <xsl:template match="define-field[@as-type='markup-line']" mode="value-keyname">
+        <xsl:value-of select="$markdown-value-label"/>
     </xsl:template>
     
-        
-    <xsl:template match="define-field" mode="value-key">
-        <xsl:attribute name="key" select="$string-value-label"/>
+    <xsl:template match="define-field[@as-type='markup-multiline']" mode="value-keyname">
+        <xsl:value-of select="$markdown-multiline-label"/>
     </xsl:template>
     
+    
+    <xsl:template match="define-field" mode="value-keyname">
+        <xsl:value-of select="$string-value-label"/>
+    </xsl:template>
+    
+    
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/compose/make-model-map2.xsl b/toolchains/xslt-M4/compose/make-model-map2.xsl
deleted file mode 100644
index 3b0bce441..000000000
--- a/toolchains/xslt-M4/compose/make-model-map2.xsl
+++ /dev/null
@@ -1,269 +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="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-    xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-    xmlns:html="http://www.w3.org/1999/xhtml"
-    
-    exclude-result-prefixes="#all"
-    version="3.0">
-    
-    <xsl:output indent="true"/>
-    <xsl:mode on-no-match="shallow-copy"/>
-    
-    <xsl:template match="/METASCHEMA">
-        <map namespace="{child::namespace ! normalize-space(.) }"
-            prefix="{child::short-name ! normalize-space(.) }">
-            <xsl:copy-of select="schema-name | schema-version"/>
-            <xsl:apply-templates select="child::*[exists(root-name)]" mode="build"/>
-        </map>
-    </xsl:template>
-    
-    <xsl:key name="global-assemblies" match="METASCHEMA/define-assembly" use="@_key-name"/>
-    <xsl:key name="global-fields"     match="METASCHEMA/define-field"    use="@_key-name"/>
-    <xsl:key name="global-flags"      match="METASCHEMA/define-flag"     use="@_key-name"/>
-    
-    <xsl:template match="define-assembly | define-field" mode="build">
-        <xsl:param name="visited" select="()" tunnel="true"/>
-        <xsl:param name="reference" select="."/>
-        
-        <!-- properties can be given on the reference or on the definition itself, and a reference
-             can overload its definition -->
-        <xsl:variable name="minOccurs"    select="($reference/@min-occurs,@min-occurs,'0')[1]"/>
-        <xsl:variable name="maxOccurs"    select="($reference/@max-occurs,@max-occurs,'1')[1]"/>
-        <xsl:variable name="type"         select="$reference => local-name() => replace('^define-','')"/>
-        <xsl:variable name="using-name"   select="$reference/@_using-name"/>
-        <xsl:variable name="group-name"   select="($reference/group-as/@name,group-as/@name)[1]"/>
-        <xsl:variable name="group-json"   select="($reference/group-as/@in-json,group-as/@in-json)[1]"/>
-        <xsl:variable name="group-xml"    select="($reference/group-as/@in-xml,group-as/@in-xml)[1]"/>
-        <xsl:variable name="in-xml"       select="$reference/@in-xml"/>
-        <xsl:variable name="with-remarks" select="$reference/remarks"/>
-        
-        
-        <xsl:element name="{ $type }" namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
-            <xsl:for-each select="self::define-assembly[empty(model)]">
-                <xsl:attribute name="as-type">empty</xsl:attribute>
-            </xsl:for-each>
-            <xsl:attribute name="scope" select="if (exists(parent::METASCHEMA)) then 'global' else 'local'"/>
-            <xsl:if test="@_key-name = $visited">
-                <xsl:attribute name="recursive">true</xsl:attribute>
-            </xsl:if>
-            
-            <xsl:apply-templates select="@*"            mode="build"/>
-            <xsl:apply-templates select="$reference/@*" mode="build"/>
-            
-            <xsl:if test="not($in-xml='UNWRAPPED')">
-              <xsl:attribute name="gi"  select="($using-name, root-name, use-name,@name)[1]"/>
-            </xsl:if>
-            <xsl:attribute name="key" select="($using-name, root-name, use-name,@name)[1]"/>
-            
-            <xsl:attribute name="min-occurs" select="$minOccurs"/>
-            <xsl:attribute name="max-occurs" select="$maxOccurs"/>
-            <xsl:if test="exists(root-name) and not(@_key-name=$visited)">
-                <xsl:attribute name="min-occurs" select="'1'"/>
-            </xsl:if>
-            <xsl:for-each select="$in-xml"><!-- UNWRAPPED or WITH_WRAPPER - supports unwrapped markup-multiline fields -->
-                <xsl:attribute name="in-xml" select="."/>
-            </xsl:for-each>
-            <xsl:for-each select="$group-xml"><!-- GROUPED or UNGROUPED - introduces a grouping element for the group -->
-                <xsl:attribute name="group-xml" select="."/>
-            </xsl:for-each>
-            <xsl:for-each select="$group-json"><!-- ARRAY (default), SINGLETON_OR_ARRAY, BY_KEY --> 
-                <xsl:attribute name="group-json" select="."/>
-            </xsl:for-each>
-            <xsl:apply-templates select="($reference/json-key,json-key)[1]" mode="build"/>
-            <xsl:apply-templates select="($reference/json-value-key,json-value-key)[1]" mode="build"/>
-            <xsl:for-each select="$group-name">
-                <xsl:attribute name="group-name" select="."/>
-            </xsl:for-each>
-            <xsl:apply-templates select="formal-name | description"/>
-            <xsl:if test="not(@_key-name = $visited)">
-                <xsl:apply-templates select="define-flag | flag" mode="build"/>
-                <xsl:apply-templates select="model" mode="build">
-                    <xsl:with-param name="visited" tunnel="true" select="$visited, string(@_key-name)"/>
-                </xsl:apply-templates>
-                <xsl:variable name="value-keyname">
-                    <xsl:apply-templates select="." mode="value-keyname"/>
-                </xsl:variable>
-                <xsl:for-each select="self::define-field">
-                    <value as-type="{(@as-type,'string')[1]}">
-                        <xsl:for-each select="(@_metaschema-xml-id|@_metaschema-json-id)">
-                            <xsl:attribute name="{ name(.) }" select=". || '/' || $value-keyname"/>
-                        </xsl:for-each>
-                        <xsl:apply-templates select="." mode="value-key"/>
-                    </value>
-                </xsl:for-each>
-            </xsl:if>
-            <xsl:apply-templates select="constraint"/>
-            <xsl:apply-templates select="$with-remarks, remarks"/>
-        </xsl:element>
-    </xsl:template>
-    
-    <xsl:template match="define-flag" mode="build">
-        <xsl:param   name="reference" select="."/>
-        
-        <xsl:variable name="given-type"   select="$reference/@as-type"/>
-        <xsl:variable name="is-required"  select="($reference/@required | @required) ='yes'"/>
-        <xsl:variable name="using-name"   select="$reference/(use-name,@ref)[1]"/>
-        <xsl:variable name="with-remarks" select="$reference/with-remarks"/>
-        
-        <flag max-occurs="1" min-occurs="{if ($is-required) then 1 else 0}" as-type="{ ($given-type,@as-type, 'string')[1] }">
-            
-            <xsl:apply-templates select="@*"            mode="build"/>
-            <xsl:apply-templates select="$reference/@*" mode="build"/>
-            
-            <xsl:for-each select="parent::METASCHEMA">
-                <xsl:attribute name="scope">global</xsl:attribute>
-            </xsl:for-each>
-            
-            <xsl:attribute name="gi"  select="($using-name,use-name,@name,@ref)[1]"/>
-            <xsl:attribute name="key" select="($using-name,use-name,@name,@ref)[1]"/>
-            
-            <xsl:apply-templates select="formal-name | description"/>
-            <xsl:apply-templates select="constraint"/>
-            <xsl:apply-templates select="$with-remarks, remarks"/>
-        </flag>
-    </xsl:template>
-
-    <xsl:template match="assembly/remarks | field/remarks | flag-remarks">
-        <xsl:copy>
-            <xsl:copy-of select="@*"/>
-            <xsl:attribute name="class">in-use</xsl:attribute>
-            <xsl:apply-templates mode="#current"/>
-        </xsl:copy>
-    </xsl:template>
-    
-    <xsl:template mode="build" match="json-value-key[matches(@flag-name,'\S')]">
-        <xsl:attribute name="json-value-flag" select="@flag-name"/>
-    </xsl:template>
-    
-    <!--<xsl:template mode="build" match="json-value-key">
-        <xsl:attribute name="{ local-name() }" select="."/>
-    </xsl:template>-->
-    
-    <xsl:template mode="build" match="json-key">
-        <xsl:attribute name="json-key-flag" select="@flag-name"/>
-    </xsl:template>
-    
-    <xsl:template match="@module | @ref" mode="build"/>
-    
-    <xsl:template match="@*" mode="build">
-        <xsl:copy-of select="."/>
-    </xsl:template>
-    
-    
-    <!--<xsl:template match="define-field/@as-type" mode="build"/>-->
-    
-    <xsl:template match="choice" mode="build">
-        <choice>
-            <xsl:apply-templates mode="#current"/>
-        </choice>
-    </xsl:template>
-    
-    <xsl:template mode="build" match="model//assembly">
-        <xsl:apply-templates mode="build" select="key('global-assemblies', @_key-ref)">
-            <xsl:with-param name="reference" select="."/>
-        </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template mode="build" match="model//field">
-        <xsl:apply-templates mode="build" select="key('global-fields', @_key-ref)">
-            <xsl:with-param name="reference" select="."/>
-        </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template mode="build" match="flag">
-        <xsl:apply-templates mode="build" select="key('global-flags', @_key-ref)">
-            <xsl:with-param name="reference" select="."/>
-        </xsl:apply-templates>
-    </xsl:template>
-    
-    <!--<xsl:template mode="build" match="model//assembly">
-        <xsl:apply-templates mode="build" select="key('global-assemblies', @ref)">
-            <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
-            <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
-            <xsl:with-param name="group-name" select="group-as/@name"/>
-            <xsl:with-param name="group-json" select="group-as/@in-json"/>
-            <xsl:with-param name="group-xml" select="group-as/@in-xml"/>
-            <xsl:with-param name="in-xml" select="@in-xml"/>
-            <xsl:with-param name="using-name" select="use-name"/>
-            <xsl:with-param name="with-remarks" select="remarks"/>
-        </xsl:apply-templates>
-    </xsl:template>-->
-    
-    
-    <!--<xsl:template mode="build" match="model//field">
-        <xsl:apply-templates mode="build" select="key('global-fields', @ref)">
-            <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
-            <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
-            <xsl:with-param name="group-name" select="group-as/@name"/>
-            <xsl:with-param name="group-json" select="group-as/@in-json"/>
-            <xsl:with-param name="group-xml" select="group-as/@in-xml"/>
-            <xsl:with-param name="in-xml" select="@in-xml"/>
-            <xsl:with-param name="using-name" select="use-name"/>
-            <xsl:with-param name="with-remarks" select="remarks"/>
-        </xsl:apply-templates>
-    </xsl:template>-->
-    
-    <!--<xsl:template mode="build" match="flag">
-        <xsl:apply-templates mode="build" select="key('global-flags', @ref)">
-            <xsl:with-param name="minOccurs" select="(@min-occurs,'0')[1]"/>
-            <xsl:with-param name="maxOccurs" select="(@max-occurs,'1')[1]"/>
-            <xsl:with-param name="group-name" select="group-as/@name"/>
-            <xsl:with-param name="group-json" select="group-as/@in-json"/>
-            <xsl:with-param name="group-xml" select="group-as/@in-xml"/>
-            <xsl:with-param name="in-xml" select="@in-xml"/>
-            <xsl:with-param name="using-name" select="(use-name,@ref)[1]"/>
-            <xsl:with-param name="with-remarks" select="remarks"/>
-            <xsl:with-param name="given-type" select="@as-type"/>
-        </xsl:apply-templates>
-    </xsl:template>-->
-    
-    <xsl:template match="constraint" mode="build">
-        <xsl:copy>
-            <xsl:copy-of select="@*"/>
-            <xsl:copy-of select="*"/>
-        </xsl:copy>
-    </xsl:template>
-    
-    <xsl:template match="text()" mode="build"/>
-    
-    <xsl:variable name="string-value-label">STRVALUE</xsl:variable>
-    <xsl:variable name="markdown-value-label">RICHTEXT</xsl:variable>
-    <xsl:variable name="markdown-multiline-label">PROSE</xsl:variable>
-
-    <xsl:template priority="3" match="define-field[exists(json-value-key/@flag-name)]" mode="value-key">
-        <xsl:attribute name="key-flag" select="json-value-key/@flag-name"/>
-    </xsl:template>
-
-    <!-- When a field has no flags not designated as a json-value-flag, it is 'naked'; its value is given without a key
-         (in target JSON it will be the value of a (scalar) property, not a value on a property of an object property. -->
-    
-    <xsl:template mode="value-key" priority="3" match="define-field[empty(flag[not(@ref=../json-value-key/@flag-name)] | define-flag[not(@ref=../json-value-key/@flag-name)])]"/>
-    
-    <xsl:template match="define-field" mode="value-key">
-        <xsl:attribute name="key">
-          <xsl:apply-templates select="." mode="value-keyname"/>
-        </xsl:attribute>
-    </xsl:template>
-    
-    <xsl:template priority="2" match="define-field[exists(json-value-key)]" mode="value-keyname">
-        <xsl:value-of select="json-value-key"/>
-    </xsl:template>
-    
-    <xsl:template match="define-field[@as-type='markup-line']" mode="value-keyname">
-        <xsl:value-of select="$markdown-value-label"/>
-    </xsl:template>
-    
-    <xsl:template match="define-field[@as-type='markup-multiline']" mode="value-keyname">
-        <xsl:value-of select="$markdown-multiline-label"/>
-    </xsl:template>
-    
-    
-    <xsl:template match="define-field" mode="value-keyname">
-        <xsl:value-of select="$string-value-label"/>
-    </xsl:template>
-    
-    
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/toolchains/xslt-M4/document/hugo-css-emulator.xsl b/toolchains/xslt-M4/document/hugo-css-emulator.xsl
index 1848c5f87..d6456aa6f 100644
--- a/toolchains/xslt-M4/document/hugo-css-emulator.xsl
+++ b/toolchains/xslt-M4/document/hugo-css-emulator.xsl
@@ -48,6 +48,9 @@
       </html>
    </xsl:template>
    
+   <xsl:template match="a/@href[starts-with(.,'../..')]">
+     <xsl:attribute name="href" select="substring-after(.,'../../')"/>
+   </xsl:template>
    
    <xsl:template match="/div" name="toc-level" mode="toc">
       <ul class="toc">
@@ -56,7 +59,7 @@
    </xsl:template>
    
    <xsl:template match="section" mode="toc">
-     <xsl:variable name="head" select="*[starts-with(@class,'toc')] | *[@class='definition-header']/*[starts-with(@class,'toc')]"/>
+     <xsl:variable name="head" select="*[starts-with(@class,'toc')] | *[@class='header']/descendant::*[starts-with(@class,'toc')][1]"/>
             <li>
                <xsl:for-each select="$head" expand-text="true">
                   <p><a href="#{ $head/@id }">{ . }</a></p>
diff --git a/toolchains/xslt-M4/document/json/object-reference-html.xsl b/toolchains/xslt-M4/document/json/object-reference-html.xsl
index 7c88a9103..fdd1411e5 100644
--- a/toolchains/xslt-M4/document/json/object-reference-html.xsl
+++ b/toolchains/xslt-M4/document/json/object-reference-html.xsl
@@ -74,19 +74,46 @@
    <xsl:template match="array" mode="produce-header" expand-text="true">
       <xsl:variable name="array-of" select="*[1]"/>
       <p>An array of { $array-of/formal-name } { $array-of/name()}s</p>
-      <p class="occurrence">
+      <!--<p class="occurrence">
          <xsl:apply-templates select="." mode="occurrence-code"/>
-      </p>
-      <xsl:apply-templates select="$array-of" mode="produce"/>
+      </p>-->
    </xsl:template>
    
+   <xsl:template match="object" mode="produce-header" expand-text="true">
+      <xsl:variable name="array-of" select="*[1]"/>
+      <p>An object { formal-name } { $array-of/name()}s</p>
+      <!--<p class="occurrence">
+         <xsl:apply-templates select="." mode="occurrence-code"/>
+      </p>-->
+   </xsl:template>
+   
+   <xsl:template match="string | number | boolean | *" mode="produce-header" expand-text="true">
+      <xsl:variable name="array-of" select="*[1]"/>
+      <p>A { name(.) } { formal-name }</p>
+      <!--<p class="occurrence">
+         <xsl:apply-templates select="." mode="occurrence-code"/>
+      </p>-->
+   </xsl:template>
+   
+   
+   
    <xsl:template match="*" mode="produce" expand-text="true">
       <xsl:param tunnel="true" name="constraints" select="()"/>
       <div class="obj-desc">
          <!-- target for cross-link -->
          <xsl:copy-of select="@id"/>
          <div class="obj-matrix">
-            <p class="obj-name">{ name(.) => replace('^define\-','')  } { formal-name }</p>
+            <p class="obj-name">
+               
+               <xsl:if test="empty(formal-name)">
+                  <xsl:text>{ name(.) => replace('^define\-','')  } of </xsl:text>
+                  <xsl:for-each select="*/child::formal-name">
+                  <span class="formal-name">
+                     <xsl:apply-templates/>
+                  </span>
+               </xsl:for-each>
+               </xsl:if>
+            </p>
             <p class="occurrence">
                <xsl:apply-templates select="." mode="occurrence-code"/>
             </p>
diff --git a/toolchains/xslt-M4/make-any-metaschema-docs.xpl b/toolchains/xslt-M4/make-any-metaschema-docs.xpl
index a35cc253d..8cec1fbd2 100644
--- a/toolchains/xslt-M4/make-any-metaschema-docs.xpl
+++ b/toolchains/xslt-M4/make-any-metaschema-docs.xpl
@@ -140,7 +140,7 @@
   
   <p:xslt name="make-abstract-map">
     <p:input port="stylesheet">
-      <p:document href="compose/make-model-map2.xsl"/>
+      <p:document href="compose/make-model-map.xsl"/>
     </p:input>
   </p:xslt>
   
diff --git a/toolchains/xslt-M4/make-hugo-metaschema-docs.xpl b/toolchains/xslt-M4/make-hugo-metaschema-docs.xpl
index b54855965..57e0e6d0e 100644
--- a/toolchains/xslt-M4/make-hugo-metaschema-docs.xpl
+++ b/toolchains/xslt-M4/make-hugo-metaschema-docs.xpl
@@ -100,7 +100,7 @@
   
   <p:xslt name="make-abstract-map">
     <p:input port="stylesheet">
-      <p:document href="compose/make-model-map2.xsl"/>
+      <p:document href="compose/make-model-map.xsl"/>
     </p:input>
   </p:xslt>
   
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 5587b04d3..9e2f1ee19 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
@@ -61,13 +61,14 @@
   <!-- The $transformation-sequence declares transformations to be applied in order. -->
   <xsl:variable name="produce-json-converter">
     <!-- first compose the metaschema -->
-    <nm:transform version="3.0">metaschema-collect.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-build-refs.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-trim-extra-modules.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-prune-unused-definitions.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-resolve-use-names.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-resolve-sibling-names.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-build-refs.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-trim-extra-modules.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-prune-unused-definitions.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-resolve-use-names.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-resolve-sibling-names.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">compose/annotate-composition.xsl</nm:transform>
     
     <!-- next produce definition map -->
     <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>
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 5b4184cc4..a00ac4e46 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
@@ -55,13 +55,14 @@
   <!-- The $transformation-sequence declares transformations to be applied in order. -->
   <xsl:variable name="produce-xml-converter">
     <!-- first compose the metaschema -->
-    <nm:transform version="3.0">metaschema-collect.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-build-refs.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-trim-extra-modules.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-prune-unused-definitions.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-resolve-use-names.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-resolve-sibling-names.xsl</nm:transform>
-    <nm:transform version="3.0">metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-collect.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-build-refs.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-trim-extra-modules.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-prune-unused-definitions.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-resolve-use-names.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-resolve-sibling-names.xsl</nm:transform>
+    <nm:transform version="3.0">compose/metaschema-digest.xsl</nm:transform>
+    <nm:transform version="3.0">compose/annotate-composition.xsl</nm:transform>
     
     <!-- next produce definition map -->
     <nm:transform version="3.0">compose/make-model-map.xsl</nm:transform>
diff --git a/toolchains/xslt-M4/testing/test-xml-json-roundtrip.xpl b/toolchains/xslt-M4/testing/test-xml-json-roundtrip.xpl
index bfe03759c..f11aa42ff 100644
--- a/toolchains/xslt-M4/testing/test-xml-json-roundtrip.xpl
+++ b/toolchains/xslt-M4/testing/test-xml-json-roundtrip.xpl
@@ -100,7 +100,7 @@
   <!--<p:identity  name="make-model-map"/>-->
   <p:xslt name="make-model-map">
     <p:input port="stylesheet">
-      <p:document href="../compose/make-model-map2.xsl"/>
+      <p:document href="../compose/make-model-map.xsl"/>
     </p:input>
   </p:xslt>
   
diff --git a/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl b/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
index 3743a9457..b2c1c7fed 100644
--- a/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
+++ b/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
@@ -58,7 +58,7 @@
   
   <p:xslt name="make-abstract-map">
     <p:input port="stylesheet">
-      <p:document href="compose/make-model-map2.xsl"/>
+      <p:document href="compose/make-model-map.xsl"/>
     </p:input>
   </p:xslt>