metanorma-iec 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1cccd7f8ca1456d7f0840146286754b04392c449d1336c20dab6a204ed8b879
-  data.tar.gz: 384e3ad5ad7c66877be128e03e764aa7f2c302ac28ebf1cbe7e8b3136e663e98
+  metadata.gz: 0f1e315189e3564df6c773144c08c36c95f35abcc7682b7722cde204bf419e5b
+  data.tar.gz: 85224ef9fb4331572fd070a28703d6ec993d2968b31fa5081d5d3a54c4c66ad7
 SHA512:
-  metadata.gz: d72936190cf78a74d7f0b4d73f9bda9203052d8c0ca6518f783bcdb501e7d9fe844ae517e97a1c840e65421022a4d91c367ea14da94c03875beca7214fc90f26
-  data.tar.gz: f6deb280eb7e0408bb4b8ad2517a24e3b2fc435fe3d81f5c2afcfbbec9688c249c6f697da73beefd8f42984bde31f4a74e7a6c68e19ce3624ca01fd086c4f707
+  metadata.gz: 14c257e1bd6081f2e8ffb54d87489b15f7752665be971c979de732b29366a007ad9e43c02e0b0e4cac765a1640769d63059ffc9ab47cf24e7e5cd20c547e0155
+  data.tar.gz: 4f23fd6d2121bda6559174faf08ca4f2d75142094a313ac121f406dfc593bf221d304e6ae007c68002cb9d8fa204a4ffc62290f0f05214f07596e12f057bafea

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

@@ -194,7 +194,7 @@
 				<fo:region-body margin-top="107mm" margin-bottom="0mm" margin-left="18mm" margin-right="0mm"/>
 			</fo:simple-page-master>
 
-			<fo:simple-page-master master-name="last-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+			<fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 				<fo:region-body margin-top="107mm" margin-bottom="0mm" margin-left="18mm" margin-right="0mm" background-color="rgb(236, 236, 236)"/>
 				<fo:region-before region-name="header" extent="107mm"/>
 				<fo:region-start region-name="left-region" extent="18mm"/>
@@ -1198,43 +1198,13 @@
 		<xsl:for-each select="xalan:nodeset($contents)//mnx:item[@display = 'true']"><!-- [@display = 'true']
 																																									[@level &lt;= 3]
 																																									[not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
-			<fo:block text-align-last="justify" role="TOCI">
-				<xsl:if test="@level = 1">
-					<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="@level = 2">
-					<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="@level &gt;= 3">
-					<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="@type = 'indexsect'">
-					<xsl:attribute name="space-before">16pt</xsl:attribute>
-				</xsl:if>
-				<xsl:if test="@type = 'references'">
-					<xsl:attribute name="space-before">5pt</xsl:attribute>
-				</xsl:if>
-
+			<fo:block role="TOCI">
 				<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mnx:title}"> <!-- link at this level needs for PDF structure tags -->
 
-					<fo:list-block role="SKIP">
-						<xsl:attribute name="margin-left">
-							<xsl:choose>
-								<xsl:when test="mnx:title/@variant-title = 'true'">0mm</xsl:when>
-								<xsl:when test="@level = 2">8mm</xsl:when>
-								<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
-								<xsl:otherwise>0mm</xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
-						<xsl:attribute name="provisional-distance-between-starts">
-							<xsl:choose>
-								<xsl:when test="@section = ''">0mm</xsl:when>
-								<xsl:when test="@level = 1">8mm</xsl:when>
-								<xsl:when test="@level = 2">15mm</xsl:when>
-								<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
-								<xsl:otherwise>0mm</xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
+					<fo:list-block xsl:use-attribute-sets="toc-item-style">
+
+						<xsl:call-template name="refine_toc-item-style"/>
+
 						<fo:list-item role="SKIP">
 							<fo:list-item-label end-indent="label-end()" role="SKIP">
 								<fo:block>
@@ -1252,7 +1222,7 @@
 										</xsl:call-template>
 										<xsl:text> </xsl:text>
 										<fo:inline keep-together.within-line="always" role="SKIP">
-											<fo:leader leader-pattern="dots"/>
+											<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 											<fo:inline role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
 										</fo:inline>
 									</fo:basic-link>
@@ -1264,31 +1234,31 @@
 			</fo:block>
 		</xsl:for-each>
 
-		<xsl:if test="$contents//mnx:figures/mnx:figure">
-			<fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
-			<xsl:for-each select="$contents//mnx:figures/mnx:figure">
-				<xsl:call-template name="insertListOf_Item"/>
-			</xsl:for-each>
-		</xsl:if>
+		<xsl:for-each select="$contents//mnx:figures/mnx:figure">
+			<xsl:if test="position() = 1">
+				<fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
+			</xsl:if>
+			<xsl:call-template name="insertListOf_Item"/>
+		</xsl:for-each>
 
-		<xsl:if test="$contents//mnx:tables/mnx:table">
-			<fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
-			<xsl:for-each select="$contents//mnx:tables/mnx:table">
-				<xsl:call-template name="insertListOf_Item"/>
-			</xsl:for-each>
-		</xsl:if>
+		<xsl:for-each select="$contents//mnx:tables/mnx:table">
+			<xsl:if test="position() = 1">
+				<fo:block margin-bottom="5pt" role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
+			</xsl:if>
+			<xsl:call-template name="insertListOf_Item"/>
+		</xsl:for-each>
 
 			<!-- </fo:block>
 		</fo:block-container> -->
 	</xsl:template> <!-- END: insertTOCpages -->
 
 	<xsl:template name="insertListOf_Item">
-		<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm" role="TOCI">
+		<fo:block xsl:use-attribute-sets="toc-listof-item-style">
 			<xsl:variable name="alt_text" select="normalize-space(translate(normalize-space(mn:fmt-name), ' —', ' -'))"/>
 			<fo:basic-link internal-destination="{@id}" fox:alt-text="{$alt_text}"> <!-- {local-name()} {@id} -->
 				<xsl:apply-templates select="." mode="contents"/>
 				<fo:inline keep-together.within-line="always" role="SKIP">
-					<fo:leader leader-pattern="dots"/>
+					<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 					<fo:wrapper role="artifact">
 						<fo:page-number-citation ref-id="{@id}"/>
 					</fo:wrapper>
@@ -1297,7 +1267,7 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="3">
+	<xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="3">
 		<fo:block-container role="SKIP">
 			<!-- render 'Contents' outside if role="TOC" -->
 			<xsl:apply-templates select="mn:fmt-title"/>
@@ -1317,7 +1287,7 @@
 	</xsl:template>
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
-		<fo:block font-size="12pt" text-align="center" margin-bottom="22pt">
+		<fo:block xsl:use-attribute-sets="toc-title-style">
 			<xsl:call-template name="addLetterSpacing">
 				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(.))"/>
 			</xsl:call-template>
@@ -2018,7 +1988,7 @@
 				</fo:flow>
 			</fo:page-sequence>
 
-			<fo:page-sequence master-reference="last-page">
+			<fo:page-sequence master-reference="back-page">
 				<fo:flow flow-name="xsl-region-body">
 					<fo:block-container margin-left="20mm" margin-top="19mm">
 						<fo:block-container margin-left="0mm" margin-top="0mm">
@@ -7276,6 +7246,16 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
+			<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
+			<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
+				<style name="border-top">none</style>
+				<style name="border-right">none</style>
+				<style name="border-left">none</style>
+				<style name="border-bottom">none</style>
+				<style name="color">inherit</style>
+				<style name="background-color">transparent</style>
+			</xsl:if>
+
 			<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -9270,7 +9250,10 @@
 
 		<xsl:call-template name="setNamedDestination"/>
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+		<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
+			<xsl:if test="not(parent::mn:references)">
+				<xsl:copy-of select="@id"/>
+			</xsl:if>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
@@ -11976,8 +11959,8 @@
 	</xsl:template> <!-- bibitem -->
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
-		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn: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 
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn: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 -->
 		<xsl:call-template name="setNamedDestination"/>
@@ -12029,7 +12012,7 @@
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
+		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -12046,8 +12029,26 @@
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
 		<!-- end bibitem processing -->
+
+		<xsl:call-template name="processBibliographyNote"/>
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
+	<xsl:template name="processBibliographyNote">
+		<xsl:if test="self::mn:note">
+			<xsl:variable name="note_node">
+				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
+					<xsl:copy> <!-- skip @id -->
+						<xsl:copy-of select="node()"/>
+					</xsl:copy>
+				</xsl:element>
+			</xsl:variable>
+			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
+				<xsl:call-template name="note"/>
+			</xsl:for-each> -->
+			<xsl:call-template name="note"/>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:title" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
@@ -12599,6 +12600,89 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-bottom">22pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-title-page-style">
+	</xsl:attribute-set> <!-- toc-title-page-style -->
+
+	<xsl:attribute-set name="toc-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+		<xsl:if test="@level = 1">
+			<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@level = 2">
+			<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@level &gt;= 3">
+			<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@type = 'indexsect'">
+			<xsl:attribute name="space-before">16pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@type = 'references'">
+			<xsl:attribute name="space-before">5pt</xsl:attribute>
+		</xsl:if>
+		<xsl:attribute name="margin-left">
+			<xsl:choose>
+				<xsl:when test="mnx:title/@variant-title = 'true'">0mm</xsl:when>
+				<xsl:when test="@level = 2">8mm</xsl:when>
+				<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
+				<xsl:otherwise>0mm</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+		<xsl:attribute name="provisional-distance-between-starts">
+			<xsl:choose>
+				<xsl:when test="@section = ''">0mm</xsl:when>
+				<xsl:when test="@level = 1">8mm</xsl:when>
+				<xsl:when test="@level = 2">15mm</xsl:when>
+				<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 19"/>mm</xsl:when>
+				<xsl:otherwise>0mm</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template> <!-- END: refine_toc-item-style -->
+
+	<xsl:attribute-set name="toc-leader-style">
+		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-leader-style -->
+
+	<xsl:attribute-set name="toc-pagenumber-style">
+	</xsl:attribute-set>
+
+	<!-- List of Figures, Tables -->
+	<xsl:attribute-set name="toc-listof-title-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+		<xsl:attribute name="margin-left">8mm</xsl:attribute>
+		<xsl:attribute name="text-indent">-8mm</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">

data/lib/isodoc/iec/xref.rb

@@ -28,15 +28,14 @@ module IsoDoc
         docxml.xpath(ns("//sections/clause/terms")).each_with_index do |t, i|
           num = semx(t, "#{@iev_part}-%02d" % [i + 1])
           @anchors[t["id"]] =
-            { label: num, 
-              #xref: l10n("#{@labels['section_iev']} #{num}"),
-              xref: labelled_autonum(@labels['section_iev'], num),
+            { label: num,
+              xref: labelled_autonum(@labels["section_iev"], num),
               level: 2, type: "clause", elem: @labels["section_iev"] }
           j = 0
           t.xpath(ns("./term")).each do |c|
             c["unnumbered"] == "true" and next
             num2 = semx(c, "%02d" % [j + 1])
-            #section_names1(c, "#{num}#{delim_wrap("-")}#{num2}", 3)
+            # section_names1(c, "#{num}#{delim_wrap("-")}#{num2}", 3)
             section_names1(c, num, num2, 3)
             j += 1
           end
@@ -54,7 +53,7 @@ module IsoDoc
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
         obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
-        s = labelled_autonum(@labels['annex'], num)
+        s = labelled_autonum(@labels["annex"], num)
         l10n("<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}")
       end
     end

data/lib/metanorma/iec/basicdoc.rng

@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
         </zeroOrMore>
       </element>
     </optional>
-    <optional>
+    <zeroOrMore>
       <element name="description">
-        <a:documentation>Description of the change described in this block</a:documentation>
-        <zeroOrMore>
+        <a:documentation>Description(s) of the change described in this block</a:documentation>
+        <oneOrMore>
           <ref name="BasicBlock"/>
-        </zeroOrMore>
+        </oneOrMore>
       </element>
-    </optional>
+    </zeroOrMore>
     <optional>
       <element name="newcontent">
         <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>

data/lib/metanorma/iec/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.0.8 -->
+<!-- VERSION v2.1.0 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -735,6 +735,12 @@ titlecase, or lowercase</a:documentation>
     <ref name="BlockAttributes"/>
   </define>
   <define name="TableAttributes" combine="interleave">
+    <optional>
+      <attribute name="plain">
+        <a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <optional>
       <attribute name="width">
         <a:documentation>Width of the table block in rendering</a:documentation>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.7.0".freeze
+    VERSION = "2.7.1".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2025-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso