metanorma-iso 1.9.3 → 1.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/basicdoc.rng +21 -4
  3. data/lib/asciidoctor/iso/front.rb +9 -1
  4. data/lib/asciidoctor/iso/isodoc.rng +435 -78
  5. data/lib/asciidoctor/iso/isostandard.rng +7 -23
  6. data/lib/asciidoctor/iso/reqt.rng +23 -2
  7. data/lib/asciidoctor/iso/validate.rb +7 -7
  8. data/lib/asciidoctor/iso/validate_section.rb +1 -1
  9. data/lib/isodoc/iso/html/isodoc.css +1 -2
  10. data/lib/isodoc/iso/html/isodoc.scss +1 -1
  11. data/lib/isodoc/iso/html/wordstyle.css +16 -4
  12. data/lib/isodoc/iso/html/wordstyle.scss +16 -4
  13. data/lib/isodoc/iso/iso.amendment.xsl +174 -11
  14. data/lib/isodoc/iso/iso.international-standard.xsl +174 -11
  15. data/lib/isodoc/iso/presentation_xml_convert.rb +30 -22
  16. data/lib/metanorma/iso/version.rb +1 -1
  17. data/metanorma-iso.gemspec +4 -3
  18. data/spec/asciidoctor/base_spec.rb +351 -178
  19. data/spec/asciidoctor/blank_spec.rb +38 -0
  20. data/spec/asciidoctor/blocks_spec.rb +28 -14
  21. data/spec/asciidoctor/cleanup_spec.rb +34 -20
  22. data/spec/asciidoctor/inline_spec.rb +10 -2
  23. data/spec/asciidoctor/section_spec.rb +3 -3
  24. data/spec/isodoc/i18n_spec.rb +4 -4
  25. data/spec/isodoc/inline_spec.rb +306 -245
  26. data/spec/isodoc/section_spec.rb +1 -1
  27. data/spec/isodoc/terms_spec.rb +11 -11
  28. data/spec/isodoc/xref_spec.rb +1397 -1376
  29. data/spec/metanorma/processor_spec.rb +4 -1
  30. data/spec/spec_helper.rb +14 -1
  31. metadata +34 -19
data/spec/asciidoctor/blocks_spec.rb CHANGED
@@ -133,7 +133,7 @@ RSpec.describe Asciidoctor::ISO do
133
133
  <p id="foreword">Foreword</p>
134
134
  <review date="20170101T00:00:00Z" from="foreword" id="_" reviewer="ISO" to="foreword">
135
135
  <p id="_">A Foreword shall appear in each document. The generic text is shown here. It does not contain requirements, recommendations or permissions.</p>
136
- <p id="_">For further information on the Foreword, see#{' '}
136
+ <p id="_">For further information on the Foreword, see
137
137
  <strong>ISO/IEC Directives, Part 2, 2016, Clause 12.</strong></p>
138
138
  </review>
139
139
  </sections>
@@ -158,9 +158,9 @@ RSpec.describe Asciidoctor::ISO do
158
158
  <sections>
159
159
  <terms id="_" obligation="normative">
160
160
  <title>Terms and definitions</title>
161
- #{TERM_BOILERPLATE}#{' '}
161
+ #{TERM_BOILERPLATE}
162
162
  <term id="term-term1">
163
- <preferred>Term1</preferred>
163
+ <preferred><expression><name>Term1</name></expression></preferred>
164
164
  <termnote id="_">
165
165
  <p id="_">This is a note</p></termnote>
166
166
  </term>
@@ -283,7 +283,7 @@ RSpec.describe Asciidoctor::ISO do
283
283
  <title>Terms and definitions</title>
284
284
  #{TERM_BOILERPLATE}
285
285
  <term id="term-term1">
286
- <preferred>Term1</preferred>
286
+ <preferred><expression><name>Term1</name></expression></preferred>
287
287
  <termexample id="_">
288
288
  <p id="_">This is an example</p></termexample>
289
289
  </term>
@@ -521,6 +521,8 @@ RSpec.describe Asciidoctor::ISO do
521
521
 
522
522
  === Term1
523
523
 
524
+ Definition
525
+
524
526
  [.source]
525
527
  <<ISO2191,section=1>>
526
528
  INPUT
@@ -531,8 +533,13 @@ RSpec.describe Asciidoctor::ISO do
531
533
  <title>Terms and definitions</title>
532
534
  #{TERM_BOILERPLATE}
533
535
  <term id="term-term1">
534
- <preferred>Term1</preferred>
535
- <termsource status="identical">
536
+ <preferred><expression><name>Term1</name></expression></preferred>
537
+ <definition>
538
+ <verbaldefinition>
539
+ <p id='_'>Definition</p>
540
+ </verbaldefinition>
541
+ </definition>
542
+ <termsource status='identical' type='authoritative'>
536
543
  <origin bibitemid="ISO2191" citeas="" type="inline">
537
544
  <localityStack>
538
545
  <locality type="section">
@@ -556,6 +563,8 @@ RSpec.describe Asciidoctor::ISO do
556
563
 
557
564
  === Term1
558
565
 
566
+ Definition
567
+
559
568
  [.source]
560
569
  <<ISO2191,section=1>>, with adjustments
561
570
  INPUT
@@ -566,8 +575,13 @@ RSpec.describe Asciidoctor::ISO do
566
575
  <title>Terms and definitions</title>
567
576
  #{TERM_BOILERPLATE}
568
577
  <term id="term-term1">
569
- <preferred>Term1</preferred>
570
- <termsource status="modified">
578
+ <preferred><expression><name>Term1</name></expression></preferred>
579
+ <definition>
580
+ <verbaldefinition>
581
+ <p id='_'>Definition</p>
582
+ </verbaldefinition>
583
+ </definition>
584
+ <termsource status='modified' type='authoritative'>
571
585
  <origin bibitemid="ISO2191" citeas="" type="inline">
572
586
  <localityStack>
573
587
  <locality type="section">
@@ -607,15 +621,15 @@ RSpec.describe Asciidoctor::ISO do
607
621
  <title>Terms and definitions</title>
608
622
  #{TERM_BOILERPLATE}
609
623
  <term id='term-term1'>
610
- <preferred>Term1</preferred>
611
- <definition>
624
+ <preferred><expression><name>Term1</name></expression></preferred>
625
+ <definition><verbaldefinition>
612
626
  <p id='_'>definition</p>
613
- </definition>
627
+ </verbaldefinition></definition>
614
628
  <term id='term-term11'>
615
- <preferred>Term11</preferred>
616
- <definition>
629
+ <preferred><expression><name>Term11</name></expression></preferred>
630
+ <definition><verbaldefinition>
617
631
  <p id='_'>definition2</p>
618
- </definition>
632
+ </verbaldefinition></definition>
619
633
  </term>
620
634
  </term>
621
635
  </terms>
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">