metanorma-standoc 2.2.4 → 2.2.6

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 (46) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/html/htmlstyle.css +1 -1
  4. data/lib/metanorma/standoc/base.rb +1 -0
  5. data/lib/metanorma/standoc/basicdoc.rng +0 -27
  6. data/lib/metanorma/standoc/biblio-standoc.rng +164 -0
  7. data/lib/metanorma/standoc/biblio.rng +45 -18
  8. data/lib/metanorma/standoc/blocks.rb +2 -1
  9. data/lib/metanorma/standoc/cleanup.rb +1 -0
  10. data/lib/metanorma/standoc/cleanup_asciibib.rb +110 -0
  11. data/lib/metanorma/standoc/cleanup_biblio.rb +5 -111
  12. data/lib/metanorma/standoc/cleanup_block.rb +7 -6
  13. data/lib/metanorma/standoc/cleanup_boilerplate.rb +6 -6
  14. data/lib/metanorma/standoc/cleanup_inline.rb +2 -2
  15. data/lib/metanorma/standoc/cleanup_text.rb +10 -3
  16. data/lib/metanorma/standoc/inline.rb +3 -1
  17. data/lib/metanorma/standoc/isodoc-compile.rng +7 -0
  18. data/lib/metanorma/standoc/isodoc.rng +32 -195
  19. data/lib/metanorma/standoc/macros_plantuml.rb +23 -10
  20. data/lib/metanorma/standoc/validate.rb +8 -8
  21. data/lib/metanorma/standoc/version.rb +1 -1
  22. data/metanorma-standoc.gemspec +0 -1
  23. data/spec/metanorma/biblio_spec.rb +152 -144
  24. data/spec/metanorma/blocks_spec.rb +2 -2
  25. data/spec/metanorma/cleanup_sections_spec.rb +1 -2
  26. data/spec/metanorma/cleanup_spec.rb +11 -0
  27. data/spec/metanorma/inline_spec.rb +70 -8
  28. data/spec/metanorma/isobib_cache_spec.rb +2 -2
  29. data/spec/metanorma/macros_plantuml_spec.rb +4 -4
  30. data/spec/metanorma/macros_spec.rb +2 -2
  31. data/spec/metanorma/refs_spec.rb +25 -25
  32. data/spec/support/shared_examples/structured_data_2_text_preprocessor.rb +3 -3
  33. data/spec/vcr_cassettes/bsi16341.yml +70 -72
  34. data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec.yml +82 -82
  35. data/spec/vcr_cassettes/dated_iso_ref_joint_iso_iec1.yml +12 -12
  36. data/spec/vcr_cassettes/hide_refs.yml +58 -58
  37. data/spec/vcr_cassettes/isobib_get_123.yml +13 -13
  38. data/spec/vcr_cassettes/isobib_get_123_1.yml +22 -22
  39. data/spec/vcr_cassettes/isobib_get_123_1_fr.yml +33 -33
  40. data/spec/vcr_cassettes/isobib_get_123_2.yml +25 -25
  41. data/spec/vcr_cassettes/isobib_get_123_2001.yml +12 -12
  42. data/spec/vcr_cassettes/isobib_get_124.yml +12 -12
  43. data/spec/vcr_cassettes/rfcbib_get_rfc8341.yml +37 -21
  44. data/spec/vcr_cassettes/separates_iev_citations_by_top_level_clause.yml +45 -45
  45. data/spec/vcr_cassettes/std-link.yml +12 -12
  46. metadata +6 -16
data/spec/metanorma/refs_spec.rb CHANGED
@@ -285,7 +285,7 @@ RSpec.describe Metanorma::Standoc do
285
285
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
286
286
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
287
287
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
288
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
288
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
289
289
  <docnumber>123</docnumber>
290
290
  <contributor>
291
291
  <role type='publisher'/>
@@ -326,7 +326,7 @@ RSpec.describe Metanorma::Standoc do
326
326
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
327
327
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
328
328
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
329
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
329
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
330
330
  <docnumber>123</docnumber>
331
331
  <date type='published'>
332
332
  <on>2001-05</on>
@@ -382,7 +382,7 @@ RSpec.describe Metanorma::Standoc do
382
382
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
383
383
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
384
384
  <docidentifier type='metanorma'>[1]</docidentifier>
385
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
385
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
386
386
  <docnumber>123</docnumber>
387
387
  <contributor>
388
388
  <role type='publisher'/>
@@ -423,7 +423,7 @@ RSpec.describe Metanorma::Standoc do
423
423
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
424
424
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
425
425
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
426
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
426
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
427
427
  <docnumber>123</docnumber>
428
428
  <date type='published'>
429
429
  <on>2001-05</on>
@@ -519,7 +519,7 @@ RSpec.describe Metanorma::Standoc do
519
519
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
520
520
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
521
521
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
522
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
522
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
523
523
  <docnumber>123</docnumber>
524
524
  <contributor>
525
525
  <role type='publisher'/>
@@ -561,7 +561,7 @@ RSpec.describe Metanorma::Standoc do
561
561
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
562
562
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
563
563
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
564
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
564
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
565
565
  <docnumber>123</docnumber>
566
566
  <date type='published'>
567
567
  <on>2001-05</on>
@@ -622,7 +622,7 @@ RSpec.describe Metanorma::Standoc do
622
622
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
623
623
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
624
624
  <docidentifier type='metanorma'>[1]</docidentifier>
625
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
625
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
626
626
  <docnumber>123</docnumber>
627
627
  <contributor>
628
628
  <role type='publisher'/>
@@ -664,7 +664,7 @@ RSpec.describe Metanorma::Standoc do
664
664
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
665
665
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
666
666
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
667
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
667
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
668
668
  <docnumber>123</docnumber>
669
669
  <date type='published'>
670
670
  <on>2001-05</on>
@@ -798,7 +798,7 @@ RSpec.describe Metanorma::Standoc do
798
798
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
799
799
  <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
800
800
  <docidentifier type="ISO" primary="true">ISO/IEC TR 12382:1992</docidentifier>
801
- <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2</docidentifier>
801
+ <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:ed-2</docidentifier>
802
802
  <docnumber>12382</docnumber>
803
803
  <date type="published">
804
804
  <on>1992-12</on>
@@ -846,7 +846,7 @@ RSpec.describe Metanorma::Standoc do
846
846
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
847
847
  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
848
848
  <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
849
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
849
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
850
850
  <docnumber>124</docnumber>
851
851
  <date type="published">
852
852
  <on>2014-03</on>
@@ -892,7 +892,7 @@ RSpec.describe Metanorma::Standoc do
892
892
  <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
893
893
  <docidentifier type="ISO" primary="true">ISO/IEC TR 12382:1992</docidentifier>
894
894
  <docidentifier type='metanorma'>[1]</docidentifier>
895
- <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:stage-90.93:ed-2</docidentifier>
895
+ <docidentifier type='URN'>urn:iso:std:iso-iec:tr:12382:ed-2</docidentifier>
896
896
  <docnumber>12382</docnumber>
897
897
  <date type="published">
898
898
  <on>1992-12</on>
@@ -941,7 +941,7 @@ RSpec.describe Metanorma::Standoc do
941
941
  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
942
942
  <docidentifier type="ISO" primary="true">ISO 124:2014</docidentifier>
943
943
  <docidentifier type='metanorma'>[1]</docidentifier>
944
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
944
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
945
945
  <docnumber>124</docnumber>
946
946
  <date type="published">
947
947
  <on>2014-03</on>
@@ -1021,7 +1021,7 @@ RSpec.describe Metanorma::Standoc do
1021
1021
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
1022
1022
  <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
1023
1023
  <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
1024
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
1024
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
1025
1025
  <docnumber>124</docnumber>
1026
1026
  <date type='published'>
1027
1027
  <on>2014-03</on>
@@ -1118,7 +1118,7 @@ RSpec.describe Metanorma::Standoc do
1118
1118
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
1119
1119
  <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
1120
1120
  <docidentifier type='ISO' primary="true">ISO 124</docidentifier>
1121
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
1121
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
1122
1122
  <docnumber>124</docnumber>
1123
1123
  <contributor>
1124
1124
  <role type='publisher'/>
@@ -1159,7 +1159,7 @@ RSpec.describe Metanorma::Standoc do
1159
1159
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
1160
1160
  <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
1161
1161
  <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
1162
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
1162
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
1163
1163
  <docnumber>124</docnumber>
1164
1164
  <date type='published'>
1165
1165
  <on>2014-03</on>
@@ -1218,7 +1218,7 @@ RSpec.describe Metanorma::Standoc do
1218
1218
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
1219
1219
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
1220
1220
  <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
1221
- <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
1221
+ <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
1222
1222
  <docnumber>125</docnumber>
1223
1223
  <contributor>
1224
1224
  <role type='publisher'/>
@@ -1262,7 +1262,7 @@ RSpec.describe Metanorma::Standoc do
1262
1262
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
1263
1263
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
1264
1264
  <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
1265
- <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
1265
+ <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
1266
1266
  <docnumber>125</docnumber>
1267
1267
  <date type='published'>
1268
1268
  <on>2020-02</on>
@@ -1325,7 +1325,7 @@ RSpec.describe Metanorma::Standoc do
1325
1325
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
1326
1326
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
1327
1327
  <docidentifier type='ISO' primary="true">ISO 125</docidentifier>
1328
- <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
1328
+ <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
1329
1329
  <docnumber>125</docnumber>
1330
1330
  <contributor>
1331
1331
  <role type='publisher'/>
@@ -1369,7 +1369,7 @@ RSpec.describe Metanorma::Standoc do
1369
1369
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:72849:en</uri>
1370
1370
  <uri type='rss'>https://www.iso.org/contents/data/standard/07/28/72849.detail.rss</uri>
1371
1371
  <docidentifier type='ISO' primary="true">ISO 125:2020</docidentifier>
1372
- <docidentifier type='URN'>urn:iso:std:iso:125:stage-60.60:ed-7</docidentifier>
1372
+ <docidentifier type='URN'>urn:iso:std:iso:125:ed-7</docidentifier>
1373
1373
  <docnumber>125</docnumber>
1374
1374
  <date type='published'>
1375
1375
  <on>2020-02</on>
@@ -1432,7 +1432,7 @@ RSpec.describe Metanorma::Standoc do
1432
1432
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
1433
1433
  <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
1434
1434
  <docidentifier type='ISO' primary="true">ISO 124</docidentifier>
1435
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
1435
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
1436
1436
  <docnumber>124</docnumber>
1437
1437
  <contributor>
1438
1438
  <role type='publisher'/>
@@ -1473,7 +1473,7 @@ RSpec.describe Metanorma::Standoc do
1473
1473
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
1474
1474
  <uri type='rss'>https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
1475
1475
  <docidentifier type='ISO' primary="true">ISO 124:2014</docidentifier>
1476
- <docidentifier type='URN'>urn:iso:std:iso:124:stage-90.93:ed-7</docidentifier>
1476
+ <docidentifier type='URN'>urn:iso:std:iso:124:ed-7</docidentifier>
1477
1477
  <docnumber>124</docnumber>
1478
1478
  <date type='published'>
1479
1479
  <on>2014-03</on>
@@ -2307,7 +2307,7 @@ RSpec.describe Metanorma::Standoc do
2307
2307
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
2308
2308
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
2309
2309
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
2310
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
2310
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
2311
2311
  <docnumber>123</docnumber>
2312
2312
  <contributor>
2313
2313
  <role type='publisher'/>
@@ -2348,7 +2348,7 @@ RSpec.describe Metanorma::Standoc do
2348
2348
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
2349
2349
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
2350
2350
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
2351
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
2351
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
2352
2352
  <docnumber>123</docnumber>
2353
2353
  <date type='published'>
2354
2354
  <on>2001-05</on>
@@ -2414,7 +2414,7 @@ RSpec.describe Metanorma::Standoc do
2414
2414
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
2415
2415
  <docidentifier type='ISO' primary="true">ISO 123</docidentifier>
2416
2416
  <docidentifier type='metanorma'>[1]</docidentifier>
2417
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
2417
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
2418
2418
  <docnumber>123</docnumber>
2419
2419
  <contributor>
2420
2420
  <role type='publisher'/>
@@ -2455,7 +2455,7 @@ RSpec.describe Metanorma::Standoc do
2455
2455
  <uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
2456
2456
  <uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
2457
2457
  <docidentifier type='ISO' primary="true">ISO 123:2001</docidentifier>
2458
- <docidentifier type='URN'>urn:iso:std:iso:123:stage-90.93:ed-3</docidentifier>
2458
+ <docidentifier type='URN'>urn:iso:std:iso:123:ed-3</docidentifier>
2459
2459
  <docnumber>123</docnumber>
2460
2460
  <date type='published'>
2461
2461
  <on>2001-05</on>
data/spec/support/shared_examples/structured_data_2_text_preprocessor.rb CHANGED
@@ -354,15 +354,15 @@ RSpec.shared_examples "structured data 2 text preprocessor" do
354
354
  <sections>
355
355
  <clause id='_' inline-header='false' obligation='normative'>
356
356
  <title>0 → 1 lorem == lorem</title>
357
- <sourcecode lang='ruby' id='_'>link:doc-0.rb[]</sourcecode>
357
+ <sourcecode lang='ruby' id='_'>link:doc-0.rb[role=include]</sourcecode>
358
358
  </clause>
359
359
  <clause id='_' inline-header='false' obligation='normative'>
360
360
  <title>1 → 2 ipsum == ipsum</title>
361
- <sourcecode lang='ruby' id='_'>link:doc-1.rb[]</sourcecode>
361
+ <sourcecode lang='ruby' id='_'>link:doc-1.rb[role=include]</sourcecode>
362
362
  </clause>
363
363
  <clause id='_' inline-header='false' obligation='normative'>
364
364
  <title>2 → 3 dolor == dolor</title>
365
- <sourcecode lang='ruby' id='_'>link:doc-2.rb[]</sourcecode>
365
+ <sourcecode lang='ruby' id='_'>link:doc-2.rb[role=include]</sourcecode>
366
366
  </clause>
367
367
  </sections>
368
368
  </standard-document>