From a75cddc5155fe7c4ec079c3faf1181b2acbea8db Mon Sep 17 00:00:00 2001
From: Wendell Piez <wendell.piez@nist.gov>
Date: Wed, 2 Jun 2021 00:24:07 -0400
Subject: [PATCH] Further work on docs redesign (#147)

* Addressing several small display and linking glitches in docs generation
* Docs generation revamp Reworked reference and other pages to sketch - #128 and others
---
 toolchains/xslt-M4/compose/make-model-map.xsl |   4 +-
 .../xslt-M4/document/common-reference.xsl     |  74 +++++++-
 .../xslt-M4/document/hugo-css-emulator.xsl    |  18 +-
 .../xslt-M4/document/json/object-map-html.xsl |   2 +-
 .../document/json/object-reference-html.xsl   | 172 +++++++++++++-----
 .../xslt-M4/document/xml/element-map-html.xsl |   2 +-
 .../document/xml/element-reference-html.xsl   |  54 ++++--
 toolchains/xslt-M4/metapath/docs-metapath.xsl |   6 +-
 .../xslt-M4/write-hugo-metaschema-docs.xpl    |  14 +-
 9 files changed, 263 insertions(+), 83 deletions(-)

diff --git a/toolchains/xslt-M4/compose/make-model-map.xsl b/toolchains/xslt-M4/compose/make-model-map.xsl
index 3b0bce441..c9f6efbf5 100644
--- a/toolchains/xslt-M4/compose/make-model-map.xsl
+++ b/toolchains/xslt-M4/compose/make-model-map.xsl
@@ -15,7 +15,9 @@
     <xsl:template match="/METASCHEMA">
         <map namespace="{child::namespace ! normalize-space(.) }"
             prefix="{child::short-name ! normalize-space(.) }">
-            <xsl:copy-of select="schema-name | schema-version"/>
+            <metadata>
+                <xsl:copy-of copy-namespaces="no" select="* except (define-assembly | define-field | define-flag)"/>
+            </metadata>
             <xsl:apply-templates select="child::*[exists(root-name)]" mode="build"/>
         </map>
     </xsl:template>
diff --git a/toolchains/xslt-M4/document/common-reference.xsl b/toolchains/xslt-M4/document/common-reference.xsl
index 6045e955d..4d0833913 100644
--- a/toolchains/xslt-M4/document/common-reference.xsl
+++ b/toolchains/xslt-M4/document/common-reference.xsl
@@ -10,10 +10,73 @@
    <!-- Silencing constraint allocation logic -->
    <!--<xsl:import href="../metapath/docs-metapath.xsl"/>-->
    
+   
+   
+   <xsl:template match="metadata">
+      <xsl:apply-templates select="* except remarks"/>
+      <xsl:apply-templates select="short-name" mode="schema-link"/>
+      <xsl:apply-templates select="short-name" mode="converter-link"/>
+      <xsl:for-each select="remarks">
+         <div class="remarks">
+            <xsl:apply-templates/>
+         </div>
+      </xsl:for-each>
+   </xsl:template>
+   
+   <xsl:template match="metadata/short-name"/>
+   
+   <xsl:template match="metadata/schema-name">
+      <p>
+         <span class="usa-tag">OSCAL model</span>
+         <xsl:text> </xsl:text>
+         <xsl:apply-templates/>
+      </p>
+   </xsl:template>
+   
+   <xsl:template match="metadata/namespace">
+      <p>
+         <span class="usa-tag">XML namespace</span>
+         <xsl:text> </xsl:text>
+         <code>
+            <xsl:apply-templates/>
+         </code>
+      </p>
+   </xsl:template>
+   
+   <xsl:template match="metadata/json-base-uri">
+      <p>
+         <span class="usa-tag">JSON Base URI</span>
+         <xsl:text> </xsl:text>
+         <code>
+            <xsl:apply-templates/>
+         </code>
+      </p>
+   </xsl:template>
+   
+   <xsl:variable name="file-map" as="map(xs:string, text())">
+      <xsl:map>
+         <xsl:map-entry key="'oscal-catalog'"  >catalog</xsl:map-entry>
+         <xsl:map-entry key="'oscal-profile'"  >profile</xsl:map-entry>
+         <xsl:map-entry key="'oscal-component-definition'">component</xsl:map-entry>
+         <xsl:map-entry key="'oscal-ssp'"      >ssp</xsl:map-entry>
+         <xsl:map-entry key="'oscal-poam'"     >poam</xsl:map-entry>
+         <xsl:map-entry key="'oscal-ap'"       >assessment-plan</xsl:map-entry>
+         <xsl:map-entry key="'oscal-ar'"       >assessment-results</xsl:map-entry>
+      </xsl:map>
+   </xsl:variable>
+   
+   <xsl:template match="schema-name"/>
+   
+   <xsl:template match="schema-version" expand-text="true">
+      <p><span class="usa-tag">Schema version:</span> { . }</p>
+   </xsl:template>
+   
+   
    <xsl:template mode="produce-matching-constraints" match="constraint">
       <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>
@@ -65,9 +128,14 @@
             <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="formal-name" mode="produce">
+      <xsl:where-populated>
+         <p class="formal-name">
+            <xsl:apply-templates mode="cast-to-html"/>
+         </p>
+      </xsl:where-populated>
    </xsl:template>
    
    <xsl:template match="remarks" mode="produce">
diff --git a/toolchains/xslt-M4/document/hugo-css-emulator.xsl b/toolchains/xslt-M4/document/hugo-css-emulator.xsl
index d6456aa6f..349018552 100644
--- a/toolchains/xslt-M4/document/hugo-css-emulator.xsl
+++ b/toolchains/xslt-M4/document/hugo-css-emulator.xsl
@@ -25,15 +25,15 @@
          </head>
          <body>
            <div id="banner">
-               <button class="nav-button">
-                 <a href="{ $metaschema-code }-{ $format }-outline.html">
-                   <xsl:value-of select="upper-case($format) || ' '"/>Outline</a></button>
-             <button class="nav-button"><a href="{ $metaschema-code }-{ $format }-reference.html">
-               <xsl:value-of select="upper-case($format) || ' '"/>Reference</a></button>
-             <button class="nav-button"><a href="{ $metaschema-code }-{ $format }-index.html">
-               <xsl:value-of select="upper-case($format) || ' '"/>Index</a></button>
-             <button class="nav-button"><a href="{ $metaschema-code }-{ $format }-definitions.html">
-               <xsl:value-of select="upper-case($format) || ' '"/>Definitions</a></button>
+               <a href="{ $metaschema-code }-{ $format }-outline.html"><button class="nav-button">
+                 
+                   <xsl:value-of select="upper-case($format) || ' '"/>Outline</button></a>
+             <a href="{ $metaschema-code }-{ $format }-reference.html"><button class="nav-button">
+               <xsl:value-of select="upper-case($format) || ' '"/>Reference</button></a>
+             <a href="{ $metaschema-code }-{ $format }-index.html"><button class="nav-button">
+               <xsl:value-of select="upper-case($format) || ' '"/>Index</button></a>
+             <a href="{ $metaschema-code }-{ $format }-definitions.html"><button class="nav-button">
+               <xsl:value-of select="upper-case($format) || ' '"/>Definitions</button></a>
            </div>
             <xsl:if test="$including-toc">
                <div id="toc">
diff --git a/toolchains/xslt-M4/document/json/object-map-html.xsl b/toolchains/xslt-M4/document/json/object-map-html.xsl
index 1da3590d4..1832dc281 100644
--- a/toolchains/xslt-M4/document/json/object-map-html.xsl
+++ b/toolchains/xslt-M4/document/json/object-map-html.xsl
@@ -69,7 +69,7 @@ details:not([open]) .show-closed { display: inline }
             </style>
    </xsl:template>
 
-   <xsl:template match="m:schema-name | m:schema-version"/>
+   <xsl:template match="m:metadata"/>
    
    <xsl:template match="m:formal-name | m:description | m:remarks | m:constraint"/>
    
diff --git a/toolchains/xslt-M4/document/json/object-reference-html.xsl b/toolchains/xslt-M4/document/json/object-reference-html.xsl
index 0cceb5e0d..92cce5b97 100644
--- a/toolchains/xslt-M4/document/json/object-reference-html.xsl
+++ b/toolchains/xslt-M4/document/json/object-reference-html.xsl
@@ -12,6 +12,37 @@
    <xsl:param name="json-reference-page">json/reference</xsl:param>
    <xsl:param name="xml-reference-page">xml/reference</xsl:param>
    <xsl:param name="json-map-page">json/outline</xsl:param>
+   <xsl:param name="json-definitions-page">json/definitions</xsl:param>
+   
+   <xsl:variable name="datatype-page" as="xs:string">../../../datatypes</xsl:variable>
+   
+   <xsl:template match="metadata/namespace"/>
+   
+   <xsl:template match="short-name" mode="schema-link" expand-text="true">
+      <p>
+         <span class="usa-tag">JSON Schema</span>
+         <a href="https://pages.nist.gov/OSCAL/artifacts/json/schema/oscal_{$file-map(.)}_schema.json">oscal_{$file-map(string(.))}_schema.json</a>
+      </p>
+   </xsl:template>
+   
+   <xsl:template match="short-name" mode="converter-link" expand-text="true">
+      <p>
+         <span class="usa-tag">XML to JSON converter</span>
+         <a href="https://pages.nist.gov/OSCAL/artifacts/json/convert/oscal_{$file-map(.)}_xml-to-json-converter.xsl">oscal_{$file-map(string(.))}_xml-to-json-converter.xsl</a> <a href="https://github.com/usnistgov/OSCAL/tree/master/json#converting-oscal-xml-content-to-json">(How do I use the converter to convert OSCAL XML to JSON?)</a>
+      </p>
+   </xsl:template>
+   
+   <xsl:template name="remarks-group">
+      <xsl:for-each-group select="remarks[not(@class = 'xml')]" group-by="true()">
+         <div class="remarks-group usa-prose">
+            <details open="open">
+               <summary class="subhead">Remarks</summary>
+               <xsl:apply-templates select="current-group()" mode="produce"/>
+            </details>
+         </div>
+      </xsl:for-each-group>
+   </xsl:template>
+   
    
    <!-- writes '../' times the number of steps in $outline-page  -->
    <xsl:variable name="path-to-common">
@@ -34,73 +65,132 @@
       </div>
    </xsl:template>
    
-   <xsl:template match="schema-name"/>
-   
-   <xsl:template match="schema-version" expand-text="true">
-      <p><span class="usa-tag">Schema version:</span> { . }</p>
-   </xsl:template>
-   
+
+<!-- Map traversal -->
    <xsl:template match="*[exists(@key)]" expand-text="true">
       <xsl:param tunnel="true" name="constraints" select="()"/>
       <xsl:variable name="level" select="count(ancestor-or-self::*[exists(@key)])"/>
-      <section class="json-obj">
-         <div class="header">
-            <div>
+      <xsl:variable name="grouped-object" select="(self::array | self::singleton-or-array)/*"/>
+      <xsl:variable name="me" select="($grouped-object,.)[1]"/>
+      <div class="definition { tokenize($me/@_metaschema-json-id,'/')[2] }">
+         <xsl:variable name="class" expand-text="true">{ if (exists(parent::map)) then 'definition' else 'instance' }-header</xsl:variable>
+         <div class="{ $class }">
             <!-- generates h1-hx headers picked up by Hugo toc -->
-            <xsl:element namespace="http://www.w3.org/1999/xhtml" name="h{ $level }" expand-text="true">
+            <xsl:element expand-text="true" name="h{ $level }" namespace="http://www.w3.org/1999/xhtml">
                <xsl:attribute name="id" select="@_tree-json-id"/>
                <xsl:attribute name="class">toc{ $level} head</xsl:attribute>
                <xsl:text>{ @key }</xsl:text>
             </xsl:element>
-            <xsl:apply-templates select="." mode="produce-header"/>
+            <p class="type">
+               <xsl:apply-templates select="." mode="metaschema-type"/>
+            </p>
+            <xsl:if test="empty(parent::map)">
+               <p class="occurrence">
+                  <xsl:apply-templates select="." mode="occurrence-code"/>
+               </p>
+            </xsl:if>
             <xsl:call-template name="crosslink-to-xml"/>
-            </div>
+            <xsl:apply-templates select="formal-name" mode="produce"/>
          </div>
-         <xsl:sequence expand-text="true">
-            <p>See <a href="{ $json-map-link }#{ @_tree-json-id }">{ @_tree-json-id }</a> in the object map.</p>
-         </xsl:sequence>
+         <!-- only arrays or singleton-or-array get array headers -->
+         <xsl:apply-templates mode="for-array-member"/>
          
-         <xsl:apply-templates select="." mode="produce"/>
-         
-         <xsl:apply-templates>
+         <xsl:apply-templates select="description" mode="produce"/>
+         <xsl:call-template name="remarks-group"/>
+      
+         <xsl:variable name="mine" select="$me / (child::* except (formal-name|description | remarks))"/>
+         <xsl:for-each-group select="$mine" group-by="true()">
+         <details class="properties" open="open">
+            <summary>
+               <xsl:text expand-text="true">Properties ({ count( $mine )})</xsl:text>
+            </summary>
+            <xsl:apply-templates select="$mine">
             <xsl:with-param tunnel="true" name="constraints" select="constraint"/>
             <!-- for later when constraint allocation is working: -->
             <!--<xsl:with-param tunnel="true" name="constraints" select="$constraints, constraint"/>-->
          </xsl:apply-templates>
+         </details>
+         </xsl:for-each-group>
          
-      </section>
+      </div>
    </xsl:template>
-
+   
+   <xsl:template mode="for-array-member" match="*"/>
+   
+   <xsl:template mode="for-array-member" match="array/*">
+      <div class="array-header">
+         <p class="array-member">(array member)</p>
+         <p class="type">
+            <xsl:apply-templates select="." mode="metaschema-type"/>
+         </p>
+         <p class="occurrence">
+            <xsl:apply-templates select="." mode="occurrence-code"/>
+         </p>
+         <xsl:apply-templates select="formal-name" mode="produce"/>
+      </div>
+      
+      <xsl:apply-templates select="description" mode="produce"/>
+      <xsl:call-template name="remarks-group"/>
+   </xsl:template>
+   
+   <xsl:template match="singleton-or-array/*" mode="for-array-member">
+      <div class="array-header">
+         <p class="array-member">(array member or singleton)</p>
+         <p class="type">
+            <xsl:apply-templates select="." mode="metaschema-type"/>
+         </p>
+         <p class="occurrence">
+            <xsl:apply-templates select="." mode="occurrence-code"/>
+         </p>
+         <xsl:apply-templates select="formal-name" mode="produce"/>
+      </div>
+      
+      <xsl:apply-templates select="description" mode="produce"/>
+      <xsl:call-template name="remarks-group"/>
+   </xsl:template>
+   
+   <xsl:template mode="metaschema-type" match="*">
+      <xsl:value-of select="local-name()"/>
+      <xsl:if test="@scope='global'">
+         <xsl:text> </xsl:text>
+         <a href="{ $json-definitions-page}#{ @_metaschema-json-id }">(global definition)</a>
+      </xsl:if>
+   </xsl:template>
+   
+   <xsl:template mode="metaschema-type" match="*[exists(@as-type)]" expand-text="true">
+      <a href="{$datatype-page}/#{(lower-case(@as-type))}">{ @as-type }</a>
+   </xsl:template>
+   
    <xsl:template match="formal-name | description | remarks | constraint"/>
    
-   <xsl:template match="array" mode="produce-header" expand-text="true">
+   <!--<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>-->
+      </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">
+      <!-\-<p class="occurrence">
          <xsl:apply-templates select="." mode="occurrence-code"/>
-      </p>-->
+      </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">
+      <!-\-<p class="occurrence">
          <xsl:apply-templates select="." mode="occurrence-code"/>
-      </p>-->
-   </xsl:template>
+      </p>-\->
+   </xsl:template>-->
    
-   <xsl:template match="*" mode="produce" expand-text="true">
+   <!--<xsl:template match="*" mode="produce" expand-text="true">
       <xsl:param tunnel="true" name="constraints" select="()"/>
       <div class="obj-desc">
-         <!-- target for cross-link -->
+         <!-\- target for cross-link -\->
          <xsl:copy-of select="@id"/>
          <div class="obj-matrix">
             <p class="obj-name">
@@ -130,12 +220,12 @@
          
          <xsl:apply-templates mode="#current" select="description"/>
          
-         <!--<xsl:variable name="potential-constraints" select="$constraints,constraint"/>-->
+         <!-\-<xsl:variable name="potential-constraints" select="$constraints,constraint"/>-\->
          
-         <!-- Visiting the constraints passed down from above, with $apply-to as the node applying -->
-         <!--<xsl:apply-templates select="$potential-constraints" mode="produce-matching-constraints">
+         <!-\- Visiting the constraints passed down from above, with $apply-to as the node applying -\->
+         <!-\-<xsl:apply-templates select="$potential-constraints" mode="produce-matching-constraints">
             <xsl:with-param name="applying-to" select="."/>
-         </xsl:apply-templates>-->
+         </xsl:apply-templates>-\->
          
          <xsl:if test="exists(remarks)">
             <details open="open" class="remarks-group">
@@ -144,15 +234,11 @@
             </details>
          </xsl:if>
       </div>
-   </xsl:template>
-   
+   </xsl:template>-->
+
+
+   <xsl:import href="../common-reference.xsl"/>
 
-   <xsl:include href="../common-reference.xsl"/>
-   
-  
-   
-   
-   
    <xsl:template name="crosslink-to-xml">
       <div class="crosslink">
          <a href="{$xml-reference-link}#{@_tree-xml-id}">
@@ -161,6 +247,4 @@
       </div>
    </xsl:template>
    
-
-   
 </xsl:stylesheet>
diff --git a/toolchains/xslt-M4/document/xml/element-map-html.xsl b/toolchains/xslt-M4/document/xml/element-map-html.xsl
index 370c3b1b3..1134cb3e7 100644
--- a/toolchains/xslt-M4/document/xml/element-map-html.xsl
+++ b/toolchains/xslt-M4/document/xml/element-map-html.xsl
@@ -74,7 +74,7 @@ div.OM-map p { margin: 0ex }
             </style>
    </xsl:template>
 
-   <xsl:template match="m:schema-name | m:schema-version"/>
+   <xsl:template match="m:metadata"/>
    
    <xsl:template match="m:formal-name | m:description | m:remarks | m:constraint"/>
    
diff --git a/toolchains/xslt-M4/document/xml/element-reference-html.xsl b/toolchains/xslt-M4/document/xml/element-reference-html.xsl
index 3ccdcbf9f..bc7340e60 100644
--- a/toolchains/xslt-M4/document/xml/element-reference-html.xsl
+++ b/toolchains/xslt-M4/document/xml/element-reference-html.xsl
@@ -8,7 +8,44 @@
    exclude-result-prefixes="#all">
 
    <!-- produces an HTML 'stub' to be inserted into Hugo -->
+   
+   
+   
+   <xsl:param name="xml-reference-page">xml/reference</xsl:param>
+   <xsl:param name="json-reference-page">json/reference</xsl:param>
+   <xsl:param name="xml-map-page">xml/outline</xsl:param>
+   
+   <xsl:variable name="datatype-page" as="xs:string">../../../datatypes</xsl:variable>
+   
+   <xsl:template match="metadata/json-base-uri"/>
+      
+   <xsl:template match="short-name" mode="schema-link" expand-text="true">
+      <p>
+         <span class="usa-tag">XML Schema</span>
+         <a href="https://pages.nist.gov/OSCAL/artifacts/xml/schema/oscal_{$file-map(.)}_schema.xsd">oscal_{$file-map(string(.))}_schema.xsd</a>
+      </p>
+   </xsl:template>
+   
+   <xsl:template match="short-name" mode="converter-link" expand-text="true">
+      <p>
+         <span class="usa-tag">JSON to XML converter</span>
+         <a href="https://pages.nist.gov/OSCAL/artifacts/xml/convert/oscal_{$file-map(.)}_json-to-xml-converter.xsl">oscal_{$file-map(string(.))}_json-to-xml-converter.xsl</a>  <a href="https://github.com/usnistgov/OSCAL/tree/master/xml#converting-oscal-json-content-to-xml">(How do I use the converter to convert OSCAL JSON to XML?)</a>
+      </p>
+   </xsl:template>
 
+   <xsl:template name="remarks-group">
+      <!-- can't use xsl:where-populated due to the header :-( -->
+      <!-- don't include a remarks if it is marked for json -->
+      <xsl:for-each-group select="remarks[not(@class = 'json')]" group-by="true()">
+         <div class="remarks-group usa-prose">
+            <details open="open">
+               <summary class="subhead">Remarks</summary>
+               <xsl:apply-templates select="current-group()" mode="produce"/>
+            </details>
+         </div>
+      </xsl:for-each-group>
+   </xsl:template>
+   
    <xsl:variable name="indenting" as="element()"
       xmlns:output="http://www.w3.org/2010/xslt-xquery-serialization">
       <output:serialization-parameters>
@@ -16,10 +53,6 @@
       </output:serialization-parameters>
    </xsl:variable>
    
-   <xsl:param name="xml-reference-page">xml/reference</xsl:param>
-   <xsl:param name="json-reference-page">json/reference</xsl:param>
-   <xsl:param name="xml-map-page">xml/outline</xsl:param>
-   
    <!-- writes '../' times the number of steps in $outline-page  -->
    <xsl:variable name="path-to-common">
       <xsl:for-each select="tokenize($xml-reference-page,'/')">../</xsl:for-each>
@@ -29,21 +62,10 @@
    
    <xsl:template match="/*">
        <div class="xml-reference">
-          <!--<details><summary>XML source</summary>
-             <pre>
-         <xsl:value-of select="serialize(.,$indenting)"/>
-      </pre>
-          </details>-->
          <xsl:apply-templates/>
        </div>
    </xsl:template>
    
-   <xsl:template match="schema-name"/>
-   
-   <xsl:template match="schema-version" expand-text="true">
-      <h2><span class="usa-tag">Schema version:</span> { . }</h2>
-   </xsl:template>
-   
    
    <xsl:template match="*[exists(@gi)]" expand-text="true">
       <xsl:param tunnel="true" name="constraints" select="()"/>
@@ -125,7 +147,7 @@
       </div>
    </xsl:template>
    
-   <xsl:include href="../common-reference.xsl"/>
+   <xsl:import href="../common-reference.xsl"/>
    
    
    <xsl:template name="json-crosslink">
diff --git a/toolchains/xslt-M4/metapath/docs-metapath.xsl b/toolchains/xslt-M4/metapath/docs-metapath.xsl
index 1c77f795f..946a08bb8 100644
--- a/toolchains/xslt-M4/metapath/docs-metapath.xsl
+++ b/toolchains/xslt-M4/metapath/docs-metapath.xsl
@@ -8,6 +8,8 @@
    
     <xsl:import href="REx/metapath02.xslt"/>
 
+    <xsl:include href="paths-split.xsl"/>
+    
     <xsl:output indent="yes"/>
 
 <!-- 1. reduce target paths to their minimized form accounting for axes, removing predicates etc.
@@ -172,11 +174,11 @@
         </m:metapath>
     </xsl:template>
     
-    <xsl:template match="UnionExpr" mode="reduce-path">
+    <!--<xsl:template match="UnionExpr" mode="reduce-path">
         <m:choice>
             <xsl:apply-templates mode="#current"/>
         </m:choice>
-    </xsl:template>
+    </xsl:template>-->
     
     <xsl:template match="UnionExpr/UnaryExpr" mode="reduce-path">
         <m:alternative>
diff --git a/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl b/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
index b2c1c7fed..5e2c414d8 100644
--- a/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
+++ b/toolchains/xslt-M4/write-hugo-metaschema-docs.xpl
@@ -104,9 +104,10 @@
     <p:input port="stylesheet">
       <p:document href="document/xml/element-reference-html.xsl"/>
     </p:input>
-    <p:with-param name="xml-reference-page"  select="$xml-reference-filename"/>
-    <p:with-param name="json-reference-page" select="$json-reference-filename"/>
-    <p:with-param name="xml-map-page"        select="$xml-outline-filename"/>
+    <p:with-param name="xml-reference-page"    select="$xml-reference-filename"/>
+    <p:with-param name="xml-definitions-page"  select="$xml-definitions-filename"/>
+    <p:with-param name="json-reference-page"   select="$json-reference-filename"/>
+    <p:with-param name="xml-map-page"          select="$xml-outline-filename"/>
   </p:xslt>
   
   <p:sink/>
@@ -177,9 +178,10 @@
     <p:input port="stylesheet">
       <p:document href="document/json/object-reference-html.xsl"/>
     </p:input>
-    <p:with-param name="json-reference-page" select="$json-reference-filename"/>
-    <p:with-param name="xml-reference-page"  select="$xml-reference-filename"/>
-    <p:with-param name="json-map-page"       select="$json-outline-filename"/>
+    <p:with-param name="json-reference-page"   select="$json-reference-filename"/>
+    <p:with-param name="json-definitions-page" select="$json-definitions-filename"/>
+    <p:with-param name="xml-reference-page"    select="$xml-reference-filename"/>
+    <p:with-param name="json-map-page"         select="$json-outline-filename"/>
   </p:xslt>
 
   <p:sink/>