metanorma-csa 2.2.13 → 2.3.0
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 +37 -14
- data/lib/isodoc/csa/html/htmlstyle.css +2 -2
- data/lib/isodoc/csa/html/htmlstyle.scss +2 -2
- data/lib/isodoc/csa/presentation_xml_convert.rb +2 -0
- data/lib/metanorma/csa/isodoc.rng +26 -4
- 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: a95131585815c4041d9a14690cc356195aec696663d927aa5d6827b8f7048747
|
4
|
+
data.tar.gz: 3a38de13f0891eb9f1450e6b0abe4bb25265d1d6f84affdb5ae964e3db725c6d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0cde280515b36664b0295bcdd154ecb916d44714675c22661944c168544b8b18d2b7bd4ceecc53884b36ae45664bdc01c227a0559d5bda48b0a169f586170fd2
|
7
|
+
data.tar.gz: 890f922da43d944129032766bb411efcf5dc858fa2f2635f5775f0aff8682c490ca15a9b0a9092a43594b7a5ef94328bf7f3a2f740afc6882dc32499f7236175
|
@@ -4459,6 +4459,9 @@
|
|
4459
4459
|
<!-- END Definition List -->
|
4460
4460
|
<!-- ===================== -->
|
4461
4461
|
|
4462
|
+
<!-- default: ignore title in sections/p -->
|
4463
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
|
4464
|
+
|
4462
4465
|
<!-- ========================= -->
|
4463
4466
|
<!-- Rich text formatting -->
|
4464
4467
|
<!-- ========================= -->
|
@@ -6543,25 +6546,45 @@
|
|
6543
6546
|
<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
|
6544
6547
|
<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
|
6545
6548
|
|
6546
|
-
<xsl:
|
6547
|
-
<xsl:
|
6548
|
-
<xsl:
|
6549
|
-
|
6550
|
-
|
6551
|
-
</xsl:variable>
|
6549
|
+
<xsl:if test="@width != '' and @width != 'auto'">
|
6550
|
+
<xsl:attribute name="width">
|
6551
|
+
<xsl:value-of select="@width"/>
|
6552
|
+
</xsl:attribute>
|
6553
|
+
</xsl:if>
|
6552
6554
|
|
6553
|
-
<xsl:
|
6555
|
+
<xsl:if test="@height != '' and @height != 'auto'">
|
6556
|
+
<xsl:attribute name="height">
|
6557
|
+
<xsl:value-of select="@height"/>
|
6558
|
+
</xsl:attribute>
|
6559
|
+
</xsl:if>
|
6554
6560
|
|
6555
|
-
|
6561
|
+
<xsl:choose>
|
6562
|
+
<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
|
6563
|
+
<xsl:attribute name="scaling">non-uniform</xsl:attribute>
|
6564
|
+
</xsl:when>
|
6565
|
+
<xsl:otherwise>
|
6556
6566
|
|
6557
|
-
|
6567
|
+
<xsl:variable name="img_src">
|
6568
|
+
<xsl:choose>
|
6569
|
+
<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
|
6570
|
+
<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
|
6571
|
+
</xsl:choose>
|
6572
|
+
</xsl:variable>
|
6558
6573
|
|
6559
|
-
|
6560
|
-
<xsl:if test="number($scale) < 100">
|
6574
|
+
<xsl:variable name="image_width_effective">
|
6561
6575
|
|
6562
|
-
|
6576
|
+
<xsl:value-of select="$width_effective"/>
|
6563
6577
|
|
6564
|
-
|
6578
|
+
</xsl:variable>
|
6579
|
+
|
6580
|
+
<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
|
6581
|
+
<xsl:if test="number($scale) < 100">
|
6582
|
+
|
6583
|
+
<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
|
6584
|
+
|
6585
|
+
</xsl:if>
|
6586
|
+
</xsl:otherwise>
|
6587
|
+
</xsl:choose>
|
6565
6588
|
|
6566
6589
|
</xsl:if>
|
6567
6590
|
|
@@ -10193,7 +10216,7 @@
|
|
10193
10216
|
<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
|
10194
10217
|
<xsl:apply-templates mode="update_xml_step1"/>
|
10195
10218
|
</xsl:template>
|
10196
|
-
<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
10219
|
+
<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
|
10197
10220
|
<xsl:copy>
|
10198
10221
|
<xsl:copy-of select="@*"/>
|
10199
10222
|
<xsl:apply-templates mode="update_xml_step1"/>
|
@@ -586,7 +586,7 @@ h3, .h3 {
|
|
586
586
|
font-size: 1.5em; }
|
587
587
|
|
588
588
|
/*
|
589
|
-
span[id^="toc"]
|
589
|
+
span[id^="toc"]::after {
|
590
590
|
float: left;
|
591
591
|
padding-right: 4px;
|
592
592
|
margin-left: -20px;
|
@@ -1112,7 +1112,7 @@ To top button
|
|
1112
1112
|
color: #4D7EA5;
|
1113
1113
|
box-shadow: none; }
|
1114
1114
|
|
1115
|
-
nav h1:hover a
|
1115
|
+
nav h1:hover a::after {
|
1116
1116
|
display: none; }
|
1117
1117
|
|
1118
1118
|
.document-stage-band p {
|
@@ -220,7 +220,7 @@ h3,.h3 {
|
|
220
220
|
font-size: 1.5em;
|
221
221
|
}
|
222
222
|
/*
|
223
|
-
span[id^="toc"]
|
223
|
+
span[id^="toc"]::after {
|
224
224
|
float: left;
|
225
225
|
padding-right: 4px;
|
226
226
|
margin-left: -20px;
|
@@ -755,7 +755,7 @@ To top button
|
|
755
755
|
}
|
756
756
|
}
|
757
757
|
|
758
|
-
nav h1:hover a
|
758
|
+
nav h1:hover a::after {
|
759
759
|
display: none;
|
760
760
|
}
|
761
761
|
|
@@ -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.3 -->
|
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">
|
@@ -192,9 +192,11 @@
|
|
192
192
|
</attribute>
|
193
193
|
</optional>
|
194
194
|
<attribute name="citeas"/>
|
195
|
-
<
|
196
|
-
<
|
197
|
-
|
195
|
+
<optional>
|
196
|
+
<attribute name="type">
|
197
|
+
<ref name="ReferenceFormat"/>
|
198
|
+
</attribute>
|
199
|
+
</optional>
|
198
200
|
<optional>
|
199
201
|
<attribute name="alt"/>
|
200
202
|
</optional>
|
@@ -836,6 +838,26 @@
|
|
836
838
|
<ref name="paragraph"/>
|
837
839
|
</element>
|
838
840
|
</define>
|
841
|
+
<define name="stem">
|
842
|
+
<element name="stem">
|
843
|
+
<attribute name="type">
|
844
|
+
<choice>
|
845
|
+
<value>MathML</value>
|
846
|
+
<value>AsciiMath</value>
|
847
|
+
<value>LatexMath</value>
|
848
|
+
</choice>
|
849
|
+
</attribute>
|
850
|
+
<attribute name="block">
|
851
|
+
<data type="boolean"/>
|
852
|
+
</attribute>
|
853
|
+
<oneOrMore>
|
854
|
+
<choice>
|
855
|
+
<text/>
|
856
|
+
<ref name="AnyElement"/>
|
857
|
+
</choice>
|
858
|
+
</oneOrMore>
|
859
|
+
</element>
|
860
|
+
</define>
|
839
861
|
<define name="em">
|
840
862
|
<element name="em">
|
841
863
|
<zeroOrMore>
|
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.
|
32
|
+
spec.add_dependency "metanorma-generic", "~> 2.5.0"
|
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.
|
4
|
+
version: 2.3.0
|
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-07
|
11
|
+
date: 2023-08-07 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.
|
19
|
+
version: 2.5.0
|
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.
|
26
|
+
version: 2.5.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: debug
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|