metanorma-cc 2.8.10 → 2.9.0

data/lib/isodoc/cc/html/_coverpage.css

@@ -130,6 +130,10 @@ dl dd {
   grid-column-start: 2;
 }
 
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

data/lib/isodoc/cc/html/htmlstyle.css

@@ -130,6 +130,10 @@ dl dd {
   grid-column-start: 2;
 }
 
+dl:has(dt .stem) {
+  grid-template-columns: fit-content(8em) auto;
+}
+
 b, strong {
   font-weight: bold;
 }

data/lib/metanorma/cc/basicdoc.rng

@@ -954,30 +954,36 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
   <define name="TdBody">
     <choice>
       <zeroOrMore>
-        <group>
-          <a:documentation>Table cell is a block</a:documentation>
+        <choice>
+          <a:documentation>Table cell is a block; footnotes admitted inline (metanorma-model-iso#154)</a:documentation>
           <ref name="TextElement"/>
-        </group>
+          <ref name="fn"/>
+        </choice>
       </zeroOrMore>
       <oneOrMore>
-        <ref name="paragraph-with-footnote">
-          <a:documentation>Table cell contains a block</a:documentation>
-        </ref>
+        <choice>
+          <a:documentation>Table cell contains a block; notes admitted alongside paragraphs (metanorma-model-iso#157)</a:documentation>
+          <ref name="paragraph-with-footnote"/>
+          <ref name="note"/>
+        </choice>
       </oneOrMore>
     </choice>
   </define>
   <define name="TdNoIdBody">
     <choice>
       <zeroOrMore>
-        <group>
-          <a:documentation>Table cell is a block</a:documentation>
+        <choice>
+          <a:documentation>Table cell is a block; footnotes admitted inline (metanorma-model-iso#154)</a:documentation>
           <ref name="TextElement"/>
-        </group>
+          <ref name="fn"/>
+        </choice>
       </zeroOrMore>
       <oneOrMore>
-        <ref name="paragraph-with-footnote-no-id">
-          <a:documentation>Table cell contains a block</a:documentation>
-        </ref>
+        <choice>
+          <a:documentation>Table cell contains a block; notes admitted alongside paragraphs (metanorma-model-iso#157)</a:documentation>
+          <ref name="paragraph-with-footnote-no-id"/>
+          <ref name="note-no-id"/>
+        </choice>
       </oneOrMore>
     </choice>
   </define>
@@ -1030,16 +1036,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </ref>
     </optional>
     <oneOrMore>
-      <choice>
+      <ref name="ExampleBodyContent">
         <a:documentation>Content of the example</a:documentation>
-        <ref name="formula"/>
-        <ref name="ul"/>
-        <ref name="ol"/>
-        <ref name="dl"/>
-        <ref name="quote"/>
-        <ref name="sourcecode"/>
-        <ref name="paragraph-with-footnote"/>
-      </choice>
+      </ref>
     </oneOrMore>
     <zeroOrMore>
       <ref name="note">
@@ -1047,6 +1046,23 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </ref>
     </zeroOrMore>
   </define>
+  <define name="ExampleBodyContent">
+    <a:documentation>Content alternatives of an example. Named as an extension hook: higher
+layers may admit further alternatives additively (|=) without copying the
+example model (metanorma-model-iso#160). note is admitted interleaved as
+attested authoring practice (metanorma-model-iso#157, maintainer hierarchy
+reservation recorded there)</a:documentation>
+    <choice>
+      <ref name="formula"/>
+      <ref name="ul"/>
+      <ref name="ol"/>
+      <ref name="dl"/>
+      <ref name="quote"/>
+      <ref name="sourcecode"/>
+      <ref name="paragraph-with-footnote"/>
+      <ref name="note"/>
+    </choice>
+  </define>
   <define name="ExampleNoIdBody">
     <optional>
       <ref name="tname">
@@ -1054,16 +1070,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </ref>
     </optional>
     <oneOrMore>
-      <choice>
+      <ref name="ExampleNoIdBodyContent">
         <a:documentation>Content of the example</a:documentation>
-        <ref name="formula-no-id"/>
-        <ref name="ul-no-id"/>
-        <ref name="ol-no-id"/>
-        <ref name="dl-no-id"/>
-        <ref name="quote-no-id"/>
-        <ref name="sourcecode-no-id"/>
-        <ref name="paragraph-with-footnote-no-id"/>
-      </choice>
+      </ref>
     </oneOrMore>
     <zeroOrMore>
       <ref name="note-no-id">
@@ -1071,6 +1080,20 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </ref>
     </zeroOrMore>
   </define>
+  <define name="ExampleNoIdBodyContent">
+    <a:documentation>Content alternatives of the no-id example variant; extension hook as
+ExampleBodyContent (metanorma-model-iso#160)</a:documentation>
+    <choice>
+      <ref name="formula-no-id"/>
+      <ref name="ul-no-id"/>
+      <ref name="ol-no-id"/>
+      <ref name="dl-no-id"/>
+      <ref name="quote-no-id"/>
+      <ref name="sourcecode-no-id"/>
+      <ref name="paragraph-with-footnote-no-id"/>
+      <ref name="note-no-id"/>
+    </choice>
+  </define>
   <define name="admonition">
     <a:documentation>A sidebar block outside of the main flow of text, conveying particular warnings or supplementary text to the reader</a:documentation>
     <element name="admonition">
@@ -1527,12 +1550,16 @@ to indicate that the index range covers a range of locations between the current
       <ref name="index-primary">
         <a:documentation>Primary index term to be recorded at the current location</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>Secondary index term to be recorded at the current location</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>Tertiary index term to be recorded at the current </a:documentation>
+        </ref>
+      </optional>
     </element>
   </define>
   <define name="index-xref">
@@ -1547,12 +1574,16 @@ The text in the inline element is the primary index term to be be cross-referenc
       <ref name="index-primary">
         <a:documentation>The primary index term to be cross-referenced</a:documentation>
       </ref>
-      <ref name="index-secondary">
-        <a:documentation>The secondary index term to be cross-referenced</a:documentation>
-      </ref>
-      <ref name="index-tertiary">
-        <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
-      </ref>
+      <optional>
+        <ref name="index-secondary">
+          <a:documentation>The secondary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
+      <optional>
+        <ref name="index-tertiary">
+          <a:documentation>The tertiary index term to be cross-referenced</a:documentation>
+        </ref>
+      </optional>
       <element name="target">
         <a:documentation>The index term to be cross-referenced to</a:documentation>
         <oneOrMore>
@@ -1933,7 +1964,8 @@ or as the string "auto"</a:documentation>
   <define name="mathml">
     <a:documentation>Encoding of MathML: the official W3C MathML 4 grammar (namespace
 http://www.w3.org/1998/Math/MathML), via the metanorma wrapper in
-grammars/mathml/. See grammars/mathml/README.adoc and basicdoc-models#35.</a:documentation>
+grammars/mathml/. See grammars/mathml/README.adoc, basicdoc-models#35,
+and the MathML 3 -&gt; 4 migration: basicdoc-models#39 / metanorma#585.</a:documentation>
     <externalRef href="metanorma-mathml.rng"/>
   </define>
   <define name="StemAttributes">

data/lib/metanorma/cc/biblio-standoc.rng

@@ -50,6 +50,24 @@
         </choice>
       </element>
     </define>
+    <define name="formattedref">
+      <a:documentation>Footnotes are admitted in formatted references in the standoc context:
+free-form bibliography entries may carry authored footnotes
+(metanorma-model-iso#154)</a:documentation>
+      <element name="formattedref">
+        <optional>
+          <attribute name="format">
+            <a:documentation>format of formatted reference; Metanorma assumes references are formatted as Metanorma XML</a:documentation>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <choice>
+            <ref name="TextElement"/>
+            <ref name="fn"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <a:documentation>The extension point of the bibliographic description of a standardisation document</a:documentation>