metanorma-iho 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5eb510ed29c22fe0e538d682476f4ec2eefacf843ba01f860f733fdcc44ca6
-  data.tar.gz: 2887dbdb2c9f493c68f4ace92028c1a593eb8b7018a5fdc81451e3e53b164ca4
+  metadata.gz: ed0af5445fa8d0826c1c8c156f4eb603a2e11fff5bc71ef3bf6ac130dc7472f3
+  data.tar.gz: 268b61813284b9985b669796434316c3e57a16d9068a63d913e573444e820625
 SHA512:
-  metadata.gz: ab19a330da77c557ca6e6f71642396c1470d3dbc6fcfd7d7588c0335837175b8da7be13cf0cc6318598e4c536e24a97986594d3bb203bc2ee9126ce0e55639b4
-  data.tar.gz: 4f92583add78fc0b60f48ba64b7514a22441de0d36d6080f6832dc78a619f9975059d2a867901dae2eeb967d25eb66c2d777eb3a0a7ca11f6f004614b4fcb3d0
+  metadata.gz: 720175f5376a0a7f5e88848cd4a2a0a78d9deeedea4047ea9af299a8a3ed0ed6233f61a7779316fa477e0875f2c28683c519ff645c298742e8fca5f5b2886dde
+  data.tar.gz: 730413f283d2a11f5fd48565584f0d8cd05218af158ed629230ac8a8e520ffa1aefa4a70082dd97a4d313ef223d33e8116f167d6b78b0e54664221e1b554b9e8

data/lib/isodoc/iho/html/htmlstyle.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;
@@ -483,10 +473,6 @@ main {
   margin: 0 3em 0 6em;
 }
 
-#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;
@@ -538,6 +524,10 @@ main {
     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;
@@ -632,7 +622,6 @@ main {
   cursor: pointer;
   padding: 10px 15px 10px 15px;
   border-radius: 4px;
-  text-transform: uppercase;
 }
 #myBtn:hover {
   opacity: 1;
@@ -642,6 +631,9 @@ main {
     display: none;
   }
 }
+#myBtn {
+  text-transform: uppercase;
+}
 #myBtn a.anchorjs-link:hover {
   background: none;
   color: #05164d;
@@ -666,12 +658,6 @@ main {
     margin: 0;
   }
 }
-div.figure {
-  line-height: 1.6em;
-  padding: 1.5em;
-  margin: 2em 0 1em 0;
-  overflow: auto;
-}
 div.figure .FigureTitle, div.figure .figure-title {
   font-weight: 700;
   font-size: 1em;
@@ -684,6 +670,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;
@@ -1030,6 +1022,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 {
@@ -1040,13 +1039,6 @@ pre,
   margin: 2em 0 1em 0;
   overflow: auto;
 }
-.figure .SourceTitle,
-pre .SourceTitle,
-.pseudocode .SourceTitle {
-  font-weight: 700;
-  font-size: 1em;
-  text-align: center;
-}
 
 pre {
   font-family: {{monospacefont}};
@@ -1110,12 +1102,14 @@ pre {
   padding: 1.2em;
   margin: 2em 0 1em 0;
   text-align: left;
-  color: #424242;
-  padding-left: 2.7em;
 }
 .example p {
   margin: 0;
 }
+.example {
+  color: #424242;
+  padding-left: 2.7em;
+}
 .example .example-title {
   font-weight: 700;
   text-transform: uppercase;

data/lib/isodoc/iho/iho.specification.xsl

@@ -340,46 +340,54 @@
 
 						<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-							<fo:page-sequence master-reference="document" format="1" force-page-count="end-on-even">
+							<xsl:variable name="page_sequence_content">
+								<xsl:apply-templates/>
+							</xsl:variable>
 
-								<xsl:attribute name="master-reference">
-									<xsl:text>document</xsl:text>
-									<xsl:call-template name="getPageSequenceOrientation"/>
-								</xsl:attribute>
+							<xsl:if test="xalan:nodeset($page_sequence_content)/node()">
 
-								<xsl:if test="position() = 1">
-									<xsl:attribute name="initial-page-number">1</xsl:attribute>
-								</xsl:if>
+								<fo:page-sequence master-reference="document" format="1" force-page-count="end-on-even">
 
-								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
-								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="title_header" select="$title_header"/>
-									<xsl:with-param name="docidentifier" select="$docidentifier"/>
-									<xsl:with-param name="edition" select="$edition"/>
-									<xsl:with-param name="month_year" select="$month_year"/>
-									<xsl:with-param name="orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:with-param>
-								</xsl:call-template>
-								<fo:flow flow-name="xsl-region-body">
-									<fo:block-container>
+									<xsl:attribute name="master-reference">
+										<xsl:text>document</xsl:text>
+										<xsl:call-template name="getPageSequenceOrientation"/>
+									</xsl:attribute>
+
+									<xsl:if test="position() = 1">
+										<xsl:attribute name="initial-page-number">1</xsl:attribute>
+									</xsl:if>
 
-										<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> -->
+									<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+									<xsl:call-template name="insertHeaderFooter">
+										<xsl:with-param name="title_header" select="$title_header"/>
+										<xsl:with-param name="docidentifier" select="$docidentifier"/>
+										<xsl:with-param name="edition" select="$edition"/>
+										<xsl:with-param name="month_year" select="$month_year"/>
+										<xsl:with-param name="orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:with-param>
+									</xsl:call-template>
+									<fo:flow flow-name="xsl-region-body">
+										<fo:block-container>
 
-										<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" /> -->
-										<!-- Normative references  -->
-										<!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" /> -->
-										<!-- Terms and definitions -->
-										<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']" />
-										<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']" />
-										<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]" /> -->
+											<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> -->
 
-										<!-- <xsl:call-template name="processMainSectionsDefault"/> -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" /> -->
+											<!-- Normative references  -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" /> -->
+											<!-- Terms and definitions -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']" />
+											<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']" />
+											<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]" /> -->
 
-										<xsl:apply-templates/>
+											<!-- <xsl:call-template name="processMainSectionsDefault"/> -->
 
-										<xsl:if test="$table_if = 'true'"><fo:block/></xsl:if>
-									</fo:block-container>
-								</fo:flow>
-							</fo:page-sequence>
+											<!--<xsl:apply-templates /> -->
+											<xsl:copy-of select="$page_sequence_content"/>
+
+											<xsl:if test="$table_if = 'true'"><fo:block/></xsl:if>
+										</fo:block-container>
+									</fo:flow>
+								</fo:page-sequence>
+							</xsl:if>
 					<!-- </xsl:if> -->
 						</xsl:for-each>
 					</xsl:for-each>
@@ -954,9 +962,18 @@
 		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:for-each select="parent::mn:clause">
-				<xsl:call-template name="setId"/>
-			</xsl:for-each>
+
+			<xsl:choose>
+				<xsl:when test="@type = 'floating-title' or @type = 'section-title'">
+					<xsl:copy-of select="@id"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:for-each select="parent::mn:clause">
+						<xsl:call-template name="setId"/>
+					</xsl:for-each>
+				</xsl:otherwise>
+			</xsl:choose>
+
 			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="space-before">
@@ -1547,6 +1564,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>
@@ -2089,6 +2107,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"/> -->
@@ -2103,10 +2122,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>
@@ -3204,6 +3223,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>
@@ -4597,6 +4622,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 -->
@@ -5240,6 +5271,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>
@@ -5699,7 +5736,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' -->
@@ -8839,6 +8876,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-size">11pt</xsl:attribute> -->
@@ -12105,10 +12148,32 @@
 				<xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
 				<xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
 				<xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
+					<!-- for default values, maximum digits for 2nd level is 4, for example 20.19, 
+						for 3rd level is 5, for example 2.15.12
+						if not, then increase -->
+					<xsl:variable name="default_value_">
+						<xsl:choose>
+							<xsl:when test="$toc_level = 3">12.9</xsl:when>
+							<xsl:when test="$toc_level &gt; 3">15</xsl:when>
+							<xsl:otherwise>10</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="default_value" select="number($default_value_)"/>
+					<xsl:variable name="root-style"><root-style xsl:use-attribute-sets="root-style"/></xsl:variable>
+					<xsl:variable name="font_size" select="normalize-space(translate(xalan:nodeset($root-style)/root-style/@font-size, 'pt', ''))"/>
+					<xsl:variable name="item_section_max">
+						<xsl:choose>
+							<xsl:when test="following-sibling::mnx:item"><xsl:value-of select="following-sibling::mnx:item[last()]/@section"/></xsl:when>
+							<xsl:otherwise><xsl:value-of select="@section"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<!-- in em -->
+					<xsl:variable name="text_rt_width_em" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($item_section_max, $font_main, $font_size)"/>
+					<!-- in mm, multiplier 3.175 for Arial em size -->
+					<xsl:variable name="text_rt_width_mm" select="number($text_rt_width_em) div 10 * 3.175 + 2"/>
 					<xsl:choose>
-						<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
-						<xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
-						<xsl:otherwise>10mm</xsl:otherwise>
+						<xsl:when test="$text_rt_width_mm &gt; $default_value"><xsl:value-of select="ceiling($text_rt_width_mm) + 1"/>mm</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$default_value"/>mm</xsl:otherwise>
 					</xsl:choose>
 				</xsl:when>
 				<xsl:otherwise>0mm</xsl:otherwise>
@@ -13719,10 +13784,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"/>
@@ -13846,6 +13918,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/iho/iho.standard.xsl

@@ -340,46 +340,54 @@
 
 						<xsl:for-each select=".//mn:page_sequence[not(parent::mn:preface)][normalize-space() != '' or .//mn:image or .//*[local-name() = 'svg']]">
 
-							<fo:page-sequence master-reference="document" format="1" force-page-count="end-on-even">
+							<xsl:variable name="page_sequence_content">
+								<xsl:apply-templates/>
+							</xsl:variable>
 
-								<xsl:attribute name="master-reference">
-									<xsl:text>document</xsl:text>
-									<xsl:call-template name="getPageSequenceOrientation"/>
-								</xsl:attribute>
+							<xsl:if test="xalan:nodeset($page_sequence_content)/node()">
 
-								<xsl:if test="position() = 1">
-									<xsl:attribute name="initial-page-number">1</xsl:attribute>
-								</xsl:if>
+								<fo:page-sequence master-reference="document" format="1" force-page-count="end-on-even">
 
-								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
-								<xsl:call-template name="insertHeaderFooter">
-									<xsl:with-param name="title_header" select="$title_header"/>
-									<xsl:with-param name="docidentifier" select="$docidentifier"/>
-									<xsl:with-param name="edition" select="$edition"/>
-									<xsl:with-param name="month_year" select="$month_year"/>
-									<xsl:with-param name="orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:with-param>
-								</xsl:call-template>
-								<fo:flow flow-name="xsl-region-body">
-									<fo:block-container>
+									<xsl:attribute name="master-reference">
+										<xsl:text>document</xsl:text>
+										<xsl:call-template name="getPageSequenceOrientation"/>
+									</xsl:attribute>
+
+									<xsl:if test="position() = 1">
+										<xsl:attribute name="initial-page-number">1</xsl:attribute>
+									</xsl:if>
 
-										<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> -->
+									<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+									<xsl:call-template name="insertHeaderFooter">
+										<xsl:with-param name="title_header" select="$title_header"/>
+										<xsl:with-param name="docidentifier" select="$docidentifier"/>
+										<xsl:with-param name="edition" select="$edition"/>
+										<xsl:with-param name="month_year" select="$month_year"/>
+										<xsl:with-param name="orientation"><xsl:call-template name="getPageSequenceOrientation"/></xsl:with-param>
+									</xsl:call-template>
+									<fo:flow flow-name="xsl-region-body">
+										<fo:block-container>
 
-										<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" /> -->
-										<!-- Normative references  -->
-										<!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" /> -->
-										<!-- Terms and definitions -->
-										<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']" />
-										<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']" />
-										<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]" /> -->
+											<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1"><xsl:value-of select="$title-en"/></fo:block> -->
 
-										<!-- <xsl:call-template name="processMainSectionsDefault"/> -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" /> -->
+											<!-- Normative references  -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" /> -->
+											<!-- Terms and definitions -->
+											<!-- <xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']" />
+											<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']" />
+											<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]" /> -->
 
-										<xsl:apply-templates/>
+											<!-- <xsl:call-template name="processMainSectionsDefault"/> -->
 
-										<xsl:if test="$table_if = 'true'"><fo:block/></xsl:if>
-									</fo:block-container>
-								</fo:flow>
-							</fo:page-sequence>
+											<!--<xsl:apply-templates /> -->
+											<xsl:copy-of select="$page_sequence_content"/>
+
+											<xsl:if test="$table_if = 'true'"><fo:block/></xsl:if>
+										</fo:block-container>
+									</fo:flow>
+								</fo:page-sequence>
+							</xsl:if>
 					<!-- </xsl:if> -->
 						</xsl:for-each>
 					</xsl:for-each>
@@ -954,9 +962,18 @@
 		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:for-each select="parent::mn:clause">
-				<xsl:call-template name="setId"/>
-			</xsl:for-each>
+
+			<xsl:choose>
+				<xsl:when test="@type = 'floating-title' or @type = 'section-title'">
+					<xsl:copy-of select="@id"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:for-each select="parent::mn:clause">
+						<xsl:call-template name="setId"/>
+					</xsl:for-each>
+				</xsl:otherwise>
+			</xsl:choose>
+
 			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="space-before">
@@ -1547,6 +1564,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>
@@ -2089,6 +2107,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"/> -->
@@ -2103,10 +2122,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>
@@ -3204,6 +3223,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>
@@ -4597,6 +4622,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 -->
@@ -5240,6 +5271,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>
@@ -5699,7 +5736,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' -->
@@ -8839,6 +8876,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-size">11pt</xsl:attribute> -->
@@ -12105,10 +12148,32 @@
 				<xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
 				<xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
 				<xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
+					<!-- for default values, maximum digits for 2nd level is 4, for example 20.19, 
+						for 3rd level is 5, for example 2.15.12
+						if not, then increase -->
+					<xsl:variable name="default_value_">
+						<xsl:choose>
+							<xsl:when test="$toc_level = 3">12.9</xsl:when>
+							<xsl:when test="$toc_level &gt; 3">15</xsl:when>
+							<xsl:otherwise>10</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="default_value" select="number($default_value_)"/>
+					<xsl:variable name="root-style"><root-style xsl:use-attribute-sets="root-style"/></xsl:variable>
+					<xsl:variable name="font_size" select="normalize-space(translate(xalan:nodeset($root-style)/root-style/@font-size, 'pt', ''))"/>
+					<xsl:variable name="item_section_max">
+						<xsl:choose>
+							<xsl:when test="following-sibling::mnx:item"><xsl:value-of select="following-sibling::mnx:item[last()]/@section"/></xsl:when>
+							<xsl:otherwise><xsl:value-of select="@section"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					<!-- in em -->
+					<xsl:variable name="text_rt_width_em" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($item_section_max, $font_main, $font_size)"/>
+					<!-- in mm, multiplier 3.175 for Arial em size -->
+					<xsl:variable name="text_rt_width_mm" select="number($text_rt_width_em) div 10 * 3.175 + 2"/>
 					<xsl:choose>
-						<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
-						<xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
-						<xsl:otherwise>10mm</xsl:otherwise>
+						<xsl:when test="$text_rt_width_mm &gt; $default_value"><xsl:value-of select="ceiling($text_rt_width_mm) + 1"/>mm</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$default_value"/>mm</xsl:otherwise>
 					</xsl:choose>
 				</xsl:when>
 				<xsl:otherwise>0mm</xsl:otherwise>
@@ -13719,10 +13784,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"/>
@@ -13846,6 +13918,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/metanorma/iho/front.rb

@@ -45,13 +45,15 @@ module Metanorma
         super
       end
 
+      def title_main(node, xml)
+        title = node.attr("title") || node.attr("doctitle")
+        add_title_xml(xml, title, "en", "title-main")
+      end
+
       def title(node, xml)
         m = full_title_prep(node)
         full_title(m, xml)
-        title = node.attr("title")
-        xml.title **attr_code(type: "title-main") do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(title)
-        end
+        title_main(node, xml)
         %i(appendix annex part supplement).each do |w|
           typed_title(m, xml, w)
         end
@@ -61,9 +63,7 @@ module Metanorma
         metadata[type] or return
         title = full_title_part(metadata, type, TITLE_COMPONENTS[type][:id],
                                 TITLE_COMPONENTS[type][:info])
-        xml.title **attr_code(type: "title-#{type}") do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(title)
-        end
+        add_title_xml(xml, title, "en", "title-#{type}")
       end
 
       TITLE_COMPONENTS = {
@@ -79,9 +79,7 @@ module Metanorma
           acc << full_title_part(metadata, p, TITLE_COMPONENTS[p][:id],
                                  TITLE_COMPONENTS[p][:info])
         end
-        xml.title **attr_code(type: "main") do |t1|
-          t1 << Metanorma::Utils::asciidoc_sub(parts.compact.join(", "))
-        end
+        add_title_xml(xml, parts.compact.join(", "), "en", "main")
       end
 
       TITLE_ID_LABELS = { main: "", annex: "Annex", appendix: "Appendix",

data/lib/metanorma/iho/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/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.2.4".freeze
+    VERSION = "1.2.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 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-generic