metanorma-iec 2.2.12 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8549ad9f88923dcaf3a906ab9b387a2f093e159b15104eae3239e9beb2f7ba
-  data.tar.gz: fb9ff030c0bcb45e56db5e9534c04dc0781932a0e933d6f373c02aa6e4f015f7
+  metadata.gz: 0dcfbfc355ea835e896c3efa463647098bc8ad0c10d79ace8de627e15c1b8a3e
+  data.tar.gz: '054086032be92eea2f17e511ca544c283dd2d33892a1626929da7dc918bf7d34'
 SHA512:
-  metadata.gz: 1377ff85a12247837f825c89e61716ab6a44351ab3ff1a01b5888439e06736e82b12346dabf7402a6a032c9b62ea8ad621422dbb9a61fbaf59cb86ebc5683a0c
-  data.tar.gz: e6eb895d37129a5f673a9dbd3d067faf51e318817f1a226aafa87077e150d24f64c2b1e0dbe8668bee10d166823e42af661e0a2dca5a1591e53cee2c637feffb
+  metadata.gz: 8dbca0f48f61bbcac0645919b6fb8748efa855929b6d5487b62bb8cfe254693f4e083cce53d0bdeec4a736a50d3589372321529c4a2e543ee4b24b1e2e0931fc
+  data.tar.gz: 2e0688e57610d42458e70ca71cd3d1a90b749791d4f5261171a3981b8411c2eb9518fbab082c07e7176526b0e4ff1d66cfa5da09fdbacdc5c42da1183c55dde1

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

@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -120,14 +120,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -385,7 +389,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -397,7 +401,7 @@ li p {
   margin-bottom: 0.6em;
   line-height: 1.2; }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none; }
 
@@ -757,57 +761,57 @@ ol > li {
   list-style: none;
   position: relative; }
 
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em; }
 
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 
@@ -994,7 +998,7 @@ ol.footnotes-list:first-child {
 ol.footnotes-list p, aside.footnote p {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

data/lib/isodoc/iec/html/htmlstyle.scss

@@ -161,7 +161,7 @@ h2 p, .h2 p {
     list-style: none;
   }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -176,7 +176,7 @@ ul > li > p:first-child:before {
   }
 
 
-  #toc li:before {
+  #toc li::before {
     content: " ";
     display: none;
   }
@@ -450,57 +450,57 @@ ol > li {
   list-style: none;
   position: relative;
 }
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em;
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em;
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em;
 }
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }
@@ -672,7 +672,7 @@ ol.footnotes-list p, aside.footnote p {
     display: inline;
 }
 
-ol > li > p:before {
+ol > li > p::before {
     content: "";
     display: none;
 }

data/lib/isodoc/iec/i18n-en.yaml

@@ -6,6 +6,9 @@ formula: Equation
 inequality: Inequality
 section_iev: Section
 price-code: Price Code
+title: Title
+proposed_stability_date: PROPOSED STABILITY DATE
+tc_sc_note: Note from TC/SC officers
 term_def_boilerplate: |
       <p>ISO and IEC maintain terminological databases for use in
       standardization at the following addresses:</p>

data/lib/isodoc/iec/i18n-fr.yaml

@@ -6,6 +6,9 @@ inequality: Inégalité
 IEC: COMMISSION ELECTROTECHNIQUE INTERNATIONALE
 section_iev: Section
 price-code: Code prix
+title: Titre
+proposed_stability_date: DATE DE STABILITÉ PROPOSÉE
+tc_sc_note: Note des officiers TC/SC
 term_def_boilerplate: |
       <p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
       destinées à être utilisées en normalisation, consultables aux adresses

data/lib/isodoc/iec/i18n-zh-Hans.yaml

@@ -3,6 +3,9 @@ foreword: 前言
 IEC: 国际电工委员会
 formula: 方程式
 inequality: 不等式
+title: 标题
+proposed_stability_date: 建议的稳定日期
+tc_sc_note: TC/SC 官员的说明
 term_def_boilerplate: |
       <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
       <ul>

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

@@ -229,7 +229,7 @@
 						<fo:static-content flow-name="left-region">
 							<fo:block-container reference-orientation="90">
 								<fo:block font-size="7pt" margin-left="3.5mm" margin-top="5.5mm">
-									<xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:docidentifier[@type = 'iso-with-lang']"/>
+									<xsl:value-of select="(//iec:iec-standard)[1]/iec:bibdata/iec:docidentifier[@type = 'iso-revdate']"/>
 								</fo:block>
 							</fo:block-container>
 						</fo:static-content>
@@ -814,7 +814,13 @@
 							<fo:block-container background-color="rgb(219, 229, 241)" margin-top="4mm" padding="2mm" padding-top="1mm" border="1.5pt solid white">
 								<fo:block font-size="6.5pt" margin-bottom="6pt">
 									<xsl:call-template name="addLetterSpacingSmallCaps">
-										<xsl:with-param name="text">Title:</xsl:with-param>
+										<xsl:with-param name="text">
+											<!-- Title: -->
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">title</xsl:with-param>
+											</xsl:call-template>
+											<xsl:text>:</xsl:text>
+										</xsl:with-param>
 									</xsl:call-template>
 								</fo:block>
 								<fo:block font-size="9pt" font-weight="bold">
@@ -829,7 +835,11 @@
 									<fo:block font-size="6.5pt">
 										<xsl:call-template name="addLetterSpacing">
 											<xsl:with-param name="text">
-												<xsl:text>PROPOSED STABILITY DATE: </xsl:text>
+												<!-- PROPOSED STABILITY DATE:  -->
+												<xsl:call-template name="getLocalizedString">
+													<xsl:with-param name="key">proposed_stability_date</xsl:with-param>
+												</xsl:call-template>
+												<xsl:text>: </xsl:text>
 											</xsl:with-param>
 										</xsl:call-template>
 										<!-- 2023 -->
@@ -841,7 +851,13 @@
 							<fo:block-container border="1.5 solid" border-color="rgb(221, 213, 213)" padding="1mm" margin-top="3mm">
 								<fo:block font-size="6.5pt" margin-bottom="6pt">
 									<xsl:call-template name="addLetterSpacingSmallCaps">
-										<xsl:with-param name="text">Note from TC/SC officers:</xsl:with-param>
+										<xsl:with-param name="text">
+											<!-- Note from TC/SC officers: -->
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">tc_sc_note</xsl:with-param>
+											</xsl:call-template>
+											<xsl:text>:</xsl:text>
+										</xsl:with-param>
 									</xsl:call-template>
 								</fo:block>
 								<!-- Example: This FDIS is the result of the discussion between the IEC SC21A experts WG 3 during the meeting held in -->
@@ -990,7 +1006,7 @@
 					<xsl:otherwise><xsl:attribute name="padding-left">1mm</xsl:attribute> </xsl:otherwise>
 				</xsl:choose>
 			</fo:inline>
-			<fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso' or @type = 'ISO']"/></fo:inline>
+			<fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso-undated']"/></fo:inline>
 		</fo:block>
 		<fo:block font-size="10.5pt" text-align="right" margin-top="0.5mm">
 			<xsl:call-template name="capitalize">
@@ -2220,19 +2236,32 @@
 	<xsl:variable name="titles_">
 
 		<!-- These titles of Table of contents renders different than determined in localized-strings -->
-		<title-toc lang="en">
-
-		</title-toc>
-		<title-toc lang="fr">
+		<!-- <title-toc lang="en">
+			<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
+				<xsl:text>Contents</xsl:text>
+			</xsl:if>
+			<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
+				<xsl:text>Table of Contents</xsl:text>
+			</xsl:if>
+			<xsl:if test="$namespace = 'gb'">
+				<xsl:text>Table of contents</xsl:text>
+			</xsl:if>
+		</title-toc> -->
+		<title-toc lang="en">Table of contents</title-toc>
+		<!-- <title-toc lang="fr">
 			<xsl:text>Sommaire</xsl:text>
-		</title-toc>
-		<title-toc lang="zh">
-
+		</title-toc> -->
+		<!-- <title-toc lang="zh">
+			<xsl:choose>
+				<xsl:when test="$namespace = 'gb'">
+					<xsl:text>目次</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
 					<xsl:text>Contents</xsl:text>
-
-		</title-toc>
-
-		<title-descriptors lang="en">Descriptors</title-descriptors>
+				</xsl:otherwise>
+			</xsl:choose>
+		</title-toc> -->
+		<title-toc lang="zh">目次</title-toc>
 
 		<title-part lang="en">
 
@@ -2254,20 +2283,6 @@
 		<title-subpart lang="en">Sub-part #</title-subpart>
 		<title-subpart lang="fr">Partie de sub #</title-subpart>
 
-		<title-list-tables lang="en">List of Tables</title-list-tables>
-
-		<title-list-figures lang="en">List of Figures</title-list-figures>
-
-		<title-table-figures lang="en">Table of Figures</title-table-figures>
-
-		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
-
-		<title-summary lang="en">Summary</title-summary>
-
-		<title-continued lang="ru">(продолжение)</title-continued>
-		<title-continued lang="en">(continued)</title-continued>
-		<title-continued lang="fr">(continué)</title-continued>
-
 	</xsl:variable>
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
 
@@ -2275,8 +2290,8 @@
 		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_table_title"/>
 		<xsl:if test="normalize-space($toc_table_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-tables'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_tables</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -2285,8 +2300,8 @@
 		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_figure_title"/>
 		<xsl:if test="normalize-space($toc_figure_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-figures'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_figures</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -2295,8 +2310,8 @@
 		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_requirement_title"/>
 		<xsl:if test="normalize-space($toc_requirement_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-recommendations'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_recommendations</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -3076,6 +3091,7 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="figure-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 
@@ -3086,6 +3102,7 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="figure-name-style">
+		<xsl:attribute name="role">Caption</xsl:attribute>
 
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">center</xsl:attribute>
@@ -3140,6 +3157,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="image-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 
 	</xsl:attribute-set>
@@ -3422,6 +3440,14 @@
 
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
 
+	<xsl:attribute-set name="bibitem-non-normative-list-item-style">
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+
+			<xsl:attribute name="margin-top">5pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
+
+	</xsl:attribute-set>
+
 	<!-- bibitem in bibliography section (references/@normative="false"), list body -->
 	<xsl:attribute-set name="bibitem-normative-list-body-style">
 
@@ -3825,14 +3851,14 @@
 							<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
+							<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
 			</xsl:when>
 
 			<xsl:otherwise>
-				<fo:inline keep-together.within-line="always"><xsl:apply-templates/></fo:inline>
+				<fo:inline keep-together.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
 			</xsl:otherwise>
 
 		</xsl:choose>
@@ -3842,7 +3868,7 @@
 	<!-- Preface boilerplate sections processing -->
 	<!-- ================================= -->
 	<xsl:template match="*[local-name()='copyright-statement']">
-		<fo:block xsl:use-attribute-sets="copyright-statement-style">
+		<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- copyright-statement -->
@@ -4015,7 +4041,7 @@
 				</xsl:choose>
 			</xsl:variable>
 
-			<fo:block-container xsl:use-attribute-sets="table-container-style">
+			<fo:block-container xsl:use-attribute-sets="table-container-style" role="SKIP">
 
 				<xsl:call-template name="refine_table-container-style">
 					<xsl:with-param name="margin-side" select="$margin-side"/>
@@ -4804,13 +4830,13 @@
 		<fo:table-body>
 
 				<xsl:variable name="title_continued_">
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-continued'"/>
+					<xsl:call-template name="getLocalizedString">
+						<xsl:with-param name="key">continued</xsl:with-param>
 					</xsl:call-template>
 				</xsl:variable>
-
+				<xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
 				<xsl:variable name="title_continued">
-					<xsl:value-of select="$title_continued_"/>
+					<xsl:value-of select="$title_continued_in_parenthesis"/>
 
 				</xsl:variable>
 
@@ -5121,7 +5147,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:variable name="footnote_inline">
-			<fo:inline>
+			<fo:inline role="Reference">
 
 				<xsl:variable name="fn_styles">
 					<xsl:choose>
@@ -5144,7 +5170,7 @@
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
-						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
+						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}" role="Lbl">
 							<xsl:copy-of select="$current_fn_number_text"/>
 						</fo:basic-link>
 					</xsl:with-param>
@@ -5157,17 +5183,17 @@
 				<xsl:copy-of select="$footnote_inline"/>
 			</xsl:when>
 			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
-				<fo:footnote xsl:use-attribute-sets="fn-style">
+				<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
 					<xsl:copy-of select="$footnote_inline"/>
-					<fo:footnote-body>
+					<fo:footnote-body role="Note">
 
-						<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
+						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="fn-body-style">
+							<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
 
 								<xsl:call-template name="refine_fn-body-style"/>
 
-								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
+								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
 
 									<xsl:call-template name="refine_fn-body-num-style"/>
 
@@ -5429,11 +5455,11 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
-		<fo:inline><xsl:value-of select="."/></fo:inline>
+		<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
-		<fo:inline>
+		<fo:inline role="P">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -5448,7 +5474,7 @@
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
-		<fo:block-container xsl:use-attribute-sets="dl-block-style">
+		<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -5483,7 +5509,7 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
-			<fo:block-container margin-left="0mm">
+			<fo:block-container margin-left="0mm" role="SKIP">
 
 						<xsl:attribute name="margin-right">0mm</xsl:attribute>
 
@@ -5553,7 +5579,7 @@
 
 				<!-- a few components -->
 				<xsl:if test="$onlyOneComponent = 'false'">
-					<fo:block>
+					<fo:block role="SKIP">
 
 						<xsl:call-template name="refine_multicomponent_style"/>
 
@@ -5561,7 +5587,7 @@
 							<xsl:attribute name="margin-top">0</xsl:attribute>
 						</xsl:if>
 
-						<fo:block>
+						<fo:block role="SKIP">
 
 							<xsl:call-template name="refine_multicomponent_block_style"/>
 
@@ -6163,6 +6189,9 @@
 
 	<xsl:template name="refine_strong_style">
 
+		<xsl:if test="ancestor::*['preferred']">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='padding']">
@@ -6209,7 +6238,7 @@
 	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
 		<xsl:choose>
-			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
 				 <!-- url -->
 				<xsl:call-template name="add-zero-spaces-link-java"/>
 			</xsl:when>
@@ -6742,10 +6771,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
+
 		<!-- replace sequence #x200B and space TO space -->
-		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
+		<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
 
-		<xsl:value-of select="$text10"/>
+		<xsl:value-of select="$text11"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -6755,8 +6787,12 @@
 		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @  -->
 		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
+
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
+
 		<!-- remove zero-width space at the end -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -7167,6 +7203,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:variable name="font_main_root_style">
+		<root-style xsl:use-attribute-sets="root-style">
+		</root-style>
+	</xsl:variable>
+	<xsl:variable name="font_main_root_style_font_family" select="xalan:nodeset($font_main_root_style)/root-style/@font-family"/>
+	<xsl:variable name="font_main">
+		<xsl:choose>
+			<xsl:when test="contains($font_main_root_style_font_family, ',')"><xsl:value-of select="substring-before($font_main_root_style_font_family, ',')"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="$font_main_root_style_font_family"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
 	<xsl:template match="*[local-name()='th' or local-name()='td']" mode="simple-table-id">
 		<xsl:param name="id"/>
 		<xsl:copy>
@@ -7205,6 +7253,33 @@
 
 				<!-- td_text='<xsl:copy-of select="$td_text"/>' -->
 
+				<xsl:variable name="words_with_width">
+					<!-- calculate width for 'word' which contain text only (without formatting tags inside) -->
+					<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][not(*)]">
+						<xsl:copy>
+							<xsl:copy-of select="@*"/>
+							<xsl:attribute name="width">
+								<xsl:value-of select="java:org.metanorma.fop.Util.getStringWidth(., $font_main)"/> <!-- Example: 'Times New Roman' -->
+							</xsl:attribute>
+							<xsl:copy-of select="node()"/>
+						</xsl:copy>
+					</xsl:for-each>
+				</xsl:variable>
+
+				<xsl:variable name="words_with_width_sorted">
+					<xsl:for-each select="xalan:nodeset($words_with_width)//*[local-name() = 'word']">
+						<xsl:sort select="@width" data-type="number" order="descending"/>
+						<!-- select word maximal width only -->
+						<xsl:if test="position() = 1">
+							<xsl:copy-of select="."/>
+						</xsl:if>
+					</xsl:for-each>
+					<!-- add 'word' with formatting tags inside -->
+					<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != ''][*]">
+						<xsl:copy-of select="."/>
+					</xsl:for-each>
+				</xsl:variable>
+
 				<xsl:variable name="words">
 					<xsl:for-each select=".//*[local-name() = 'image' or local-name() = 'stem']">
 						<word>
@@ -7212,9 +7287,12 @@
 						</word>
 					</xsl:for-each>
 
-					<xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
+					<xsl:for-each select="xalan:nodeset($words_with_width_sorted)//*[local-name() = 'word'][normalize-space() != '']">
 						<xsl:copy-of select="."/>
 					</xsl:for-each>
+					<!-- <xsl:for-each select="xalan:nodeset($td_text)//*[local-name() = 'word'][normalize-space() != '']">
+						<xsl:copy-of select="."/>
+					</xsl:for-each> -->
 
 				</xsl:variable>
 
@@ -7675,10 +7753,10 @@
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="mathml"/>
 			<xsl:if test="not(@lspace)">
-				<xsl:attribute name="lspace">0.4em</xsl:attribute>
+				<xsl:attribute name="lspace">0.2em</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="not(@rspace)">
-				<xsl:attribute name="rspace">0.4em</xsl:attribute>
+			<xsl:if test="not(@rspace) and not(following-sibling::*[1][self::mathml:mo and normalize-space(text()) = '|'])">
+				<xsl:attribute name="rspace">0.2em</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates mode="mathml"/>
 		</xsl:copy>
@@ -7695,6 +7773,27 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<!-- increase space before '(' -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '(']" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="(preceding-sibling::* and not(preceding-sibling::*[1][self::mathml:mo])) or (../preceding-sibling::* and not(../preceding-sibling::*[1][self::mathml:mo]))">
+				<xsl:if test="not(@lspace)">
+					<xsl:attribute name="lspace">0.4em</xsl:attribute>
+					<xsl:choose>
+						<xsl:when test="preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
+							<xsl:attribute name="lspace">0.2em</xsl:attribute>
+						</xsl:when>
+						<xsl:when test="../preceding-sibling::*[1][self::mathml:mi or self::mathml:mstyle]">
+							<xsl:attribute name="lspace">0.2em</xsl:attribute>
+						</xsl:when>
+					</xsl:choose>
+				</xsl:if>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<!-- Examples: 
 		<stem type="AsciiMath">x = 1</stem> 
 		<stem type="AsciiMath"><asciimath>x = 1</asciimath></stem>
@@ -7854,7 +7953,7 @@
 	<!-- formula  -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'formula']" name="formula">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container margin-left="0mm" role="SKIP">
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -7864,7 +7963,7 @@
 				</xsl:attribute>
 
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
+			<fo:block-container margin-left="0mm" role="SKIP">
 				<fo:block id="{@id}">
 					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
 				</fo:block>
@@ -7944,19 +8043,19 @@
 
 	<xsl:template match="*[local-name() = 'note']" name="note">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_note-style"/>
 
-			<fo:block-container margin-left="0mm" margin-right="0mm">
+			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 
 						<fo:block>
 
 							<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style">
+							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
 								<xsl:call-template name="refine_note-name-style"/>
 
@@ -7993,12 +8092,12 @@
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
-				<fo:inline xsl:use-attribute-sets="note-p-style">
+				<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="note-p-style">
+				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -8114,12 +8213,13 @@
 
 	<xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-			<xsl:variable name="level">
+			<!-- <xsl:variable name="level">
 				<xsl:call-template name="getLevelTermName"/>
 			</xsl:variable>
 			<fo:inline role="H{$level}">
-				<xsl:apply-templates/>
-			</fo:inline>
+				<xsl:apply-templates />
+			</fo:inline> -->
+			<xsl:apply-templates/>
 		</xsl:if>
 	</xsl:template>
 	<!-- ====== -->
@@ -8143,7 +8243,7 @@
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
 
-			<fo:block xsl:use-attribute-sets="figure-style">
+			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
 				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
 			<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
@@ -9291,7 +9391,7 @@
 			</xsl:when>
 
 			<xsl:otherwise>
-				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
+				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
 
 					<xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
@@ -9312,7 +9412,7 @@
 						</xsl:attribute>
 
 					</xsl:if>
-					<fo:block-container margin-left="0mm">
+					<fo:block-container margin-left="0mm" role="SKIP">
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -9858,11 +9958,11 @@
 	<!-- requirement, recommendation, permission table -->
 	<!-- ========== -->
 	<xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
-		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
+		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt" role="SKIP">
 			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
 			</xsl:if>
-			<fo:block-container margin-left="0mm" margin-right="0mm">
+			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 				<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
 					<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 						<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
@@ -10024,7 +10124,7 @@
 	-->
 	<xsl:template match="*[local-name() = 'example']">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -10041,7 +10141,7 @@
 
 			</xsl:variable>
 
-			<fo:block-container margin-left="0mm">
+			<fo:block-container margin-left="0mm" role="SKIP">
 
 				<xsl:choose>
 
@@ -10054,8 +10154,8 @@
 							</xsl:apply-templates>
 						</fo:block>
 
-						<fo:block-container xsl:use-attribute-sets="example-body-style">
-							<fo:block-container margin-left="0mm" margin-right="0mm">
+						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 								<xsl:apply-templates select="node()[not(local-name() = 'name')]">
 									<xsl:with-param name="fo_element" select="$fo_element"/>
 								</xsl:apply-templates>
@@ -10108,8 +10208,8 @@
 
 						<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
 							<!-- display further elements in blocks -->
-							<fo:block-container xsl:use-attribute-sets="example-body-style">
-								<fo:block-container margin-left="0mm" margin-right="0mm">
+							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 									<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
 										<xsl:with-param name="fo_element" select="'block'"/>
 									</xsl:apply-templates>
@@ -10162,7 +10262,7 @@
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="starts-with(normalize-space($element), 'block')">
-				<fo:block-container>
+				<fo:block-container role="SKIP">
 					<xsl:if test="ancestor::*[local-name() = 'li'] and contains(normalize-space($fo_element), 'block')">
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 						<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -10303,7 +10403,7 @@
 	<!-- author  -->
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'quote']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container margin-left="0mm" role="SKIP">
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -10313,12 +10413,12 @@
 				</xsl:if>
 			</xsl:if>
 
-			<fo:block-container margin-left="0mm">
-				<fo:block-container xsl:use-attribute-sets="quote-style">
+			<fo:block-container margin-left="0mm" role="SKIP">
+				<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
 
 					<xsl:call-template name="refine_quote-style"/>
 
-					<fo:block-container margin-left="0mm" margin-right="0mm">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 						<fo:block role="BlockQuote">
 							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
 						</fo:block>
@@ -10476,10 +10576,10 @@
 
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'">
-				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
+				<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
 			</xsl:when>
 			<xsl:when test="../../@inline-header = 'true'">
-				<fo:inline font-size="90%">
+				<fo:inline font-size="90%" role="SKIP">
 					<xsl:call-template name="insertNonBreakSpaces">
 						<xsl:with-param name="count" select="$padding-right"/>
 					</xsl:call-template>
@@ -10487,7 +10587,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:variable name="direction"><xsl:if test="$lang = 'ar'"><xsl:value-of select="$RLM"/></xsl:if></xsl:variable>
-				<fo:inline padding-right="{$padding-right}mm"><xsl:value-of select="$direction"/>​</fo:inline>
+				<fo:inline padding-right="{$padding-right}mm" role="SKIP"><xsl:value-of select="$direction"/>​</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
 
@@ -10521,12 +10621,12 @@
 				</xsl:if>
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
-				<fo:block xsl:use-attribute-sets="term-name-style">
+				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
 					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
 				</fo:block>
 			</xsl:if>
 
-			<fo:block xsl:use-attribute-sets="preferred-term-style">
+			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
 				<xsl:call-template name="setStyle_preferred"/>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -10567,7 +10667,7 @@
 	<!-- definition -->
 	<!-- ========== -->
 	<xsl:template match="*[local-name() = 'definition']">
-		<fo:block xsl:use-attribute-sets="definition-style">
+		<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -10610,6 +10710,10 @@
 
 	<xsl:template match="*[local-name() = 'clause']">
 		<fo:block>
+			<xsl:if test="parent::*[local-name() = 'copyright-statement']">
+				<xsl:attribute name="role">SKIP</xsl:attribute>
+			</xsl:if>
+
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="setBlockSpanAll"/>
@@ -10848,7 +10952,7 @@
 	<xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
-				<fo:block-container>
+				<fo:block-container role="SKIP">
 					<xsl:attribute name="margin-left">
 						<xsl:choose>
 							<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
@@ -10858,7 +10962,7 @@
 
 					<xsl:call-template name="refine_list_container_style"/>
 
-					<fo:block-container margin-left="0mm">
+					<fo:block-container margin-left="0mm" role="SKIP">
 						<fo:block>
 							<xsl:apply-templates select="." mode="list"/>
 						</fo:block>
@@ -10867,7 +10971,7 @@
 			</xsl:when>
 			<xsl:otherwise>
 
-						<fo:block>
+						<fo:block role="SKIP">
 							<xsl:apply-templates select="." mode="list"/>
 						</fo:block>
 
@@ -11289,7 +11393,10 @@
 	<!-- Reference sections (Normative References and Bibliography) -->
 	<!-- ========================================================== -->
 	<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
-	<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/>
+	<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
+
+	</xsl:template>
 	<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
 	<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
 
@@ -11343,7 +11450,7 @@
 
 	<!-- Bibliography (non-normative references) -->
 	<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
-
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		 <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or 
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
@@ -11371,6 +11478,35 @@
 
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
 
+	<xsl:template name="insertListItem_Bibitem">
+		<xsl:choose>
+			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
+			<xsl:otherwise>
+				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
+					<fo:list-item-label end-indent="label-end()">
+						<fo:block role="SKIP">
+							<fo:inline role="SKIP">
+								<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+									<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+								</xsl:apply-templates>
+							</fo:inline>
+						</fo:block>
+					</fo:list-item-label>
+					<fo:list-item-body start-indent="body-start()">
+						<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
+							<xsl:call-template name="processBibitem">
+								<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
+							</xsl:call-template>
+						</fo:block>
+					</fo:list-item-body>
+				</fo:list-item>
+			</xsl:otherwise>
+		</xsl:choose>
+		<xsl:apply-templates select="following-sibling::*[1][local-name() = 'bibitem']">
+			<xsl:with-param name="skip">false</xsl:with-param>
+		</xsl:apply-templates>
+	</xsl:template>
+
 	<xsl:template name="processBibitem">
 		<xsl:param name="biblio_tag_part">both</xsl:param>
 
@@ -11704,7 +11840,7 @@
 
 					<xsl:call-template name="setBlockSpanAll"/>
 
-							<fo:block-container xsl:use-attribute-sets="admonition-container-style">
+							<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
 
 										<fo:block text-align="justify">
 											<fo:inline>

data/lib/metanorma/iec/front.rb

@@ -1,3 +1,5 @@
+require "pubid-iec"
+
 module Metanorma
   module Iec
     class Converter < ISO::Converter
@@ -42,8 +44,7 @@ module Metanorma
       end
 
       def iso_id(node, xml)
-        return unless node.attr("docnumber") || node.attr("docidentifier")
-
+        node.attr("docnumber") || node.attr("docidentifier") or return
         unless dn = node.attr("docidentifier")
           part, subpart = node&.attr("partnumber")&.split(/-/)
           dn = add_id_parts(node.attr("docnumber"), part, subpart)
@@ -220,6 +221,7 @@ module Metanorma
         abbr
       end
 
+      # TODO: replace by ISO call
       def metadata_status(node, xml)
         stage = get_stage(node)
         substage = get_substage(node)
@@ -231,6 +233,10 @@ module Metanorma
           s.substage substage, **attr_code(abbreviation: subst)
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
+        iso_id_default(iso_id_params(node))
+        rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
+        report_illegal_stage(stage, substage)
       end
 
       def metadata_subdoctype(node, xml)

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.2.12".freeze
+    VERSION = "2.2.14".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "metanorma-iso", "~> 2.4.2"
+  spec.add_dependency "pubid-iec"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.2.12
+  version: 2.2.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: pubid-iec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement