metanorma-csa 2.3.0 → 2.3.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/csa/csa.standard.xsl +34 -15
- data/lib/metanorma/csa/isodoc.rng +4 -1
- data/lib/metanorma/csa/version.rb +1 -1
- data/metanorma-csa.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e6fa4bb4d5377446472cd3ec7cd29fac67f6ed12c08fc50dd7b3520f740f097e
|
4
|
+
data.tar.gz: a078c193e2e50bcd42fd42633ddb0b0c8bbab2925c6b381787d872cb11f6e43f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e4718d435bca0ef4fffe7b47869c888e259425ac918d00c24147eea5cca252e9a29a57b1f4a61ae62a11d01c60970c0fa0c97d8fcc55b1134cb80b0f901ebbce
|
7
|
+
data.tar.gz: 92ad70c6a066e6862bd0fe14bd594d754b118472ee8415025ed2038a04584874b1344b992ef8cb23f9f8169a9898f868f1157bc670d6a0e18b3a6b04d820c80f
|
@@ -891,11 +891,26 @@
|
|
891
891
|
<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
|
892
892
|
</xsl:if>
|
893
893
|
|
894
|
-
<xsl:
|
894
|
+
<xsl:variable name="font_family" select="."/>
|
895
895
|
|
896
|
-
<xsl:
|
897
|
-
<xsl:
|
898
|
-
|
896
|
+
<xsl:choose>
|
897
|
+
<xsl:when test="$additional_fonts = ''">
|
898
|
+
<xsl:value-of select="$font_family"/>
|
899
|
+
</xsl:when>
|
900
|
+
<xsl:otherwise> <!-- $additional_fonts != '' -->
|
901
|
+
<xsl:choose>
|
902
|
+
<xsl:when test="contains($font_family, ',')">
|
903
|
+
<xsl:value-of select="substring-before($font_family, ',')"/>
|
904
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
905
|
+
<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
|
906
|
+
</xsl:when>
|
907
|
+
<xsl:otherwise>
|
908
|
+
<xsl:value-of select="$font_family"/>
|
909
|
+
<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
|
910
|
+
</xsl:otherwise>
|
911
|
+
</xsl:choose>
|
912
|
+
</xsl:otherwise>
|
913
|
+
</xsl:choose>
|
899
914
|
</xsl:attribute>
|
900
915
|
</xsl:when>
|
901
916
|
<xsl:otherwise>
|
@@ -3380,21 +3395,21 @@
|
|
3380
3395
|
|
3381
3396
|
<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
|
3382
3397
|
|
3383
|
-
|
3398
|
+
<fo:block xsl:use-attribute-sets="table-note-style">
|
3384
3399
|
|
3385
|
-
|
3400
|
+
<xsl:call-template name="refine_table-note-style"/>
|
3386
3401
|
|
3387
|
-
|
3388
|
-
|
3402
|
+
<!-- Table's note/example name (NOTE, for example) -->
|
3403
|
+
<fo:inline xsl:use-attribute-sets="table-note-name-style">
|
3389
3404
|
|
3390
|
-
|
3405
|
+
<xsl:call-template name="refine_table-note-name-style"/>
|
3391
3406
|
|
3392
|
-
|
3407
|
+
<xsl:apply-templates select="*[local-name() = 'name']"/>
|
3393
3408
|
|
3394
|
-
|
3409
|
+
</fo:inline>
|
3395
3410
|
|
3396
|
-
|
3397
|
-
|
3411
|
+
<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
|
3412
|
+
</fo:block>
|
3398
3413
|
|
3399
3414
|
</xsl:template> <!-- table/note -->
|
3400
3415
|
|
@@ -6512,8 +6527,12 @@
|
|
6512
6527
|
<xsl:variable name="isAdded" select="../@added"/>
|
6513
6528
|
<xsl:variable name="isDeleted" select="../@deleted"/>
|
6514
6529
|
<xsl:choose>
|
6515
|
-
<xsl:when test="ancestor::*[local-name() = 'title']">
|
6530
|
+
<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
6516
6531
|
<fo:inline padding-left="1mm" padding-right="1mm">
|
6532
|
+
<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
|
6533
|
+
<xsl:attribute name="padding-left">0mm</xsl:attribute>
|
6534
|
+
<xsl:attribute name="padding-right">0mm</xsl:attribute>
|
6535
|
+
</xsl:if>
|
6517
6536
|
<xsl:variable name="src">
|
6518
6537
|
<xsl:call-template name="image_src"/>
|
6519
6538
|
</xsl:variable>
|
@@ -6546,7 +6565,7 @@
|
|
6546
6565
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
6547
6566
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
6548
6567
|
|
6549
|
-
<xsl:if test="@width != '' and @width != 'auto'">
|
6568
|
+
<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
|
6550
6569
|
<xsl:attribute name="width">
|
6551
6570
|
<xsl:value-of select="@width"/>
|
6552
6571
|
</xsl:attribute>
|
@@ -17,7 +17,7 @@
|
|
17
17
|
these elements; we just want one namespace for any child grammars
|
18
18
|
of this.
|
19
19
|
-->
|
20
|
-
<!-- VERSION v1.2.
|
20
|
+
<!-- VERSION v1.2.4 -->
|
21
21
|
<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">
|
22
22
|
<include href="reqt.rng"/>
|
23
23
|
<include href="basicdoc.rng">
|
@@ -2068,6 +2068,9 @@
|
|
2068
2068
|
</define>
|
2069
2069
|
<define name="termdefinition">
|
2070
2070
|
<element name="definition">
|
2071
|
+
<optional>
|
2072
|
+
<attribute name="type"/>
|
2073
|
+
</optional>
|
2071
2074
|
<choice>
|
2072
2075
|
<ref name="verbaldefinition"/>
|
2073
2076
|
<ref name="nonverbalrep"/>
|
data/metanorma-csa.gemspec
CHANGED
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.require_paths = ["lib"]
|
30
30
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
|
31
31
|
|
32
|
-
spec.add_dependency "metanorma-generic", "~> 2.5.
|
32
|
+
spec.add_dependency "metanorma-generic", "~> 2.5.2"
|
33
33
|
|
34
34
|
spec.add_development_dependency "debug"
|
35
35
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-csa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.3.
|
4
|
+
version: 2.3.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-09-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.5.
|
19
|
+
version: 2.5.2
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 2.5.
|
26
|
+
version: 2.5.2
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: debug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|