metanorma-iec 2.1.9 → 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/iec/html/htmlstyle.css +1 -1
- data/lib/isodoc/iec/html/htmlstyle.scss +1 -1
- data/lib/isodoc/iec/iec.international-standard.xsl +16 -4
- data/lib/isodoc/iec/presentation_xml_convert.rb +1 -1
- data/lib/metanorma/iec/basicdoc.rng +0 -27
- data/lib/metanorma/iec/biblio-standoc.rng +164 -0
- data/lib/metanorma/iec/biblio.rng +45 -18
- data/lib/metanorma/iec/iec.rng +1 -100
- data/lib/metanorma/iec/isodoc.rng +31 -194
- data/lib/metanorma/iec/isostandard.rng +0 -191
- data/lib/metanorma/iec/relaton-iec.rng +284 -0
- data/lib/metanorma/iec/version.rb +1 -1
- data/spec/isodoc/iev_spec.rb +1 -1
- data/spec/isodoc/inline_spec.rb +0 -37
- metadata +5 -2
@@ -0,0 +1,284 @@
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
+
<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
3
|
+
<include href="biblio-standoc.rng">
|
4
|
+
<define name="BibDataExtensionType">
|
5
|
+
<optional>
|
6
|
+
<attribute name="schema-version"/>
|
7
|
+
</optional>
|
8
|
+
<ref name="doctype"/>
|
9
|
+
<optional>
|
10
|
+
<ref name="docsubtype"/>
|
11
|
+
</optional>
|
12
|
+
<optional>
|
13
|
+
<ref name="horizontal"/>
|
14
|
+
</optional>
|
15
|
+
<optional>
|
16
|
+
<ref name="function"/>
|
17
|
+
</optional>
|
18
|
+
<ref name="editorialgroup"/>
|
19
|
+
<zeroOrMore>
|
20
|
+
<ref name="ics"/>
|
21
|
+
</zeroOrMore>
|
22
|
+
<ref name="structuredidentifier"/>
|
23
|
+
<optional>
|
24
|
+
<ref name="stagename"/>
|
25
|
+
</optional>
|
26
|
+
<optional>
|
27
|
+
<ref name="updates_document_type"/>
|
28
|
+
</optional>
|
29
|
+
<optional>
|
30
|
+
<ref name="accessibility-color-inside"/>
|
31
|
+
</optional>
|
32
|
+
<optional>
|
33
|
+
<ref name="price-code"/>
|
34
|
+
</optional>
|
35
|
+
<optional>
|
36
|
+
<ref name="cen-processing"/>
|
37
|
+
</optional>
|
38
|
+
<optional>
|
39
|
+
<ref name="secretary"/>
|
40
|
+
</optional>
|
41
|
+
<optional>
|
42
|
+
<ref name="interest-to-committees"/>
|
43
|
+
</optional>
|
44
|
+
<optional>
|
45
|
+
<ref name="tc-sc-officers-note"/>
|
46
|
+
</optional>
|
47
|
+
</define>
|
48
|
+
<define name="bdate">
|
49
|
+
<element name="date">
|
50
|
+
<attribute name="type">
|
51
|
+
<choice>
|
52
|
+
<ref name="BibliographicDateType"/>
|
53
|
+
<text/>
|
54
|
+
</choice>
|
55
|
+
</attribute>
|
56
|
+
<choice>
|
57
|
+
<group>
|
58
|
+
<element name="from">
|
59
|
+
<ref name="ISO8601Date"/>
|
60
|
+
</element>
|
61
|
+
<optional>
|
62
|
+
<element name="to">
|
63
|
+
<ref name="ISO8601Date"/>
|
64
|
+
</element>
|
65
|
+
</optional>
|
66
|
+
</group>
|
67
|
+
<element name="on">
|
68
|
+
<choice>
|
69
|
+
<ref name="ISO8601Date"/>
|
70
|
+
<value>--</value>
|
71
|
+
<value>–</value>
|
72
|
+
</choice>
|
73
|
+
</element>
|
74
|
+
</choice>
|
75
|
+
</element>
|
76
|
+
</define>
|
77
|
+
<define name="organization">
|
78
|
+
<element name="organization">
|
79
|
+
<oneOrMore>
|
80
|
+
<ref name="orgname"/>
|
81
|
+
</oneOrMore>
|
82
|
+
<optional>
|
83
|
+
<ref name="abbreviation"/>
|
84
|
+
</optional>
|
85
|
+
<optional>
|
86
|
+
<ref name="uri"/>
|
87
|
+
</optional>
|
88
|
+
<zeroOrMore>
|
89
|
+
<ref name="org-identifier"/>
|
90
|
+
</zeroOrMore>
|
91
|
+
<zeroOrMore>
|
92
|
+
<ref name="contact"/>
|
93
|
+
</zeroOrMore>
|
94
|
+
<optional>
|
95
|
+
<ref name="technical-committee"/>
|
96
|
+
</optional>
|
97
|
+
<optional>
|
98
|
+
<ref name="subcommittee"/>
|
99
|
+
</optional>
|
100
|
+
<optional>
|
101
|
+
<ref name="workgroup"/>
|
102
|
+
</optional>
|
103
|
+
<optional>
|
104
|
+
<ref name="secretariat"/>
|
105
|
+
</optional>
|
106
|
+
</element>
|
107
|
+
</define>
|
108
|
+
<define name="DocumentType">
|
109
|
+
<choice>
|
110
|
+
<value>international-standard</value>
|
111
|
+
<value>technical-specification</value>
|
112
|
+
<value>technical-report</value>
|
113
|
+
<value>publicly-available-specification</value>
|
114
|
+
<value>international-workshop-agreement</value>
|
115
|
+
<value>guide</value>
|
116
|
+
<value>industry-technical-agreement</value>
|
117
|
+
<value>system-reference-deliverable</value>
|
118
|
+
</choice>
|
119
|
+
</define>
|
120
|
+
<define name="DocumentSubtype">
|
121
|
+
<choice>
|
122
|
+
<value>specification</value>
|
123
|
+
<value>method-of-test</value>
|
124
|
+
<value>vocabulary</value>
|
125
|
+
<value>code-of-practice</value>
|
126
|
+
</choice>
|
127
|
+
</define>
|
128
|
+
<define name="structuredidentifier">
|
129
|
+
<element name="structuredidentifier">
|
130
|
+
<optional>
|
131
|
+
<attribute name="type"/>
|
132
|
+
</optional>
|
133
|
+
<group>
|
134
|
+
<ref name="documentnumber"/>
|
135
|
+
<optional>
|
136
|
+
<ref name="tc-documentnumber"/>
|
137
|
+
</optional>
|
138
|
+
</group>
|
139
|
+
</element>
|
140
|
+
</define>
|
141
|
+
<define name="editorialgroup">
|
142
|
+
<element name="editorialgroup">
|
143
|
+
<ref name="ISOProjectGroup"/>
|
144
|
+
</element>
|
145
|
+
</define>
|
146
|
+
</include>
|
147
|
+
<define name="updates_document_type">
|
148
|
+
<element name="updates-document-type">
|
149
|
+
<ref name="DocumentType"/>
|
150
|
+
</element>
|
151
|
+
</define>
|
152
|
+
<define name="ISOProjectGroup">
|
153
|
+
<zeroOrMore>
|
154
|
+
<ref name="agency"/>
|
155
|
+
</zeroOrMore>
|
156
|
+
<oneOrMore>
|
157
|
+
<ref name="technical-committee"/>
|
158
|
+
</oneOrMore>
|
159
|
+
<zeroOrMore>
|
160
|
+
<ref name="subcommittee"/>
|
161
|
+
</zeroOrMore>
|
162
|
+
<zeroOrMore>
|
163
|
+
<ref name="workgroup"/>
|
164
|
+
</zeroOrMore>
|
165
|
+
<optional>
|
166
|
+
<ref name="secretariat"/>
|
167
|
+
</optional>
|
168
|
+
</define>
|
169
|
+
<define name="approvalgroup">
|
170
|
+
<element name="approvalgroup">
|
171
|
+
<ref name="ISOProjectGroup"/>
|
172
|
+
</element>
|
173
|
+
</define>
|
174
|
+
<define name="agency">
|
175
|
+
<element name="agency">
|
176
|
+
<text/>
|
177
|
+
</element>
|
178
|
+
</define>
|
179
|
+
<define name="horizontal">
|
180
|
+
<element name="horizontal">
|
181
|
+
<data type="boolean"/>
|
182
|
+
</element>
|
183
|
+
</define>
|
184
|
+
<define name="documentnumber">
|
185
|
+
<element name="project-number">
|
186
|
+
<optional>
|
187
|
+
<attribute name="part">
|
188
|
+
<data type="int"/>
|
189
|
+
</attribute>
|
190
|
+
</optional>
|
191
|
+
<optional>
|
192
|
+
<attribute name="subpart">
|
193
|
+
<data type="int"/>
|
194
|
+
</attribute>
|
195
|
+
</optional>
|
196
|
+
<optional>
|
197
|
+
<attribute name="amendment">
|
198
|
+
<data type="int"/>
|
199
|
+
</attribute>
|
200
|
+
</optional>
|
201
|
+
<optional>
|
202
|
+
<attribute name="corrigendum">
|
203
|
+
<data type="int"/>
|
204
|
+
</attribute>
|
205
|
+
</optional>
|
206
|
+
<optional>
|
207
|
+
<attribute name="origyr">
|
208
|
+
<ref name="ISO8601Date"/>
|
209
|
+
</attribute>
|
210
|
+
</optional>
|
211
|
+
<text/>
|
212
|
+
</element>
|
213
|
+
</define>
|
214
|
+
<define name="tc-documentnumber">
|
215
|
+
<element name="tc-document-number">
|
216
|
+
<data type="int"/>
|
217
|
+
</element>
|
218
|
+
</define>
|
219
|
+
<define name="subcommittee">
|
220
|
+
<element name="subcommittee">
|
221
|
+
<ref name="IsoWorkgroup"/>
|
222
|
+
</element>
|
223
|
+
</define>
|
224
|
+
<define name="workgroup">
|
225
|
+
<element name="workgroup">
|
226
|
+
<ref name="IsoWorkgroup"/>
|
227
|
+
</element>
|
228
|
+
</define>
|
229
|
+
<define name="secretariat">
|
230
|
+
<element name="secretariat">
|
231
|
+
<text/>
|
232
|
+
</element>
|
233
|
+
</define>
|
234
|
+
<define name="stagename">
|
235
|
+
<element name="stagename">
|
236
|
+
<optional>
|
237
|
+
<attribute name="abbreviation"/>
|
238
|
+
</optional>
|
239
|
+
<text/>
|
240
|
+
</element>
|
241
|
+
</define>
|
242
|
+
<define name="function">
|
243
|
+
<element name="function">
|
244
|
+
<choice>
|
245
|
+
<value>emc</value>
|
246
|
+
<value>safety</value>
|
247
|
+
<value>environment</value>
|
248
|
+
<value>quality-assurance</value>
|
249
|
+
</choice>
|
250
|
+
</element>
|
251
|
+
</define>
|
252
|
+
<define name="accessibility-color-inside">
|
253
|
+
<element name="accessibility-color-inside">
|
254
|
+
<data type="boolean"/>
|
255
|
+
</element>
|
256
|
+
</define>
|
257
|
+
<define name="price-code">
|
258
|
+
<element name="price-code">
|
259
|
+
<text/>
|
260
|
+
</element>
|
261
|
+
</define>
|
262
|
+
<define name="cen-processing">
|
263
|
+
<element name="cen-processing">
|
264
|
+
<data type="boolean"/>
|
265
|
+
</element>
|
266
|
+
</define>
|
267
|
+
<define name="secretary">
|
268
|
+
<element name="secretary">
|
269
|
+
<text/>
|
270
|
+
</element>
|
271
|
+
</define>
|
272
|
+
<define name="interest-to-committees">
|
273
|
+
<element name="interest-to-committees">
|
274
|
+
<text/>
|
275
|
+
</element>
|
276
|
+
</define>
|
277
|
+
<define name="tc-sc-officers-note">
|
278
|
+
<element name="tc-sc-officers-note">
|
279
|
+
<zeroOrMore>
|
280
|
+
<ref name="BasicBlock"/>
|
281
|
+
</zeroOrMore>
|
282
|
+
</element>
|
283
|
+
</define>
|
284
|
+
</grammar>
|
data/spec/isodoc/iev_spec.rb
CHANGED
@@ -861,7 +861,7 @@ RSpec.describe IsoDoc do
|
|
861
861
|
<dd language='zh' script='Hans'>
|
862
862
|
<preferred>
|
863
863
|
<strong>产品</strong>
|
864
|
-
, <在可靠性方面
|
864
|
+
, <在可靠性方面/>
|
865
865
|
</preferred>
|
866
866
|
</dd>
|
867
867
|
</dl>
|
data/spec/isodoc/inline_spec.rb
CHANGED
@@ -101,43 +101,6 @@ RSpec.describe IsoDoc do
|
|
101
101
|
.to be_equivalent_to xmlpp(output)
|
102
102
|
end
|
103
103
|
|
104
|
-
it "processes AsciiMath and MathML" do
|
105
|
-
input = <<~INPUT
|
106
|
-
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
107
|
-
<preface><foreword>
|
108
|
-
<p>
|
109
|
-
<stem type="AsciiMath">A</stem>
|
110
|
-
<stem type="MathML"><m:math><m:row>X</m:row></m:math></stem>
|
111
|
-
<stem type="None">Latex?</stem>
|
112
|
-
</p>
|
113
|
-
</foreword></preface>
|
114
|
-
<sections>
|
115
|
-
</iso-standard>
|
116
|
-
INPUT
|
117
|
-
output = <<~OUTPUT
|
118
|
-
#{HTML_HDR.sub(/<html/, "<html xmlns:m='m'")}
|
119
|
-
<div>
|
120
|
-
<h1 class="ForewordTitle">FOREWORD</h1>
|
121
|
-
<div class="boilerplate_legal"/>
|
122
|
-
<p>
|
123
|
-
<span class="stem">(#(A)#)</span>
|
124
|
-
<span class="stem"><m:math>
|
125
|
-
<m:row>X</m:row>
|
126
|
-
</m:math></span>
|
127
|
-
<span class="stem">Latex?</span>
|
128
|
-
</p>
|
129
|
-
</div>
|
130
|
-
#{IEC_TITLE1}
|
131
|
-
</div>
|
132
|
-
</body>
|
133
|
-
</html>
|
134
|
-
OUTPUT
|
135
|
-
expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({})
|
136
|
-
.convert("test", input, true)
|
137
|
-
.sub(/<html/, "<html xmlns:m='m'")))
|
138
|
-
.to be_equivalent_to xmlpp(output)
|
139
|
-
end
|
140
|
-
|
141
104
|
it "overrides AsciiMath delimiters" do
|
142
105
|
input = <<~INPUT
|
143
106
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-iec
|
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: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-10-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: metanorma-iso
|
@@ -202,6 +202,7 @@ executables: []
|
|
202
202
|
extensions: []
|
203
203
|
extra_rdoc_files: []
|
204
204
|
files:
|
205
|
+
- ".github/workflows/automerge.yml"
|
205
206
|
- ".github/workflows/rake.yml"
|
206
207
|
- ".github/workflows/release.yml"
|
207
208
|
- ".gitignore"
|
@@ -241,6 +242,7 @@ files:
|
|
241
242
|
- lib/metanorma-iec.rb
|
242
243
|
- lib/metanorma/iec.rb
|
243
244
|
- lib/metanorma/iec/basicdoc.rng
|
245
|
+
- lib/metanorma/iec/biblio-standoc.rng
|
244
246
|
- lib/metanorma/iec/biblio.rng
|
245
247
|
- lib/metanorma/iec/converter.rb
|
246
248
|
- lib/metanorma/iec/front.rb
|
@@ -250,6 +252,7 @@ files:
|
|
250
252
|
- lib/metanorma/iec/isodoc.rng
|
251
253
|
- lib/metanorma/iec/isostandard.rng
|
252
254
|
- lib/metanorma/iec/processor.rb
|
255
|
+
- lib/metanorma/iec/relaton-iec.rng
|
253
256
|
- lib/metanorma/iec/reqt.rng
|
254
257
|
- lib/metanorma/iec/version.rb
|
255
258
|
- metanorma-iec.gemspec
|