metanorma-cc 2.1.3 → 2.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/cc/cc.standard.xsl +114 -74
- data/lib/metanorma/cc/isodoc.rng +16 -0
- data/lib/metanorma/cc/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: 8ef4f9ebb812ee2caf69f863c4367d4bca5b2c956dccdc39aa346e7d1a74f3f4
|
4
|
+
data.tar.gz: 84f3b82691f749111d3a5a6d5717cf6121a441deeaeade57fd93b11b48fb5a5a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8319023cf9aea5f2aeda498a2343f853cfbc68b6121df318bfbb9f0dde8fa36f6d11fe40fea438113ea39f460381f4c8eb1acd515aa4094d423b1b0648f9bd71
|
7
|
+
data.tar.gz: d18d0e56ff22f422474b4b46718ca32538770a1ad6eb91d4093329ac196a09c288961f293b94f49fceaa323c237fb5aafb7735598fe91c407d80838fa5336e58
|
@@ -896,7 +896,10 @@
|
|
896
896
|
|
897
897
|
</xsl:attribute-set><xsl:attribute-set name="requirement-style">
|
898
898
|
|
899
|
+
|
899
900
|
</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
|
901
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
902
|
+
|
900
903
|
|
901
904
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
902
905
|
|
@@ -1000,6 +1003,7 @@
|
|
1000
1003
|
|
1001
1004
|
|
1002
1005
|
|
1006
|
+
|
1003
1007
|
|
1004
1008
|
|
1005
1009
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
@@ -1337,7 +1341,8 @@
|
|
1337
1341
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1338
1342
|
|
1339
1343
|
|
1340
|
-
|
1344
|
+
|
1345
|
+
|
1341
1346
|
|
1342
1347
|
|
1343
1348
|
|
@@ -1353,6 +1358,7 @@
|
|
1353
1358
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
1354
1359
|
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
1355
1360
|
|
1361
|
+
|
1356
1362
|
|
1357
1363
|
|
1358
1364
|
|
@@ -1784,7 +1790,10 @@
|
|
1784
1790
|
|
1785
1791
|
|
1786
1792
|
|
1787
|
-
|
1793
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
1794
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
1795
|
+
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
1796
|
+
</xsl:if> -->
|
1788
1797
|
|
1789
1798
|
|
1790
1799
|
|
@@ -2971,80 +2980,88 @@
|
|
2971
2980
|
</xsl:choose>
|
2972
2981
|
</xsl:variable>
|
2973
2982
|
|
2974
|
-
|
2975
|
-
|
2976
|
-
|
2983
|
+
|
2984
|
+
<xsl:variable name="tableWithNotesAndFootnotes">
|
2985
|
+
|
2986
|
+
<fo:table keep-with-previous="always">
|
2987
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
2988
|
+
<xsl:variable name="name" select="local-name()"/>
|
2989
|
+
<xsl:choose>
|
2990
|
+
<xsl:when test="$name = 'border-top'">
|
2991
|
+
<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
|
2992
|
+
</xsl:when>
|
2993
|
+
<xsl:when test="$name = 'border'">
|
2994
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
2995
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
2996
|
+
</xsl:when>
|
2997
|
+
<xsl:otherwise>
|
2998
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
2999
|
+
</xsl:otherwise>
|
3000
|
+
</xsl:choose>
|
3001
|
+
</xsl:for-each>
|
3002
|
+
|
3003
|
+
|
3004
|
+
|
2977
3005
|
<xsl:choose>
|
2978
|
-
<xsl:when test="$name
|
2979
|
-
<xsl:
|
2980
|
-
|
2981
|
-
|
2982
|
-
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
2983
|
-
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
3006
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3007
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
3008
|
+
<fo:table-column column-width="{@width}"/>
|
3009
|
+
</xsl:for-each>
|
2984
3010
|
</xsl:when>
|
2985
3011
|
<xsl:otherwise>
|
2986
|
-
|
3012
|
+
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3013
|
+
<xsl:call-template name="insertTableColumnWidth">
|
3014
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3015
|
+
</xsl:call-template>
|
2987
3016
|
</xsl:otherwise>
|
2988
3017
|
</xsl:choose>
|
2989
|
-
|
2990
|
-
|
2991
|
-
|
2992
|
-
|
2993
|
-
|
2994
|
-
|
2995
|
-
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
2996
|
-
<fo:table-column column-width="{@width}"/>
|
2997
|
-
</xsl:for-each>
|
2998
|
-
</xsl:when>
|
2999
|
-
<xsl:otherwise>
|
3000
|
-
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
3001
|
-
<xsl:call-template name="insertTableColumnWidth">
|
3002
|
-
<xsl:with-param name="colwidths" select="$colwidths"/>
|
3003
|
-
</xsl:call-template>
|
3004
|
-
</xsl:otherwise>
|
3005
|
-
</xsl:choose>
|
3006
|
-
|
3007
|
-
<fo:table-body>
|
3008
|
-
<fo:table-row>
|
3009
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3010
|
-
|
3011
|
-
|
3018
|
+
|
3019
|
+
<fo:table-body>
|
3020
|
+
<fo:table-row>
|
3021
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
3022
|
+
|
3023
|
+
|
3012
3024
|
|
3013
|
-
|
3014
|
-
|
3015
|
-
<!-- fn will be processed inside 'note' processing -->
|
3016
|
-
|
3017
|
-
|
3018
|
-
|
3019
|
-
|
3020
|
-
|
3021
|
-
|
3022
|
-
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3023
|
-
|
3024
|
-
|
3025
|
-
<!-- except gb and bsi -->
|
3026
|
-
|
3027
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3028
3025
|
|
3029
|
-
|
3030
|
-
|
3031
|
-
<!-- horizontal row separator -->
|
3032
|
-
|
3033
|
-
|
3034
|
-
<!-- fn processing -->
|
3035
|
-
|
3036
|
-
<xsl:call-template name="table_fn_display"/>
|
3037
3026
|
|
3038
|
-
|
3039
|
-
|
3040
|
-
|
3041
|
-
|
3042
|
-
|
3043
|
-
|
3044
|
-
|
3045
|
-
|
3046
|
-
|
3047
|
-
|
3027
|
+
<!-- fn will be processed inside 'note' processing -->
|
3028
|
+
|
3029
|
+
|
3030
|
+
|
3031
|
+
|
3032
|
+
|
3033
|
+
|
3034
|
+
<!-- for BSI (not PAS) display Notes before footnotes -->
|
3035
|
+
|
3036
|
+
|
3037
|
+
<!-- except gb and bsi -->
|
3038
|
+
|
3039
|
+
<xsl:apply-templates select="../*[local-name()='note']"/>
|
3040
|
+
|
3041
|
+
|
3042
|
+
|
3043
|
+
<!-- horizontal row separator -->
|
3044
|
+
|
3045
|
+
|
3046
|
+
<!-- fn processing -->
|
3047
|
+
|
3048
|
+
<xsl:call-template name="table_fn_display"/>
|
3049
|
+
|
3050
|
+
|
3051
|
+
|
3052
|
+
<!-- for PAS display Notes after footnotes -->
|
3053
|
+
|
3054
|
+
|
3055
|
+
</fo:table-cell>
|
3056
|
+
</fo:table-row>
|
3057
|
+
</fo:table-body>
|
3058
|
+
|
3059
|
+
</fo:table>
|
3060
|
+
</xsl:variable>
|
3061
|
+
|
3062
|
+
<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
|
3063
|
+
<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
|
3064
|
+
</xsl:if>
|
3048
3065
|
|
3049
3066
|
|
3050
3067
|
|
@@ -3338,6 +3355,7 @@
|
|
3338
3355
|
<xsl:variable name="footnote_inline">
|
3339
3356
|
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
3340
3357
|
|
3358
|
+
|
3341
3359
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
3342
3360
|
<xsl:value-of select="$current_fn_number_text"/>
|
3343
3361
|
</fo:basic-link>
|
@@ -3359,8 +3377,12 @@
|
|
3359
3377
|
<fo:block xsl:use-attribute-sets="fn-body-style">
|
3360
3378
|
|
3361
3379
|
|
3380
|
+
|
3362
3381
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
3363
3382
|
|
3383
|
+
|
3384
|
+
|
3385
|
+
|
3364
3386
|
<xsl:value-of select="$current_fn_number_text"/>
|
3365
3387
|
</fo:inline>
|
3366
3388
|
<xsl:apply-templates/>
|
@@ -5045,6 +5067,8 @@
|
|
5045
5067
|
|
5046
5068
|
|
5047
5069
|
|
5070
|
+
|
5071
|
+
|
5048
5072
|
<xsl:choose>
|
5049
5073
|
<xsl:when test="$target_text = ''">
|
5050
5074
|
<xsl:apply-templates/>
|
@@ -5252,6 +5276,7 @@
|
|
5252
5276
|
|
5253
5277
|
|
5254
5278
|
|
5279
|
+
|
5255
5280
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
5256
5281
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
5257
5282
|
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
@@ -5274,6 +5299,7 @@
|
|
5274
5299
|
<xsl:otherwise>
|
5275
5300
|
|
5276
5301
|
|
5302
|
+
|
5277
5303
|
</xsl:otherwise>
|
5278
5304
|
</xsl:choose>
|
5279
5305
|
</xsl:variable>
|
@@ -5291,6 +5317,7 @@
|
|
5291
5317
|
<xsl:otherwise>
|
5292
5318
|
|
5293
5319
|
|
5320
|
+
|
5294
5321
|
</xsl:otherwise>
|
5295
5322
|
</xsl:choose>
|
5296
5323
|
</xsl:variable>
|
@@ -6066,6 +6093,9 @@
|
|
6066
6093
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
6067
6094
|
|
6068
6095
|
|
6096
|
+
|
6097
|
+
|
6098
|
+
|
6069
6099
|
<xsl:apply-templates/>
|
6070
6100
|
</fo:block>
|
6071
6101
|
</xsl:if>
|
@@ -6126,7 +6156,7 @@
|
|
6126
6156
|
<xsl:apply-templates/>
|
6127
6157
|
</xsl:otherwise>
|
6128
6158
|
</xsl:choose>
|
6129
|
-
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
|
6159
|
+
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
|
6130
6160
|
<xsl:value-of select="."/>
|
6131
6161
|
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
6132
6162
|
<xsl:text> </xsl:text>
|
@@ -6202,6 +6232,9 @@
|
|
6202
6232
|
<!-- 9 -->
|
6203
6233
|
|
6204
6234
|
|
6235
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
6236
|
+
<xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
|
6237
|
+
</xsl:if> -->
|
6205
6238
|
|
6206
6239
|
|
6207
6240
|
|
@@ -6646,10 +6679,14 @@
|
|
6646
6679
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
6647
6680
|
<xsl:variable name="element">inline
|
6648
6681
|
|
6682
|
+
|
6649
6683
|
</xsl:variable>
|
6650
6684
|
<xsl:choose>
|
6651
6685
|
<xsl:when test="contains($element, 'block')">
|
6652
6686
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6687
|
+
|
6688
|
+
|
6689
|
+
|
6653
6690
|
<xsl:apply-templates/>
|
6654
6691
|
</fo:block>
|
6655
6692
|
</xsl:when>
|
@@ -6757,6 +6794,7 @@
|
|
6757
6794
|
</xsl:if>
|
6758
6795
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
6759
6796
|
|
6797
|
+
|
6760
6798
|
<xsl:apply-templates/>
|
6761
6799
|
</fo:block>
|
6762
6800
|
</fo:block-container>
|
@@ -6913,6 +6951,8 @@
|
|
6913
6951
|
|
6914
6952
|
|
6915
6953
|
|
6954
|
+
|
6955
|
+
|
6916
6956
|
<fo:basic-link fox:alt-text="{@citeas}">
|
6917
6957
|
<xsl:if test="normalize-space(@citeas) = ''">
|
6918
6958
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
@@ -7342,6 +7382,8 @@
|
|
7342
7382
|
|
7343
7383
|
|
7344
7384
|
|
7385
|
+
|
7386
|
+
|
7345
7387
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
7346
7388
|
<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
7347
7389
|
<xsl:call-template name="append_add-style"/>
|
@@ -7599,7 +7641,7 @@
|
|
7599
7641
|
</fo:block>
|
7600
7642
|
|
7601
7643
|
|
7602
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
7644
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
7603
7645
|
|
7604
7646
|
<!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
|
7605
7647
|
$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
|
@@ -7612,9 +7654,7 @@
|
|
7612
7654
|
|
7613
7655
|
<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
|
7614
7656
|
<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
|
7615
|
-
|
7616
|
-
<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
|
7617
|
-
|
7657
|
+
<xsl:number format="[1]" count="*[local-name()='bibitem'][not(@hidden = 'true')]"/>
|
7618
7658
|
</xsl:if>
|
7619
7659
|
|
7620
7660
|
</fo:inline>
|
@@ -8386,7 +8426,7 @@
|
|
8386
8426
|
<dc:description>
|
8387
8427
|
<xsl:variable name="abstract">
|
8388
8428
|
|
8389
|
-
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
8429
|
+
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
|
8390
8430
|
|
8391
8431
|
</xsl:variable>
|
8392
8432
|
<xsl:value-of select="normalize-space($abstract)"/>
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
@@ -69,6 +69,17 @@
|
|
69
69
|
</zeroOrMore>
|
70
70
|
</element>
|
71
71
|
</define>
|
72
|
+
<define name="AdmonitionType">
|
73
|
+
<choice>
|
74
|
+
<value>warning</value>
|
75
|
+
<value>note</value>
|
76
|
+
<value>tip</value>
|
77
|
+
<value>important</value>
|
78
|
+
<value>caution</value>
|
79
|
+
<value>statement</value>
|
80
|
+
<value>editorial</value>
|
81
|
+
</choice>
|
82
|
+
</define>
|
72
83
|
<define name="index">
|
73
84
|
<element name="index">
|
74
85
|
<optional>
|
@@ -116,6 +127,11 @@
|
|
116
127
|
<data type="boolean"/>
|
117
128
|
</attribute>
|
118
129
|
</optional>
|
130
|
+
<optional>
|
131
|
+
<attribute name="suppress_identifier">
|
132
|
+
<data type="boolean"/>
|
133
|
+
</attribute>
|
134
|
+
</optional>
|
119
135
|
<ref name="BibliographicItem"/>
|
120
136
|
</element>
|
121
137
|
</define>
|
data/lib/metanorma/cc/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-cc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-07-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-generic
|