metanorma-iec 1.0.8 → 1.0.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/iec/biblio.rng +1 -1
- data/lib/asciidoctor/iec/front.rb +1 -1
- data/lib/asciidoctor/iec/isodoc.rng +427 -0
- data/lib/asciidoctor/iec/isostandard.rng +3 -0
- data/lib/asciidoctor/iec/reqt.rng +23 -0
- data/lib/isodoc/iec/base_convert.rb +6 -31
- data/lib/isodoc/iec/word_convert.rb +1 -1
- data/lib/metanorma/iec/version.rb +1 -1
- data/spec/asciidoctor-iec/base_spec.rb +5 -5
- data/spec/asciidoctor-iec/iev_spec.rb +2 -2
- data/spec/isodoc/blocks_spec.rb +12 -18
- data/spec/isodoc/i18n_spec.rb +4 -4
- data/spec/isodoc/iev_spec.rb +7 -10
- data/spec/isodoc/inline_spec.rb +9 -9
- data/spec/isodoc/iso_spec.rb +4 -4
- data/spec/isodoc/metadata_spec.rb +2 -2
- data/spec/isodoc/postproc_spec.rb +3 -3
- data/spec/isodoc/ref_spec.rb +5 -5
- data/spec/isodoc/section_spec.rb +9 -9
- data/spec/isodoc/terms_spec.rb +10 -12
- data/spec/metanorma/processor_spec.rb +0 -3
- data/spec/spec_helper.rb +7 -0
- 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: 4b6ff62f9dcd74b090c2c917d2f3cf3a9e9189871366b83f04b21a2a1ee44571
|
|
4
|
+
data.tar.gz: 758d89c6fb5a0216f88015336dab11e0932c3c175e13c3841f48d56e62e66b8c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a41f914c5b7ea225c7d3adf8ea80fa6690be071dc91461c1e35a4385f54a9cabe4f7bffe9755c087d0bbe88593f18f978cb3ff448e5bb86e6444efc1300b7aa3
|
|
7
|
+
data.tar.gz: af7f0b65f1ffd961edbad483ec865f3bd26a25cf247bff849c5950239f434a046b84f1b432eec91b117ea9cedf822f0d1f06dcb62ee74c66fe7ceb62445f5f4b
|
|
@@ -532,7 +532,7 @@
|
|
|
532
532
|
</define>
|
|
533
533
|
<define name="LocalityType">
|
|
534
534
|
<data type="string">
|
|
535
|
-
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
|
|
535
|
+
<param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
|
|
536
536
|
</data>
|
|
537
537
|
</define>
|
|
538
538
|
<define name="referenceFrom">
|
|
@@ -39,7 +39,7 @@ module Asciidoctor
|
|
|
39
39
|
dn = add_id_parts(node.attr("docnumber"), part, subpart)
|
|
40
40
|
dn = id_stage_prefix(dn, node, false)
|
|
41
41
|
dn = id_edition_suffix(dn, node)
|
|
42
|
-
xml.docidentifier dn, **attr_code(type: "
|
|
42
|
+
xml.docidentifier dn, **attr_code(type: "ISO")
|
|
43
43
|
end
|
|
44
44
|
|
|
45
45
|
def id_edition_suffix(dn, node)
|
|
@@ -64,6 +64,85 @@
|
|
|
64
64
|
<text/>
|
|
65
65
|
</element>
|
|
66
66
|
</define>
|
|
67
|
+
<define name="ul">
|
|
68
|
+
<element name="ul">
|
|
69
|
+
<attribute name="id">
|
|
70
|
+
<data type="ID"/>
|
|
71
|
+
</attribute>
|
|
72
|
+
<optional>
|
|
73
|
+
<attribute name="keep-with-next">
|
|
74
|
+
<data type="boolean"/>
|
|
75
|
+
</attribute>
|
|
76
|
+
</optional>
|
|
77
|
+
<optional>
|
|
78
|
+
<attribute name="keep-lines-together">
|
|
79
|
+
<data type="boolean"/>
|
|
80
|
+
</attribute>
|
|
81
|
+
</optional>
|
|
82
|
+
<oneOrMore>
|
|
83
|
+
<ref name="li"/>
|
|
84
|
+
</oneOrMore>
|
|
85
|
+
<zeroOrMore>
|
|
86
|
+
<ref name="note"/>
|
|
87
|
+
</zeroOrMore>
|
|
88
|
+
</element>
|
|
89
|
+
</define>
|
|
90
|
+
<define name="ol">
|
|
91
|
+
<element name="ol">
|
|
92
|
+
<attribute name="id">
|
|
93
|
+
<data type="ID"/>
|
|
94
|
+
</attribute>
|
|
95
|
+
<optional>
|
|
96
|
+
<attribute name="keep-with-next">
|
|
97
|
+
<data type="boolean"/>
|
|
98
|
+
</attribute>
|
|
99
|
+
</optional>
|
|
100
|
+
<optional>
|
|
101
|
+
<attribute name="keep-lines-together">
|
|
102
|
+
<data type="boolean"/>
|
|
103
|
+
</attribute>
|
|
104
|
+
</optional>
|
|
105
|
+
<attribute name="type">
|
|
106
|
+
<choice>
|
|
107
|
+
<value>roman</value>
|
|
108
|
+
<value>alphabet</value>
|
|
109
|
+
<value>arabic</value>
|
|
110
|
+
<value>roman_upper</value>
|
|
111
|
+
<value>alphabet_upper</value>
|
|
112
|
+
</choice>
|
|
113
|
+
</attribute>
|
|
114
|
+
<oneOrMore>
|
|
115
|
+
<ref name="li"/>
|
|
116
|
+
</oneOrMore>
|
|
117
|
+
<zeroOrMore>
|
|
118
|
+
<ref name="note"/>
|
|
119
|
+
</zeroOrMore>
|
|
120
|
+
</element>
|
|
121
|
+
</define>
|
|
122
|
+
<define name="dl">
|
|
123
|
+
<element name="dl">
|
|
124
|
+
<attribute name="id">
|
|
125
|
+
<data type="ID"/>
|
|
126
|
+
</attribute>
|
|
127
|
+
<optional>
|
|
128
|
+
<attribute name="keep-with-next">
|
|
129
|
+
<data type="boolean"/>
|
|
130
|
+
</attribute>
|
|
131
|
+
</optional>
|
|
132
|
+
<optional>
|
|
133
|
+
<attribute name="keep-lines-together">
|
|
134
|
+
<data type="boolean"/>
|
|
135
|
+
</attribute>
|
|
136
|
+
</optional>
|
|
137
|
+
<oneOrMore>
|
|
138
|
+
<ref name="dt"/>
|
|
139
|
+
<ref name="dd"/>
|
|
140
|
+
</oneOrMore>
|
|
141
|
+
<zeroOrMore>
|
|
142
|
+
<ref name="note"/>
|
|
143
|
+
</zeroOrMore>
|
|
144
|
+
</element>
|
|
145
|
+
</define>
|
|
67
146
|
<define name="example">
|
|
68
147
|
<element name="example">
|
|
69
148
|
<attribute name="id">
|
|
@@ -77,6 +156,19 @@
|
|
|
77
156
|
<optional>
|
|
78
157
|
<attribute name="subsequence"/>
|
|
79
158
|
</optional>
|
|
159
|
+
<optional>
|
|
160
|
+
<attribute name="number"/>
|
|
161
|
+
</optional>
|
|
162
|
+
<optional>
|
|
163
|
+
<attribute name="keep-with-next">
|
|
164
|
+
<data type="boolean"/>
|
|
165
|
+
</attribute>
|
|
166
|
+
</optional>
|
|
167
|
+
<optional>
|
|
168
|
+
<attribute name="keep-lines-together">
|
|
169
|
+
<data type="boolean"/>
|
|
170
|
+
</attribute>
|
|
171
|
+
</optional>
|
|
80
172
|
<optional>
|
|
81
173
|
<ref name="tname"/>
|
|
82
174
|
</optional>
|
|
@@ -97,6 +189,296 @@
|
|
|
97
189
|
</zeroOrMore>
|
|
98
190
|
</element>
|
|
99
191
|
</define>
|
|
192
|
+
<define name="table">
|
|
193
|
+
<element name="table">
|
|
194
|
+
<attribute name="id">
|
|
195
|
+
<data type="ID"/>
|
|
196
|
+
</attribute>
|
|
197
|
+
<optional>
|
|
198
|
+
<attribute name="unnumbered">
|
|
199
|
+
<data type="boolean"/>
|
|
200
|
+
</attribute>
|
|
201
|
+
</optional>
|
|
202
|
+
<optional>
|
|
203
|
+
<attribute name="number"/>
|
|
204
|
+
</optional>
|
|
205
|
+
<optional>
|
|
206
|
+
<attribute name="subsequence"/>
|
|
207
|
+
</optional>
|
|
208
|
+
<optional>
|
|
209
|
+
<attribute name="alt"/>
|
|
210
|
+
</optional>
|
|
211
|
+
<optional>
|
|
212
|
+
<attribute name="summary"/>
|
|
213
|
+
</optional>
|
|
214
|
+
<optional>
|
|
215
|
+
<attribute name="uri">
|
|
216
|
+
<data type="anyURI"/>
|
|
217
|
+
</attribute>
|
|
218
|
+
</optional>
|
|
219
|
+
<optional>
|
|
220
|
+
<attribute name="keep-with-next">
|
|
221
|
+
<data type="boolean"/>
|
|
222
|
+
</attribute>
|
|
223
|
+
</optional>
|
|
224
|
+
<optional>
|
|
225
|
+
<attribute name="keep-lines-together">
|
|
226
|
+
<data type="boolean"/>
|
|
227
|
+
</attribute>
|
|
228
|
+
</optional>
|
|
229
|
+
<optional>
|
|
230
|
+
<ref name="tname"/>
|
|
231
|
+
</optional>
|
|
232
|
+
<optional>
|
|
233
|
+
<ref name="thead"/>
|
|
234
|
+
</optional>
|
|
235
|
+
<ref name="tbody"/>
|
|
236
|
+
<optional>
|
|
237
|
+
<ref name="tfoot"/>
|
|
238
|
+
</optional>
|
|
239
|
+
<zeroOrMore>
|
|
240
|
+
<ref name="table-note"/>
|
|
241
|
+
</zeroOrMore>
|
|
242
|
+
<optional>
|
|
243
|
+
<ref name="dl"/>
|
|
244
|
+
</optional>
|
|
245
|
+
</element>
|
|
246
|
+
</define>
|
|
247
|
+
<define name="figure">
|
|
248
|
+
<element name="figure">
|
|
249
|
+
<attribute name="id">
|
|
250
|
+
<data type="ID"/>
|
|
251
|
+
</attribute>
|
|
252
|
+
<optional>
|
|
253
|
+
<attribute name="unnumbered">
|
|
254
|
+
<data type="boolean"/>
|
|
255
|
+
</attribute>
|
|
256
|
+
</optional>
|
|
257
|
+
<optional>
|
|
258
|
+
<attribute name="number"/>
|
|
259
|
+
</optional>
|
|
260
|
+
<optional>
|
|
261
|
+
<attribute name="subsequence"/>
|
|
262
|
+
</optional>
|
|
263
|
+
<optional>
|
|
264
|
+
<attribute name="keep-with-next">
|
|
265
|
+
<data type="boolean"/>
|
|
266
|
+
</attribute>
|
|
267
|
+
</optional>
|
|
268
|
+
<optional>
|
|
269
|
+
<attribute name="keep-lines-together">
|
|
270
|
+
<data type="boolean"/>
|
|
271
|
+
</attribute>
|
|
272
|
+
</optional>
|
|
273
|
+
<optional>
|
|
274
|
+
<attribute name="class"/>
|
|
275
|
+
</optional>
|
|
276
|
+
<optional>
|
|
277
|
+
<ref name="source"/>
|
|
278
|
+
</optional>
|
|
279
|
+
<optional>
|
|
280
|
+
<ref name="tname"/>
|
|
281
|
+
</optional>
|
|
282
|
+
<choice>
|
|
283
|
+
<ref name="image"/>
|
|
284
|
+
<ref name="video"/>
|
|
285
|
+
<ref name="audio"/>
|
|
286
|
+
<ref name="pre"/>
|
|
287
|
+
<oneOrMore>
|
|
288
|
+
<ref name="paragraph-with-footnote"/>
|
|
289
|
+
</oneOrMore>
|
|
290
|
+
<zeroOrMore>
|
|
291
|
+
<ref name="figure"/>
|
|
292
|
+
</zeroOrMore>
|
|
293
|
+
</choice>
|
|
294
|
+
<zeroOrMore>
|
|
295
|
+
<ref name="fn"/>
|
|
296
|
+
</zeroOrMore>
|
|
297
|
+
<optional>
|
|
298
|
+
<ref name="dl"/>
|
|
299
|
+
</optional>
|
|
300
|
+
<zeroOrMore>
|
|
301
|
+
<ref name="note"/>
|
|
302
|
+
</zeroOrMore>
|
|
303
|
+
</element>
|
|
304
|
+
</define>
|
|
305
|
+
<define name="sourcecode">
|
|
306
|
+
<element name="sourcecode">
|
|
307
|
+
<attribute name="id">
|
|
308
|
+
<data type="ID"/>
|
|
309
|
+
</attribute>
|
|
310
|
+
<optional>
|
|
311
|
+
<attribute name="unnumbered">
|
|
312
|
+
<data type="boolean"/>
|
|
313
|
+
</attribute>
|
|
314
|
+
</optional>
|
|
315
|
+
<optional>
|
|
316
|
+
<attribute name="number"/>
|
|
317
|
+
</optional>
|
|
318
|
+
<optional>
|
|
319
|
+
<attribute name="subsequence"/>
|
|
320
|
+
</optional>
|
|
321
|
+
<optional>
|
|
322
|
+
<attribute name="keep-with-next">
|
|
323
|
+
<data type="boolean"/>
|
|
324
|
+
</attribute>
|
|
325
|
+
</optional>
|
|
326
|
+
<optional>
|
|
327
|
+
<attribute name="keep-lines-together">
|
|
328
|
+
<data type="boolean"/>
|
|
329
|
+
</attribute>
|
|
330
|
+
</optional>
|
|
331
|
+
<optional>
|
|
332
|
+
<attribute name="lang"/>
|
|
333
|
+
</optional>
|
|
334
|
+
<optional>
|
|
335
|
+
<ref name="tname"/>
|
|
336
|
+
</optional>
|
|
337
|
+
<oneOrMore>
|
|
338
|
+
<choice>
|
|
339
|
+
<text/>
|
|
340
|
+
<ref name="callout"/>
|
|
341
|
+
</choice>
|
|
342
|
+
</oneOrMore>
|
|
343
|
+
<zeroOrMore>
|
|
344
|
+
<ref name="annotation"/>
|
|
345
|
+
</zeroOrMore>
|
|
346
|
+
<zeroOrMore>
|
|
347
|
+
<ref name="note"/>
|
|
348
|
+
</zeroOrMore>
|
|
349
|
+
</element>
|
|
350
|
+
</define>
|
|
351
|
+
<define name="formula">
|
|
352
|
+
<element name="formula">
|
|
353
|
+
<attribute name="id">
|
|
354
|
+
<data type="ID"/>
|
|
355
|
+
</attribute>
|
|
356
|
+
<optional>
|
|
357
|
+
<attribute name="unnumbered">
|
|
358
|
+
<data type="boolean"/>
|
|
359
|
+
</attribute>
|
|
360
|
+
</optional>
|
|
361
|
+
<optional>
|
|
362
|
+
<attribute name="number"/>
|
|
363
|
+
</optional>
|
|
364
|
+
<optional>
|
|
365
|
+
<attribute name="subsequence"/>
|
|
366
|
+
</optional>
|
|
367
|
+
<optional>
|
|
368
|
+
<attribute name="keep-with-next">
|
|
369
|
+
<data type="boolean"/>
|
|
370
|
+
</attribute>
|
|
371
|
+
</optional>
|
|
372
|
+
<optional>
|
|
373
|
+
<attribute name="keep-lines-together">
|
|
374
|
+
<data type="boolean"/>
|
|
375
|
+
</attribute>
|
|
376
|
+
</optional>
|
|
377
|
+
<optional>
|
|
378
|
+
<attribute name="inequality">
|
|
379
|
+
<data type="boolean"/>
|
|
380
|
+
</attribute>
|
|
381
|
+
</optional>
|
|
382
|
+
<ref name="stem"/>
|
|
383
|
+
<optional>
|
|
384
|
+
<ref name="dl"/>
|
|
385
|
+
</optional>
|
|
386
|
+
<zeroOrMore>
|
|
387
|
+
<ref name="note"/>
|
|
388
|
+
</zeroOrMore>
|
|
389
|
+
</element>
|
|
390
|
+
</define>
|
|
391
|
+
<define name="ParagraphType">
|
|
392
|
+
<attribute name="id">
|
|
393
|
+
<data type="ID"/>
|
|
394
|
+
</attribute>
|
|
395
|
+
<optional>
|
|
396
|
+
<attribute name="align">
|
|
397
|
+
<ref name="Alignments"/>
|
|
398
|
+
</attribute>
|
|
399
|
+
</optional>
|
|
400
|
+
<optional>
|
|
401
|
+
<attribute name="keep-with-next">
|
|
402
|
+
<data type="boolean"/>
|
|
403
|
+
</attribute>
|
|
404
|
+
</optional>
|
|
405
|
+
<optional>
|
|
406
|
+
<attribute name="keep-lines-together">
|
|
407
|
+
<data type="boolean"/>
|
|
408
|
+
</attribute>
|
|
409
|
+
</optional>
|
|
410
|
+
<zeroOrMore>
|
|
411
|
+
<ref name="TextElement"/>
|
|
412
|
+
</zeroOrMore>
|
|
413
|
+
<zeroOrMore>
|
|
414
|
+
<ref name="note"/>
|
|
415
|
+
</zeroOrMore>
|
|
416
|
+
</define>
|
|
417
|
+
<define name="paragraph-with-footnote">
|
|
418
|
+
<element name="p">
|
|
419
|
+
<attribute name="id">
|
|
420
|
+
<data type="ID"/>
|
|
421
|
+
</attribute>
|
|
422
|
+
<optional>
|
|
423
|
+
<attribute name="align">
|
|
424
|
+
<ref name="Alignments"/>
|
|
425
|
+
</attribute>
|
|
426
|
+
</optional>
|
|
427
|
+
<optional>
|
|
428
|
+
<attribute name="keep-with-next">
|
|
429
|
+
<data type="boolean"/>
|
|
430
|
+
</attribute>
|
|
431
|
+
</optional>
|
|
432
|
+
<optional>
|
|
433
|
+
<attribute name="keep-lines-together">
|
|
434
|
+
<data type="boolean"/>
|
|
435
|
+
</attribute>
|
|
436
|
+
</optional>
|
|
437
|
+
<zeroOrMore>
|
|
438
|
+
<choice>
|
|
439
|
+
<ref name="TextElement"/>
|
|
440
|
+
<ref name="fn"/>
|
|
441
|
+
</choice>
|
|
442
|
+
</zeroOrMore>
|
|
443
|
+
<zeroOrMore>
|
|
444
|
+
<ref name="note"/>
|
|
445
|
+
</zeroOrMore>
|
|
446
|
+
</element>
|
|
447
|
+
</define>
|
|
448
|
+
<define name="quote">
|
|
449
|
+
<element name="quote">
|
|
450
|
+
<attribute name="id">
|
|
451
|
+
<data type="ID"/>
|
|
452
|
+
</attribute>
|
|
453
|
+
<optional>
|
|
454
|
+
<attribute name="alignment">
|
|
455
|
+
<ref name="Alignments"/>
|
|
456
|
+
</attribute>
|
|
457
|
+
</optional>
|
|
458
|
+
<optional>
|
|
459
|
+
<attribute name="keep-with-next">
|
|
460
|
+
<data type="boolean"/>
|
|
461
|
+
</attribute>
|
|
462
|
+
</optional>
|
|
463
|
+
<optional>
|
|
464
|
+
<attribute name="keep-lines-together">
|
|
465
|
+
<data type="boolean"/>
|
|
466
|
+
</attribute>
|
|
467
|
+
</optional>
|
|
468
|
+
<optional>
|
|
469
|
+
<ref name="quote-source"/>
|
|
470
|
+
</optional>
|
|
471
|
+
<optional>
|
|
472
|
+
<ref name="quote-author"/>
|
|
473
|
+
</optional>
|
|
474
|
+
<oneOrMore>
|
|
475
|
+
<ref name="paragraph-with-footnote"/>
|
|
476
|
+
</oneOrMore>
|
|
477
|
+
<zeroOrMore>
|
|
478
|
+
<ref name="note"/>
|
|
479
|
+
</zeroOrMore>
|
|
480
|
+
</element>
|
|
481
|
+
</define>
|
|
100
482
|
<define name="BibDataExtensionType">
|
|
101
483
|
<ref name="doctype"/>
|
|
102
484
|
<optional>
|
|
@@ -165,6 +547,30 @@
|
|
|
165
547
|
<attribute name="id">
|
|
166
548
|
<data type="ID"/>
|
|
167
549
|
</attribute>
|
|
550
|
+
<optional>
|
|
551
|
+
<attribute name="unnumbered">
|
|
552
|
+
<data type="boolean"/>
|
|
553
|
+
</attribute>
|
|
554
|
+
</optional>
|
|
555
|
+
<optional>
|
|
556
|
+
<attribute name="number"/>
|
|
557
|
+
</optional>
|
|
558
|
+
<optional>
|
|
559
|
+
<attribute name="subsequence"/>
|
|
560
|
+
</optional>
|
|
561
|
+
<optional>
|
|
562
|
+
<attribute name="keep-with-next">
|
|
563
|
+
<data type="boolean"/>
|
|
564
|
+
</attribute>
|
|
565
|
+
</optional>
|
|
566
|
+
<optional>
|
|
567
|
+
<attribute name="keep-lines-together">
|
|
568
|
+
<data type="boolean"/>
|
|
569
|
+
</attribute>
|
|
570
|
+
</optional>
|
|
571
|
+
<optional>
|
|
572
|
+
<attribute name="type"/>
|
|
573
|
+
</optional>
|
|
168
574
|
<oneOrMore>
|
|
169
575
|
<choice>
|
|
170
576
|
<ref name="paragraph"/>
|
|
@@ -910,6 +1316,27 @@
|
|
|
910
1316
|
<attribute name="id">
|
|
911
1317
|
<data type="ID"/>
|
|
912
1318
|
</attribute>
|
|
1319
|
+
<optional>
|
|
1320
|
+
<attribute name="unnumbered">
|
|
1321
|
+
<data type="boolean"/>
|
|
1322
|
+
</attribute>
|
|
1323
|
+
</optional>
|
|
1324
|
+
<optional>
|
|
1325
|
+
<attribute name="number"/>
|
|
1326
|
+
</optional>
|
|
1327
|
+
<optional>
|
|
1328
|
+
<attribute name="subsequence"/>
|
|
1329
|
+
</optional>
|
|
1330
|
+
<optional>
|
|
1331
|
+
<attribute name="keep-with-next">
|
|
1332
|
+
<data type="boolean"/>
|
|
1333
|
+
</attribute>
|
|
1334
|
+
</optional>
|
|
1335
|
+
<optional>
|
|
1336
|
+
<attribute name="keep-lines-together">
|
|
1337
|
+
<data type="boolean"/>
|
|
1338
|
+
</attribute>
|
|
1339
|
+
</optional>
|
|
913
1340
|
<oneOrMore>
|
|
914
1341
|
<choice>
|
|
915
1342
|
<ref name="paragraph"/>
|
|
@@ -30,9 +30,22 @@
|
|
|
30
30
|
<data type="boolean"/>
|
|
31
31
|
</attribute>
|
|
32
32
|
</optional>
|
|
33
|
+
<optional>
|
|
34
|
+
<attribute name="number"/>
|
|
35
|
+
</optional>
|
|
33
36
|
<optional>
|
|
34
37
|
<attribute name="subsequence"/>
|
|
35
38
|
</optional>
|
|
39
|
+
<optional>
|
|
40
|
+
<attribute name="keep-with-next">
|
|
41
|
+
<data type="boolean"/>
|
|
42
|
+
</attribute>
|
|
43
|
+
</optional>
|
|
44
|
+
<optional>
|
|
45
|
+
<attribute name="keep-lines-together">
|
|
46
|
+
<data type="boolean"/>
|
|
47
|
+
</attribute>
|
|
48
|
+
</optional>
|
|
36
49
|
<attribute name="id">
|
|
37
50
|
<data type="ID"/>
|
|
38
51
|
</attribute>
|
|
@@ -141,6 +154,16 @@
|
|
|
141
154
|
<data type="boolean"/>
|
|
142
155
|
</attribute>
|
|
143
156
|
</optional>
|
|
157
|
+
<optional>
|
|
158
|
+
<attribute name="keep-with-next">
|
|
159
|
+
<data type="boolean"/>
|
|
160
|
+
</attribute>
|
|
161
|
+
</optional>
|
|
162
|
+
<optional>
|
|
163
|
+
<attribute name="keep-lines-together">
|
|
164
|
+
<data type="boolean"/>
|
|
165
|
+
</attribute>
|
|
166
|
+
</optional>
|
|
144
167
|
<oneOrMore>
|
|
145
168
|
<ref name="BasicBlock"/>
|
|
146
169
|
</oneOrMore>
|
|
@@ -16,6 +16,7 @@ module IsoDoc
|
|
|
16
16
|
f = isoxml.at(ns("//foreword"))
|
|
17
17
|
b = isoxml.at(ns("//boilerplate/legal-statement"))
|
|
18
18
|
page_break(out)
|
|
19
|
+
iec_orgname(out)
|
|
19
20
|
middle_title(out)
|
|
20
21
|
out.div **attr_code(id: f ? f["id"] : "") do |s|
|
|
21
22
|
s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @foreword_lbl }
|
|
@@ -27,10 +28,13 @@ module IsoDoc
|
|
|
27
28
|
end
|
|
28
29
|
end
|
|
29
30
|
|
|
30
|
-
def
|
|
31
|
+
def iec_orgname(out)
|
|
31
32
|
out.p(**{ class: "zzSTDTitle1" }) { |p| p << @labels["IEC"] }
|
|
32
33
|
out.p(**{ class: "zzSTDTitle1" }) { |p| p << "____________" }
|
|
33
34
|
out.p(**{ class: "zzSTDTitle1" }) { |p| p << " " }
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
def middle_title(out)
|
|
34
38
|
title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
|
|
35
39
|
@meta.get[:doctitleintro] and
|
|
36
40
|
title1 = "#{@meta.get[:doctitleintro]} — #{title1}"
|
|
@@ -76,7 +80,7 @@ module IsoDoc
|
|
|
76
80
|
def convert1(docxml, filename, dir)
|
|
77
81
|
id = docxml&.at(ns("//bibdata/docnumber"))&.text
|
|
78
82
|
@is_iev = id == "60050"
|
|
79
|
-
id = docxml&.at(ns("//bibdata/docidentifier[@type = '
|
|
83
|
+
id = docxml&.at(ns("//bibdata/docidentifier[@type = 'ISO']"))&.text
|
|
80
84
|
m = /60050-(\d+)/.match(id) and @iev_part = m[1]
|
|
81
85
|
super
|
|
82
86
|
end
|
|
@@ -192,35 +196,6 @@ module IsoDoc
|
|
|
192
196
|
end
|
|
193
197
|
end
|
|
194
198
|
|
|
195
|
-
def admonition_parse(node, out)
|
|
196
|
-
type = node["type"]
|
|
197
|
-
name = admonition_name(node, type)
|
|
198
|
-
out.div **{ id: node["id"], class: admonition_class(node) } do |div|
|
|
199
|
-
node.first_element_child.name == "p" ?
|
|
200
|
-
admonition_p_parse(node, div, name) : admonition_parse1(node, div, name)
|
|
201
|
-
end
|
|
202
|
-
end
|
|
203
|
-
|
|
204
|
-
def admonition_parse1(node, div, name)
|
|
205
|
-
div.p do |p|
|
|
206
|
-
admonition_name_parse(node, p, name) if name
|
|
207
|
-
end
|
|
208
|
-
node.children.each { |n| parse(n, div) unless n.name == "name" }
|
|
209
|
-
end
|
|
210
|
-
|
|
211
|
-
def admonition_p_parse(node, div, name)
|
|
212
|
-
div.p do |p|
|
|
213
|
-
admonition_name_parse(node, p, name) if name
|
|
214
|
-
node.first_element_child.children.each { |n| parse(n, p) }
|
|
215
|
-
end
|
|
216
|
-
node.element_children[1..-1].each { |n| parse(n, div) }
|
|
217
|
-
end
|
|
218
|
-
|
|
219
|
-
def admonition_name_parse(_node, div, name)
|
|
220
|
-
name.children.each { |n| parse(n, div) }
|
|
221
|
-
div << " — "
|
|
222
|
-
end
|
|
223
|
-
|
|
224
199
|
def clause_parse_title(node, div, c1, out)
|
|
225
200
|
IsoDoc::Common.instance_method(:clause_parse_title).bind(self).call(node, div, c1, out)
|
|
226
201
|
end
|
|
@@ -167,7 +167,7 @@ module IsoDoc
|
|
|
167
167
|
end
|
|
168
168
|
|
|
169
169
|
def formula_parse1(node, out)
|
|
170
|
-
out.div **attr_code(
|
|
170
|
+
out.div **attr_code(class: "formula") do |div|
|
|
171
171
|
div.p **attr_code(class: "formula") do |p|
|
|
172
172
|
insert_tab(div, 1)
|
|
173
173
|
parse(node.at(ns("./stem")), div)
|
|
@@ -99,7 +99,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
99
99
|
<title language="fr" format="text/plain" type="title-intro">Introduction Française</title>
|
|
100
100
|
<title language="fr" format="text/plain" type="title-main">Titre Principal</title>
|
|
101
101
|
<title language="fr" format="text/plain" type="title-part">Part du Titre</title>
|
|
102
|
-
<docidentifier type="
|
|
102
|
+
<docidentifier type="ISO">IEC/3NWIP 1000-1 ED 2</docidentifier>
|
|
103
103
|
<docnumber>1000</docnumber>
|
|
104
104
|
<contributor>
|
|
105
105
|
<role type="author"/>
|
|
@@ -190,7 +190,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
190
190
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
191
191
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec">
|
|
192
192
|
<bibdata type="standard">
|
|
193
|
-
<docidentifier type="
|
|
193
|
+
<docidentifier type="ISO">ISO/IEC/IETF/2CDTS 1000-1-1 ED 1</docidentifier>
|
|
194
194
|
<docidentifier type="iso-tc">2000</docidentifier>
|
|
195
195
|
<docnumber>1000</docnumber>
|
|
196
196
|
<contributor>
|
|
@@ -338,7 +338,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
338
338
|
INPUT
|
|
339
339
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec">
|
|
340
340
|
<bibdata type="standard">
|
|
341
|
-
<docidentifier type="
|
|
341
|
+
<docidentifier type="ISO">IEC/FDIS 1000 ED 1</docidentifier>
|
|
342
342
|
<docnumber>1000</docnumber>
|
|
343
343
|
<contributor>
|
|
344
344
|
<role type="author"/>
|
|
@@ -402,7 +402,7 @@ OUTPUT
|
|
|
402
402
|
INPUT
|
|
403
403
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec">
|
|
404
404
|
<bibdata type="standard">
|
|
405
|
-
<docidentifier type="
|
|
405
|
+
<docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
|
|
406
406
|
<docnumber>1000</docnumber>
|
|
407
407
|
<contributor>
|
|
408
408
|
<role type="author"/>
|
|
@@ -467,7 +467,7 @@ OUTPUT
|
|
|
467
467
|
INPUT
|
|
468
468
|
<iec-standard xmlns="https://www.metanorma.org/ns/iec">
|
|
469
469
|
<bibdata type="standard">
|
|
470
|
-
<docidentifier type="
|
|
470
|
+
<docidentifier type="ISO">IEC 1000 ED 1</docidentifier>
|
|
471
471
|
<docnumber>1000</docnumber>
|
|
472
472
|
<contributor>
|
|
473
473
|
<role type="author"/>
|
|
@@ -20,7 +20,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
20
20
|
<?xml version='1.0' encoding='UTF-8'?>
|
|
21
21
|
<iec-standard xmlns='https://www.metanorma.org/ns/iec'>
|
|
22
22
|
<bibdata type='standard'>
|
|
23
|
-
<docidentifier type='
|
|
23
|
+
<docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
|
|
24
24
|
<docnumber>60050</docnumber>
|
|
25
25
|
<contributor>
|
|
26
26
|
<role type='author'/>
|
|
@@ -98,7 +98,7 @@ RSpec.describe Asciidoctor::Iec do
|
|
|
98
98
|
INPUT
|
|
99
99
|
<iec-standard xmlns='https://www.metanorma.org/ns/iec'>
|
|
100
100
|
<bibdata type='standard'>
|
|
101
|
-
<docidentifier type='
|
|
101
|
+
<docidentifier type='ISO'>IEC 60050 ED 1</docidentifier>
|
|
102
102
|
<docnumber>60050</docnumber>
|
|
103
103
|
<contributor>
|
|
104
104
|
<role type='author'/>
|
data/spec/isodoc/blocks_spec.rb
CHANGED
|
@@ -25,7 +25,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
25
25
|
<p id='_e94663cc-2473-4ccc-9a72-983a74d989f3'>Para 2.</p>
|
|
26
26
|
</div>
|
|
27
27
|
</div>
|
|
28
|
-
#{
|
|
28
|
+
#{IEC_TITLE1}
|
|
29
29
|
</div>
|
|
30
30
|
</body>
|
|
31
31
|
</html>
|
|
@@ -58,7 +58,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
58
58
|
<p id='_e94663cc-2473-4ccc-9a72-983a74d989f2'>Only use paddy or parboiled rice for the determination of husked rice yield.</p>
|
|
59
59
|
</div>
|
|
60
60
|
</div>
|
|
61
|
-
#{
|
|
61
|
+
#{IEC_TITLE1}
|
|
62
62
|
</div>
|
|
63
63
|
</body>
|
|
64
64
|
</html>
|
|
@@ -105,25 +105,17 @@ RSpec.describe IsoDoc::Iec do
|
|
|
105
105
|
<div>
|
|
106
106
|
<h1 class='ForewordTitle'>FOREWORD</h1>
|
|
107
107
|
<div class='boilerplate_legal'/>
|
|
108
|
-
<div id='_be9158af-7e93-4ee2-90c5-26d31c181934' class='formula'>
|
|
108
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
|
|
109
109
|
<p class='formula'>
|
|
110
110
|
<span style='mso-tab-count:1'>  </span>
|
|
111
111
|
<span class='stem'>(#(r = 1 %)#)</span>
|
|
112
112
|
</p>
|
|
113
113
|
</div>
|
|
114
|
-
<
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
<span class='stem'>(#(r)#)</span>
|
|
120
|
-
</p>
|
|
121
|
-
</td>
|
|
122
|
-
<td valign='top'>
|
|
123
|
-
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
|
|
124
|
-
</td>
|
|
125
|
-
</tr>
|
|
126
|
-
</table>
|
|
114
|
+
<span class='zzMoveToFollowing'>
|
|
115
|
+
where
|
|
116
|
+
<span class='stem'>(#(r)#)</span>
|
|
117
|
+
</span>
|
|
118
|
+
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
|
|
127
119
|
<div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
|
|
128
120
|
<p class='Note'>
|
|
129
121
|
<span class='note_label'>NOTE</span>
|
|
@@ -133,7 +125,8 @@ RSpec.describe IsoDoc::Iec do
|
|
|
133
125
|
always expressed.
|
|
134
126
|
</p>
|
|
135
127
|
</div>
|
|
136
|
-
|
|
128
|
+
</div>
|
|
129
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
|
|
137
130
|
<p class='formula'>
|
|
138
131
|
<span style='mso-tab-count:1'>  </span>
|
|
139
132
|
<span class='stem'>(#(r = 1 %)#)</span>
|
|
@@ -141,6 +134,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
141
134
|
(1)
|
|
142
135
|
</p>
|
|
143
136
|
</div>
|
|
137
|
+
</div>
|
|
144
138
|
</div>
|
|
145
139
|
<p> </p>
|
|
146
140
|
</div>
|
|
@@ -148,7 +142,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
148
142
|
<br clear='all' class='section'/>
|
|
149
143
|
</p>
|
|
150
144
|
<div class='WordSection3'>
|
|
151
|
-
#{
|
|
145
|
+
#{IEC_TITLE1}
|
|
152
146
|
</div>
|
|
153
147
|
<br clear='all' style='page-break-before:left;mso-break-type:section-break'/>
|
|
154
148
|
<div class='colophon'/>
|
data/spec/isodoc/i18n_spec.rb
CHANGED
|
@@ -85,7 +85,7 @@ RSpec.describe IsoDoc do
|
|
|
85
85
|
</div>
|
|
86
86
|
<p>This is patent boilerplate</p>
|
|
87
87
|
</div>
|
|
88
|
-
#{
|
|
88
|
+
#{IEC_TITLE1}
|
|
89
89
|
<div id="D">
|
|
90
90
|
<h1>1  Scope</h1>
|
|
91
91
|
<p id="E">Text</p>
|
|
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
|
|
|
229
229
|
</div>
|
|
230
230
|
<p>This is patent boilerplate</p>
|
|
231
231
|
</div>
|
|
232
|
-
#{
|
|
232
|
+
#{IEC_TITLE1}
|
|
233
233
|
<div id="D">
|
|
234
234
|
<h1>1  Scope</h1>
|
|
235
235
|
<p id="E">Text</p>
|
|
@@ -374,7 +374,7 @@ RSpec.describe IsoDoc do
|
|
|
374
374
|
</div>
|
|
375
375
|
<p>This is patent boilerplate</p>
|
|
376
376
|
</div>
|
|
377
|
-
#{
|
|
377
|
+
#{IEC_TITLE1}
|
|
378
378
|
<div id="D">
|
|
379
379
|
<h1>1  Domaine d'application</h1>
|
|
380
380
|
<p id="E">Text</p>
|
|
@@ -529,7 +529,7 @@ RSpec.describe IsoDoc do
|
|
|
529
529
|
</div>
|
|
530
530
|
<p>This is patent boilerplate</p>
|
|
531
531
|
</div>
|
|
532
|
-
#{
|
|
532
|
+
#{IEC_TITLE1}
|
|
533
533
|
<div id="D">
|
|
534
534
|
<h1>1  范围</h1>
|
|
535
535
|
<p id="E">
|
data/spec/isodoc/iev_spec.rb
CHANGED
|
@@ -37,7 +37,7 @@ RSpec.describe IsoDoc do
|
|
|
37
37
|
<h2>Introduction Subsection</h2>
|
|
38
38
|
</div>
|
|
39
39
|
</div>
|
|
40
|
-
#{
|
|
40
|
+
#{IEC_TITLE1}
|
|
41
41
|
</div>
|
|
42
42
|
</body>
|
|
43
43
|
</html>
|
|
@@ -122,7 +122,7 @@ INPUT
|
|
|
122
122
|
<h1 class='ForewordTitle'>FOREWORD</h1>
|
|
123
123
|
<div class='boilerplate_legal'/>
|
|
124
124
|
</div>
|
|
125
|
-
#{
|
|
125
|
+
#{IEC_TITLE1}
|
|
126
126
|
<div>
|
|
127
127
|
<h1>1  Normative references</h1>
|
|
128
128
|
<p id='_'>There are no normative references in this document.</p>
|
|
@@ -141,7 +141,7 @@ OUTPUT
|
|
|
141
141
|
expect(xmlpp(IsoDoc::Iec::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
142
142
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
143
143
|
<bibdata type='standard'>
|
|
144
|
-
<docidentifier type='
|
|
144
|
+
<docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
|
|
145
145
|
<docnumber>60050</docnumber>
|
|
146
146
|
</bibdata>
|
|
147
147
|
<sections>
|
|
@@ -198,7 +198,7 @@ INPUT
|
|
|
198
198
|
<h1 class='ForewordTitle'>FOREWORD</h1>
|
|
199
199
|
<div class='boilerplate_legal'/>
|
|
200
200
|
</div>
|
|
201
|
-
#{
|
|
201
|
+
#{IEC_TITLE1}
|
|
202
202
|
<div id='_terms_and_definitions'>
|
|
203
203
|
<h1>1  Terms and definitions</h1>
|
|
204
204
|
<br/>
|
|
@@ -248,14 +248,14 @@ INPUT
|
|
|
248
248
|
<li>A</li>
|
|
249
249
|
</ul>
|
|
250
250
|
</div>
|
|
251
|
-
<div class='Note'>
|
|
251
|
+
<div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74e'>
|
|
252
252
|
<p>
|
|
253
253
|
Note 1 to entry: The starch of waxy rice consists almost entirely
|
|
254
254
|
of amylopectin. The kernels have a tendency to stick together
|
|
255
255
|
after cooking.
|
|
256
256
|
</p>
|
|
257
257
|
</div>
|
|
258
|
-
<div class='Note'>
|
|
258
|
+
<div class='Note' id='_671a1994-4783-40d0-bc81-987d06ffb74f'>
|
|
259
259
|
<p>
|
|
260
260
|
Note 2 to entry:
|
|
261
261
|
<ul>
|
|
@@ -286,7 +286,7 @@ end
|
|
|
286
286
|
IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", false)
|
|
287
287
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
288
288
|
<bibdata type='standard'>
|
|
289
|
-
<docidentifier type='
|
|
289
|
+
<docidentifier type='ISO'>IEC 60050-192 ED 1</docidentifier>
|
|
290
290
|
<docnumber>60050</docnumber>
|
|
291
291
|
</bibdata>
|
|
292
292
|
<sections>
|
|
@@ -312,9 +312,6 @@ end
|
|
|
312
312
|
sub(%r{<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>.*$}m, "")
|
|
313
313
|
expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
314
314
|
<div class='WordSection3'>
|
|
315
|
-
<p class='zzSTDTitle1'>INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
|
|
316
|
-
<p class='zzSTDTitle1'>____________</p>
|
|
317
|
-
<p class='zzSTDTitle1'> </p>
|
|
318
315
|
<p class='zzSTDTitle1'>
|
|
319
316
|
<b/>
|
|
320
317
|
</p>
|
data/spec/isodoc/inline_spec.rb
CHANGED
|
@@ -24,7 +24,7 @@ RSpec.describe IsoDoc do
|
|
|
24
24
|
<a id="H"/> <br/>
|
|
25
25
|
</p>
|
|
26
26
|
</div>
|
|
27
|
-
#{
|
|
27
|
+
#{IEC_TITLE1}
|
|
28
28
|
</div>
|
|
29
29
|
</body>
|
|
30
30
|
</html>
|
|
@@ -56,7 +56,7 @@ RSpec.describe IsoDoc do
|
|
|
56
56
|
<a href="mailto:fred@example.com">mailto:fred@example.com</a>
|
|
57
57
|
</p>
|
|
58
58
|
</div>
|
|
59
|
-
#{
|
|
59
|
+
#{IEC_TITLE1}
|
|
60
60
|
</div>
|
|
61
61
|
</body>
|
|
62
62
|
</html>
|
|
@@ -82,7 +82,7 @@ RSpec.describe IsoDoc do
|
|
|
82
82
|
<para><b role="strong"><barry fred="http://example.com">example</barry></b></para>
|
|
83
83
|
</p>
|
|
84
84
|
</div>
|
|
85
|
-
#{
|
|
85
|
+
#{IEC_TITLE1}
|
|
86
86
|
</div>
|
|
87
87
|
</body>
|
|
88
88
|
</html>
|
|
@@ -114,7 +114,7 @@ RSpec.describe IsoDoc do
|
|
|
114
114
|
<span class="stem">Latex?</span>
|
|
115
115
|
</p>
|
|
116
116
|
</div>
|
|
117
|
-
#{
|
|
117
|
+
#{IEC_TITLE1}
|
|
118
118
|
</div>
|
|
119
119
|
</body>
|
|
120
120
|
</html>
|
|
@@ -142,7 +142,7 @@ RSpec.describe IsoDoc do
|
|
|
142
142
|
(#((Hello))#)
|
|
143
143
|
</p>
|
|
144
144
|
</div>
|
|
145
|
-
#{
|
|
145
|
+
#{IEC_TITLE1}
|
|
146
146
|
</div>
|
|
147
147
|
</body>
|
|
148
148
|
</html>
|
|
@@ -182,7 +182,7 @@ RSpec.describe IsoDoc do
|
|
|
182
182
|
<a href="#ISO712">A</a>
|
|
183
183
|
</p>
|
|
184
184
|
</div>
|
|
185
|
-
#{
|
|
185
|
+
#{IEC_TITLE1}
|
|
186
186
|
<div>
|
|
187
187
|
<h1>1  Normative references</h1>
|
|
188
188
|
<p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
|
|
@@ -243,15 +243,15 @@ RSpec.describe IsoDoc do
|
|
|
243
243
|
<a href="#ISO712">ISO 712, Clause 1</a>
|
|
244
244
|
<a href="#ISO712">ISO 712, 1.5</a>
|
|
245
245
|
<a href="#ISO712">A</a>
|
|
246
|
-
<a href="#ISO712">ISO 712, </a>
|
|
246
|
+
<a href="#ISO712">ISO 712, Whole of text</a>
|
|
247
247
|
<a href="#ISO712">ISO 712, Prelude 7</a>
|
|
248
248
|
<a href="#ISO712">A</a>
|
|
249
249
|
</p>
|
|
250
250
|
</div>
|
|
251
|
-
#{
|
|
251
|
+
#{IEC_TITLE1}
|
|
252
252
|
<div>
|
|
253
253
|
<h1>1  Normative references</h1>
|
|
254
|
-
<p id="ISO712" class="NormRef">ISO 712, <i>
|
|
254
|
+
<p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
|
|
255
255
|
</div>
|
|
256
256
|
</div>
|
|
257
257
|
</body>
|
data/spec/isodoc/iso_spec.rb
CHANGED
|
@@ -88,7 +88,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
88
88
|
<p><span class="example_label">EXAMPLE</span>  Hello</p>
|
|
89
89
|
</div>
|
|
90
90
|
</div>
|
|
91
|
-
#{
|
|
91
|
+
#{IEC_TITLE1}
|
|
92
92
|
</div>
|
|
93
93
|
</body>
|
|
94
94
|
</html>
|
|
@@ -120,7 +120,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
120
120
|
<p><span class="example_label">EXAMPLE 2</span>  Hello</p>
|
|
121
121
|
</div>
|
|
122
122
|
</div>
|
|
123
|
-
#{
|
|
123
|
+
#{IEC_TITLE1}
|
|
124
124
|
</div>
|
|
125
125
|
</body>
|
|
126
126
|
</html>
|
|
@@ -156,7 +156,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
156
156
|
<br clear="all" class="section"/>
|
|
157
157
|
</p>
|
|
158
158
|
<div class="WordSection3">
|
|
159
|
-
#{
|
|
159
|
+
#{IEC_TITLE1}
|
|
160
160
|
</div>
|
|
161
161
|
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
162
162
|
<div class="colophon"/>
|
|
@@ -200,7 +200,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
200
200
|
<br clear="all" class="section"/>
|
|
201
201
|
</p>
|
|
202
202
|
<div class="WordSection3">
|
|
203
|
-
#{
|
|
203
|
+
#{IEC_TITLE1}
|
|
204
204
|
</div>
|
|
205
205
|
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
206
206
|
<div class="colophon"/>
|
|
@@ -16,7 +16,7 @@ RSpec.describe IsoDoc::Iec::Metadata do
|
|
|
16
16
|
<title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
|
|
17
17
|
<title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
|
|
18
18
|
<title type="title-part" language="fr" format="text/plain">Riz</title>
|
|
19
|
-
<docidentifier type="
|
|
19
|
+
<docidentifier type="ISO">ISO/PreCD3 17301-1</docidentifier>
|
|
20
20
|
<docidentifier type="iso-tc">17301</docidentifier>
|
|
21
21
|
<docnumber>1730</docnumber>
|
|
22
22
|
<date type="published"><on>2011</on></date>
|
|
@@ -139,7 +139,7 @@ OUTPUT
|
|
|
139
139
|
<title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
|
|
140
140
|
<title type="title-part" language="fr" format="text/plain">Riz</title>
|
|
141
141
|
</title>
|
|
142
|
-
<docidentifier type="
|
|
142
|
+
<docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
|
|
143
143
|
<docidentifier type="iso-tc">17301</docidentifier>
|
|
144
144
|
<contributor>
|
|
145
145
|
<role type="author"/>
|
|
@@ -123,7 +123,7 @@ RSpec.describe IsoDoc do
|
|
|
123
123
|
sub(%r{<br.*$}m, "")
|
|
124
124
|
expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
125
125
|
<div class="WordSection3">
|
|
126
|
-
#{
|
|
126
|
+
#{IEC_TITLE1.gsub(/\ /, " ")}
|
|
127
127
|
<div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1 class="main">1<span style="mso-tab-count:1">  </span>Terms and Definitions</h1>
|
|
128
128
|
<p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
|
129
129
|
<p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
|
|
@@ -228,7 +228,7 @@ RSpec.describe IsoDoc do
|
|
|
228
228
|
sub(%r{<br[^>]*>\s*<div class="colophon">.*$}m, "")
|
|
229
229
|
expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
230
230
|
<div class="WordSection3">
|
|
231
|
-
#{
|
|
231
|
+
#{IEC_TITLE1.gsub(/\ /, " ")}
|
|
232
232
|
<p class="MsoNormal">
|
|
233
233
|
<br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
|
|
234
234
|
</p>
|
|
@@ -274,7 +274,7 @@ RSpec.describe IsoDoc do
|
|
|
274
274
|
sub(%r{<br[^>]*>\s*<div class="colophon">.*$}m, "")
|
|
275
275
|
expect(xmlpp(word)).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
276
276
|
<div class="WordSection3">
|
|
277
|
-
#{
|
|
277
|
+
#{IEC_TITLE1.gsub(/\ /, " ")}
|
|
278
278
|
<p class="MsoNormal">
|
|
279
279
|
<br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
|
|
280
280
|
</p>
|
data/spec/isodoc/ref_spec.rb
CHANGED
|
@@ -44,7 +44,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
44
44
|
<abbreviation>ISO</abbreviation>
|
|
45
45
|
</organization>
|
|
46
46
|
</contributor>
|
|
47
|
-
<note format="text/plain" reference="1"
|
|
47
|
+
<note format="text/plain" reference="1" type="ISO DATE">Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
|
|
48
48
|
<extent type="part">
|
|
49
49
|
<referenceFrom>all</referenceFrom>
|
|
50
50
|
</extent>
|
|
@@ -139,7 +139,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
139
139
|
<a href='#zip_ffs'>[5]</a>
|
|
140
140
|
</p>
|
|
141
141
|
</div>
|
|
142
|
-
#{
|
|
142
|
+
#{IEC_TITLE1}
|
|
143
143
|
<div>
|
|
144
144
|
<h1>1  Normative references</h1>
|
|
145
145
|
<p>
|
|
@@ -178,7 +178,7 @@ RSpec.describe IsoDoc::Iec do
|
|
|
178
178
|
<a href='http://www.icc.or.at'>http://www.icc.or.at</a>
|
|
179
179
|
)
|
|
180
180
|
</p>
|
|
181
|
-
<div
|
|
181
|
+
<div class='Note'>
|
|
182
182
|
<p>
|
|
183
183
|
<span class='note_label'>NOTE</span>
|
|
184
184
|
  This is an annotation of ISO 20483:2013-2014
|
|
@@ -197,13 +197,13 @@ RSpec.describe IsoDoc::Iec do
|
|
|
197
197
|
[2],
|
|
198
198
|
<i>Instruments for analytical laboratory use</i>
|
|
199
199
|
</p>
|
|
200
|
-
<div
|
|
200
|
+
<div class='Note'>
|
|
201
201
|
<p>
|
|
202
202
|
<span class='note_label'>NOTE</span>
|
|
203
203
|
  This is an annotation of document ISSN.
|
|
204
204
|
</p>
|
|
205
205
|
</div>
|
|
206
|
-
<div
|
|
206
|
+
<div class='Note'>
|
|
207
207
|
<p>
|
|
208
208
|
<span class='note_label'>NOTE</span>
|
|
209
209
|
  This is another annotation of document ISSN.
|
data/spec/isodoc/section_spec.rb
CHANGED
|
@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
|
|
|
94
94
|
</div>
|
|
95
95
|
<p>This is patent boilerplate</p>
|
|
96
96
|
</div>
|
|
97
|
-
#{
|
|
97
|
+
#{IEC_TITLE1}
|
|
98
98
|
<div id="D">
|
|
99
99
|
<h1>1  Scope</h1>
|
|
100
100
|
<p id="E">Text</p>
|
|
@@ -243,7 +243,7 @@ OUTPUT
|
|
|
243
243
|
</div>
|
|
244
244
|
<p><br clear="all" class="section"/></p>
|
|
245
245
|
<div class="WordSection3">
|
|
246
|
-
#{
|
|
246
|
+
#{IEC_TITLE1}
|
|
247
247
|
<div id="D">
|
|
248
248
|
<h1>1<span style="mso-tab-count:1">  </span>Scope</h1>
|
|
249
249
|
<p id="E">Text</p>
|
|
@@ -327,7 +327,7 @@ INPUT
|
|
|
327
327
|
<h1 class='ForewordTitle'>FOREWORD</h1>
|
|
328
328
|
<div class='boilerplate_legal'/>
|
|
329
329
|
</div>
|
|
330
|
-
#{
|
|
330
|
+
#{IEC_TITLE1}
|
|
331
331
|
<div id='D'>
|
|
332
332
|
<h1>1  Scope</h1>
|
|
333
333
|
<div id='D1'>
|
|
@@ -361,7 +361,7 @@ OUTPUT
|
|
|
361
361
|
<h1 class="ForewordTitle">FOREWORD</h1>
|
|
362
362
|
<div class="boilerplate_legal"/>
|
|
363
363
|
</div>
|
|
364
|
-
#{
|
|
364
|
+
#{IEC_TITLE1}
|
|
365
365
|
<div id="H"><h1>1  Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
|
366
366
|
<p class="TermNum" id="J">1.1</p>
|
|
367
367
|
<p class="Terms" style="text-align:left;">Term2</p>
|
|
@@ -391,7 +391,7 @@ OUTPUT
|
|
|
391
391
|
<h1 class="ForewordTitle">FOREWORD</h1>
|
|
392
392
|
<div class="boilerplate_legal"/>
|
|
393
393
|
</div>
|
|
394
|
-
#{
|
|
394
|
+
#{IEC_TITLE1}
|
|
395
395
|
<div id="M">
|
|
396
396
|
<h1>1  Clause 4</h1>
|
|
397
397
|
<div id="N">
|
|
@@ -434,7 +434,7 @@ OUTPUT
|
|
|
434
434
|
</div>
|
|
435
435
|
<p><br clear="all" class="section"/></p>
|
|
436
436
|
<div class="WordSection3">
|
|
437
|
-
#{
|
|
437
|
+
#{IEC_TITLE1}
|
|
438
438
|
</div>
|
|
439
439
|
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
440
440
|
<div class="colophon"/>
|
|
@@ -469,7 +469,7 @@ OUTPUT
|
|
|
469
469
|
</div>
|
|
470
470
|
<p><br clear="all" class="section"/></p>
|
|
471
471
|
<div class="WordSection3">
|
|
472
|
-
#{
|
|
472
|
+
#{IEC_TITLE1}
|
|
473
473
|
</div>
|
|
474
474
|
</body>
|
|
475
475
|
OUTPUT
|
|
@@ -496,7 +496,7 @@ OUTPUT
|
|
|
496
496
|
<p>Boilerplate</p>
|
|
497
497
|
</div>
|
|
498
498
|
</div>
|
|
499
|
-
#{
|
|
499
|
+
#{IEC_TITLE1}
|
|
500
500
|
</div>
|
|
501
501
|
</body>
|
|
502
502
|
</html>
|
|
@@ -521,7 +521,7 @@ OUTPUT
|
|
|
521
521
|
<div id="">
|
|
522
522
|
<h1 class="ForewordTitle">FOREWORD</h1>
|
|
523
523
|
</div>
|
|
524
|
-
#{
|
|
524
|
+
#{IEC_TITLE1}
|
|
525
525
|
</div>
|
|
526
526
|
</body>
|
|
527
527
|
</html>
|
data/spec/isodoc/terms_spec.rb
CHANGED
|
@@ -57,7 +57,7 @@ RSpec.describe IsoDoc do
|
|
|
57
57
|
<h1 class="ForewordTitle">FOREWORD</h1>
|
|
58
58
|
<div class="boilerplate_legal"/>
|
|
59
59
|
</div>
|
|
60
|
-
#{
|
|
60
|
+
#{IEC_TITLE1}
|
|
61
61
|
<div id="_terms_and_definitions"><h1>1  Terms and definitions</h1>
|
|
62
62
|
<p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
|
63
63
|
|
|
@@ -83,8 +83,8 @@ RSpec.describe IsoDoc do
|
|
|
83
83
|
<li>A</li>
|
|
84
84
|
</ul>
|
|
85
85
|
</div>
|
|
86
|
-
<div class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
|
|
87
|
-
<div class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
|
|
86
|
+
<div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p>Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div>
|
|
87
|
+
<div id='_671a1994-4783-40d0-bc81-987d06ffb74f' class="Note"><p>Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
|
|
88
88
|
<p>[TERMREF]
|
|
89
89
|
<a href="#ISO7301">ISO 7301:2011, 3.1</a>
|
|
90
90
|
[/TERMREF]</p></div>
|
|
@@ -95,7 +95,7 @@ OUTPUT
|
|
|
95
95
|
end
|
|
96
96
|
|
|
97
97
|
it "processes IsoXML terms (Word)" do
|
|
98
|
-
expect((IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div id="_terms_and_definitions">}m, '<div id="_terms_and_definitions">').sub(%r{
|
|
98
|
+
expect((IsoDoc::Iec::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div id="_terms_and_definitions">}m, '<div id="_terms_and_definitions">').sub(%r{</div>\s*<br[^>]*>\s*<div class="colophon"/>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
99
99
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
100
100
|
<sections>
|
|
101
101
|
<terms id="_terms_and_definitions" obligation="normative"><title>Terms and definitions</title>
|
|
@@ -145,8 +145,7 @@ OUTPUT
|
|
|
145
145
|
</sections>
|
|
146
146
|
</iso-standard>
|
|
147
147
|
INPUT
|
|
148
|
-
|
|
149
|
-
<p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
|
148
|
+
<div id="_terms_and_definitions"><h1>1<span style="mso-tab-count:1">  </span>Terms and definitions</h1><p class="TermNum" id="paddy1">1.1</p><p class="Terms" style="text-align:left;">paddy</p>
|
|
150
149
|
|
|
151
150
|
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"><rice> rice retaining its husk after threshing</p>
|
|
152
151
|
<div id="_bd57bbf1-f948-4bae-b0ce-73c00431f892" class="example"><p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">  </span>Foreign seeds, husks, bran, sand, dust.</p><ul>
|
|
@@ -164,18 +163,17 @@ OUTPUT
|
|
|
164
163
|
[/TERMREF]</p><p class="TermNum" id="paddy">1.2</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
|
|
165
164
|
<p class="AltTerms" style="text-align:left;">rough rice</p>
|
|
166
165
|
<p class="DeprecatedTerms" style="text-align:left;">DEPRECATED: cargo rice</p>
|
|
167
|
-
<div class="
|
|
168
|
-
<div class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
|
|
169
|
-
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p>
|
|
170
|
-
<div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">  </span></p>
|
|
166
|
+
<p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p><div id="_bd57bbf1-f948-4bae-b0ce-73c00431f893" class="example"><p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">  </span></p>
|
|
171
167
|
<ul>
|
|
172
168
|
<li>A</li>
|
|
173
169
|
</ul>
|
|
174
|
-
</div>
|
|
170
|
+
</div><div id="_671a1994-4783-40d0-bc81-987d06ffb74e" class="Note"><p class="Note">Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></div><div id="_671a1994-4783-40d0-bc81-987d06ffb74f" class="Note"><p class="Note">Note 2 to entry: <ul><li>A</li></ul><p id="_19830f33-e46c-42cc-94ca-a5ef101132d5">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p></p></div>
|
|
171
|
+
|
|
172
|
+
|
|
173
|
+
|
|
175
174
|
<p>[TERMREF]
|
|
176
175
|
<a href="#ISO7301">ISO 7301:2011, 3.1</a>
|
|
177
176
|
[/TERMREF]</p></div>
|
|
178
|
-
|
|
179
177
|
OUTPUT
|
|
180
178
|
end
|
|
181
179
|
end
|
|
@@ -60,9 +60,6 @@ RSpec.describe Metanorma::Iec::Processor do
|
|
|
60
60
|
<h1 class="ForewordTitle" id="toc0">FOREWORD</h1>
|
|
61
61
|
<div class="boilerplate_legal"></div>
|
|
62
62
|
</div>
|
|
63
|
-
<p class="zzSTDTitle1">INTERNATIONAL ELECTROTECHNICAL COMMISSION</p>
|
|
64
|
-
<p class="zzSTDTitle1">____________</p>
|
|
65
|
-
<p class="zzSTDTitle1"> </p>
|
|
66
63
|
<p class="zzSTDTitle1">
|
|
67
64
|
<b></b>
|
|
68
65
|
</p>
|
data/spec/spec_helper.rb
CHANGED
|
@@ -195,6 +195,13 @@ IEC_TITLE = <<~END
|
|
|
195
195
|
<p class="zzSTDTitle1"> </p>
|
|
196
196
|
END
|
|
197
197
|
|
|
198
|
+
IEC_TITLE1 = <<~END
|
|
199
|
+
<p class="zzSTDTitle1">
|
|
200
|
+
<b/>
|
|
201
|
+
</p>
|
|
202
|
+
<p class="zzSTDTitle1"> </p>
|
|
203
|
+
END
|
|
204
|
+
|
|
198
205
|
HTML_HDR = <<~END
|
|
199
206
|
<html xmlns:epub="http://www.idpf.org/2007/ops" lang="en">
|
|
200
207
|
<head/>
|
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: 1.0.
|
|
4
|
+
version: 1.0.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-06-
|
|
11
|
+
date: 2020-06-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: ruby-jing
|