metanorma-csa 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33d743a277d5c4b8e79e72e00babc9a6d893b790aa6d05b20c255fdad5497440
-  data.tar.gz: 11f31706e87c44207935ff00b4b04fba1521a946b5a5025d28c20c8a78c95bb2
+  metadata.gz: b5bef565529ba8c3d376a169c0593757f0be8e0f51a876ef8043aa08127728df
+  data.tar.gz: 47c1ae2636d2c8d0a954694480afe9f998d08afce3eb0626ae9e6f423e583ec4
 SHA512:
-  metadata.gz: aed6f2d3098350158f721f3caf59dcc1347a5677746e7200c686d2440df3af93e2d13efc730fbd89e5cd1d4667562d352a8835b34c0585bf26ef6ed12ba5a060
-  data.tar.gz: f1f3a765842c7c35a7d6e04c7bcdb5509da00e81a2ff7430fc87ee3c4755a1b00fbd60b5ea593fac0076072522bc0ca1f4176466d0a772208c53d907161ba87f
+  metadata.gz: 83bcf0f50b66cf1893a1de62f51e1fbcbe77a3703f6071d7be60d7968e6fdc28b772551062a781e3e1b9231aa6e16f190a00137765e60fd83dec2712c5d5e2dd
+  data.tar.gz: 8d50516c5236e27df948c97cf6e7c36a9182df9e1d51c9fbf382fd1a7c8392978425de3d210d825edf2268976af3c0edc4e35bc3528045f5b821b2fd69addbb7

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

@@ -1093,6 +1093,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termexample-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-style">
 
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
@@ -2185,6 +2189,36 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template name="processMainSectionsDefault_flatxml">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -4258,13 +4292,13 @@
 		<tr>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
 				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
 
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -4875,6 +4909,10 @@
 		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -5505,7 +5543,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
+				<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -5513,7 +5551,7 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
+						<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
 					<!-- <xsl:copy-of select="node()" /> -->
@@ -5577,7 +5615,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
+							<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -8382,7 +8420,7 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-
+			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="*[local-name()='name']"/>

data/lib/isodoc/csa/metadata.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'isodoc'
+require "isodoc"
 
 module IsoDoc
   module Csa
@@ -12,7 +12,8 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml.at(ns("//bibdata/title[@language='en']"))
+          &.children&.to_xml
         set(:doctitle, main)
       end
 
@@ -39,8 +40,8 @@ module IsoDoc
       end
 
       def nonauth_roles(isoxml, persons)
-        roles = isoxml.xpath(ns("//bibdata/contributor[person]/role/@type")).
-          inject([]) { |m, t| m << t.value }.reject { |i| i == "author" }
+        roles = isoxml.xpath(ns("//bibdata/contributor[person]/role/@type"))
+          .inject([]) { |m, t| m << t.value }.reject { |i| i == "author" }
         roles.uniq.sort.each do |r|
           n = isoxml.xpath(ns("//bibdata/contributor[role/@type = '#{r}']"\
                               "/person"))
@@ -51,12 +52,13 @@ module IsoDoc
 
       def auth_roles(isoxml, persons)
         roles = isoxml.xpath(ns("//bibdata/contributor[person]/"\
-                                "role[@type = 'author']/description")).
-        inject([]) { |m, t| m << t.text }
+                                "role[@type = 'author']/description"))
+          .inject([]) { |m, t| m << t.text }
         roles.uniq.sort.each do |r|
           n = isoxml.xpath(
-               ns("//bibdata/contributor[role/@type = 'author']"\
-                  "[xmlns:role/description = '#{r}']/person"))
+            ns("//bibdata/contributor[role/@type = 'author']"\
+               "[xmlns:role/description = '#{r}']/person"),
+          )
           n.empty? or persons[r] = extract_person_names_affiliations(n)
         end
         persons

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.2".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(">= 2.7.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.6.0"
+  spec.add_dependency "metanorma-generic", "~> 2.6.1"
 
   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.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement