metanorma-csa 2.6.10 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e14194a675b44fb99b488425c04a870e54fbca7460a29b1702dc27c982b327
-  data.tar.gz: 99fb32f2d961863351cff2c7f664fffffbb946d4dd48ccaed21a4db39cbef123
+  metadata.gz: dd8c77f4a99cfbf81e151ab5ba7f9bd5e7bb716867183fbce2953bdaf44c6540
+  data.tar.gz: a726b84ff192baf5fdeb8a5830a72fbf2a3c82db54e0f7f4162092f1adc01d59
 SHA512:
-  metadata.gz: a3380315307099389ff8ba25c6899e5d226740ed504e0c0157d7711b1312da5a9042ff4cc91d7f2d414fff32789320e0d2b9e16b4a689353e21d2ed27f541f68
-  data.tar.gz: 457cf4de27fe167dc0af0d838ff3e6af99e3d0a68988e137ca06b7462b938a110f9d3741837df1813c272dc3e583d9e27fda11986a6a3baf4dfd9193c25249ef
+  metadata.gz: 455cdf3fcf3e8cb0b418d5b5d54dc60a8a3f051ae2486d43cbbfd5b715f420518c1280983587db35c04f53e3e03dfb4085271d6399a55e54b3973a2dae4a36d7
+  data.tar.gz: a0d0b5398824d6f166a8fb973658f1eb42fec2747579c8473ec99c8769371e4cc160dfbbe1e1268f262719fcc8c3c5bc305516c3b068d5bc0b3839c21ce29d69

data/lib/isodoc/csa/csa.standard.xsl

@@ -262,7 +262,7 @@
 	<xsl:template name="insertListOf_Title">
 		<xsl:param name="title"/>
 		<fo:block role="TOCI" keep-with-next="always">
-			<fo:list-block provisional-distance-between-starts="3mm">
+			<fo:list-block xsl:use-attribute-sets="toc-listof-title-style">
 				<fo:list-item>
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block font-size="1pt"> </fo:block>
@@ -279,20 +279,20 @@
 
 	<xsl:template name="insertListOf_Item">
 		<fo:block role="TOCI">
-			<fo:list-block provisional-distance-between-starts="10mm">
+			<fo:list-block xsl:use-attribute-sets="toc-listof-item-block-style">
 				<fo:list-item>
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block font-size="1pt"> </fo:block>
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
-						<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+						<fo:block xsl:use-attribute-sets="toc-listof-item-style">
 							<fo:basic-link internal-destination="{@id}">
 								<xsl:call-template name="setAltText">
 									<xsl:with-param name="value" select="@alt-text"/>
 								</xsl:call-template>
 								<xsl:apply-templates select="." mode="contents"/>
 								<fo:inline keep-together.within-line="always">
-									<fo:leader leader-pattern="dots"/>
+									<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 									<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 								</fo:inline>
 							</fo:basic-link>
@@ -303,10 +303,10 @@
 		</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">
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
-			<fo:block-container font-size="12pt" line-height="170%" color="rgb(7, 72, 156)">
+			<fo:block-container xsl:use-attribute-sets="toc-style">
 
 				<xsl:apply-templates/>
 
@@ -314,24 +314,19 @@
 					<fo:block margin-left="-3mm" role="TOC">
 						<xsl:for-each select="$contents//mnx:item[@display = 'true']">
 							<fo:block role="TOCI">
-								<fo:list-block>
-									<xsl:attribute name="provisional-distance-between-starts">
-										<xsl:choose>
-											<xsl:when test="@level &gt;= 2"><xsl:value-of select="(@level - 1) * 10"/>mm</xsl:when>
-											<xsl:otherwise>3mm</xsl:otherwise>
-										</xsl:choose>
-									</xsl:attribute>
+								<fo:list-block xsl:use-attribute-sets="toc-item-block-style">
+									<xsl:call-template name="refine_toc-item-block-style"/>
 									<fo:list-item>
 										<fo:list-item-label end-indent="label-end()">
 											<fo:block font-size="1pt"> </fo:block>
 										</fo:list-item-label>
 										<fo:list-item-body start-indent="body-start()">
-											<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+											<fo:block xsl:use-attribute-sets="toc-item-style">
 												<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
 													<fo:inline padding-right="2mm"><xsl:value-of select="@section"/></fo:inline>
 													<xsl:apply-templates select="mnx:title"/>
 													<fo:inline keep-together.within-line="always">
-														<fo:leader leader-pattern="dots"/>
+														<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
 														<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
 													</fo:inline>
 												</fo:basic-link>
@@ -343,24 +338,24 @@
 						</xsl:for-each>
 
 						<!-- List of Tables -->
-						<xsl:if test="$contents//mnx:tables/mnx:table">
-							<xsl:call-template name="insertListOf_Title">
-								<xsl:with-param name="title" select="$title-list-tables"/>
-							</xsl:call-template>
-							<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">
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-tables"/>
+								</xsl:call-template>
+							</xsl:if>
+							<xsl:call-template name="insertListOf_Item"/>
+						</xsl:for-each>
 
 						<!-- List of Figures -->
-						<xsl:if test="$contents//mnx:figures/mnx:figure">
-							<xsl:call-template name="insertListOf_Title">
-								<xsl:with-param name="title" select="$title-list-figures"/>
-							</xsl:call-template>
-							<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">
+								<xsl:call-template name="insertListOf_Title">
+									<xsl:with-param name="title" select="$title-list-figures"/>
+								</xsl:call-template>
+							</xsl:if>
+							<xsl:call-template name="insertListOf_Item"/>
+						</xsl:for-each>
 
 					</fo:block>
 				</xsl:if>
@@ -371,7 +366,7 @@
 	</xsl:template>
 
 	<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
-		<fo:block font-size="26pt" color="black" margin-top="2pt" margin-bottom="30pt" role="H1">
+		<fo:block xsl:use-attribute-sets="toc-title-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -5629,6 +5624,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,''), ':'))"/>
@@ -7617,7 +7622,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"/>
 
@@ -10301,13 +10309,14 @@
 	</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 -->
+	<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 -->
 		<!-- start CSA bibitem processing -->
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
 			<xsl:apply-templates select="mn:biblio-tag"/>
 			<xsl:apply-templates select="mn:formattedref"/>
+			<xsl:call-template name="processBibliographyNote"/>
 		</fo:block>
 		<!-- END CSA bibitem processing -->
 
@@ -10338,7 +10347,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>
@@ -10355,8 +10364,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>
@@ -10902,6 +10929,70 @@
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
 
+	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="line-height">170%</xsl:attribute>
+		<xsl:attribute name="color">rgb(7, 72, 156)</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-title-style">
+		<xsl:attribute name="font-size">26pt</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="margin-top">2pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
+		<xsl:attribute name="role">H1</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 name="provisional-distance-between-starts">3mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_toc-item-block-style">
+		<xsl:if test="@level &gt;= 2">
+			<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="(@level - 1) * 10"/>mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:attribute-set name="toc-item-style">
+		<xsl:attribute name="role">TOCI</xsl:attribute>
+		<xsl:attribute name="text-align-last">justify</xsl:attribute>
+		<xsl:attribute name="margin-left">12mm</xsl:attribute>
+		<xsl:attribute name="text-indent">-12mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set> <!-- END: toc-item-style -->
+
+	<xsl:template name="refine_toc-item-style">
+	</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 name="provisional-distance-between-starts">3mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="toc-listof-item-block-style">
+		<xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
+	</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-left">12mm</xsl:attribute>
+		<xsl:attribute name="text-indent">-12mm</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/metanorma/csa/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/csa/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/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.6.10".freeze
+    VERSION = "2.7.0".freeze
   end
 end

data/metanorma-csa.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 3.0.4"
+  spec.add_dependency "metanorma-generic", "~> 3.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 2.6.10
+  version: 2.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 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-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement