metanorma-jis 1.1.6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2119d2690172777a1cc17607f0e31b1b8f013517149c80788bf6581b1311af89
-  data.tar.gz: 9907b1fd89aad50b3c36da002bc7f18ed14d2c017d8b218547253d0881fe8a13
+  metadata.gz: 41ed633ae82eeba0b4cc6e96a3648e189b71fc20e0b0cf751cb513533ea26d91
+  data.tar.gz: bbb19bd39b02105cebff6eba058c66d78d6d3e50fbeb56716995bd0b75e88c7f
 SHA512:
-  metadata.gz: fc82ae6e2c5f5d7ec37d2c456c2a2139f6df65b50dddf6cd8d652d06bd6c9ed0b90baa84ad2c9bc6f97bdb4fe1b6e54a307b8a0aea2dccc7cbdea8ea4fad8555
-  data.tar.gz: 7b98797cb5b25646b7ddd50d51997a331075a13aa6c4340b68b599114a4a28fddcb9ae65989cc8b5ab380f51aad4f75c84d6515cb0bc828ecc748451b87d91a7
+  metadata.gz: 80fdd530e51886b1aa85cf8c3eed317ba5fc766af95aeda274356c4a76219929f1b38cd4d110a6aa9c96508635fda49dc997de76873f06cbe3d23687a840785c
+  data.tar.gz: e40ec0a3e09f8be4fd51f7b511194bd973307025e9f73eef32e8529158b3bd459b60cb05b8d49cdee6fe1bfebb84094d188d1e6bead04cb325997a4b04674fb0

data/lib/isodoc/jis/jis.international-standard.xsl

@@ -1163,7 +1163,7 @@
 						<xsl:attribute name="id">firstpage_id_0</xsl:attribute>
 					</xsl:if>
 					<fo:block id="firstpage_id_{$num}">
-						<fo:instream-foreign-object content-width="81mm" fox:alt-text="JIS Logo">
+						<fo:instream-foreign-object content-width="81mm" fox:alt-text="JIS Logo" fox:placement="Block">
 							<xsl:copy-of select="$JIS-Logo"/>
 						</fo:instream-foreign-object>
 					</fo:block>
@@ -1233,7 +1233,7 @@
 						<xsl:if test="$first = 'true'">
 							<xsl:attribute name="id">firstpage_id_<xsl:value-of select="$num"/></xsl:attribute>
 						</xsl:if>
-						<fo:external-graphic fox:alt-text="Image Cover">
+						<fo:external-graphic fox:alt-text="Image Cover" fox:placement="Block">
 							<xsl:attribute name="src">
 								<xsl:text>data:application/pdf;base64,</xsl:text>
 								<xsl:choose>
@@ -1534,7 +1534,7 @@
 				<xsl:attribute name="left"><xsl:value-of select="$left"/></xsl:attribute>
 			</xsl:if>
 			<fo:block>
-				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color">
+				<fo:instream-foreign-object content-height="{$pageHeight}mm" fox:alt-text="Background color" fox:placement="Block">
 					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="{$width}" height="{$pageHeight}mm">
 						<rect width="{$pageWidth}mm" height="{$pageHeight}mm" style="fill:{$color_background};stroke-width:0;fill-opacity:{$opacity}"/>
 					</svg>
@@ -6525,7 +6525,7 @@
 		</xsl:element>
 	</xsl:template> -->
 
-	<xsl:template match="mn:span[                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
+	<xsl:template match="mn:span[                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim' or                @class = 'fmt-clause-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
 
@@ -7655,6 +7655,9 @@
 
 	<xsl:template name="refine_sourcecode-style">
 		<xsl:call-template name="setKeepAttributes"/>
+		<xsl:if test="ancestor::mn:sourcecode and parent::mn:td">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
 	<xsl:attribute-set name="sourcecode-number-style">
@@ -7981,30 +7984,30 @@
 	</xsl:template>
 
 	<!-- outer table with line numbers for sourcecode -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
-		<fo:block>
-			<fo:table width="100%" table-layout="fixed">
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] |  -->
+		<fo:block role="SKIP">
+			<fo:table width="100%" table-layout="fixed" role="SKIP">
 				<xsl:copy-of select="@id"/>
 					<fo:table-column column-width="8%"/>
 					<fo:table-column column-width="92%"/>
-					<fo:table-body>
+					<fo:table-body role="SKIP">
 						<xsl:apply-templates/>
 					</fo:table-body>
 			</fo:table>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table/mn:tbody" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']/*[local-name() = 'tbody'] |  -->
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
-		<fo:table-row>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode']//*[local-name()='tr'] |  -->
+		<fo:table-row role="SKIP">
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template>
 	<!-- first td with line numbers -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
-		<fo:table-cell>
-			<fo:block>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][not(preceding-sibling::*)]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
+		<fo:table-cell role="SKIP">
+			<fo:block role="SKIP">
 
 				<!-- set attibutes for line numbers - same as sourcecode -->
 				<xsl:variable name="sourcecode_attributes">
@@ -8012,7 +8015,7 @@
 						<xsl:call-template name="get_sourcecode_attributes"/>
 					</xsl:for-each>
 				</xsl:variable>
-				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-'))]">
+				<xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*[not(starts-with(local-name(), 'margin-') or starts-with(local-name(), 'space-') or starts-with(local-name(), 'role'))]">
 					<xsl:attribute name="{name()}">
 						<xsl:value-of select="."/>
 					</xsl:attribute>
@@ -8024,8 +8027,8 @@
 	</xsl:template>
 
 	<!-- second td with sourcecode -->
-	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
-		<fo:table-cell>
+	<xsl:template match="mn:sourcecode[@linenums = 'true']/mn:table//mn:tr/*[local-name() = 'td'][preceding-sibling::*]" priority="3"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
+		<fo:table-cell role="SKIP">
 			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
@@ -8595,7 +8598,7 @@
 		<xsl:param name="value"/>
 		<xsl:variable name="add_width" select="string-length($value) * 20"/>
 		<xsl:variable name="maxwidth" select="60 + $add_width"/>
-			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%"><!-- alignment-baseline="middle" -->
+			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-10%" fox:placement="Inline"><!-- alignment-baseline="middle" -->
 				<xsl:attribute name="height">3.5mm</xsl:attribute> <!-- 5mm -->
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -8832,11 +8835,12 @@
 			<xsl:choose>
 
 				<xsl:when test="ancestor::mn:sourcecode[@linenums = 'true'] and ancestor::*[local-name() = 'td'][1][not(preceding-sibling::*)]"> <!-- pre in the first td in the table with @linenums = 'true' -->
+					<xsl:attribute name="role">SKIP</xsl:attribute>
 					<xsl:if test="ancestor::mn:tr[1]/following-sibling::mn:tr"> <!-- is current tr isn't last -->
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 					</xsl:if>
-					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%">
+					<fo:instream-foreign-object fox:alt-text="{.}" content-width="95%" fox:placement="Inline" role="artifact">
 						<math xmlns="http://www.w3.org/1998/Math/MathML">
 							<mtext><xsl:value-of select="."/></mtext>
 						</math>
@@ -10380,19 +10384,22 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="table-name-style">
-
 				<xsl:call-template name="refine_table-name-style">
 					<xsl:with-param name="continued" select="$continued"/>
 				</xsl:call-template>
 
-				<xsl:choose>
-					<xsl:when test="$continued = 'true'">
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:apply-templates/>
-					</xsl:otherwise>
-				</xsl:choose>
+				<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+				<fo:block role="P">
 
+					<xsl:choose>
+						<xsl:when test="$continued = 'true'">
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates/>
+						</xsl:otherwise>
+					</xsl:choose>
+
+				</fo:block>
 			</fo:block>
 
 			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
@@ -10876,7 +10883,7 @@
 
 			<xsl:variable name="tableWithNotesAndFootnotes">
 
-				<fo:table keep-with-previous="always" role="SKIP">
+				<fo:table keep-with-previous="always" role="TFoot">
 					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
 						<xsl:variable name="name" select="local-name()"/>
 						<xsl:choose>
@@ -10914,14 +10921,14 @@
 					</xsl:choose>
 
 					<fo:table-body role="SKIP">
-						<fo:table-row role="SKIP">
+						<fo:table-row>
 							<xsl:for-each select="ancestor::mn:table[1]">
 								<xsl:call-template name="setTableStyles">
 									<xsl:with-param name="scope">ancestor_table</xsl:with-param>
 								</xsl:call-template>
 							</xsl:for-each>
 
-							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}" role="SKIP">
+							<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
 
 								<xsl:call-template name="refine_table-footer-cell-style"/>
 
@@ -13274,6 +13281,13 @@
 	<xsl:template name="refine_note-style">
 	</xsl:template> <!-- refine_note-style -->
 
+	<xsl:attribute-set name="note-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set> <!-- note-block-style -->
+
+	<xsl:template name="refine_note-block-style">
+	</xsl:template> <!-- refine_note-block-style -->
+
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
 
@@ -13379,9 +13393,6 @@
 
 	</xsl:template>
 
-	<xsl:template name="refine_note_block_style">
-	</xsl:template> <!-- refine_note_block_style -->
-
 	<xsl:template match="mn:note/mn:p">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
@@ -13502,9 +13513,9 @@
 	<!-- ====== -->
 
 	<xsl:attribute-set name="quote-container-style">
+		<xsl:attribute name="role">BlockQuote</xsl:attribute>
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
-		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -13531,6 +13542,7 @@
 	</xsl:template> <!-- refine_quote-style -->
 
 	<xsl:attribute-set name="quote-source-style">
+		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="text-align">right</xsl:attribute>
 		<xsl:attribute name="margin-right">-12mm</xsl:attribute>
 	</xsl:attribute-set> <!-- quote-source-style -->
@@ -13563,7 +13575,7 @@
 					<xsl:call-template name="refine_quote-style"/>
 
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-						<fo:block role="BlockQuote">
+						<fo:block role="SKIP"> <!-- BlockQuote -->
 							<xsl:apply-templates select="./node()[not(self::mn:author) and         not(self::mn:fmt-source) and         not(self::mn:attribution)]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
 					</fo:block-container>
@@ -13572,11 +13584,15 @@
 					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block xsl:use-attribute-sets="quote-source-style">
 							<xsl:call-template name="refine_quote-source-style"/>
-							<!-- — ISO, ISO 7301:2011, Clause 1 -->
-							<xsl:apply-templates select="mn:author"/>
-							<xsl:apply-templates select="mn:fmt-source"/>
-							<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
-							<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
+
+							<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+							<fo:block role="P">
+								<!-- — ISO, ISO 7301:2011, Clause 1 -->
+								<xsl:apply-templates select="mn:author"/>
+								<xsl:apply-templates select="mn:fmt-source"/>
+								<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
+								<xsl:apply-templates select="mn:attribution/mn:p/node()"/>
+							</fo:block>
 						</fo:block>
 					</fo:block-container>
 				</xsl:if>
@@ -14133,7 +14149,7 @@
 
 					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
 
-					<fo:external-graphic src="{$src}" vertical-align="middle">
+					<fo:external-graphic src="{$src}" vertical-align="middle" fox:placement="Inline">
 						<xsl:call-template name="addAltText"/>
 
 						<xsl:if test="parent::mn:logo"> <!-- publisher's logo -->
@@ -14198,7 +14214,7 @@
 					<xsl:choose>
 						<xsl:when test="$isDeleted = 'true'">
 							<!-- enclose in svg -->
-							<fo:instream-foreign-object>
+							<fo:instream-foreign-object fox:placement="Block">
 								<xsl:attribute name="width">100%</xsl:attribute>
 								<xsl:attribute name="content-height">100%</xsl:attribute>
 								<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -14219,7 +14235,7 @@
 							<xsl:value-of select="concat('scale=', $scale,', indent=', $indent)"/>
 							</fo:block> -->
 
-							<fo:external-graphic src="{$src}">
+							<fo:external-graphic src="{$src}" fox:placement="Block">
 								<xsl:call-template name="addAltText"/>
 
 								<xsl:choose>
@@ -14566,7 +14582,7 @@
 											</xsl:if>
 											<fo:block text-depth="0" line-height="0" font-size="0">
 
-												<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+												<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
 													<xsl:attribute name="width">100%</xsl:attribute>
 													<xsl:attribute name="content-height">100%</xsl:attribute>
 													<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -14615,7 +14631,7 @@
 					<xsl:copy>
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
-						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
+						<fo:instream-foreign-object fox:alt-text="{$alt-text}" fox:placement="Block">
 
 							<xsl:choose>
 								<xsl:when test="$image_class = 'corrigenda-tag'">
@@ -14680,6 +14696,10 @@
 								<xsl:attribute name="content-height"><xsl:value-of select="round($scale_x * $scale_y * 100)"/>%</xsl:attribute>
 							</xsl:if>
 
+							<xsl:if test="self::fo:inline">
+								<xsl:attribute name="fox:placement">Inline</xsl:attribute>
+							</xsl:if>
+
 							<xsl:copy-of select="$svg_content"/>
 
 							<!-- <debug>
@@ -14955,10 +14975,12 @@
 	<xsl:template match="mn:figure/mn:fmt-name |         mn:image/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
-
 				<xsl:call-template name="refine_figure-name-style"/>
 
-				<xsl:apply-templates/>
+				<!-- <Caption><P> tags, see https://github.com/metanorma/metanorma-pdfa/issues/81 -->
+				<fo:block role="P">
+					<xsl:apply-templates/>
+				</fo:block>
 			</fo:block>
 		</xsl:if>
 	</xsl:template>
@@ -14980,6 +15002,7 @@
 
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
+		<xsl:attribute name="role">P</xsl:attribute>
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-style -->
@@ -14988,6 +15011,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="formula-stem-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-stem-block-style -->
 
@@ -14995,6 +15019,7 @@
 	</xsl:template> <!-- refine_formula-stem-block-style -->
 
 	<xsl:attribute-set name="formula-stem-number-style">
+		<xsl:attribute name="role">Span</xsl:attribute>
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-stem-number-style -->
 	<!-- End Formula's styles -->
@@ -15003,12 +15028,25 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="mathml-style">
+		<xsl:attribute name="role">Formula</xsl:attribute>
 		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_mathml-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="mathml-instream-foreign-object-style">
+		<xsl:attribute name="fox:alt-text">Math</xsl:attribute>
+		<xsl:attribute name="fox:actual-text">Math</xsl:attribute>
+		<xsl:attribute name="fox:placement">Inline</xsl:attribute>
+	</xsl:attribute-set> <!-- mathml-instream-foreign-object-style -->
+
+	<xsl:template name="refine_mathml-instream-foreign-object-style">
+		<xsl:if test="ancestor::mn:formula">
+			<xsl:attribute name="fox:placement">Block</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_mathml-instream-foreign-object-style -->
+
 	<!-- ====== -->
 	<!-- formula  -->
 	<!-- ====== -->
