metanorma-iso 2.1.4 → 2.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iso/html/isodoc-dis.css +1 -10
  3. data/lib/isodoc/iso/html/isodoc-dis.scss +1 -13
  4. data/lib/isodoc/iso/html/isodoc.css +4 -11
  5. data/lib/isodoc/iso/html/isodoc.scss +5 -15
  6. data/lib/isodoc/iso/html/style-human.css +3 -0
  7. data/lib/isodoc/iso/html/style-human.scss +4 -0
  8. data/lib/isodoc/iso/html/style-iso.css +3 -0
  9. data/lib/isodoc/iso/html/style-iso.scss +4 -0
  10. data/lib/isodoc/iso/i18n-en.yaml +1 -1
  11. data/lib/isodoc/iso/iso.amendment.xsl +3618 -2934
  12. data/lib/isodoc/iso/iso.international-standard.xsl +3618 -2934
  13. data/lib/isodoc/iso/presentation_xml_convert.rb +8 -6
  14. data/lib/isodoc/iso/word_cleanup.rb +50 -19
  15. data/lib/isodoc/iso/word_dis_cleanup.rb +2 -14
  16. data/lib/isodoc/iso/word_dis_convert.rb +1 -1
  17. data/lib/metanorma/iso/boilerplate-fr.xml +1 -1
  18. data/lib/metanorma/iso/boilerplate-ru.xml +1 -1
  19. data/lib/metanorma/iso/boilerplate.xml +1 -1
  20. data/lib/metanorma/iso/cleanup.rb +0 -1
  21. data/lib/metanorma/iso/front_id.rb +20 -1
  22. data/lib/metanorma/iso/isodoc.rng +16 -1
  23. data/lib/metanorma/iso/reqt.rng +1 -1
  24. data/lib/metanorma/iso/version.rb +1 -1
  25. data/metanorma-iso.gemspec +2 -1
  26. data/spec/isodoc/postproc_spec.rb +8 -75
  27. data/spec/isodoc/ref_spec.rb +123 -76
  28. data/spec/isodoc/terms_spec.rb +62 -0
  29. data/spec/isodoc/word_dis_spec.rb +133 -15
  30. data/spec/metanorma/base_spec.rb +19 -17
  31. data/spec/metanorma/cleanup_spec.rb +5 -5
  32. data/spec/metanorma/processor_spec.rb +1 -2
  33. data/spec/metanorma/refs_spec.rb +5 -3
  34. data/spec/metanorma/section_spec.rb +8 -8
  35. data/spec/spec_helper.rb +1 -1
  36. data/spec/vcr_cassettes/withdrawn_iso.yml +33 -33
  37. metadata +18 -4
@@ -1240,7 +1240,7 @@ RSpec.describe Metanorma::ISO do
1240
1240
  <title>Terms and definitions</title>
1241
1241
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1242
1242
  <p id='_'>
1243
- ISO and IEC maintain terminological databases for use in standardization
1243
+ ISO and IEC maintain terminology databases for use in standardization
1244
1244
  at the following addresses:
1245
1245
  </p>
1246
1246
  <ul id='_'>
@@ -1289,7 +1289,7 @@ RSpec.describe Metanorma::ISO do
1289
1289
  <title>Terms and definitions</title>
1290
1290
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1291
1291
  <p id='_'>
1292
- ISO and IEC maintain terminological databases for use in standardization
1292
+ ISO and IEC maintain terminology databases for use in standardization
1293
1293
  at the following addresses:
1294
1294
  </p>
1295
1295
  <ul id='_'>
@@ -1353,7 +1353,7 @@ RSpec.describe Metanorma::ISO do
1353
1353
  <title>Terms and definitions</title>
1354
1354
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1355
1355
  <p id='_'>
1356
- ISO and IEC maintain terminological databases for use in
1356
+ ISO and IEC maintain terminology databases for use in
1357
1357
  standardization at the following addresses:
1358
1358
  </p>
1359
1359
  <ul id='_'>
@@ -1420,7 +1420,7 @@ RSpec.describe Metanorma::ISO do
1420
1420
  <title>Terms and definitions</title>
1421
1421
  <p id='_'>For the purposes of this document, the following terms and definitions apply.</p>
1422
1422
  <p id='_'>
1423
- ISO and IEC maintain terminological databases for use in
1423
+ ISO and IEC maintain terminology databases for use in
1424
1424
  standardization at the following addresses:
1425
1425
  </p>
1426
1426
  <ul id='_'>
@@ -1478,7 +1478,7 @@ RSpec.describe Metanorma::ISO do
1478
1478
  <terms id='_' obligation='normative'>
1479
1479
  <title>Terms and definitions</title>
1480
1480
  <p id='_'>
1481
- ISO and IEC maintain terminological databases for use in standardization
1481
+ ISO and IEC maintain terminology databases for use in standardization
1482
1482
  at the following addresses:
1483
1483
  </p>
1484
1484
  <ul id='_'>
@@ -78,8 +78,7 @@ l&#8217;adresse ci-apr&#232;s ou au comit&#233; membre de l&#8217;ISO dans le pa
78
78
  ISO copyright office<br/>
79
79
  Ch. de Blandonnet 8 &#8226; CP 401<br/>
80
80
  CH-1214 Vernier, Geneva, Switzerland<br/>
81
- Tel.&#160;&#160;+ 41 22 749 01 11<br/>
82
- Fax&#160;&#160;+ 41 22 749 09 47<br/>
81
+ Phone: +41 22 749 01 11<br/>
83
82
  Email: copyright@iso.org<br/>
84
83
  Website: www.iso.org
85
84
  </p>
@@ -410,7 +410,7 @@ RSpec.describe Metanorma::ISO do
410
410
  <uri type='src'>https://www.iso.org/standard/2405.html</uri>
411
411
  <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
412
412
  <docidentifier type='ISO' primary='true'>ISO 31-0</docidentifier>
413
- <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
413
+ <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
414
414
  <docnumber>31</docnumber>
415
415
  <contributor>
416
416
  <role type='publisher'/>
@@ -447,7 +447,7 @@ RSpec.describe Metanorma::ISO do
447
447
  <uri type='src'>https://www.iso.org/standard/2405.html</uri>
448
448
  <uri type='rss'>https://www.iso.org/contents/data/standard/00/24/2405.detail.rss</uri>
449
449
  <docidentifier type='ISO' primary='true'>ISO 31-0:1974</docidentifier>
450
- <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1:en</docidentifier>
450
+ <docidentifier type='URN'>urn:iso:std:iso:31:-0:stage-95.99:ed-1</docidentifier>
451
451
  <docnumber>31</docnumber>
452
452
  <date type='published'>
453
453
  <on>1974-01</on>
@@ -494,7 +494,7 @@ RSpec.describe Metanorma::ISO do
494
494
  <uri type='src'>https://www.iso.org/standard/76389.html</uri>
495
495
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/63/76389.detail.rss</uri>
496
496
  <docidentifier type='ISO' primary='true'>ISO 683-3:2019</docidentifier>
497
- <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3:en</docidentifier>
497
+ <docidentifier type='URN'>urn:iso:std:iso:683:-3:stage-95.99:ed-3</docidentifier>
498
498
  <docnumber>683</docnumber>
499
499
  <date type='published'>
500
500
  <on>2019-01</on>
@@ -551,11 +551,13 @@ RSpec.describe Metanorma::ISO do
551
551
  <relation type='obsoletes'>
552
552
  <bibitem type='standard'>
553
553
  <formattedref format='text/plain'>ISO 683-3:2016</formattedref>
554
+ <docidentifier type='ISO' primary='true'>ISO 683-3:2016</docidentifier>
554
555
  </bibitem>
555
556
  </relation>
556
557
  <relation type='updates'>
557
558
  <bibitem type='standard'>
558
559
  <formattedref format='text/plain'>ISO 683-3:2022</formattedref>
560
+ <docidentifier type='ISO' primary='true'>ISO 683-3:2022</docidentifier>
559
561
  <date type='circulated'>
560
562
  <on>2022-01-21</on>
561
563
  </date>
@@ -12,12 +12,12 @@ RSpec.describe Metanorma::ISO do
12
12
 
13
13
  === Introduction Subsection
14
14
 
15
+ == Acknowledgements
16
+
15
17
  == Scope
16
18
 
17
19
  Text
18
20
 
19
- == Acknowledgements
20
-
21
21
  == Normative References
22
22
 
23
23
  == Terms and Definitions
@@ -81,7 +81,7 @@ RSpec.describe Metanorma::ISO do
81
81
  <terms id="_" obligation="normative">
82
82
  <title>Terms and definitions</title>
83
83
  <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
84
- <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
84
+ <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
85
85
  <ul id="_">
86
86
  <li>
87
87
  <p id="_">ISO Online browsing platform: available at
@@ -275,7 +275,7 @@ RSpec.describe Metanorma::ISO do
275
275
  given in <eref bibitemid="iso1234"/>
276
276
  and <eref bibitemid="iso5678"/>
277
277
  and the following apply.</p>
278
- <p id="_">ISO and IEC maintain terminological databases for use in
278
+ <p id="_">ISO and IEC maintain terminology databases for use in
279
279
  standardization at the following addresses:</p>
280
280
  <ul id="_">
281
281
  <li>
@@ -321,7 +321,7 @@ RSpec.describe Metanorma::ISO do
321
321
  <title>Terms and definitions</title>
322
322
  <p id='_'>No terms and definitions are listed in this document.</p>
323
323
  <p id='_'>
324
- ISO and IEC maintain terminological databases for use in standardization
324
+ ISO and IEC maintain terminology databases for use in standardization
325
325
  at the following addresses:
326
326
  </p>
327
327
  <ul id='_'>
@@ -373,7 +373,7 @@ RSpec.describe Metanorma::ISO do
373
373
  and <eref bibitemid="iso5678"/>
374
374
  apply.
375
375
  </p>
376
- <p id="_">ISO and IEC maintain terminological databases for use in standardization at the following addresses:</p>
376
+ <p id="_">ISO and IEC maintain terminology databases for use in standardization at the following addresses:</p>
377
377
  <ul id="_">
378
378
  <li>
379
379
  <p id="_">ISO Online browsing platform: available at
@@ -411,7 +411,7 @@ RSpec.describe Metanorma::ISO do
411
411
  <title>Terms and definitions</title>
412
412
  <p id='_'>No terms and definitions are listed in this document.</p>
413
413
  <p id='_'>
414
- ISO and IEC maintain terminological databases for use in standardization
414
+ ISO and IEC maintain terminology databases for use in standardization
415
415
  at the following addresses:
416
416
  </p>
417
417
  <ul id='_'>
@@ -461,7 +461,7 @@ RSpec.describe Metanorma::ISO do
461
461
  <terms id='_' obligation='normative'>
462
462
  <title>Terms and Definitions</title>
463
463
  <p id='_'>No terms and definitions are listed in this document.</p>
464
- <p id='_'>ISO and IEC maintain terminological databases for use in standardization
464
+ <p id='_'>ISO and IEC maintain terminology databases for use in standardization
465
465
  at the following addresses:
466
466
  </p>
467
467
  <ul id='_'>
data/spec/spec_helper.rb CHANGED
@@ -225,7 +225,7 @@ HDR
225
225
  TERM_BOILERPLATE = <<~TERM.freeze
226
226
  <p id="_">For the purposes of this document,
227
227
  the following terms and definitions apply.</p>
228
- <p id="_">ISO and IEC maintain terminological databases for use in
228
+ <p id="_">ISO and IEC maintain terminology databases for use in
229
229
  standardization at the following addresses:</p>
230
230
 
231
231
  <ul id="_">