metanorma-iso 2.0.7 → 2.0.8

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 (37) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/base.rb +0 -1
  3. data/lib/asciidoctor/iso/cleanup.rb +0 -1
  4. data/lib/asciidoctor/iso/converter.rb +0 -1
  5. data/lib/asciidoctor/iso/deprecated.rb +4 -2
  6. data/lib/asciidoctor/iso/front.rb +0 -1
  7. data/lib/asciidoctor/iso/front_id.rb +0 -1
  8. data/lib/asciidoctor/iso/section.rb +0 -1
  9. data/lib/asciidoctor/iso/validate.rb +0 -1
  10. data/lib/asciidoctor/iso/validate_image.rb +0 -1
  11. data/lib/asciidoctor/iso/validate_requirements.rb +0 -1
  12. data/lib/asciidoctor/iso/validate_section.rb +0 -1
  13. data/lib/asciidoctor/iso/validate_style.rb +0 -1
  14. data/lib/asciidoctor/iso/validate_title.rb +0 -1
  15. data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -2
  16. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +1 -1
  17. data/lib/isodoc/iso/html/word_iso_titlepage.html +2 -2
  18. data/lib/isodoc/iso/i18n-en.yaml +1 -1
  19. data/lib/isodoc/iso/index.rb +1 -1
  20. data/lib/isodoc/iso/iso.amendment.xsl +132 -46
  21. data/lib/isodoc/iso/iso.international-standard.xsl +132 -46
  22. data/lib/isodoc/iso/metadata.rb +74 -56
  23. data/lib/isodoc/iso/presentation_xml_convert.rb +0 -2
  24. data/lib/isodoc/iso/xref.rb +4 -5
  25. data/lib/metanorma/iso/biblio.rng +25 -2
  26. data/lib/metanorma/iso/cleanup.rb +5 -5
  27. data/lib/metanorma/iso/front_id.rb +28 -11
  28. data/lib/metanorma/iso/version.rb +1 -1
  29. data/spec/isodoc/i18n_spec.rb +111 -114
  30. data/spec/isodoc/iso_spec.rb +42 -26
  31. data/spec/metanorma/amd_spec.rb +39 -16
  32. data/spec/metanorma/base_spec.rb +8 -0
  33. data/spec/metanorma/blocks_spec.rb +4 -4
  34. data/spec/metanorma/cleanup_spec.rb +11 -11
  35. data/spec/metanorma/section_spec.rb +3 -3
  36. data/spec/spec_helper.rb +1 -1
  37. metadata +2 -2
data/spec/metanorma/base_spec.rb CHANGED
@@ -65,6 +65,7 @@ RSpec.describe Metanorma::ISO do
65
65
  <title format="text/plain" language="fr" type="title-main">Titre Principal</title>
66
66
  <title format="text/plain" language="fr" type="title-part">Part du Titre</title>
67
67
  <docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
68
+ <docidentifier type='iso-undated'>ISO/PreWD3 1000-1</docidentifier>
68
69
  <docidentifier type="iso-with-lang">ISO/PreWD3 1000-1(E)</docidentifier>
69
70
  <docidentifier type="iso-reference">ISO/PreWD3 1000-1:2000(E)</docidentifier>
70
71
  <docnumber>1000</docnumber>
@@ -167,6 +168,7 @@ RSpec.describe Metanorma::ISO do
167
168
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
168
169
  <bibdata type="standard">
169
170
  <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
171
+ <docidentifier type='iso-undated'>ISO/IEC/IETF/TR 1000-1-1</docidentifier>
170
172
  <docidentifier type="iso-with-lang">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
171
173
  <docidentifier type="iso-reference">ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
172
174
  <docidentifier type="iso-tc">2000</docidentifier>
@@ -340,6 +342,7 @@ RSpec.describe Metanorma::ISO do
340
342
  <title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
341
343
  <title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
342
344
  <docidentifier type='ISO'>ISO 1000-1:2000</docidentifier>
345
+ <docidentifier type='iso-undated'>ISO 1000-1</docidentifier>
343
346
  <docidentifier type='iso-with-lang'>ISO 1000-1:2000(R)</docidentifier>
344
347
  <docidentifier type='iso-reference'>ISO 1000-1:2000(R)</docidentifier>
345
348
  <docnumber>1000</docnumber>
@@ -426,6 +429,7 @@ RSpec.describe Metanorma::ISO do
426
429
  <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
427
430
  <bibdata type='standard'>
428
431
  <docidentifier type='ISO'>SD 1000-1-1</docidentifier>
432
+ <docidentifier type='iso-undated'>SD 1000-1-1</docidentifier>
429
433
  <docidentifier type='iso-with-lang'>SD 1000-1-1(X)</docidentifier>
430
434
  <docidentifier type='iso-reference'>SD 1000-1-1(X)</docidentifier>
431
435
  <docidentifier type='iso-tc'>2000</docidentifier>
@@ -521,6 +525,7 @@ RSpec.describe Metanorma::ISO do
521
525
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
522
526
  <bibdata type="standard">
523
527
  <docidentifier type='ISO'>ISO/FDIS 1000.2</docidentifier>
528
+ <docidentifier type='iso-undated'>ISO/FDIS 1000.2</docidentifier>
524
529
  <docidentifier type='iso-with-lang'>ISO/FDIS 1000.2(F)</docidentifier>
525
530
  <docidentifier type='iso-reference'>ISO/FDIS 1000.2(F)</docidentifier>
526
531
  <docnumber>1000</docnumber>
@@ -589,6 +594,7 @@ RSpec.describe Metanorma::ISO do
589
594
  <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
590
595
  <bibdata type="standard">
591
596
  <docidentifier type="ISO">ISO 1000</docidentifier>
597
+ <docidentifier type='iso-undated'>ISO 1000</docidentifier>
592
598
  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
593
599
  <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
594
600
  <docnumber>1000</docnumber>
@@ -657,6 +663,7 @@ RSpec.describe Metanorma::ISO do
657
663
  <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
658
664
  <bibdata type="standard">
659
665
  <docidentifier type="ISO">ISO 1000</docidentifier>
666
+ <docidentifier type='iso-undated'>ISO 1000</docidentifier>
660
667
  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
661
668
  <docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
662
669
  <docnumber>1000</docnumber>
@@ -725,6 +732,7 @@ RSpec.describe Metanorma::ISO do
725
732
  <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
726
733
  <bibdata type='standard'>
727
734
  <docidentifier type='ISO'>ISO DIR 1000</docidentifier>
735
+ <docidentifier type='iso-undated'>ISO DIR 1000</docidentifier>
728
736
  <docidentifier type='iso-with-lang'>ISO DIR 1000(E)</docidentifier>
729
737
  <docidentifier type='iso-reference'>ISO DIR 1000(E)</docidentifier>
730
738
  <docnumber>1000</docnumber>
data/spec/metanorma/blocks_spec.rb CHANGED
@@ -159,7 +159,7 @@ RSpec.describe Metanorma::ISO do
159
159
  <terms id="_" obligation="normative">
160
160
  <title>Terms and definitions</title>
161
161
  #{TERM_BOILERPLATE}
162
- <term id="term-term1">
162
+ <term id="term-Term1">
163
163
  <preferred><expression><name>Term1</name></expression></preferred>
164
164
  <termnote id="_">
165
165
  <p id="_">This is a note</p></termnote>
@@ -282,7 +282,7 @@ RSpec.describe Metanorma::ISO do
282
282
  <terms id="_" obligation="normative">
283
283
  <title>Terms and definitions</title>
284
284
  #{TERM_BOILERPLATE}
285
- <term id="term-term1">
285
+ <term id="term-Term1">
286
286
  <preferred><expression><name>Term1</name></expression></preferred>
287
287
  <termexample id="_">
288
288
  <p id="_">This is an example</p></termexample>
@@ -532,7 +532,7 @@ RSpec.describe Metanorma::ISO do
532
532
  <terms id="_" obligation="normative">
533
533
  <title>Terms and definitions</title>
534
534
  #{TERM_BOILERPLATE}
535
- <term id="term-term1">
535
+ <term id="term-Term1">
536
536
  <preferred><expression><name>Term1</name></expression></preferred>
537
537
  <definition>
538
538
  <verbal-definition>
@@ -574,7 +574,7 @@ RSpec.describe Metanorma::ISO do
574
574
  <terms id="_" obligation="normative">
575
575
  <title>Terms and definitions</title>
576
576
  #{TERM_BOILERPLATE}
577
- <term id="term-term1">
577
+ <term id="term-Term1">
578
578
  <preferred><expression><name>Term1</name></expression></preferred>
579
579
  <definition>
580
580
  <verbal-definition>
data/spec/metanorma/cleanup_spec.rb CHANGED
@@ -93,7 +93,7 @@ RSpec.describe Metanorma::ISO do
93
93
  <terms id="_" obligation="normative">
94
94
  <title>Terms and definitions</title>#{TERM_BOILERPLATE}
95
95
 
96
- <term id="term-tempus">
96
+ <term id="term-Tempus">
97
97
  <preferred><expression><name>Tempus</name></expression></preferred>
98
98
  <domain>relativity</domain>
99
99
  <definition><verbal-definition>
@@ -204,7 +204,7 @@ RSpec.describe Metanorma::ISO do
204
204
  <li>
205
205
  <p id="_">So am I</p></li>
206
206
  </ul>
207
- <term id="term-time">
207
+ <term id="term-Time">
208
208
  <preferred><expression><name>Time</name></expression></preferred>
209
209
  <definition><verbal-definition>
210
210
  <p id="_">This paragraph is extraneous</p>
@@ -454,7 +454,7 @@ RSpec.describe Metanorma::ISO do
454
454
  <terms id="_" obligation="normative">
455
455
  <title>Terms and definitions</title>
456
456
  #{TERM_BOILERPLATE}
457
- <term id="term-term1">
457
+ <term id="term-Term1">
458
458
  <preferred><expression><name>Term1</name></expression></preferred>
459
459
  <definition>
460
460
  <verbal-definition>
@@ -1257,7 +1257,7 @@ RSpec.describe Metanorma::ISO do
1257
1257
  </p>
1258
1258
  </li>
1259
1259
  </ul>
1260
- <term id='term-term1'>
1260
+ <term id='term-Term1'>
1261
1261
  <preferred><expression><name>Term1</name></expression></preferred>
1262
1262
  </term>
1263
1263
  </terms>
@@ -1308,13 +1308,13 @@ RSpec.describe Metanorma::ISO do
1308
1308
  </ul>
1309
1309
  <terms id='_' obligation='normative'>
1310
1310
  <title>Normal Terms</title>
1311
- <term id='term-term1'>
1311
+ <term id='term-Term1'>
1312
1312
  <preferred><expression><name>Term1</name></expression></preferred>
1313
1313
  </term>
1314
1314
  </terms>
1315
1315
  <terms id='_' obligation='normative'>
1316
1316
  <title>Abnormal terms</title>
1317
- <term id='term-term-2'>
1317
+ <term id='term-Term-2'>
1318
1318
  <preferred><expression><name>Term 2</name></expression></preferred>
1319
1319
  </term>
1320
1320
  </terms>
@@ -1372,13 +1372,13 @@ RSpec.describe Metanorma::ISO do
1372
1372
  </ul>
1373
1373
  <terms id='_' obligation='normative'>
1374
1374
  <title>Normal Terms</title>
1375
- <term id='term-term1'>
1375
+ <term id='term-Term1'>
1376
1376
  <preferred><expression><name>Term1</name></expression></preferred>
1377
1377
  </term>
1378
1378
  </terms>
1379
1379
  <terms id='_' obligation='normative'>
1380
1380
  <title>Abnormal terms</title>
1381
- <term id='term-term-2'>
1381
+ <term id='term-Term-2'>
1382
1382
  <preferred><expression><name>Term 2</name></expression></preferred>
1383
1383
  </term>
1384
1384
  </terms>
@@ -1437,13 +1437,13 @@ RSpec.describe Metanorma::ISO do
1437
1437
  </p>
1438
1438
  </li>
1439
1439
  </ul>
1440
- <term id='term-term1'>
1440
+ <term id='term-Term1'>
1441
1441
  <preferred><expression><name>Term1</name></expression></preferred>
1442
1442
  </term>
1443
1443
  </terms>
1444
1444
  <terms id='_' obligation='normative'>
1445
1445
  <title>Other Terms</title>
1446
- <term id='term-term-2'>
1446
+ <term id='term-Term-2'>
1447
1447
  <preferred><expression><name>Term 2</name></expression></preferred>
1448
1448
  </term>
1449
1449
  </terms>
@@ -1495,7 +1495,7 @@ RSpec.describe Metanorma::ISO do
1495
1495
  </p>
1496
1496
  </li>
1497
1497
  </ul>
1498
- <term id='term-term1'>
1498
+ <term id='term-Term1'>
1499
1499
  <preferred><expression><name>Term1</name></expression></preferred>
1500
1500
  </term>
1501
1501
  </terms>
data/spec/metanorma/section_spec.rb CHANGED
@@ -92,7 +92,7 @@ RSpec.describe Metanorma::ISO do
92
92
  <link target="https://www.electropedia.org"/></p>
93
93
  </li>
94
94
  </ul>
95
- <term id="term-term1">
95
+ <term id="term-Term1">
96
96
  <preferred><expression><name>Term1</name></expression></preferred>
97
97
  </term>
98
98
  </terms>
@@ -100,7 +100,7 @@ RSpec.describe Metanorma::ISO do
100
100
  <title>Terms, definitions, symbols and abbreviated terms</title>
101
101
  <terms id="_" obligation="normative">
102
102
  <title>Normal Terms</title>
103
- <term id="term-term2">
103
+ <term id="term-Term2">
104
104
  <preferred><expression><name>Term2</name></expression></preferred>
105
105
  </term>
106
106
  </terms>
@@ -287,7 +287,7 @@ RSpec.describe Metanorma::ISO do
287
287
  <link target="https://www.electropedia.org"/></p>
288
288
  </li>
289
289
  </ul>
290
- <term id="term-term1">
290
+ <term id="term-Term1">
291
291
  <preferred><expression><name>Term1</name></expression></preferred>
292
292
  </term>
293
293
  </terms>
data/spec/spec_helper.rb CHANGED
@@ -62,7 +62,7 @@ def xmlpp(xml)
62
62
  f.compact = true
63
63
  f.write(REXML::Document.new(xml
64
64
  .gsub(%r{<fetched>20[0-9-]+</fetched>}, "<fetched/>")), s)
65
- s
65
+ HTMLEntities.new.decode(s)
66
66
  end
67
67
 
68
68
  ASCIIDOC_BLANK_HDR = <<~"HDR".freeze
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.7
4
+ version: 2.0.8
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-04-04 00:00:00.000000000 Z
11
+ date: 2022-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-standoc