@@ -15024,7 +15062,7 @@
 			</xsl:if>
 			<fo:block-container margin-left="0mm" role="SKIP">
 				<xsl:call-template name="setNamedDestination"/>
-				<fo:block id="{@id}">
+				<fo:block id="{@id}" role="SKIP">
 					<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/> <!-- formula's number will be process in 'stem' template -->
 				</fo:block>
 			</fo:block-container>
@@ -15057,22 +15095,22 @@
 
 			<xsl:call-template name="refine_formula-style"/>
 
-			<fo:table table-layout="fixed" width="100%">
+			<fo:table table-layout="fixed" width="100%" role="SKIP">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
+				<fo:table-body role="SKIP">
+					<fo:table-row role="SKIP">
+						<fo:table-cell display-align="center" role="SKIP">
+							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
 
 								<xsl:call-template name="refine_formula-stem-block-style"/>
 
 								<xsl:apply-templates/>
 							</fo:block>
 						</fo:table-cell>
-						<fo:table-cell display-align="center">
+						<fo:table-cell display-align="center" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
+							<fo:block xsl:use-attribute-sets="formula-stem-number-style">
 
 								<xsl:for-each select="../mn:fmt-name">
 									<xsl:call-template name="setIDforNamedDestination"/>
@@ -15220,9 +15258,9 @@
 			<xsl:apply-templates select="." mode="mathml"/>
 		</xsl:variable>
 
-		<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
+		<fo:instream-foreign-object xsl:use-attribute-sets="mathml-instream-foreign-object-style">
 
-			<xsl:call-template name="refine_mathml_insteam_object_style"/>
+			<xsl:call-template name="refine_mathml-instream-foreign-object-style"/>
 
 			<xsl:if test="$isGenerateTableIF = 'false'">
 				<!-- put MathML in Actual Text -->
@@ -15246,9 +15284,6 @@
 		</fo:instream-foreign-object>
 	</xsl:template>
 
-	<xsl:template name="refine_mathml_insteam_object_style">
-	</xsl:template> <!-- refine_mathml_insteam_object_style -->
-
 	<xsl:template match="mathml:*" mode="mathml_actual_text">
 		<!-- <xsl:text>a+b</xsl:text> -->
 		<xsl:text>&lt;</xsl:text>
@@ -16483,8 +16518,10 @@
 
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
 
+	<!-- commented 2026-08-06: from https://github.com/metanorma/metanorma-standoc/issues/1140:
+			Presentation XML will no longer contain notes following bibitem, those notes will have been moved in Presentation XML to inside bibitem, and then duplicated to inside formattedref. -->
 	<!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
-	<xsl:template match="mn:references/mn:note" priority="2"/> <!-- [not(@normative='true')] -->
+	<!-- <xsl:template match="mn:references/mn:note" priority="2"/>--> <!-- [not(@normative='true')] -->
 
 	<xsl:template name="insertListItem_Bibitem">
 		<xsl:choose>
@@ -17163,7 +17200,7 @@
 			<xsl:call-template name="set_id_metanorma_form_item">
 				<xsl:with-param name="form_item_type" select="$form_item_type"/>
 			</xsl:call-template>
-			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -17190,7 +17227,7 @@
 			<xsl:call-template name="set_id_metanorma_form_item">
 				<xsl:with-param name="form_item_type" select="$form_item_type"/>
 			</xsl:call-template>
-			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
+			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%" fox:placement="Inline">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
@@ -17482,7 +17519,9 @@
 				</xsl:variable>
 				<mnx:example id="{@id}" alt-text="{normalize-space($example_name)}">
 					<xsl:element name="fmt-name" namespace="{$namespace_full}">
-						<xsl:value-of select="mn:fmt-xref-label[@container]"/>
+						<xsl:call-template name="capitalize"><!-- https://github.com/metanorma/metanorma-pdfa/issues/72 -->
+							<xsl:with-param name="str" select="mn:fmt-xref-label[@container]"/>
+						</xsl:call-template>
 						<xsl:if test="normalize-space($example_name) != ''">
 							<xsl:value-of select="mn:fmt-name/mn:span[@class = 'fmt-caption-delim']"/>
 							<xsl:copy-of select="$example_name"/>
@@ -19299,7 +19338,8 @@
 	<xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
 		<fo:block break-after="page"/>
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
+			<xsl:call-template name="addTagElementT"/>
 			<xsl:call-template name="setId"/>
 			<xsl:call-template name="addReviewHelper"/>
 			<xsl:apply-templates/>
@@ -19388,7 +19428,7 @@
 
 	<xsl:template match="mn:blacksquare" name="blacksquare">
 		<fo:inline padding-right="2.5mm" baseline-shift="5%">
-			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
+			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad" fox:placement="Inline">
 					<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 2 2">
 						<rect x="0" y="0" width="2" height="2" fill="black"/>
 					</svg>
@@ -20370,13 +20410,13 @@
 		<xsl:param name="bitmap_width" select="$pageWidth"/>
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-				<fo:instream-foreign-object fox:alt-text="Image Front">
+				<fo:instream-foreign-object fox:alt-text="Image Front" fox:placement="Block">
 					<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
 					<xsl:call-template name="getSVG"/>
 				</fo:instream-foreign-object>
 			</xsl:when>
 			<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-				<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
+				<fo:external-graphic src="{@src}" fox:alt-text="Image Front" fox:placement="Block"/>
 			</xsl:when>
 			<xsl:otherwise> <!-- bitmap image -->
 				<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
@@ -20386,7 +20426,7 @@
 							<xsl:with-param name="src" select="$coverimage_src"/>
 						</xsl:call-template>
 					</xsl:variable>
-					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front" fox:placement="Block"/>
 				</xsl:if>
 			</xsl:otherwise>
 		</xsl:choose>

data/lib/isodoc/jis/xref.rb

@@ -160,10 +160,11 @@ module IsoDoc
       end
 
       def commentary_name_anchors(clause, num, root, level)
+        t = clause_title(clause)
         @anchors[clause["id"]] =
           { label: num, xref: labelled_autonum(@labels["clause"], num),
             container: root,
-            title: clause_title(clause), level: level, type: "clause",
+            title: t && semx(clause, t, "title"), level: level, type: "clause",
             elem: @labels["clause"] }
       end
 

data/lib/metanorma/jis/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">

data/lib/metanorma/jis/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>

data/lib/metanorma/jis/isodoc.rng

@@ -27,11 +27,89 @@
     <define name="amend">
       <a:documentation>Block expressing a machine-readable change in a document</a:documentation>
       <element name="amend">
+        <ref name="OptionalId"/>
         <ref name="BlockAttributes"/>
-        <ref name="AmendType"/>
+        <attribute name="change">
+          <a:documentation>The type of change described in this block</a:documentation>
+          <choice>
+            <value>add</value>
+            <value>modify</value>
+            <value>delete</value>
+            <value>replace</value>
+          </choice>
+        </attribute>
+        <optional>
+          <attribute name="path"/>
+        </optional>
+        <optional>
+          <attribute name="path_end"/>
+        </optional>
+        <optional>
+          <attribute name="title"/>
+        </optional>
+        <optional>
+          <attribute name="position">
+            <choice>
+              <value>before</value>
+              <value>after</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <element name="location">
+            <a:documentation>The location(s) in the original document which have undergone the change described in this block</a:documentation>
+            <zeroOrMore>
+              <choice>
+                <ref name="locality"/>
+                <ref name="localityStack"/>
+              </choice>
+            </zeroOrMore>
+          </element>
+        </optional>
         <zeroOrMore>
           <ref name="autonumber">
-            <a:documentation>Specification of how blocks of a given class should be autonumbered within an AmendBlock newContent element</a:documentation>
+            <a:documentation>Specification of how blocks of a given class should be autonumbered within the newcontent element.
+Precedes the content it numbers</a:documentation>
+          </ref>
+        </zeroOrMore>
+        <zeroOrMore>
+          <element name="description">
+            <a:documentation>Description(s) of the change described in this block</a:documentation>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+          </element>
+        </zeroOrMore>
+        <optional>
+          <element name="newcontent">
+            <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or clauses</a:documentation>
+            <ref name="OptionalId"/>
+            <zeroOrMore>
+              <choice>
+                <ref name="BasicBlock"/>
+                <ref name="clause"/>
+              </choice>
+            </zeroOrMore>
+          </element>
+        </optional>
+        <zeroOrMore>
+          <element name="description">
+            <a:documentation>Further description(s) of the change, following the new content
+(e.g. consequential renumbering instructions)</a:documentation>
+            <oneOrMore>
+              <ref name="BasicBlock"/>
+            </oneOrMore>
+          </element>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="classification">
+            <a:documentation>Classification of the change</a:documentation>
+          </ref>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="contributor">
+            <a:documentation>Contributor responsible for the change</a:documentation>
           </ref>
         </zeroOrMore>
       </element>
@@ -42,6 +120,27 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
+    <define name="image-no-id">
+      <a:documentation>Container for image content: optional ID attributes recursively (for use in Relaton, metadata).
+The embedded SVG content is admitted here as in ImageBody, and is NOT subject to the no-id
+convention of this model family: SVGs carry ids pervasively, and those ids cannot be stripped,
+because they are load-bearing for image-map functionality (svgmap hyperlink targets)</a:documentation>
+      <element name="image">
+        <ref name="OptionalId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>image can contain SVG XML, which is used to access its identifiers within the Metanorma XML</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -49,7 +148,7 @@ the type attribute defaults to `review` for reviews</a:documentation>
         <ref name="RequiredId"/>
         <ref name="ReviewAttributes"/>
         <oneOrMore>
-          <ref name="paragraph">
+          <ref name="BasicBlock">
             <a:documentation>Reviewer comments content</a:documentation>
           </ref>
         </oneOrMore>
@@ -85,10 +184,14 @@ the type attribute defaults to `review` for reviews</a:documentation>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
-        <a:documentation>Title proper for a clause</a:documentation>
+        <a:documentation>Title proper for a clause. Footnotes on section headings are admitted
+(metanorma-model-iso#154)</a:documentation>
         <ref name="RequiredId"/>
         <zeroOrMore>
-          <ref name="TextElement"/>
+          <choice>
+            <ref name="TextElement"/>
+            <ref name="fn"/>
+          </choice>
         </zeroOrMore>
       </element>
       <zeroOrMore>
@@ -154,13 +257,17 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
       <ref name="BlockAttributes"/>
       <optional>
         <attribute name="type">
-          <a:documentation>Type of numbering to be applied to the list items</a:documentation>
+          <a:documentation>Type of numbering to be applied to the list items: one of the five named
+numbering styles, or a renderer-native numbering format string passed
+through for the target rendering language to expand (e.g. xml2rfc v2
+format strings such as "R%d", carried through by metanorma-ietf)</a:documentation>
           <choice>
             <value>roman</value>
             <value>alphabet</value>
             <value>arabic</value>
             <value>roman_upper</value>
             <value>alphabet_upper</value>
+            <text/>
           </choice>
         </attribute>
       </optional>
@@ -220,30 +327,23 @@ Sources are currently only rendered in metanorma-plateau</a:documentation>
         </attribute>
       </optional>
     </define>
-    <define name="ExampleBody">
-      <optional>
-        <ref name="tname">
-          <a:documentation>The caption of the example</a:documentation>
-        </ref>
-      </optional>
-      <oneOrMore>
-        <choice>
-          <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"/>
-          <ref name="figure"/>
-        </choice>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="note">
-          <a:documentation>Notes whose scope is the current block</a:documentation>
-        </ref>
-      </zeroOrMore>
+    <define name="ExampleBodyContent">
+      <a:documentation>Content alternatives of an example in the isodoc context: as basicdoc,
+with figure admitted, and note admitted only trailing the example body
+rather than interleaved. The content hook is overridden rather than
+ExampleBody itself, so that the extension seam survives: additive
+admissions (|=) from higher layers, such as illustrative provisions in
+reqt, attach to the definition that governs (metanorma-model-iso#160)</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="figure"/>
+      </choice>
     </define>
     <define name="TableBody">
       <optional>
@@ -413,20 +513,22 @@ and is intended to be referenced by a callout within the source code</a:document
     <define name="source">
       <element name="source">
         <attribute name="status">
-          <a:documentation>The status of the term as it is used in this document, relative to its definition in the original document</a:documentation>
+          <a:documentation>The status of the block content, relative to the source it has been taken from</a:documentation>
           <ref name="SourceStatusType"/>
         </attribute>
-        <attribute name="type">
-          <a:documentation>The type of the managed term in the present context</a:documentation>
-          <ref name="SourceTypeType"/>
-        </attribute>
+        <optional>
+          <attribute name="type">
+            <a:documentation>The type of the source relation. Term-management vocabulary (authoritative/lineage);
+not normally applicable to block attribution, and omitted by the generator for blocks</a:documentation>
+            <ref name="SourceTypeType"/>
+          </attribute>
+        </optional>
         <ref name="origin">
-          <a:documentation>The original document and location where the term definition has been obtained from</a:documentation>
+          <a:documentation>The original document and location the block content has been obtained from</a:documentation>
         </ref>
         <optional>
           <ref name="modification">
-            <a:documentation>Any changes that the definition of the term has undergone relative to the original document,
-in order to be applicable in this standardisation document</a:documentation>
+            <a:documentation>Any changes that the block content has undergone relative to the original document</a:documentation>
           </ref>
         </optional>
       </element>
@@ -852,6 +954,11 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the figure block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="height">
+        <a:documentation>Height of the figure block in rendering</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributesCore"/>
   </define>
   <define name="SourceAttributes" combine="interleave">
@@ -1066,6 +1173,9 @@ parargaph sources are currently only rendered in metanorma-plateau</a:documentat
     <a:documentation>Internal reference (for Metanorma document collections)</a:documentation>
   </define>
   <define name="TextElement" combine="choice">
+    <a:documentation>Form input elements are admitted as inline content generally, mirroring
+HTML phrasing content: inputs sit inside paragraphs and table cells
+within forms (metanorma-model-iso#145)</a:documentation>
     <choice>
       <ref name="concept"/>
       <ref name="add"/>
@@ -1073,13 +1183,18 @@ parargaph sources are currently only rendered in metanorma-plateau</a:documentat
       <ref name="span"/>
       <ref name="erefstack"/>
       <ref name="date_inline"/>
+      <ref name="FormInput"/>
+      <ref name="formlabel"/>
     </choice>
   </define>
   <define name="PureTextElement" combine="choice">
     <ref name="passthrough_inline"/>
   </define>
   <define name="NestedTextElement" combine="choice">
-    <ref name="erefstack"/>
+    <choice>
+      <ref name="erefstack"/>
+      <ref name="concept"/>
+    </choice>
   </define>
   <define name="passthrough_inline">
     <a:documentation>Inline text not to be processed semantically, and left in the markup of a target rendering language (e.g. raw HTML)</a:documentation>
@@ -1227,9 +1342,26 @@ That concept may be defined as a term within the current document, or it may be
         <ref name="termref">
           <a:documentation>Link to a definition of the term in a termbase</a:documentation>
         </ref>
+        <ref name="errormsg">
+          <a:documentation>Error message inserted by the Metanorma generator, replacing a concept reference
+that could not be resolved. Only ever emitted by Metanorma itself, never authored;
+its presence marks the document as not ready for publication</a:documentation>
+        </ref>
       </choice>
     </element>
   </define>
+  <define name="errormsg">
+    <a:documentation>Error message inserted by the Metanorma generator, replacing markup it could not process</a:documentation>
+    <element name="errormsg">
+      <zeroOrMore>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -1272,12 +1404,16 @@ That concept may be defined as a term within the current document, or it may be
     <a:documentation>Input form, for use under HTML</a:documentation>
     <element name="form">
       <ref name="RequiredId"/>
-      <attribute name="name">
-        <a:documentation>Name of the input form block</a:documentation>
-      </attribute>
-      <attribute name="action">
-        <a:documentation>Action to be taken on submission of the input form</a:documentation>
-      </attribute>
+      <optional>
+        <attribute name="name">
+          <a:documentation>Name of the input form block</a:documentation>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="action">
+          <a:documentation>Action to be taken on submission of the input form</a:documentation>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="class">
           <a:documentation>Class of input form</a:documentation>
@@ -1289,8 +1425,13 @@ avoid duplicating the custom-class slot in BlockAttributes. Treated like
 figure. See metanorma/metanorma-standoc#1197</a:documentation>
       </ref>
       <zeroOrMore>
-        <!-- Input form contents -->
+        <!--
+          Input form contents: as in HTML, a form contains block-level content,
+          with form input elements appearing inline within it
+        -->
         <choice>
+          <ref name="paragraph-with-footnote"/>
+          <ref name="table"/>
           <ref name="TextElement"/>
           <ref name="FormInput"/>
           <ref name="formlabel"/>
@@ -1734,14 +1875,18 @@ terms sections</a:documentation>
         </ref>
       </optional>
       <oneOrMore>
-        <zeroOrMore>
+        <choice>
           <ref name="BasicBlock">
-            <a:documentation>Prefatory material, may be specific to each definition list</a:documentation>
+            <a:documentation>Prefatory or discursive material; a symbols section may consist of prose only,
+e.g. deferring to symbols defined in another standard</a:documentation>
           </ref>
-        </zeroOrMore>
-        <ref name="dl">
-          <a:documentation>Definition list containing symbols and abbreviations</a:documentation>
-        </ref>
+          <ref name="dl">
+            <a:documentation>Definition list(s) containing symbols and abbreviations</a:documentation>
+          </ref>
+          <ref name="definitions">
+            <a:documentation>Subsections of the symbols section</a:documentation>
+          </ref>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -2011,22 +2156,31 @@ used in document amendments</a:documentation>
         <a:documentation>Type of relation of term applicable</a:documentation>
         <ref name="RelatedTermType"/>
       </attribute>
-      <element name="preferred">
-        <a:documentation>Preferred designation of the term related to the current term</a:documentation>
-        <ref name="Designation"/>
-      </element>
       <choice>
-        <ref name="eref">
-          <a:documentation>Link to a definition of the term in a bibliographic entry</a:documentation>
-        </ref>
-        <ref name="erefstack">
-          <a:documentation>Stack of links to a definition of the term in a bibliographic entry</a:documentation>
-        </ref>
-        <ref name="xref">
-          <a:documentation>Link to a definition of the term in an element of the current document</a:documentation>
-        </ref>
-        <ref name="termref">
-          <a:documentation>Link to a definition of the term in a termbase</a:documentation>
+        <group>
+          <element name="preferred">
+            <a:documentation>Preferred designation of the term related to the current term</a:documentation>
+            <ref name="Designation"/>
+          </element>
+          <choice>
+            <ref name="eref">
+              <a:documentation>Link to a definition of the term in a bibliographic entry</a:documentation>
+            </ref>
+            <ref name="erefstack">
+              <a:documentation>Stack of links to a definition of the term in a bibliographic entry</a:documentation>
+            </ref>
+            <ref name="xref">
+              <a:documentation>Link to a definition of the term in an element of the current document</a:documentation>
+            </ref>
+            <ref name="termref">
+              <a:documentation>Link to a definition of the term in a termbase</a:documentation>
+            </ref>
+          </choice>
+        </group>
+        <ref name="errormsg">
+          <a:documentation>Error message inserted by the Metanorma generator, replacing a related-term
+reference that could not be resolved. Only ever emitted by Metanorma itself,
+never authored; its presence marks the document as not ready for publication</a:documentation>
         </ref>
       </choice>
     </element>
@@ -2177,16 +2331,21 @@ used in document amendments</a:documentation>
           <data type="boolean"/>
         </attribute>
       </optional>
-      <element name="name">
-        <a:documentation>The textual form of the designation</a:documentation>
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="index"/>
-            <ref name="index-xref"/>
-          </choice>
-        </zeroOrMore>
-      </element>
+      <oneOrMore>
+        <element name="name">
+          <a:documentation>The textual form of the designation. Repeated for language variants of the
+same designation: repetition of name with language attributes replaces the
+retired variant element (metanorma-standoc#940, metanorma-model-iso#155)</a:documentation>
+          <ref name="LocalizedStringAttributes"/>
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </oneOrMore>
       <optional>
         <element name="abbreviation-type">
           <a:documentation>Type of abbreviation that constitutes the designation, according to how it is formed</a:documentation>
@@ -2556,6 +2715,7 @@ to better fit some local requirement, though still with the intent of retaining
           <value>sourcecode</value>
           <value>example</value>
           <value>note</value>
+          <value>clause</value>
         </choice>
       </attribute>
       <text>

data/lib/metanorma/jis/reqt.rng

@@ -35,9 +35,12 @@ the tag name of the top level containers</a:documentation>
         <ref name="ReqtObligationType"/>
       </attribute>
     </optional>
-    <attribute name="id">
-      <data type="ID"/>
-    </attribute>
+    <ref name="RequiredId">
+      <a:documentation>Identification of provisions routed through the shared ID patterns,
+like every other identified block: content GUID in `id`, with the
+isodoc context adding the user-supplied `anchor` (e.g. Modspec
+identifiers) and `source` (metanorma-model-iso#149)</a:documentation>
+    </ref>
     <ref name="NumberingAttributes"/>
     <ref name="BlockAttributesCore">
       <a:documentation>requirement carries its own semantic `class` (provision class, below), so
@@ -126,6 +129,15 @@ interruption by other sub-containers</a:documentation>
           <a:documentation>Provisions nested within this provision, which cannot be referenced autonomously and have
 subclasses specific to the parent provision. Not expressed with provision metadata</a:documentation>
         </ref>
+        <ref name="requirement">
+          <a:documentation>Provisions nested within this provision, which are self-standing and do not have
+subclasses specific to the parent provision. Interleaved with the other
+sub-containers: a requirements class alternates descriptions with its member
+provisions, and descriptions resume after interruption
+(metanorma-model-iso#160)</a:documentation>
+        </ref>
+        <ref name="recommendation"/>
+        <ref name="permission"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -133,15 +145,17 @@ subclasses specific to the parent provision. Not expressed with provision metada
         <a:documentation>A list of references for the requirement, following the Relaton model</a:documentation>
       </ref>
     </optional>
-    <zeroOrMore>
-      <choice>
-        <a:documentation>Provisions nested within this provision, which are self-standing and do not have
-subclasses specific to the parent provision</a:documentation>
-        <ref name="requirement"/>
-        <ref name="recommendation"/>
-        <ref name="permission"/>
-      </choice>
-    </zeroOrMore>
+  </define>
+  <define name="ExampleBodyContent" combine="choice">
+    <a:documentation>Provisions presented illustratively inside examples. This shape is
+expected only in documents defining schemas and standards (e.g. the
+Modspec specification exhibiting requirement boxes), not in
+standards proper (metanorma-model-iso#160)</a:documentation>
+    <choice>
+      <ref name="requirement"/>
+      <ref name="recommendation"/>
+      <ref name="permission"/>
+    </choice>
   </define>
   <define name="reqtitle">
     <element name="title">
@@ -214,6 +228,12 @@ subclasses specific to the parent provision</a:documentation>
 mixture of the two.
 A machine-readable component can be included as source code with
 nomination of the language</a:documentation>
+    <ref name="OptionalId">
+      <a:documentation>Identification of subparts routed through the shared ID patterns
+(metanorma-model-iso#149). Optional, not required: only some generator
+pipelines (Modspec) stamp subparts with content GUIDs; others emit
+description/specification/component without ids</a:documentation>
+    </ref>
     <optional>
       <attribute name="type">
         <a:documentation>Type of sub-container.

data/lib/metanorma/jis/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Jis
-    VERSION = "1.1.6".freeze
+    VERSION = "1.2.0".freeze
   end
 end
 

data/metanorma-jis.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
   spec.add_dependency "japanese_calendar", "~> 0"
-  spec.add_dependency "metanorma-iso", "~> 3.4.2"
+  spec.add_dependency "metanorma-iso", "~> 3.5.0"
   spec.add_dependency "pubid"
 
   spec.add_development_dependency "canon"# , "= 0.2.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-jis
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: metanorma-jis lets you write JIS standards in AsciiDoc.
 test_files: []