metanorma-iso 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7748ef6add031eb09194fb7f3f03b99dff88532fbd7704a900ab429645e167
-  data.tar.gz: 827b31bb776182c7617bf662497f574a23778a093665c9e0a4dd93c4603911ef
+  metadata.gz: 714a368be85c8da9ffe28d8fa5897da7d8b0dff0939c7b108681cc5720241513
+  data.tar.gz: feb31751f9388342066e14b68dbd1589bddfe87fd6b7cf48100606f2b4c5e820
 SHA512:
-  metadata.gz: c585deba5466803f414c0f019652ef924b37ceb4667a3d8aaa56f5fddf46dc3b4220341de67684cb3aa783c9a3707aaab8711e1c1e33e142af001c04c1a2fba1
-  data.tar.gz: fe14778ada761e6f02016f9b89ddb018ccd18b3505c695aa50b679ab6b159b59eb377798acd54cfd1f38e2213a54e992169b2eaf442be9dde6197facf38e35ef
+  metadata.gz: eec64e6e178acbea0e0f391068c2cef244c22c4568490e5cf27c185497e132df5457e4bed8ffa03da71cd54fa66f55746ba83e5f67bb0ef38fd6e8b87129fbc9
+  data.tar.gz: e8effac1511a8364303574f1ec1a3ff70188c9f528700fa2c5e3fb59f35caf5e7be439e9742718b61546cc2d39a41533a6032786323603a6fcfd802dcaf463b9

data/lib/isodoc/iso/html/style-human.css

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -717,10 +707,6 @@ p.Terms {
 }
 
 /* Navigation*/
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -768,6 +754,10 @@ p.Terms {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -785,9 +775,6 @@ p.Terms {
   font-size: 100%;
 }
 
-nav {
-  line-height: 1.2em;
-}
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -812,11 +799,10 @@ nav {
     background-color: white;
   }
 }
-
-#toggle {
-  margin-left: -4em;
-  margin-top: -2em;
+nav {
+  line-height: 1.2em;
 }
+
 @media screen and (min-width: 768px) {
   #toggle {
     position: fixed;
@@ -845,6 +831,10 @@ nav {
     display: none;
   }
 }
+#toggle {
+  margin-left: -4em;
+  margin-top: -2em;
+}
 
 @media screen and (min-width: 768px) {
   .container {
@@ -875,17 +865,6 @@ nav {
     width: 100%;
   }
 }
-.figure,
-pre,
-.pseudocode {
-  background-color: #f7f7f7;
-  font-size: {{monospacefontsize}};
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-size: {{normalfontsize}};
-}
 .figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
@@ -893,13 +872,18 @@ pre .SourceTitle,
   font-size: 1em;
   text-align: center;
 }
-
-div.figure {
+.figure,
+pre,
+.pseudocode {
+  background-color: #f7f7f7;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
+  font-size: {{normalfontsize}};
 }
+
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -912,6 +896,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1143,6 +1133,13 @@ p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1154,13 +1151,6 @@ pre,
   overflow: auto;
   font-size: {{normalfontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1233,19 +1223,23 @@ pre {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  color: black;
-  padding-left: 2em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  color: black;
+  padding-left: 2em;
+}
 .example .example-title {
   margin-left: -1.5em;
 }

data/lib/isodoc/iso/html/style-iso.css

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;
@@ -660,10 +650,6 @@ p.Terms {
 }
 
 /* Navigation*/
-#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-}
 #toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
   margin: 0;
   padding: 0;
@@ -711,6 +697,10 @@ p.Terms {
     color: black;
   }
 }
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  font-family: {{bodyfont}};
+  font-weight: 400;
+}
 @media screen and (max-width: 768px) {
   #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0 1.5em;
@@ -734,9 +724,6 @@ p.Terms {
   font-size: 100%;
 }
 
-nav {
-  line-height: 1.2em;
-}
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -761,12 +748,10 @@ nav {
     background-color: white;
   }
 }
-
-#toggle {
-  border-right: solid black 1px;
-  margin-left: -4em;
-  margin-top: -2em;
+nav {
+  line-height: 1.2em;
 }
+
 @media screen and (min-width: 768px) {
   #toggle {
     position: fixed;
@@ -795,6 +780,11 @@ nav {
     display: none;
   }
 }
+#toggle {
+  border-right: solid black 1px;
+  margin-left: -4em;
+  margin-top: -2em;
+}
 
 @media screen and (min-width: 768px) {
   .container {
@@ -824,17 +814,6 @@ nav {
     width: 100%;
   }
 }
-.figure,
-pre,
-.pseudocode {
-  background-color: #f7f7f7;
-  font-size: {{monospacefontsize}};
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-  font-size: {{normalfontsize}};
-}
 .figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
@@ -842,13 +821,18 @@ pre .SourceTitle,
   font-size: 1em;
   text-align: center;
 }
-
-div.figure {
+.figure,
+pre,
+.pseudocode {
+  background-color: #f7f7f7;
+  font-size: {{monospacefontsize}};
   line-height: 1.6em;
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow: auto;
+  font-size: {{normalfontsize}};
 }
+
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -861,6 +845,12 @@ div.figure > img, div.figure > svg {
   max-width: 100%;
   height: auto;
 }
+div.figure {
+  line-height: 1.6em;
+  padding: 1.5em;
+  margin: 2em 0 1em 0;
+  overflow: auto;
+}
 
 table div.figure {
   padding: 0;
@@ -1208,6 +1198,13 @@ p.Biblio, p.NormRef {
 /*
 3.6 Source Code + figures
 */
+.figure .SourceTitle,
+pre .SourceTitle,
+.pseudocode .SourceTitle {
+  font-weight: 700;
+  font-size: 1em;
+  text-align: center;
+}
 .figure,
 pre,
 .pseudocode {
@@ -1219,13 +1216,6 @@ pre,
   overflow: auto;
   font-size: {{normalfontsize}};
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1299,19 +1289,23 @@ div.zzHelp {
   padding: 0.5em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2em;
-  color: black;
-  padding-left: 0.5em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;
   margin-left: -1.5em;
 }
+.example {
+  color: black;
+  padding-left: 0.5em;
+}
 .example .example-title {
   margin-top: 0;
 }

data/lib/isodoc/iso/iso.amendment.xsl

@@ -6104,6 +6104,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -6670,6 +6671,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -6684,10 +6686,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -7984,6 +7986,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -9392,6 +9400,12 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 		<xsl:attribute name="line-height">1.1</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-block-style -->
@@ -10086,6 +10100,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -10624,7 +10644,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -13920,6 +13940,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -18856,10 +18882,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -18999,6 +19032,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

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

@@ -6104,6 +6104,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -6670,6 +6671,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -6684,10 +6686,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -7984,6 +7986,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -9392,6 +9400,12 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 		<xsl:attribute name="line-height">1.1</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-block-style -->
@@ -10086,6 +10100,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -10624,7 +10644,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -13920,6 +13940,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -18856,10 +18882,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -18999,6 +19032,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

data/lib/isodoc/iso/presentation_section.rb

@@ -84,7 +84,8 @@ module IsoDoc
         super
       end
 
-      def middle_title(docxml)
+      # KILL
+      def middle_titlex(docxml)
         @meta.get[:doctitlemain].nil? || @meta.get[:doctitlemain].empty? and
           return
         s = docxml.at(ns("//sections")) or return
@@ -92,7 +93,8 @@ module IsoDoc
         s.add_first_child ret
       end
 
-      def middle_title_main
+      # KILL
+      def middle_title_mainx
         ret = "<span class='boldtitle'>#{@meta.get[:doctitleintro]}"
         @meta.get[:doctitleintro] && @meta.get[:doctitlemain] and
           ret += " &#x2014; "
@@ -104,7 +106,17 @@ module IsoDoc
         "<p class='zzSTDTitle1'>#{ret}</p>"
       end
 
-      def middle_title_part
+      def middle_title_main
+        <<~OUTPUT
+          <p class='zzSTDTitle1'><span class='boldtitle'>{{ doctitleintro -}}
+          {% if doctitleintro and doctitlemain %} &#x2014; {% endif %}{{ doctitlemain -}}
+          {% if doctitlemain %}{% if doctitlepart or doctitlecomplementary %} &#x2014; {% endif %}{% endif -%}
+          </span>#{middle_title_part}</p>
+        OUTPUT
+      end
+
+      # KILL
+      def middle_title_partx
         ret = ""
         if a = @meta.get[:doctitlecomplementary]
           ret += "<span class='boldtitle'>#{a}</span>"
@@ -116,7 +128,17 @@ module IsoDoc
         ret
       end
 
-      def middle_title_amd
+      def middle_title_part
+        <<~OUTPUT.strip
+          {% if doctitlecomplementary %}<span class='boldtitle'>{{ doctitlecomplementary }}</span>
+          {% elsif doctitlepart -%}
+            {% if doctitlepartlabel %}<span class='nonboldtitle'>{{ doctitlepartlabel }}:</span>{% endif -%}
+          <span class='boldtitle'>{{ doctitlepart }}</span>{% endif %}
+        OUTPUT
+      end
+
+      # KILL
+      def middle_title_amdx
         ret = ""
         if a = @meta.get[:doctitleamdlabel]
           ret += "<p class='zzSTDTitle2'>#{a}"
@@ -128,6 +150,19 @@ module IsoDoc
         ret
       end
 
+      def middle_title_amd
+        <<~OUTPUT
+          {% if doctitleamdlabel %}<p class='zzSTDTitle2'>{{ doctitleamdlabel -}}
+            {% if doctitleamd %}: {{doctitleamd}}{% endif -%}
+            </p>{% endif %}
+          {% if doctitlecorrlabel %}<p class='zzSTDTitle2'>{{ doctitlecorrlabel }}</p>{% endif %}
+        OUTPUT
+      end
+
+      def middle_title_template
+        middle_title_main + middle_title_amd
+      end
+
       def move_norm_ref_to_sections(docxml)
         amd?(docxml) or super
       end

data/lib/metanorma/iso/front.rb

@@ -71,56 +71,18 @@ module Metanorma
         @log.add("Document Attributes", nil, err)
       end
 
-      def title_component(node, xml, lang, attr, comp)
+      def title_component(node, xml, lang, comp)
         t = node.attr("title-#{comp[:name]}-#{lang}") or return
-        xml.title(**attr_code(attr.merge(type: "title-#{comp[:abbr]}"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
+        add_title_xml(xml, t, lang, "title-#{comp[:abbr]}")
       end
 
-      def title_intro(node, xml, lang, at)
-        t = node.attr("title-intro-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-intro"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_main(node, xml, lang, at)
-        xml.title **attr_code(at.merge(type: "title-main")) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(node.attr("title-main-#{lang}"))
-        end
-      end
-
-      def title_part(node, xml, lang, at)
-        t = node.attr("title-part-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-part"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_amd(node, xml, lang, at)
-        t = node.attr("title-amendment-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-amd"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_add(node, xml, lang, at)
-        t = node.attr("title-addendum-#{lang}") or return
-        xml.title(**attr_code(at.merge(type: "title-add"))) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(t)
-        end
-      end
-
-      def title_full(node, xml, lang, at)
+      def title_full(node, xml, lang)
         title, intro, part, amd, add = title_full_prep(node, lang)
         title = "#{intro} -- #{title}" if intro
         title = "#{title} -- #{part}" if part
         title = "#{title} -- #{amd}" if amd
         title = "#{title} -- #{add}" if add
-        xml.title **attr_code(at.merge(type: "main")) do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(title)
-        end
+        add_title_xml(xml, title, lang, "main")
       end
 
       def title_full_prep(node, lang)
@@ -136,20 +98,19 @@ module Metanorma
 
       def title(node, xml)
         %w(en ru fr).each do |lang|
-          at = { language: lang, format: "text/plain" }
-          title1(node, xml, lang, at)
+          title1(node, xml, lang)
         end
       end
 
-      def title1(node, xml, lang, at)
-        title_full(node, xml, lang, at)
+      def title1(node, xml, lang)
+        title_full(node, xml, lang)
         %w(intro main part complementary).each do |w|
-          title_component(node, xml, lang, at, { name: w, abbr: w })
+          title_component(node, xml, lang, { name: w, abbr: w })
         end
-        @amd and title_component(node, xml, lang, at,
+        @amd and title_component(node, xml, lang,
                                  { name: "amendment", abbr: "amd" })
         node.attr("addendum-number") and
-          title_component(node, xml, lang, at,
+          title_component(node, xml, lang,
                           { name: "addendum", abbr: "add" })
       end
 

data/lib/metanorma/iso/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -604,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -853,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">

data/lib/metanorma/iso/validate_style.rb

@@ -119,11 +119,6 @@ module Metanorma
                     "language-specific abbreviation", node, text)
       end
 
-      # leaving out as problematic: N J K C S T H h d B o E
-      SI_UNIT = "(m|cm|mm|km|μm|nm|g|kg|mgmol|cd|rad|sr|Hz|Hz|MHz|Pa|hPa|kJ|" \
-                "V|kV|W|MW|kW|F|μF|Ω|Wb|°C|lm|lx|Bq|Gy|Sv|kat|l|t|eV|u|Np|Bd|" \
-                "bit|kB|MB|Hart|nat|Sh|var)".freeze
-
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-and
       # https://www.iso.org/ISO-house-style.html#iso-hs-s-text-r-p-andor
       def style_punct(node, text)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "3.1.4".freeze
+    VERSION = "3.1.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc