metanorma-csa 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95131585815c4041d9a14690cc356195aec696663d927aa5d6827b8f7048747
-  data.tar.gz: 3a38de13f0891eb9f1450e6b0abe4bb25265d1d6f84affdb5ae964e3db725c6d
+  metadata.gz: 661139013d4b25cf8fa87695220331515caa028fb0a98b625cdf1782dd03fc2e
+  data.tar.gz: 7ecf7a7d7f34c2d3a36ff2ad171225349ae600263e8b897c5bca97254a9fd775
 SHA512:
-  metadata.gz: 0cde280515b36664b0295bcdd154ecb916d44714675c22661944c168544b8b18d2b7bd4ceecc53884b36ae45664bdc01c227a0559d5bda48b0a169f586170fd2
-  data.tar.gz: 890f922da43d944129032766bb411efcf5dc858fa2f2635f5775f0aff8682c490ca15a9b0a9092a43594b7a5ef94328bf7f3a2f740afc6882dc32499f7236175
+  metadata.gz: c877ccf93488311ce8030977543667f7a9bf26116aa5ca01b786d7c9cfe3d950a151624c3b713db9558be187ec829c2f7dd7e6dd940f30e4abf54885df454c31
+  data.tar.gz: 194b74741b17490735ebafb3addfaec4acf7cc3ce3f7387c3ecc224ac0523ee92ee56aa6b36095d92ade4a6f304050571bd0b76431345397f59959fbae006275

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

@@ -891,11 +891,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -3380,21 +3395,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -6512,8 +6527,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -6546,7 +6565,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/metanorma/csa/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.3 -->
+<!-- VERSION v1.2.4 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -2068,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.3.0".freeze
+    VERSION = "2.3.1".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.5.0"
+  spec.add_dependency "metanorma-generic", "~> 2.5.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.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-28 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.5.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement