metanorma-iec 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c63cc2c74daf603f426870fdd2ec75742bed39e60a24c6cc8d054eb618271e
-  data.tar.gz: 9a0bc3e736d8aeec83ea4b8284e12c87b4733ff5318355edd3df5eddc0d189fa
+  metadata.gz: cd8549ad9f88923dcaf3a906ab9b387a2f093e159b15104eae3239e9beb2f7ba
+  data.tar.gz: fb9ff030c0bcb45e56db5e9534c04dc0781932a0e933d6f373c02aa6e4f015f7
 SHA512:
-  metadata.gz: 1ab7f9ec577953150b3db3f4926ec7ddadc605f1cd9d5e1e3b49daaef130d41f011f80888f5c2a0f32b7babac14ecd5cd024cdfa95efdcb8700863d0897e3ee2
-  data.tar.gz: 631a447183ff8b90700f5d00231b1cabd5d63da62b24f92d49409f08818915aba931a44a37bf2194d50db42b95b29f9b794d789b66450b7b894fae4300f2c9c9
+  metadata.gz: 1377ff85a12247837f825c89e61716ab6a44351ab3ff1a01b5888439e06736e82b12346dabf7402a6a032c9b62ea8ad621422dbb9a61fbaf59cb86ebc5683a0c
+  data.tar.gz: e6eb895d37129a5f673a9dbd3d067faf51e318817f1a226aafa87077e150d24f64c2b1e0dbe8668bee10d166823e42af661e0a2dca5a1591e53cee2c637feffb

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

@@ -3131,6 +3131,14 @@
 	</xsl:attribute-set> <!-- formula-stem-number-style -->
 	<!-- End Formula's styles -->
 
+	<xsl:template name="refine_formula-stem-number-style">
+
+			<xsl:if test="ancestor::*[local-name() = 'table']">
+				<xsl:attribute name="margin-right">0mm</xsl:attribute>
+			</xsl:if>
+
+	</xsl:template>
+
 	<xsl:attribute-set name="image-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
 
@@ -3642,13 +3650,13 @@
 
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
-			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
+			<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
 				<node id="{@id}"/>
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 
-		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition')]">
+		<xsl:for-each select="/*/*[local-name()='preface']/*[not(local-name() = 'note' or local-name() = 'admonition' or @type = 'toc')]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 
 			<!-- process Section's title -->
@@ -3682,12 +3690,12 @@
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
 
-		<xsl:for-each select="/*/*[local-name()='annex']">
+		<!-- <xsl:for-each select="/*/*[local-name()='annex']">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
-		</xsl:for-each>
+		</xsl:for-each> -->
 
-		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
+		<xsl:for-each select="/*/*[local-name()='annex'] | /*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -4145,7 +4153,7 @@
 							<fo:table-row>
 								<fo:table-cell column-number="2">
 									<xsl:copy-of select="$table-preamble"/>
-									<fo:block>
+									<fo:block role="SKIP">
 										<xsl:call-template name="setTrackChangesStyles">
 											<xsl:with-param name="isAdded" select="$isAdded"/>
 											<xsl:with-param name="isDeleted" select="$isDeleted"/>
@@ -4193,7 +4201,7 @@
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style">
+					<fo:block xsl:use-attribute-sets="table-name-style" role="SKIP">
 
 						<xsl:call-template name="refine_table-name-style">
 							<xsl:with-param name="continued" select="$continued"/>
@@ -4209,10 +4217,10 @@
 						</xsl:choose>
 
 							<xsl:if test="$continued = 'true'">
-								<fo:inline font-weight="bold" font-style="normal">
+								<fo:inline font-weight="bold" font-style="normal" role="SKIP">
 									<fo:retrieve-table-marker retrieve-class-name="table_number"/>
 								</fo:inline>
