metanorma-cc 2.1.10 → 2.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/automerge.yml +31 -0
- data/lib/isodoc/cc/cc.standard.xsl +15 -3
- data/lib/isodoc/cc/html/htmlstyle.css +1 -1
- data/lib/metanorma/cc/basicdoc.rng +0 -27
- data/lib/metanorma/cc/biblio-standoc.rng +164 -0
- data/lib/metanorma/cc/biblio.rng +45 -18
- data/lib/metanorma/cc/cc.rng +1 -40
- data/lib/metanorma/cc/isodoc.rng +22 -194
- data/lib/metanorma/cc/relaton-cc.rng +48 -0
- data/lib/metanorma/cc/version.rb +1 -1
- metadata +5 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 97ce2809458bcd871cc0cb293e22305f528c764946a3843154ae6fc524edd363
|
|
4
|
+
data.tar.gz: 154d5f42665f04084d69fd9007a25870dae47dc9bd23e4b744bb1e585226cdc7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c9e54b76abdf33229f400e851c9c4de1d1a1c7722d865401e1e8c05e93e225b357b260da88c42207125a02807b6418b4be115257f315e5c5a45a0a6973edc130
|
|
7
|
+
data.tar.gz: ab54c1ce35877386b371465f8605b30b880fc324b58b244e19736a2e619ced8cd632a3fc0a888e81e5a79be04901b202388df9f8592a245ffda385dca60cec88
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
|
2
|
+
# See https://github.com/metanorma/cimas
|
|
3
|
+
# source: https://github.com/marketplace/actions/merge-pull-requests#usage
|
|
4
|
+
name: automerge
|
|
5
|
+
on:
|
|
6
|
+
pull_request:
|
|
7
|
+
types:
|
|
8
|
+
- labeled
|
|
9
|
+
- unlabeled
|
|
10
|
+
- synchronize
|
|
11
|
+
- opened
|
|
12
|
+
- edited
|
|
13
|
+
- ready_for_review
|
|
14
|
+
- reopened
|
|
15
|
+
- unlocked
|
|
16
|
+
pull_request_review:
|
|
17
|
+
types:
|
|
18
|
+
- submitted
|
|
19
|
+
check_suite:
|
|
20
|
+
types:
|
|
21
|
+
- completed
|
|
22
|
+
status: {}
|
|
23
|
+
jobs:
|
|
24
|
+
automerge:
|
|
25
|
+
runs-on: ubuntu-latest
|
|
26
|
+
steps:
|
|
27
|
+
- id: automerge
|
|
28
|
+
name: automerge
|
|
29
|
+
uses: "pascalgn/automerge-action@v0.15.3"
|
|
30
|
+
env:
|
|
31
|
+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
|
|
@@ -3975,8 +3975,17 @@
|
|
|
3975
3975
|
</fo:inline>
|
|
3976
3976
|
</xsl:template> <!-- tt -->
|
|
3977
3977
|
|
|
3978
|
+
<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
|
|
3978
3979
|
<xsl:template match="*[local-name()='tt']/text()" priority="2">
|
|
3979
|
-
<xsl:
|
|
3980
|
+
<xsl:choose>
|
|
3981
|
+
<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
|
|
3982
|
+
<!-- url -->
|
|
3983
|
+
<xsl:call-template name="add-zero-spaces-link-java"/>
|
|
3984
|
+
</xsl:when>
|
|
3985
|
+
<xsl:otherwise>
|
|
3986
|
+
<xsl:call-template name="add_spaces_to_sourcecode"/>
|
|
3987
|
+
</xsl:otherwise>
|
|
3988
|
+
</xsl:choose>
|
|
3980
3989
|
</xsl:template>
|
|
3981
3990
|
|
|
3982
3991
|
<xsl:template match="*[local-name()='underline']">
|
|
@@ -4332,8 +4341,11 @@
|
|
|
4332
4341
|
|
|
4333
4342
|
<xsl:template name="add-zero-spaces-link-java">
|
|
4334
4343
|
<xsl:param name="text" select="."/>
|
|
4344
|
+
|
|
4345
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
|
|
4346
|
+
<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
|
|
4335
4347
|
<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
|
|
4336
|
-
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($
|
|
4348
|
+
<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1')"/>
|
|
4337
4349
|
</xsl:template>
|
|
4338
4350
|
|
|
4339
4351
|
<!-- add zero space after dash character (for table's entries) -->
|
|
@@ -8768,7 +8780,7 @@
|
|
|
8768
8780
|
|
|
8769
8781
|
<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
|
|
8770
8782
|
|
|
8771
|
-
<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or
|
|
8783
|
+
<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
|
|
8772
8784
|
|
|
8773
8785
|
<!-- enclose standard's number into tag 'keep-together_within-line' -->
|
|
8774
8786
|
<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
3
|
-
<include href="biblio.rng">
|
|
4
|
-
<start>
|
|
5
|
-
<ref name="document"/>
|
|
6
|
-
</start>
|
|
7
|
-
</include>
|
|
8
3
|
<define name="document">
|
|
9
4
|
<element name="document">
|
|
10
5
|
<optional>
|
|
@@ -1125,26 +1120,4 @@
|
|
|
1125
1120
|
</zeroOrMore>
|
|
1126
1121
|
</element>
|
|
1127
1122
|
</define>
|
|
1128
|
-
<define name="ext">
|
|
1129
|
-
<element name="ext">
|
|
1130
|
-
<ref name="BibDataExtensionType"/>
|
|
1131
|
-
</element>
|
|
1132
|
-
</define>
|
|
1133
|
-
<define name="BibDataExtensionType">
|
|
1134
|
-
<ref name="doctype"/>
|
|
1135
|
-
</define>
|
|
1136
|
-
<define name="doctype">
|
|
1137
|
-
<element name="doctype">
|
|
1138
|
-
<ref name="DocumentType"/>
|
|
1139
|
-
</element>
|
|
1140
|
-
</define>
|
|
1141
|
-
<define name="DocumentType">
|
|
1142
|
-
<value>document</value>
|
|
1143
|
-
</define>
|
|
1144
|
-
<define name="BibData">
|
|
1145
|
-
<ref name="BibliographicItem"/>
|
|
1146
|
-
<optional>
|
|
1147
|
-
<ref name="ext"/>
|
|
1148
|
-
</optional>
|
|
1149
|
-
</define>
|
|
1150
1123
|
</grammar>
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
|
|
3
|
+
<!--
|
|
4
|
+
Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
|
|
5
|
+
of relaton
|
|
6
|
+
|
|
7
|
+
Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
|
|
8
|
+
(SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
|
|
9
|
+
-->
|
|
10
|
+
<include href="biblio.rng">
|
|
11
|
+
<define name="BibData">
|
|
12
|
+
<ref name="BibliographicItem"/>
|
|
13
|
+
<optional>
|
|
14
|
+
<ref name="ext"/>
|
|
15
|
+
</optional>
|
|
16
|
+
</define>
|
|
17
|
+
</include>
|
|
18
|
+
<define name="ext">
|
|
19
|
+
<element name="ext">
|
|
20
|
+
<ref name="BibDataExtensionType"/>
|
|
21
|
+
</element>
|
|
22
|
+
</define>
|
|
23
|
+
<define name="BibDataExtensionType">
|
|
24
|
+
<optional>
|
|
25
|
+
<attribute name="schema-version"/>
|
|
26
|
+
</optional>
|
|
27
|
+
<ref name="doctype"/>
|
|
28
|
+
<optional>
|
|
29
|
+
<ref name="docsubtype"/>
|
|
30
|
+
</optional>
|
|
31
|
+
<optional>
|
|
32
|
+
<ref name="editorialgroup"/>
|
|
33
|
+
</optional>
|
|
34
|
+
<zeroOrMore>
|
|
35
|
+
<ref name="ics"/>
|
|
36
|
+
</zeroOrMore>
|
|
37
|
+
<zeroOrMore>
|
|
38
|
+
<ref name="structuredidentifier"/>
|
|
39
|
+
</zeroOrMore>
|
|
40
|
+
</define>
|
|
41
|
+
<define name="doctype">
|
|
42
|
+
<element name="doctype">
|
|
43
|
+
<optional>
|
|
44
|
+
<attribute name="abbreviation"/>
|
|
45
|
+
</optional>
|
|
46
|
+
<ref name="DocumentType"/>
|
|
47
|
+
</element>
|
|
48
|
+
</define>
|
|
49
|
+
<define name="DocumentType">
|
|
50
|
+
<value>document</value>
|
|
51
|
+
</define>
|
|
52
|
+
<define name="docsubtype">
|
|
53
|
+
<element name="subdoctype">
|
|
54
|
+
<ref name="DocumentSubtype"/>
|
|
55
|
+
</element>
|
|
56
|
+
</define>
|
|
57
|
+
<define name="DocumentSubtype">
|
|
58
|
+
<text/>
|
|
59
|
+
</define>
|
|
60
|
+
<define name="editorialgroup">
|
|
61
|
+
<element name="editorialgroup">
|
|
62
|
+
<oneOrMore>
|
|
63
|
+
<ref name="technical-committee"/>
|
|
64
|
+
</oneOrMore>
|
|
65
|
+
</element>
|
|
66
|
+
</define>
|
|
67
|
+
<define name="technical-committee">
|
|
68
|
+
<element name="technical-committee">
|
|
69
|
+
<ref name="IsoWorkgroup"/>
|
|
70
|
+
</element>
|
|
71
|
+
</define>
|
|
72
|
+
<define name="IsoWorkgroup">
|
|
73
|
+
<optional>
|
|
74
|
+
<attribute name="number"/>
|
|
75
|
+
</optional>
|
|
76
|
+
<optional>
|
|
77
|
+
<attribute name="type"/>
|
|
78
|
+
</optional>
|
|
79
|
+
<optional>
|
|
80
|
+
<attribute name="identifier"/>
|
|
81
|
+
</optional>
|
|
82
|
+
<optional>
|
|
83
|
+
<attribute name="prefix"/>
|
|
84
|
+
</optional>
|
|
85
|
+
<text/>
|
|
86
|
+
</define>
|
|
87
|
+
<define name="ics">
|
|
88
|
+
<element name="ics">
|
|
89
|
+
<element name="code">
|
|
90
|
+
<text/>
|
|
91
|
+
</element>
|
|
92
|
+
<optional>
|
|
93
|
+
<element name="text">
|
|
94
|
+
<text/>
|
|
95
|
+
</element>
|
|
96
|
+
</optional>
|
|
97
|
+
</element>
|
|
98
|
+
</define>
|
|
99
|
+
<define name="structuredidentifier">
|
|
100
|
+
<element name="structuredidentifier">
|
|
101
|
+
<optional>
|
|
102
|
+
<attribute name="type"/>
|
|
103
|
+
</optional>
|
|
104
|
+
<oneOrMore>
|
|
105
|
+
<element name="agency">
|
|
106
|
+
<text/>
|
|
107
|
+
</element>
|
|
108
|
+
</oneOrMore>
|
|
109
|
+
<optional>
|
|
110
|
+
<element name="class">
|
|
111
|
+
<text/>
|
|
112
|
+
</element>
|
|
113
|
+
</optional>
|
|
114
|
+
<element name="docnumber">
|
|
115
|
+
<text/>
|
|
116
|
+
</element>
|
|
117
|
+
<optional>
|
|
118
|
+
<element name="partnumber">
|
|
119
|
+
<text/>
|
|
120
|
+
</element>
|
|
121
|
+
</optional>
|
|
122
|
+
<optional>
|
|
123
|
+
<element name="edition">
|
|
124
|
+
<text/>
|
|
125
|
+
</element>
|
|
126
|
+
</optional>
|
|
127
|
+
<optional>
|
|
128
|
+
<element name="version">
|
|
129
|
+
<text/>
|
|
130
|
+
</element>
|
|
131
|
+
</optional>
|
|
132
|
+
<optional>
|
|
133
|
+
<element name="supplementtype">
|
|
134
|
+
<text/>
|
|
135
|
+
</element>
|
|
136
|
+
</optional>
|
|
137
|
+
<optional>
|
|
138
|
+
<element name="supplementnumber">
|
|
139
|
+
<text/>
|
|
140
|
+
</element>
|
|
141
|
+
</optional>
|
|
142
|
+
<optional>
|
|
143
|
+
<element name="amendment">
|
|
144
|
+
<text/>
|
|
145
|
+
</element>
|
|
146
|
+
</optional>
|
|
147
|
+
<optional>
|
|
148
|
+
<element name="corrigendum">
|
|
149
|
+
<text/>
|
|
150
|
+
</element>
|
|
151
|
+
</optional>
|
|
152
|
+
<optional>
|
|
153
|
+
<element name="language">
|
|
154
|
+
<text/>
|
|
155
|
+
</element>
|
|
156
|
+
</optional>
|
|
157
|
+
<optional>
|
|
158
|
+
<element name="year">
|
|
159
|
+
<text/>
|
|
160
|
+
</element>
|
|
161
|
+
</optional>
|
|
162
|
+
</element>
|
|
163
|
+
</define>
|
|
164
|
+
</grammar>
|
data/lib/metanorma/cc/biblio.rng
CHANGED
|
@@ -33,9 +33,10 @@
|
|
|
33
33
|
<param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
|
|
34
34
|
</data>
|
|
35
35
|
</define>
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
<!-- start = bibitem -->
|
|
37
|
+
<define name="BibData">
|
|
38
|
+
<ref name="BibliographicItem"/>
|
|
39
|
+
</define>
|
|
39
40
|
<define name="status">
|
|
40
41
|
<element name="status">
|
|
41
42
|
<ref name="stage"/>
|
|
@@ -170,27 +171,25 @@
|
|
|
170
171
|
</define>
|
|
171
172
|
<define name="contributor">
|
|
172
173
|
<element name="contributor">
|
|
173
|
-
<
|
|
174
|
+
<oneOrMore>
|
|
174
175
|
<ref name="role"/>
|
|
175
|
-
</
|
|
176
|
+
</oneOrMore>
|
|
176
177
|
<ref name="ContributorInfo"/>
|
|
177
178
|
</element>
|
|
178
179
|
</define>
|
|
179
180
|
<define name="role">
|
|
180
181
|
<element name="role">
|
|
181
|
-
<
|
|
182
|
-
<
|
|
183
|
-
<
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
</attribute>
|
|
193
|
-
</optional>
|
|
182
|
+
<attribute name="type">
|
|
183
|
+
<choice>
|
|
184
|
+
<value>author</value>
|
|
185
|
+
<value>performer</value>
|
|
186
|
+
<value>publisher</value>
|
|
187
|
+
<value>editor</value>
|
|
188
|
+
<value>adapter</value>
|
|
189
|
+
<value>translator</value>
|
|
190
|
+
<value>distributor</value>
|
|
191
|
+
</choice>
|
|
192
|
+
</attribute>
|
|
194
193
|
<zeroOrMore>
|
|
195
194
|
<ref name="roledescription"/>
|
|
196
195
|
</zeroOrMore>
|
|
@@ -512,6 +511,17 @@
|
|
|
512
511
|
</define>
|
|
513
512
|
<define name="localityStack">
|
|
514
513
|
<element name="localityStack">
|
|
514
|
+
<optional>
|
|
515
|
+
<attribute name="connective">
|
|
516
|
+
<choice>
|
|
517
|
+
<value>and</value>
|
|
518
|
+
<value>or</value>
|
|
519
|
+
<value>from</value>
|
|
520
|
+
<value>to</value>
|
|
521
|
+
<value/>
|
|
522
|
+
</choice>
|
|
523
|
+
</attribute>
|
|
524
|
+
</optional>
|
|
515
525
|
<zeroOrMore>
|
|
516
526
|
<ref name="locality"/>
|
|
517
527
|
</zeroOrMore>
|
|
@@ -524,6 +534,17 @@
|
|
|
524
534
|
</define>
|
|
525
535
|
<define name="sourceLocalityStack">
|
|
526
536
|
<element name="sourceLocalityStack">
|
|
537
|
+
<optional>
|
|
538
|
+
<attribute name="connective">
|
|
539
|
+
<choice>
|
|
540
|
+
<value>and</value>
|
|
541
|
+
<value>or</value>
|
|
542
|
+
<value>from</value>
|
|
543
|
+
<value>to</value>
|
|
544
|
+
<value/>
|
|
545
|
+
</choice>
|
|
546
|
+
</attribute>
|
|
547
|
+
</optional>
|
|
527
548
|
<zeroOrMore>
|
|
528
549
|
<ref name="sourceLocality"/>
|
|
529
550
|
</zeroOrMore>
|
|
@@ -626,6 +647,9 @@
|
|
|
626
647
|
<ref name="BibItemType"/>
|
|
627
648
|
</attribute>
|
|
628
649
|
</optional>
|
|
650
|
+
<optional>
|
|
651
|
+
<attribute name="schema-version"/>
|
|
652
|
+
</optional>
|
|
629
653
|
<optional>
|
|
630
654
|
<ref name="fetched"/>
|
|
631
655
|
</optional>
|
|
@@ -720,6 +744,9 @@
|
|
|
720
744
|
<ref name="BibItemType"/>
|
|
721
745
|
</attribute>
|
|
722
746
|
</optional>
|
|
747
|
+
<optional>
|
|
748
|
+
<attribute name="schema-version"/>
|
|
749
|
+
</optional>
|
|
723
750
|
<optional>
|
|
724
751
|
<ref name="fetched"/>
|
|
725
752
|
</optional>
|
data/lib/metanorma/cc/cc.rng
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
we cannot have a new default namespace: we will end up with a grammar with two different
|
|
7
7
|
namespaces, one for isostandard and one for csd additions. And we do not want that.
|
|
8
8
|
-->
|
|
9
|
+
<include href="relaton-cc.rng"/>
|
|
9
10
|
<include href="isodoc.rng">
|
|
10
11
|
<start>
|
|
11
12
|
<ref name="csd-standard"/>
|
|
@@ -56,46 +57,6 @@
|
|
|
56
57
|
</choice>
|
|
57
58
|
</element>
|
|
58
59
|
</define>
|
|
59
|
-
<define name="DocumentType">
|
|
60
|
-
<choice>
|
|
61
|
-
<value>directive</value>
|
|
62
|
-
<value>guide</value>
|
|
63
|
-
<value>specification</value>
|
|
64
|
-
<value>standard</value>
|
|
65
|
-
<value>report</value>
|
|
66
|
-
<value>administrative</value>
|
|
67
|
-
<value>amendment</value>
|
|
68
|
-
<value>technical corrigendum</value>
|
|
69
|
-
<value>advisory</value>
|
|
70
|
-
</choice>
|
|
71
|
-
</define>
|
|
72
|
-
<define name="BibDataExtensionType">
|
|
73
|
-
<optional>
|
|
74
|
-
<ref name="doctype"/>
|
|
75
|
-
</optional>
|
|
76
|
-
<optional>
|
|
77
|
-
<ref name="docsubtype"/>
|
|
78
|
-
</optional>
|
|
79
|
-
<ref name="editorialgroup"/>
|
|
80
|
-
<zeroOrMore>
|
|
81
|
-
<ref name="ics"/>
|
|
82
|
-
</zeroOrMore>
|
|
83
|
-
</define>
|
|
84
|
-
<define name="editorialgroup">
|
|
85
|
-
<element name="editorialgroup">
|
|
86
|
-
<oneOrMore>
|
|
87
|
-
<ref name="technical-committee"/>
|
|
88
|
-
</oneOrMore>
|
|
89
|
-
</element>
|
|
90
|
-
</define>
|
|
91
|
-
<define name="technical-committee">
|
|
92
|
-
<element name="committee">
|
|
93
|
-
<optional>
|
|
94
|
-
<attribute name="type"/>
|
|
95
|
-
</optional>
|
|
96
|
-
<text/>
|
|
97
|
-
</element>
|
|
98
|
-
</define>
|
|
99
60
|
</include>
|
|
100
61
|
<define name="csd-standard">
|
|
101
62
|
<element name="csd-standard">
|
data/lib/metanorma/cc/isodoc.rng
CHANGED
|
@@ -19,19 +19,7 @@
|
|
|
19
19
|
-->
|
|
20
20
|
<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">
|
|
21
21
|
<include href="reqt.rng"/>
|
|
22
|
-
<!-- include "biblio.rnc" { } -->
|
|
23
22
|
<include href="basicdoc.rng">
|
|
24
|
-
<start>
|
|
25
|
-
<ref name="standard-document"/>
|
|
26
|
-
</start>
|
|
27
|
-
<define name="doctype">
|
|
28
|
-
<element name="doctype">
|
|
29
|
-
<optional>
|
|
30
|
-
<attribute name="abbreviation"/>
|
|
31
|
-
</optional>
|
|
32
|
-
<ref name="DocumentType"/>
|
|
33
|
-
</element>
|
|
34
|
-
</define>
|
|
35
23
|
<define name="admonition">
|
|
36
24
|
<element name="admonition">
|
|
37
25
|
<attribute name="type">
|
|
@@ -117,24 +105,6 @@
|
|
|
117
105
|
</optional>
|
|
118
106
|
</element>
|
|
119
107
|
</define>
|
|
120
|
-
<define name="bibitem">
|
|
121
|
-
<element name="bibitem">
|
|
122
|
-
<attribute name="id">
|
|
123
|
-
<data type="ID"/>
|
|
124
|
-
</attribute>
|
|
125
|
-
<optional>
|
|
126
|
-
<attribute name="hidden">
|
|
127
|
-
<data type="boolean"/>
|
|
128
|
-
</attribute>
|
|
129
|
-
</optional>
|
|
130
|
-
<optional>
|
|
131
|
-
<attribute name="suppress_identifier">
|
|
132
|
-
<data type="boolean"/>
|
|
133
|
-
</attribute>
|
|
134
|
-
</optional>
|
|
135
|
-
<ref name="BibliographicItem"/>
|
|
136
|
-
</element>
|
|
137
|
-
</define>
|
|
138
108
|
<define name="section-title">
|
|
139
109
|
<element name="title">
|
|
140
110
|
<zeroOrMore>
|
|
@@ -248,42 +218,6 @@
|
|
|
248
218
|
<ref name="PureTextElement"/>
|
|
249
219
|
</oneOrMore>
|
|
250
220
|
</define>
|
|
251
|
-
<define name="localityStack">
|
|
252
|
-
<element name="localityStack">
|
|
253
|
-
<optional>
|
|
254
|
-
<attribute name="connective">
|
|
255
|
-
<choice>
|
|
256
|
-
<value>and</value>
|
|
257
|
-
<value>or</value>
|
|
258
|
-
<value>from</value>
|
|
259
|
-
<value>to</value>
|
|
260
|
-
<value/>
|
|
261
|
-
</choice>
|
|
262
|
-
</attribute>
|
|
263
|
-
</optional>
|
|
264
|
-
<zeroOrMore>
|
|
265
|
-
<ref name="locality"/>
|
|
266
|
-
</zeroOrMore>
|
|
267
|
-
</element>
|
|
268
|
-
</define>
|
|
269
|
-
<define name="sourceLocalityStack">
|
|
270
|
-
<element name="sourceLocalityStack">
|
|
271
|
-
<optional>
|
|
272
|
-
<attribute name="connective">
|
|
273
|
-
<choice>
|
|
274
|
-
<value>and</value>
|
|
275
|
-
<value>or</value>
|
|
276
|
-
<value>from</value>
|
|
277
|
-
<value>to</value>
|
|
278
|
-
<value/>
|
|
279
|
-
</choice>
|
|
280
|
-
</attribute>
|
|
281
|
-
</optional>
|
|
282
|
-
<zeroOrMore>
|
|
283
|
-
<ref name="sourceLocality"/>
|
|
284
|
-
</zeroOrMore>
|
|
285
|
-
</element>
|
|
286
|
-
</define>
|
|
287
221
|
<define name="ul">
|
|
288
222
|
<element name="ul">
|
|
289
223
|
<attribute name="id">
|
|
@@ -827,21 +761,6 @@
|
|
|
827
761
|
</zeroOrMore>
|
|
828
762
|
</element>
|
|
829
763
|
</define>
|
|
830
|
-
<define name="BibDataExtensionType">
|
|
831
|
-
<ref name="doctype"/>
|
|
832
|
-
<optional>
|
|
833
|
-
<ref name="docsubtype"/>
|
|
834
|
-
</optional>
|
|
835
|
-
<optional>
|
|
836
|
-
<ref name="editorialgroup"/>
|
|
837
|
-
</optional>
|
|
838
|
-
<zeroOrMore>
|
|
839
|
-
<ref name="ics"/>
|
|
840
|
-
</zeroOrMore>
|
|
841
|
-
<zeroOrMore>
|
|
842
|
-
<ref name="structuredidentifier"/>
|
|
843
|
-
</zeroOrMore>
|
|
844
|
-
</define>
|
|
845
764
|
<!-- TitleType = text -->
|
|
846
765
|
<define name="sections">
|
|
847
766
|
<element name="sections">
|
|
@@ -881,7 +800,7 @@
|
|
|
881
800
|
<ref name="BasicBlock"/>
|
|
882
801
|
</zeroOrMore>
|
|
883
802
|
<zeroOrMore>
|
|
884
|
-
<ref name="
|
|
803
|
+
<ref name="doc_bibitem"/>
|
|
885
804
|
<zeroOrMore>
|
|
886
805
|
<ref name="note"/>
|
|
887
806
|
</zeroOrMore>
|
|
@@ -1219,6 +1138,24 @@
|
|
|
1219
1138
|
</define>
|
|
1220
1139
|
</include>
|
|
1221
1140
|
<!-- end overrides -->
|
|
1141
|
+
<define name="doc_bibitem">
|
|
1142
|
+
<element name="bibitem">
|
|
1143
|
+
<attribute name="id">
|
|
1144
|
+
<data type="ID"/>
|
|
1145
|
+
</attribute>
|
|
1146
|
+
<optional>
|
|
1147
|
+
<attribute name="hidden">
|
|
1148
|
+
<data type="boolean"/>
|
|
1149
|
+
</attribute>
|
|
1150
|
+
</optional>
|
|
1151
|
+
<optional>
|
|
1152
|
+
<attribute name="suppress_identifier">
|
|
1153
|
+
<data type="boolean"/>
|
|
1154
|
+
</attribute>
|
|
1155
|
+
</optional>
|
|
1156
|
+
<ref name="BibliographicItem"/>
|
|
1157
|
+
</element>
|
|
1158
|
+
</define>
|
|
1222
1159
|
<define name="image" combine="choice">
|
|
1223
1160
|
<element name="svg">
|
|
1224
1161
|
<oneOrMore>
|
|
@@ -1237,14 +1174,6 @@
|
|
|
1237
1174
|
<value>tag</value>
|
|
1238
1175
|
</choice>
|
|
1239
1176
|
</define>
|
|
1240
|
-
<define name="docsubtype">
|
|
1241
|
-
<element name="subdoctype">
|
|
1242
|
-
<ref name="DocumentSubtype"/>
|
|
1243
|
-
</element>
|
|
1244
|
-
</define>
|
|
1245
|
-
<define name="DocumentSubtype">
|
|
1246
|
-
<text/>
|
|
1247
|
-
</define>
|
|
1248
1177
|
<define name="colgroup">
|
|
1249
1178
|
<element name="colgroup">
|
|
1250
1179
|
<oneOrMore>
|
|
@@ -1606,45 +1535,6 @@
|
|
|
1606
1535
|
</choice>
|
|
1607
1536
|
</element>
|
|
1608
1537
|
</define>
|
|
1609
|
-
<define name="editorialgroup">
|
|
1610
|
-
<element name="editorialgroup">
|
|
1611
|
-
<oneOrMore>
|
|
1612
|
-
<ref name="technical-committee"/>
|
|
1613
|
-
</oneOrMore>
|
|
1614
|
-
</element>
|
|
1615
|
-
</define>
|
|
1616
|
-
<define name="technical-committee">
|
|
1617
|
-
<element name="technical-committee">
|
|
1618
|
-
<ref name="IsoWorkgroup"/>
|
|
1619
|
-
</element>
|
|
1620
|
-
</define>
|
|
1621
|
-
<define name="IsoWorkgroup">
|
|
1622
|
-
<optional>
|
|
1623
|
-
<attribute name="number"/>
|
|
1624
|
-
</optional>
|
|
1625
|
-
<optional>
|
|
1626
|
-
<attribute name="type"/>
|
|
1627
|
-
</optional>
|
|
1628
|
-
<optional>
|
|
1629
|
-
<attribute name="identifier"/>
|
|
1630
|
-
</optional>
|
|
1631
|
-
<optional>
|
|
1632
|
-
<attribute name="prefix"/>
|
|
1633
|
-
</optional>
|
|
1634
|
-
<text/>
|
|
1635
|
-
</define>
|
|
1636
|
-
<define name="ics">
|
|
1637
|
-
<element name="ics">
|
|
1638
|
-
<element name="code">
|
|
1639
|
-
<text/>
|
|
1640
|
-
</element>
|
|
1641
|
-
<optional>
|
|
1642
|
-
<element name="text">
|
|
1643
|
-
<text/>
|
|
1644
|
-
</element>
|
|
1645
|
-
</optional>
|
|
1646
|
-
</element>
|
|
1647
|
-
</define>
|
|
1648
1538
|
<define name="standard-document">
|
|
1649
1539
|
<element name="standard-document">
|
|
1650
1540
|
<attribute name="version"/>
|
|
@@ -2475,71 +2365,6 @@
|
|
|
2475
2365
|
</optional>
|
|
2476
2366
|
</element>
|
|
2477
2367
|
</define>
|
|
2478
|
-
<define name="structuredidentifier">
|
|
2479
|
-
<element name="structuredidentifier">
|
|
2480
|
-
<optional>
|
|
2481
|
-
<attribute name="type"/>
|
|
2482
|
-
</optional>
|
|
2483
|
-
<oneOrMore>
|
|
2484
|
-
<element name="agency">
|
|
2485
|
-
<text/>
|
|
2486
|
-
</element>
|
|
2487
|
-
</oneOrMore>
|
|
2488
|
-
<optional>
|
|
2489
|
-
<element name="class">
|
|
2490
|
-
<text/>
|
|
2491
|
-
</element>
|
|
2492
|
-
</optional>
|
|
2493
|
-
<element name="docnumber">
|
|
2494
|
-
<text/>
|
|
2495
|
-
</element>
|
|
2496
|
-
<optional>
|
|
2497
|
-
<element name="partnumber">
|
|
2498
|
-
<text/>
|
|
2499
|
-
</element>
|
|
2500
|
-
</optional>
|
|
2501
|
-
<optional>
|
|
2502
|
-
<element name="edition">
|
|
2503
|
-
<text/>
|
|
2504
|
-
</element>
|
|
2505
|
-
</optional>
|
|
2506
|
-
<optional>
|
|
2507
|
-
<element name="version">
|
|
2508
|
-
<text/>
|
|
2509
|
-
</element>
|
|
2510
|
-
</optional>
|
|
2511
|
-
<optional>
|
|
2512
|
-
<element name="supplementtype">
|
|
2513
|
-
<text/>
|
|
2514
|
-
</element>
|
|
2515
|
-
</optional>
|
|
2516
|
-
<optional>
|
|
2517
|
-
<element name="supplementnumber">
|
|
2518
|
-
<text/>
|
|
2519
|
-
</element>
|
|
2520
|
-
</optional>
|
|
2521
|
-
<optional>
|
|
2522
|
-
<element name="amendment">
|
|
2523
|
-
<text/>
|
|
2524
|
-
</element>
|
|
2525
|
-
</optional>
|
|
2526
|
-
<optional>
|
|
2527
|
-
<element name="corrigendum">
|
|
2528
|
-
<text/>
|
|
2529
|
-
</element>
|
|
2530
|
-
</optional>
|
|
2531
|
-
<optional>
|
|
2532
|
-
<element name="language">
|
|
2533
|
-
<text/>
|
|
2534
|
-
</element>
|
|
2535
|
-
</optional>
|
|
2536
|
-
<optional>
|
|
2537
|
-
<element name="year">
|
|
2538
|
-
<text/>
|
|
2539
|
-
</element>
|
|
2540
|
-
</optional>
|
|
2541
|
-
</element>
|
|
2542
|
-
</define>
|
|
2543
2368
|
<define name="term-clause">
|
|
2544
2369
|
<element name="clause">
|
|
2545
2370
|
<optional>
|
|
@@ -2813,4 +2638,7 @@
|
|
|
2813
2638
|
</attribute>
|
|
2814
2639
|
</element>
|
|
2815
2640
|
</define>
|
|
2641
|
+
<start>
|
|
2642
|
+
<ref name="standard-document"/>
|
|
2643
|
+
</start>
|
|
2816
2644
|
</grammar>
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0">
|
|
3
|
+
<include href="biblio-standoc.rng">
|
|
4
|
+
<define name="DocumentType">
|
|
5
|
+
<choice>
|
|
6
|
+
<value>directive</value>
|
|
7
|
+
<value>guide</value>
|
|
8
|
+
<value>specification</value>
|
|
9
|
+
<value>standard</value>
|
|
10
|
+
<value>report</value>
|
|
11
|
+
<value>administrative</value>
|
|
12
|
+
<value>amendment</value>
|
|
13
|
+
<value>technical corrigendum</value>
|
|
14
|
+
<value>advisory</value>
|
|
15
|
+
</choice>
|
|
16
|
+
</define>
|
|
17
|
+
<define name="BibDataExtensionType">
|
|
18
|
+
<optional>
|
|
19
|
+
<attribute name="schema-version"/>
|
|
20
|
+
</optional>
|
|
21
|
+
<optional>
|
|
22
|
+
<ref name="doctype"/>
|
|
23
|
+
</optional>
|
|
24
|
+
<optional>
|
|
25
|
+
<ref name="docsubtype"/>
|
|
26
|
+
</optional>
|
|
27
|
+
<ref name="editorialgroup"/>
|
|
28
|
+
<zeroOrMore>
|
|
29
|
+
<ref name="ics"/>
|
|
30
|
+
</zeroOrMore>
|
|
31
|
+
</define>
|
|
32
|
+
<define name="editorialgroup">
|
|
33
|
+
<element name="editorialgroup">
|
|
34
|
+
<oneOrMore>
|
|
35
|
+
<ref name="technical-committee"/>
|
|
36
|
+
</oneOrMore>
|
|
37
|
+
</element>
|
|
38
|
+
</define>
|
|
39
|
+
<define name="technical-committee">
|
|
40
|
+
<element name="committee">
|
|
41
|
+
<optional>
|
|
42
|
+
<attribute name="type"/>
|
|
43
|
+
</optional>
|
|
44
|
+
<text/>
|
|
45
|
+
</element>
|
|
46
|
+
</define>
|
|
47
|
+
</include>
|
|
48
|
+
</grammar>
|
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.11
|
|
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-10-
|
|
11
|
+
date: 2022-10-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -176,6 +176,7 @@ executables: []
|
|
|
176
176
|
extensions: []
|
|
177
177
|
extra_rdoc_files: []
|
|
178
178
|
files:
|
|
179
|
+
- ".github/workflows/automerge.yml"
|
|
179
180
|
- ".github/workflows/rake.yml"
|
|
180
181
|
- ".github/workflows/release.yml"
|
|
181
182
|
- ".gitignore"
|
|
@@ -219,12 +220,14 @@ files:
|
|
|
219
220
|
- lib/metanorma-cc.rb
|
|
220
221
|
- lib/metanorma/cc.rb
|
|
221
222
|
- lib/metanorma/cc/basicdoc.rng
|
|
223
|
+
- lib/metanorma/cc/biblio-standoc.rng
|
|
222
224
|
- lib/metanorma/cc/biblio.rng
|
|
223
225
|
- lib/metanorma/cc/boilerplate.xml
|
|
224
226
|
- lib/metanorma/cc/cc.rng
|
|
225
227
|
- lib/metanorma/cc/converter.rb
|
|
226
228
|
- lib/metanorma/cc/isodoc.rng
|
|
227
229
|
- lib/metanorma/cc/processor.rb
|
|
230
|
+
- lib/metanorma/cc/relaton-cc.rng
|
|
228
231
|
- lib/metanorma/cc/reqt.rng
|
|
229
232
|
- lib/metanorma/cc/validate_section.rb
|
|
230
233
|
- lib/metanorma/cc/version.rb
|