metanorma-iso 1.9.6 → 1.10.0

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.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/isodoc.rng +218 -27
  3. data/lib/asciidoctor/iso/validate.rb +7 -7
  4. data/lib/asciidoctor/iso/validate_section.rb +1 -1
  5. data/lib/isodoc/iso/iso.amendment.xsl +7 -1
  6. data/lib/isodoc/iso/iso.international-standard.xsl +7 -1
  7. data/lib/metanorma/iso/version.rb +1 -1
  8. data/metanorma-iso.gemspec +1 -2
  9. data/spec/asciidoctor/base_spec.rb +2 -2
  10. data/spec/asciidoctor/blocks_spec.rb +28 -14
  11. data/spec/asciidoctor/cleanup_spec.rb +34 -20
  12. data/spec/asciidoctor/inline_spec.rb +10 -2
  13. data/spec/asciidoctor/section_spec.rb +3 -3
  14. data/spec/isodoc/i18n_spec.rb +4 -4
  15. data/spec/isodoc/inline_spec.rb +2 -2
  16. data/spec/isodoc/section_spec.rb +1 -1
  17. data/spec/isodoc/terms_spec.rb +11 -11
  18. data/spec/isodoc/xref_spec.rb +1397 -1376
  19. data/spec/metanorma/processor_spec.rb +4 -1
  20. data/spec/spec_helper.rb +2 -1
  21. metadata +5 -20
  22. data/spec/vcr_cassettes/docrels.yml +0 -393
data/spec/asciidoctor/cleanup_spec.rb CHANGED
@@ -36,6 +36,7 @@ RSpec.describe Asciidoctor::ISO do
36
36
  #{TERM_BOILERPLATE}
37
37
  <term id="term-t90">
38
38
  <preferred>
39
+ <letter-symbol><name>
39
40
  <stem type="MathML">
40
41
  <math xmlns="http://www.w3.org/1998/Math/MathML">
41
42
  <msub>
@@ -47,8 +48,10 @@ RSpec.describe Asciidoctor::ISO do
47
48
  </msub>
48
49
  </math>
49
50
  </stem>
51
+ </name></letter-symbol>
50
52
  </preferred>
51
53
  <admitted>
54
+ <letter-symbol><name>
52
55
  <stem type="MathML">
53
56
  <math xmlns="http://www.w3.org/1998/Math/MathML">
54
57
  <msub>
@@ -61,10 +64,11 @@ RSpec.describe Asciidoctor::ISO do
61
64
  </msub>
62
65
  </math>
63
66
  </stem>
67
+ </name></letter-symbol>
64
68
  </admitted>
65
- <definition>
69
+ <definition><verbaldefinition>
66
70
  <p id="_">Time</p>
67
- </definition>
71
+ </verbaldefinition></definition>
68
72
  </term>
69
73
  </terms>
70
74
  </sections>
@@ -90,10 +94,10 @@ RSpec.describe Asciidoctor::ISO do
90
94
  <title>Terms and definitions</title>#{TERM_BOILERPLATE}
91
95
 
92
96
  <term id="term-tempus">
93
- <preferred>Tempus</preferred>
97
+ <preferred><expression><name>Tempus</name></expression></preferred>
94
98
  <domain>relativity</domain>
95
- <definition>
96
- <p id="_">Time</p></definition>
99
+ <definition><verbaldefinition>
100
+ <p id="_">Time</p></verbaldefinition></definition>
97
101
  </term>
98
102
  </terms>
99
103
  </sections>
@@ -132,6 +136,7 @@ RSpec.describe Asciidoctor::ISO do
132
136
  #{TERM_BOILERPLATE}
133
137
  <term id="term-t90">
134
138
  <preferred>
139
+ <letter-symbol><name>
135
140
  <stem type="MathML">
136
141
  <math xmlns="http://www.w3.org/1998/Math/MathML">
137
142
  <msub>
@@ -143,8 +148,11 @@ RSpec.describe Asciidoctor::ISO do
143
148
  </msub>
144
149
  </math>
145
150
  </stem>
151
+ </name></letter-symbol>
146
152
  </preferred>
147
153
  <definition>
154
+ <verbaldefinition><p id="_">This paragraph is extraneous</p></verbaldefinition>
155
+ <nonverbalrepresentation>
148
156
  <formula id="_">
149
157
  <stem type="MathML">
150
158
  <math xmlns="http://www.w3.org/1998/Math/MathML">
@@ -159,8 +167,7 @@ RSpec.describe Asciidoctor::ISO do
159
167
  </math>
160
168
  </stem>
161
169
  </formula>
162
- <p id="_">This paragraph is extraneous</p>
163
- </definition>
170
+ </nonverbalrepresentation></definition>
164
171
  </term>
165
172
  </terms>
166
173
  </sections>
@@ -195,10 +202,10 @@ RSpec.describe Asciidoctor::ISO do
195
202
  <p id="_">So am I</p></li>
196
203
  </ul>
197
204
  <term id="term-time">
198
- <preferred>Time</preferred>
199
- <definition>
205
+ <preferred><expression><name>Time</name></expression></preferred>
206
+ <definition><verbaldefinition>
200
207
  <p id="_">This paragraph is extraneous</p>
201
- </definition>
208
+ </verbaldefinition></definition>
202
209
  </term>
203
210
  </terms>
204
211
  </sections>
@@ -433,6 +440,8 @@ RSpec.describe Asciidoctor::ISO do
433
440
 
434
441
  === Term1
435
442
 
443
+ Definition
444
+
436
445
  [.source]
437
446
  <<ISO2191,section=1>>
438
447
  INPUT
@@ -443,8 +452,13 @@ RSpec.describe Asciidoctor::ISO do
443
452
  <title>Terms and definitions</title>
444
453
  #{TERM_BOILERPLATE}
445
454
  <term id="term-term1">
446
- <preferred>Term1</preferred>
447
- <termsource status="identical">
455
+ <preferred><expression><name>Term1</name></expression></preferred>
456
+ <definition>
457
+ <verbaldefinition>
458
+ <p id='_'>Definition</p>
459
+ </verbaldefinition>
460
+ </definition>
461
+ <termsource status='identical' type='authoritative'>
448
462
  <origin bibitemid="ISO2191" citeas="" type="inline">
449
463
  <localityStack>
450
464
  <locality type="section">
@@ -1241,7 +1255,7 @@ RSpec.describe Asciidoctor::ISO do
1241
1255
  </li>
1242
1256
  </ul>
1243
1257
  <term id='term-term1'>
1244
- <preferred>Term1</preferred>
1258
+ <preferred><expression><name>Term1</name></expression></preferred>
1245
1259
  </term>
1246
1260
  </terms>
1247
1261
  </sections>
@@ -1292,13 +1306,13 @@ RSpec.describe Asciidoctor::ISO do
1292
1306
  <terms id='_' obligation='normative'>
1293
1307
  <title>Normal Terms</title>
1294
1308
  <term id='term-term1'>
1295
- <preferred>Term1</preferred>
1309
+ <preferred><expression><name>Term1</name></expression></preferred>
1296
1310
  </term>
1297
1311
  </terms>
1298
1312
  <terms id='_' obligation='normative'>
1299
1313
  <title>Abnormal terms</title>
1300
1314
  <term id='term-term-2'>
1301
- <preferred>Term 2</preferred>
1315
+ <preferred><expression><name>Term 2</name></expression></preferred>
1302
1316
  </term>
1303
1317
  </terms>
1304
1318
  </clause>
@@ -1356,13 +1370,13 @@ RSpec.describe Asciidoctor::ISO do
1356
1370
  <terms id='_' obligation='normative'>
1357
1371
  <title>Normal Terms</title>
1358
1372
  <term id='term-term1'>
1359
- <preferred>Term1</preferred>
1373
+ <preferred><expression><name>Term1</name></expression></preferred>
1360
1374
  </term>
1361
1375
  </terms>
1362
1376
  <terms id='_' obligation='normative'>
1363
1377
  <title>Abnormal terms</title>
1364
1378
  <term id='term-term-2'>
1365
- <preferred>Term 2</preferred>
1379
+ <preferred><expression><name>Term 2</name></expression></preferred>
1366
1380
  </term>
1367
1381
  </terms>
1368
1382
  </clause>
@@ -1421,13 +1435,13 @@ RSpec.describe Asciidoctor::ISO do
1421
1435
  </li>
1422
1436
  </ul>
1423
1437
  <term id='term-term1'>
1424
- <preferred>Term1</preferred>
1438
+ <preferred><expression><name>Term1</name></expression></preferred>
1425
1439
  </term>
1426
1440
  </terms>
1427
1441
  <terms id='_' obligation='normative'>
1428
1442
  <title>Other Terms</title>
1429
1443
  <term id='term-term-2'>
1430
- <preferred>Term 2</preferred>
1444
+ <preferred><expression><name>Term 2</name></expression></preferred>
1431
1445
  </term>
1432
1446
  </terms>
1433
1447
  <definitions id='_' obligation='normative'>
@@ -1479,7 +1493,7 @@ RSpec.describe Asciidoctor::ISO do
1479
1493
  </li>
1480
1494
  </ul>
1481
1495
  <term id='term-term1'>
1482
- <preferred>Term1</preferred>
1496
+ <preferred><expression><name>Term1</name></expression></preferred>
1483
1497
  </term>
1484
1498
  </terms>
1485
1499
  </sections>
data/spec/asciidoctor/inline_spec.rb CHANGED
@@ -56,8 +56,16 @@ RSpec.describe Asciidoctor::ISO do
56
56
  </msub>
57
57
  </math>
58
58
  </stem>
59
- <admitted>alt</admitted>
60
- <deprecates>deprecated</deprecates>
59
+ <admitted>
60
+ <expression>
61
+ <name>alt</name>
62
+ </expression>
63
+ </admitted>
64
+ <deprecates>
65
+ <expression>
66
+ <name>deprecated</name>
67
+ </expression>
68
+ </deprecates>
61
69
  <domain>domain</domain>
62
70
  <strike>strike</strike>
63
71
  <smallcap>smallcap</smallcap>
data/spec/asciidoctor/section_spec.rb CHANGED
@@ -95,7 +95,7 @@ RSpec.describe Asciidoctor::ISO do
95
95
  </li>
96
96
  </ul>
97
97
  <term id="term-term1">
98
- <preferred>Term1</preferred>
98
+ <preferred><expression><name>Term1</name></expression></preferred>
99
99
  </term>
100
100
  </terms>
101
101
  <clause id="_" obligation="normative">
@@ -103,7 +103,7 @@ RSpec.describe Asciidoctor::ISO do
103
103
  <terms id="_" obligation="normative">
104
104
  <title>Normal Terms</title>
105
105
  <term id="term-term2">
106
- <preferred>Term2</preferred>
106
+ <preferred><expression><name>Term2</name></expression></preferred>
107
107
  </term>
108
108
  </terms>
109
109
  <definitions id="_" obligation="normative">
@@ -292,7 +292,7 @@ RSpec.describe Asciidoctor::ISO do
292
292
  </li>
293
293
  </ul>
294
294
  <term id="term-term1">
295
- <preferred>Term1</preferred>
295
+ <preferred><expression><name>Term1</name></expression></preferred>
296
296
  </term>
297
297
  </terms>
298
298
  </sections>
data/spec/isodoc/i18n_spec.rb CHANGED
@@ -30,7 +30,7 @@ RSpec.describe IsoDoc do
30
30
  <terms id="I" obligation="normative">
31
31
  <title>Normal Terms</title>
32
32
  <term id="J">
33
- <preferred>Term2</preferred>
33
+ <preferred><expression><name>Term2</name></expression></preferred>
34
34
  </term>
35
35
  </terms>
36
36
  <definitions id="K">
@@ -283,7 +283,7 @@ RSpec.describe IsoDoc do
283
283
  <terms id="I" obligation="normative">
284
284
  <title>Normal Terms</title>
285
285
  <term id="J">
286
- <preferred>Term2</preferred>
286
+ <preferred><expression><name>Term2</name></expression></preferred>
287
287
  </term>
288
288
  </terms>
289
289
  <definitions id="K">
@@ -457,7 +457,7 @@ RSpec.describe IsoDoc do
457
457
  <terms id="I" obligation="normative">
458
458
  <title>Normal Terms</title>
459
459
  <term id="J">
460
- <preferred>Term2</preferred>
460
+ <preferred><expression><name>Term2</name></expression></preferred>
461
461
  </term>
462
462
  </terms>
463
463
  <definitions id="K">
@@ -728,7 +728,7 @@ RSpec.describe IsoDoc do
728
728
  <terms id="I" obligation="normative">
729
729
  <title>Normal Terms</title>
730
730
  <term id="J">
731
- <preferred>Term2</preferred>
731
+ <preferred><expression><name>Term2</name></expression></preferred>
732
732
  </term>
733
733
  </terms>
734
734
  <definitions id="K">
data/spec/isodoc/inline_spec.rb CHANGED
@@ -399,7 +399,7 @@ RSpec.describe IsoDoc do
399
399
  <iso-standard xmlns="http://riboseinc.com/isoxml">
400
400
  <sections>
401
401
  <terms id="Terms">
402
- <term id="B"><preferred>B</preferred>
402
+ <term id="B"><preferred><expression><name>B</name></expression></preferred>
403
403
  <p>
404
404
  <ul>
405
405
  <li><concept><refterm>term0</refterm>
@@ -774,7 +774,7 @@ RSpec.describe IsoDoc do
774
774
  <sections>
775
775
  <clause id="clause1"><title>Clause 1</title></clause>
776
776
  <terms id="A">
777
- <term id="B"><preferred>B</preferred<
777
+ <term id="B"><preferred><expression><name>B</name></expression></preferred<
778
778
  <p>
779
779
  <ul>
780
780
  <li>
data/spec/isodoc/section_spec.rb CHANGED
@@ -27,7 +27,7 @@ RSpec.describe IsoDoc do
27
27
  <terms id="I" obligation="normative">
28
28
  <title>Normal Terms</title>
29
29
  <term id="J">
30
- <preferred>Term2</preferred>
30
+ <preferred><expression><name>Term2</name></expression></preferred>
31
31
  </term>
32
32
  </terms>
33
33
  <definitions id="K">
data/spec/isodoc/terms_spec.rb CHANGED
@@ -7,9 +7,9 @@ RSpec.describe IsoDoc do
7
7
  <sections>
8
8
  <terms id="_terms_and_definitions" obligation="normative"><title>Terms and Definitions</title>
9
9
  <term id="paddy1">
10
- <preferred>paddy</preferred>
10
+ <preferred><expression><name>paddy</name></expression></preferred>
11
11
  <domain>rice</domain>
12
- <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
12
+ <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
13
13
  <termexample id="_bd57bbf1-f948-4bae-b0ce-73c00431f892">
14
14
  <p id="_65c9a509-9a89-4b54-a890-274126aeb55c">Foreign seeds, husks, bran, sand, dust.</p>
15
15
  <ul>
@@ -31,11 +31,11 @@ RSpec.describe IsoDoc do
31
31
  </term>
32
32
 
33
33
  <term id="paddy">
34
- <preferred>paddy</preferred>
35
- <admitted>paddy rice</admitted>
36
- <admitted>rough rice</admitted>
37
- <deprecates>cargo rice</deprecates>
38
- <definition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></definition>
34
+ <preferred><expression><name>paddy</name></expression></preferred>
35
+ <admitted><expression><name>paddy rice</name></expression></admitted>
36
+ <admitted><expression><name>rough rice</name></expression></admitted>
37
+ <deprecates><expression><name>cargo rice</name></expression></deprecates>
38
+ <definition><verbaldefinition><p id="_eb29b35e-123e-4d1c-b50b-2714d41e747f">rice retaining its husk after threshing</p></verbaldefinition></definition>
39
39
  <termnote id="_671a1994-4783-40d0-bc81-987d06ffb74e">
40
40
  <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>
41
41
  </termnote>
@@ -53,11 +53,11 @@ RSpec.describe IsoDoc do
53
53
  </termsource>
54
54
  </term>
55
55
  <term id="A">
56
- <preferred>term1</preferred>
57
- <definition>term1 definition</definition>
56
+ <preferred><expression><name>term1</name></expression></preferred>
57
+ <definition><verbaldefinition>term1 definition</verbaldefinition></definition>
58
58
  <term id="B">
59
- <preferred>term2</preferred>
60
- <definition>term2 definition</definition>
59
+ <preferred><expression><name>term2</name></expression></preferred>
60
+ <definition><verbaldefinition>term2 definition</verbaldefinition></definition>
61
61
  </term>
62
62
  </term>
63
63
  </terms>