metanorma-csa 1.8.8 → 1.8.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/csa/reqt.rng +15 -4
- data/lib/isodoc/csa/csa.standard.xsl +46 -24
- data/lib/metanorma/csa/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a7aefe79c1f9cb7bfad232959f298be205d970ac1502093b58af0aaf9436478d
|
4
|
+
data.tar.gz: 8c4e27f9ca23412d6add815c971b0051ab280bd93d1f1418ae1743d7c3ef65af
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 321c6a9aca508161b1aba80939fd09a63bc81b4073eacd597b2ed3ad3edb7381d4848778c114224fe81efd2bb7051cfc52791658ab5fa386797f3a8ce833d3a5
|
7
|
+
data.tar.gz: 48bdcfb288a3697149f7031e38c26c2f80d5353927b6e3f2c2a9c8deedcbfceedafac68db4f0b281dac26294e99fdf7b3bf4ff05eaa23e74d469f0bd1f86c6de
|
@@ -64,9 +64,9 @@
|
|
64
64
|
<optional>
|
65
65
|
<ref name="label"/>
|
66
66
|
</optional>
|
67
|
-
<
|
67
|
+
<zeroOrMore>
|
68
68
|
<ref name="subject"/>
|
69
|
-
</
|
69
|
+
</zeroOrMore>
|
70
70
|
<zeroOrMore>
|
71
71
|
<ref name="reqinherit"/>
|
72
72
|
</zeroOrMore>
|
@@ -80,6 +80,7 @@
|
|
80
80
|
<ref name="verification"/>
|
81
81
|
<ref name="import"/>
|
82
82
|
<ref name="description"/>
|
83
|
+
<ref name="component"/>
|
83
84
|
</choice>
|
84
85
|
</zeroOrMore>
|
85
86
|
<optional>
|
@@ -105,12 +106,16 @@
|
|
105
106
|
</define>
|
106
107
|
<define name="subject">
|
107
108
|
<element name="subject">
|
108
|
-
<
|
109
|
+
<oneOrMore>
|
110
|
+
<ref name="TextElement"/>
|
111
|
+
</oneOrMore>
|
109
112
|
</element>
|
110
113
|
</define>
|
111
114
|
<define name="reqinherit">
|
112
115
|
<element name="inherit">
|
113
|
-
<
|
116
|
+
<oneOrMore>
|
117
|
+
<ref name="TextElement"/>
|
118
|
+
</oneOrMore>
|
114
119
|
</element>
|
115
120
|
</define>
|
116
121
|
<define name="measurementtarget">
|
@@ -138,6 +143,12 @@
|
|
138
143
|
<ref name="RequirementSubpart"/>
|
139
144
|
</element>
|
140
145
|
</define>
|
146
|
+
<define name="component">
|
147
|
+
<element name="component">
|
148
|
+
<attribute name="class"/>
|
149
|
+
<ref name="RequirementSubpart"/>
|
150
|
+
</element>
|
151
|
+
</define>
|
141
152
|
<define name="reqt_references">
|
142
153
|
<element name="references">
|
143
154
|
<oneOrMore>
|
@@ -1162,6 +1162,7 @@
|
|
1162
1162
|
|
1163
1163
|
|
1164
1164
|
|
1165
|
+
|
1165
1166
|
</xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
|
1166
1167
|
|
1167
1168
|
<xsl:attribute name="padding-right">10mm</xsl:attribute>
|
@@ -1610,6 +1611,8 @@
|
|
1610
1611
|
<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer -->
|
1611
1612
|
</xsl:if>
|
1612
1613
|
|
1614
|
+
|
1615
|
+
|
1613
1616
|
<xsl:choose>
|
1614
1617
|
<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
|
1615
1618
|
<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
|
@@ -1897,9 +1900,9 @@
|
|
1897
1900
|
<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
|
1898
1901
|
<xsl:with-param name="continued">true</xsl:with-param>
|
1899
1902
|
</xsl:apply-templates>
|
1900
|
-
|
1901
|
-
|
1902
|
-
|
1903
|
+
|
1904
|
+
|
1905
|
+
|
1903
1906
|
|
1904
1907
|
</fo:table-cell>
|
1905
1908
|
</fo:table-row>
|
@@ -1981,7 +1984,11 @@
|
|
1981
1984
|
|
1982
1985
|
<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
|
1983
1986
|
|
1984
|
-
<xsl:
|
1987
|
+
<xsl:variable name="isNoteOrFnExistShowAfterTable">
|
1988
|
+
|
1989
|
+
</xsl:variable>
|
1990
|
+
|
1991
|
+
<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
|
1985
1992
|
|
1986
1993
|
<xsl:variable name="cols-count">
|
1987
1994
|
<xsl:choose>
|
@@ -2122,6 +2129,19 @@
|
|
2122
2129
|
|
2123
2130
|
</fo:table-body>
|
2124
2131
|
|
2132
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
|
2133
|
+
<xsl:choose>
|
2134
|
+
<xsl:when test="substring-after(., '—') != ''">
|
2135
|
+
<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
|
2136
|
+
</xsl:when>
|
2137
|
+
<xsl:otherwise>
|
2138
|
+
<xsl:value-of select="."/>
|
2139
|
+
</xsl:otherwise>
|
2140
|
+
</xsl:choose>
|
2141
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
|
2142
|
+
<xsl:apply-templates mode="presentation_name"/>
|
2143
|
+
</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
|
2144
|
+
<xsl:apply-templates select="."/>
|
2125
2145
|
</xsl:template><xsl:template match="*[local-name()='tr']">
|
2126
2146
|
<xsl:variable name="parent-name" select="local-name(..)"/>
|
2127
2147
|
<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
|
@@ -2294,14 +2314,12 @@
|
|
2294
2314
|
<xsl:apply-templates/>
|
2295
2315
|
</xsl:template><xsl:template name="fn_display">
|
2296
2316
|
<xsl:variable name="references">
|
2317
|
+
|
2297
2318
|
<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
|
2298
|
-
<
|
2299
|
-
|
2300
|
-
|
2301
|
-
<xsl:apply-templates/>
|
2302
|
-
</fn>
|
2319
|
+
<xsl:call-template name="create_fn"/>
|
2303
2320
|
</xsl:for-each>
|
2304
2321
|
</xsl:variable>
|
2322
|
+
|
2305
2323
|
<xsl:for-each select="xalan:nodeset($references)//fn">
|
2306
2324
|
<xsl:variable name="reference" select="@reference"/>
|
2307
2325
|
<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
|
@@ -2335,6 +2353,12 @@
|
|
2335
2353
|
</fo:block>
|
2336
2354
|
</xsl:if>
|
2337
2355
|
</xsl:for-each>
|
2356
|
+
</xsl:template><xsl:template name="create_fn">
|
2357
|
+
<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
|
2358
|
+
|
2359
|
+
|
2360
|
+
<xsl:apply-templates/>
|
2361
|
+
</fn>
|
2338
2362
|
</xsl:template><xsl:template name="fn_name_display">
|
2339
2363
|
<!-- <xsl:variable name="references">
|
2340
2364
|
<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
|
@@ -3333,19 +3357,6 @@
|
|
3333
3357
|
<!-- replace start and end spaces to non-break space -->
|
3334
3358
|
<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
|
3335
3359
|
</xsl:copy>
|
3336
|
-
</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
|
3337
|
-
<xsl:copy>
|
3338
|
-
<xsl:apply-templates select="@*|node()" mode="mathml"/>
|
3339
|
-
</xsl:copy>
|
3340
|
-
<xsl:choose>
|
3341
|
-
<!-- if in msub, then don't add space -->
|
3342
|
-
<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
|
3343
|
-
<!-- if next char in digit, don't add space -->
|
3344
|
-
<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
|
3345
|
-
<xsl:otherwise>
|
3346
|
-
<mathml:mspace width="0.5ex"/>
|
3347
|
-
</xsl:otherwise>
|
3348
|
-
</xsl:choose>
|
3349
3360
|
</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
|
3350
3361
|
<xsl:variable name="target">
|
3351
3362
|
<xsl:choose>
|
@@ -4529,7 +4540,19 @@
|
|
4529
4540
|
</fo:inline>
|
4530
4541
|
</xsl:if>
|
4531
4542
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
4532
|
-
<
|
4543
|
+
<xsl:variable name="element">inline
|
4544
|
+
|
4545
|
+
</xsl:variable>
|
4546
|
+
<xsl:choose>
|
4547
|
+
<xsl:when test="contains($element, 'block')">
|
4548
|
+
<fo:block xsl:use-attribute-sets="example-p-style">
|
4549
|
+
<xsl:apply-templates/>
|
4550
|
+
</fo:block>
|
4551
|
+
</xsl:when>
|
4552
|
+
<xsl:otherwise>
|
4553
|
+
<fo:inline><xsl:apply-templates/></fo:inline>
|
4554
|
+
</xsl:otherwise>
|
4555
|
+
</xsl:choose>
|
4533
4556
|
</xsl:template><xsl:template match="*[local-name() = 'example']">
|
4534
4557
|
<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
|
4535
4558
|
|
@@ -5107,7 +5130,6 @@
|
|
5107
5130
|
</xsl:template><xsl:template name="processBibitem">
|
5108
5131
|
|
5109
5132
|
|
5110
|
-
<!-- end BIPM bibitem processing-->
|
5111
5133
|
|
5112
5134
|
|
5113
5135
|
|
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: 1.8.
|
4
|
+
version: 1.8.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-08-
|
11
|
+
date: 2021-08-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|