-								<fo:inline font-weight="normal" font-style="italic">
+								<fo:inline font-weight="normal" font-style="italic" role="SKIP">
 									<xsl:text> </xsl:text>
 									<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
 								</fo:inline>
@@ -4592,8 +4600,8 @@
 	<xsl:template name="table-header-title">
 		<xsl:param name="cols-count"/>
 		<!-- row for title -->
-		<fo:table-row>
-			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
+		<fo:table-row role="SKIP">
+			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black" role="SKIP">
 
 				<xsl:call-template name="refine_table-header-title-style"/>
 
@@ -4602,7 +4610,7 @@
 						</xsl:apply-templates>
 
 						<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
-							<fo:block/>
+							<fo:block role="SKIP"/>
 						</xsl:if>
 
 			</fo:table-cell>
@@ -4709,7 +4717,7 @@
 								<!-- fn will be processed inside 'note' processing -->
 
 									<xsl:if test="../*[local-name()='note']">
-										<fo:block margin-bottom="6pt"> </fo:block>
+										<fo:block margin-bottom="6pt" role="SKIP"> </fo:block>
 									</xsl:if>
 
 								<!-- for BSI (not PAS) display Notes before footnotes -->
@@ -4809,24 +4817,24 @@
 				<xsl:variable name="title_start" select="ancestor::*[local-name()='table'][1]/*[local-name()='name']/node()[1][self::text()]"/>
 				<xsl:variable name="table_number" select="substring-before($title_start, '—')"/>
 
-				<fo:table-row height="0" keep-with-next.within-page="always">
-					<fo:table-cell>
+				<fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
+					<fo:table-cell role="SKIP">
 
 							<fo:marker marker-class-name="table_number"/>
 							<fo:marker marker-class-name="table_continued"/>
 
-						<fo:block/>
+						<fo:block role="SKIP"/>
 					</fo:table-cell>
 				</fo:table-row>
-				<fo:table-row height="0" keep-with-next.within-page="always">
-					<fo:table-cell>
+				<fo:table-row height="0" keep-with-next.within-page="always" role="SKIP">
+					<fo:table-cell role="SKIP">
 
 							<fo:marker marker-class-name="table_number"><xsl:value-of select="normalize-space(translate($table_number, ' ', ' '))"/></fo:marker>
 
 						<fo:marker marker-class-name="table_continued">
 							<xsl:value-of select="$title_continued"/>
 						</fo:marker>
-						 <fo:block/>
+						 <fo:block role="SKIP"/>
 					</fo:table-cell>
 				</fo:table-row>
 
@@ -4967,7 +4975,7 @@
 
 			<xsl:call-template name="refine_table-header-cell-style"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -5020,7 +5028,7 @@
 				<xsl:attribute name="text-align">left</xsl:attribute>
 			</xsl:if>
 
-			<fo:block>
+			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -5895,7 +5903,7 @@
 		-->
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="2">
-				<fo:block>
+				<fo:block role="SKIP">
 					<xsl:call-template name="note"/>
 				</fo:block>
 			</fo:table-cell>
@@ -5960,7 +5968,7 @@
 
 			<xsl:call-template name="refine_dt-cell-style"/>
 
-			<fo:block xsl:use-attribute-sets="dt-block-style">
+			<fo:block xsl:use-attribute-sets="dt-block-style" role="SKIP">
 				<xsl:copy-of select="@id"/>
 
 				<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -5990,7 +5998,7 @@
 
 			<xsl:call-template name="refine_dd-cell-style"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
 					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
@@ -6365,11 +6373,41 @@
 
 	<xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
-		<fo:inline font-size="75%">
+		<fo:inline font-size="75%" role="SKIP">
 				<xsl:if test="string-length($text) &gt; 0">
-					<xsl:call-template name="recursiveSmallCaps">
-						<xsl:with-param name="text" select="$text"/>
-					</xsl:call-template>
+					<xsl:variable name="smallCapsText">
+						<xsl:call-template name="recursiveSmallCaps">
+							<xsl:with-param name="text" select="$text"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<!-- merge neighboring fo:inline -->
+					<xsl:for-each select="xalan:nodeset($smallCapsText)/node()">
+						<xsl:choose>
+							<xsl:when test="self::fo:inline and preceding-sibling::node()[1][self::fo:inline]"><!-- <xsl:copy-of select="."/> --></xsl:when>
+							<xsl:when test="self::fo:inline and @font-size">
+								<xsl:variable name="curr_pos" select="count(preceding-sibling::node()) + 1"/>
+								<!-- <curr_pos><xsl:value-of select="$curr_pos"/></curr_pos> -->
+								<xsl:variable name="next_text_" select="count(following-sibling::node()[not(local-name() = 'inline')][1]/preceding-sibling::node())"/>
+								<xsl:variable name="next_text">
+									<xsl:choose>
+										<xsl:when test="$next_text_ = 0">99999999</xsl:when>
+										<xsl:otherwise><xsl:value-of select="$next_text_ + 1"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:variable>
+								<!-- <next_text><xsl:value-of select="$next_text"/></next_text> -->
+								<fo:inline>
+									<xsl:copy-of select="@*"/>
+									<xsl:copy-of select="./node()"/>
+									<xsl:for-each select="following-sibling::node()[position() &lt; $next_text - $curr_pos]"> <!-- [self::fo:inline] -->
+										<xsl:copy-of select="./node()"/>
+									</xsl:for-each>
+								</fo:inline>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="."/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
 				</xsl:if>
 			</fo:inline>
 	</xsl:template>
@@ -6381,7 +6419,7 @@
 		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
-        <fo:inline font-size="{100 div 0.75}%">
+        <fo:inline font-size="{100 div 0.75}%" role="SKIP">
           <xsl:value-of select="$upperCase"/>
         </fo:inline>
       </xsl:when>
@@ -6614,6 +6652,10 @@
 
 			<xsl:when test="not(contains($text, $separator))">
 				<word>
+					<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
+						<xsl:text>
+ </xsl:text> <!-- to add distance between dt and dd -->
+					</xsl:if>
 					<xsl:call-template name="enclose_text_in_tags">
 						<xsl:with-param name="text" select="normalize-space($text)"/>
 						<xsl:with-param name="tags" select="$tags"/>
@@ -6622,6 +6664,10 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<word>
+					<xsl:if test="ancestor::*[local-name() = 'p'][@from_dl = 'true']">
+						<xsl:text>
+ </xsl:text> <!-- to add distance between dt and dd -->
+					</xsl:if>
 					<xsl:call-template name="enclose_text_in_tags">
 						<xsl:with-param name="text" select="normalize-space(substring-before($text, $separator))"/>
 						<xsl:with-param name="tags" select="$tags"/>
@@ -6805,6 +6851,10 @@
 	<xsl:template name="getSimpleTable">
 		<xsl:param name="id"/>
 
+		<!-- <test0>
+			<xsl:copy-of select="."/>
+		</test0> -->
+
 		<xsl:variable name="simple-table">
 
 			<!-- Step 0. replace <br/> to <p>...</p> -->
@@ -7850,7 +7900,7 @@
 				<fo:table-body>
 					<fo:table-row>
 						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
+							<fo:block xsl:use-attribute-sets="formula-stem-block-style" role="SKIP">
 
 								<xsl:call-template name="refine_formula-stem-block-style"/>
 
@@ -7858,7 +7908,10 @@
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell display-align="center">
-							<fo:block xsl:use-attribute-sets="formula-stem-number-style">
+							<fo:block xsl:use-attribute-sets="formula-stem-number-style" role="SKIP">
+
+								<xsl:call-template name="refine_formula-stem-number-style"/>
+
 								<xsl:apply-templates select="../*[local-name() = 'name']"/>
 							</fo:block>
 						</fo:table-cell>
@@ -9383,7 +9436,7 @@
 	<!-- second td with sourcecode -->
 	<xsl:template match="*[local-name() = 'sourcecode'][@linenums = 'true']/*[local-name()='table']//*[local-name()='tr']/*[local-name()='td'][preceding-sibling::*]" priority="2"> <!-- *[local-name()='table'][@type = 'sourcecode'] -->
 		<fo:table-cell>
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -9870,7 +9923,7 @@
 
 			<xsl:call-template name="setTableCellAttributes"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -9892,7 +9945,7 @@
 
 			<xsl:call-template name="setTableCellAttributes"/>
 
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
@@ -10672,7 +10725,48 @@
 				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="local-name(..) = 'ol' and @label"> <!-- for ordered lists 'ol', and if there is @label, for instance label="1.1.2" -->
-				<xsl:value-of select="@label"/>
+
+				<xsl:variable name="label">
+
+					<xsl:variable name="type" select="../@type"/>
+
+					<xsl:variable name="style_prefix_">
+						<xsl:if test="$type = 'roman'">
+							 <!-- Example: (i) -->
+						</xsl:if>
+					</xsl:variable>
+					<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
+
+					<xsl:variable name="style_suffix_">
+						<xsl:choose>
+							<xsl:when test="$type = 'arabic'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
+								.
+							</xsl:when>
+							<xsl:when test="$type = 'roman'">
+								)
+							</xsl:when>
+							<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:variable name="style_suffix" select="normalize-space($style_suffix_)"/>
+
+					<xsl:if test="$style_prefix != '' and not(starts-with(@label, $style_prefix))">
+						<xsl:value-of select="$style_prefix"/>
+					</xsl:if>
+					<xsl:value-of select="@label"/>
+					<xsl:if test="not(java:endsWith(java:java.lang.String.new(@label),$style_suffix))">
+						<xsl:value-of select="$style_suffix"/>
+					</xsl:if>
+				</xsl:variable>
+
+				<xsl:value-of select="normalize-space($label)"/>
+
 			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
 
@@ -10869,7 +10963,7 @@
 			<xsl:call-template name="refine_list-item-style"/>
 
 			<fo:list-item-label end-indent="label-end()">
-				<fo:block xsl:use-attribute-sets="list-item-label-style">
+				<fo:block xsl:use-attribute-sets="list-item-label-style" role="SKIP">
 
 					<xsl:call-template name="refine_list-item-label-style"/>
 
@@ -10883,7 +10977,7 @@
 				</fo:block>
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
-				<fo:block>
+				<fo:block role="SKIP">
 
 					<xsl:call-template name="refine_list-item-body-style"/>
 
@@ -11162,10 +11256,10 @@
 			<fo:table-body>
 				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
 
-					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
-					<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Pages</fo:block></fo:table-cell>
 				</fo:table-row>
 				<xsl:apply-templates/>
 			</fo:table-body>
@@ -11180,7 +11274,7 @@
 
 	<xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
 		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
-			<fo:block><xsl:apply-templates/></fo:block>
+			<fo:block role="SKIP"><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template>
 	<!-- ============ -->
@@ -11256,8 +11350,8 @@
 				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
 					<fo:list-item>
 						<fo:list-item-label end-indent="label-end()">
-							<fo:block>
-								<fo:inline>
+							<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>
@@ -11266,7 +11360,7 @@
 							</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">
+							<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>
@@ -11488,7 +11582,7 @@
 		<xsl:for-each select="*[local-name() = 'tab']">
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<fo:table-cell>
-				<fo:block line-height-shift-adjustment="disregard-shifts">
+				<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
@@ -11506,7 +11600,7 @@
 		</xsl:for-each>
 		<!-- last column - for page numbers -->
 		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
-			<fo:block>
+			<fo:block role="SKIP">
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">

data/lib/metanorma/iec/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso