metanorma-iso 2.0.6.1 → 2.0.8.1

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 (50) 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/base_convert.rb +3 -3
  16. data/lib/isodoc/iso/html/header-dis.html +391 -0
  17. data/lib/isodoc/iso/html/html_iso_titlepage.html +2 -2
  18. data/lib/isodoc/iso/html/isodoc-dis.css +4524 -0
  19. data/lib/isodoc/iso/html/isodoc-dis.scss +4289 -0
  20. data/lib/isodoc/iso/html/word_iso_intro-dis.html +7 -0
  21. data/lib/isodoc/iso/html/word_iso_titlepage-dis.html +50 -0
  22. data/lib/isodoc/iso/html/word_iso_titlepage.html +2 -2
  23. data/lib/isodoc/iso/html/wordstyle-dis.css +2160 -0
  24. data/lib/isodoc/iso/html/wordstyle-dis.scss +2011 -0
  25. data/lib/isodoc/iso/i18n-en.yaml +1 -1
  26. data/lib/isodoc/iso/index.rb +7 -4
  27. data/lib/isodoc/iso/iso.amendment.xsl +310 -130
  28. data/lib/isodoc/iso/iso.international-standard.xsl +310 -130
  29. data/lib/isodoc/iso/metadata.rb +75 -64
  30. data/lib/isodoc/iso/presentation_xml_convert.rb +0 -2
  31. data/lib/isodoc/iso/sts_convert.rb +8 -3
  32. data/lib/isodoc/iso/word_cleanup.rb +2 -2
  33. data/lib/isodoc/iso/word_convert.rb +12 -0
  34. data/lib/isodoc/iso/xref.rb +4 -5
  35. data/lib/metanorma/iso/biblio.rng +25 -2
  36. data/lib/metanorma/iso/cleanup.rb +5 -5
  37. data/lib/metanorma/iso/front_id.rb +28 -11
  38. data/lib/metanorma/iso/version.rb +1 -1
  39. data/spec/isodoc/i18n_spec.rb +111 -114
  40. data/spec/isodoc/iso_spec.rb +42 -26
  41. data/spec/isodoc/ref_spec.rb +11 -7
  42. data/spec/metanorma/amd_spec.rb +45 -23
  43. data/spec/metanorma/base_spec.rb +8 -0
  44. data/spec/metanorma/blocks_spec.rb +4 -4
  45. data/spec/metanorma/cleanup_spec.rb +11 -11
  46. data/spec/metanorma/section_spec.rb +3 -3
  47. data/spec/spec_helper.rb +1 -1
  48. data/spec/vcr_cassettes/docrels.yml +35 -43
  49. data/spec/vcr_cassettes/withdrawn_iso.yml +26 -32
  50. metadata +9 -2
@@ -2,7 +2,7 @@ require "spec_helper"
2
2
 
3
3
  RSpec.describe Metanorma::ISO do
4
4
  it "processes amendment sections" do
5
- expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", *OPTIONS)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
5
+ input = <<~INPUT
6
6
  #{AMD_BLANK_HDR}
7
7
  == Foreword
8
8
 
@@ -54,6 +54,7 @@ RSpec.describe Metanorma::ISO do
54
54
 
55
55
  === Bibliography Subsection
56
56
  INPUT
57
+ output = <<~OUTPUT
57
58
  #{BLANK_HDR.sub(%r{<doctype>article</doctype>}, '<doctype>amendment</doctype>')}
58
59
  <sections>
59
60
  <clause id="_" obligation="normative">
@@ -127,10 +128,12 @@ RSpec.describe Metanorma::ISO do
127
128
  </annex>
128
129
  </iso-standard>
129
130
  OUTPUT
131
+ expect(xmlpp(strip_guid(Asciidoctor.convert(input, *OPTIONS))))
132
+ .to be_equivalent_to xmlpp(output)
130
133
  end
131
134
 
132
135
  it "processes default metadata, amendment" do
133
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
136
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
134
137
  = Document title
135
138
  Author
136
139
  :docfile: test.adoc
@@ -182,7 +185,7 @@ RSpec.describe Metanorma::ISO do
182
185
  :updates-document-type: international-standard
183
186
  INPUT
184
187
 
185
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
188
+ output = <<~OUTPUT
186
189
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
187
190
  <bibdata type="standard">
188
191
  <title format="text/plain" language="en" type="main">Introduction — Main Title — Title — Title Part — Mass fraction of
@@ -207,6 +210,7 @@ RSpec.describe Metanorma::ISO do
207
210
  de transport
208
211
  </title>
209
212
  <docidentifier type="ISO">ISO 17301-1:2016/PreNP Amd 1</docidentifier>
213
+ <docidentifier type='iso-undated'>ISO 17301-1/PreNP Amd 1</docidentifier>
210
214
  <docidentifier type="iso-with-lang">ISO 17301-1:2016/PreNP Amd 1(E)</docidentifier>
211
215
  <docidentifier type="iso-reference">ISO 17301-1:2016/PreNP Amd 1:2017(E)</docidentifier>
212
216
  <docnumber>17301</docnumber>
@@ -278,10 +282,12 @@ RSpec.describe Metanorma::ISO do
278
282
  <sections/>
279
283
  </iso-standard>
280
284
  OUTPUT
285
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
286
+ .to be_equivalent_to xmlpp(output)
281
287
  end
282
288
 
283
- it "processes metadata, amendment" do
284
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
289
+ it "processes metadata, amendment, stage 30" do
290
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
285
291
  = Document title
286
292
  Author
287
293
  :docfile: test.adoc
@@ -295,11 +301,11 @@ RSpec.describe Metanorma::ISO do
295
301
  :updates: ISO 17301-1:2030
296
302
  :amendment-number: 1
297
303
  INPUT
298
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
299
-
304
+ output = <<~OUTPUT
300
305
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
301
306
  <bibdata type="standard">
302
307
  <docidentifier type="ISO">ISO 17301-1:2030/CD Amd 1</docidentifier>
308
+ <docidentifier type='iso-undated'>ISO 17301-1/CD Amd 1</docidentifier>
303
309
  <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
304
310
  <docidentifier type="iso-reference">ISO 17301-1:2030/CD Amd 1(E)</docidentifier>
305
311
  <docnumber>17301</docnumber>
@@ -348,10 +354,12 @@ RSpec.describe Metanorma::ISO do
348
354
  <sections/>
349
355
  </iso-standard>
350
356
  OUTPUT
357
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
358
+ .to be_equivalent_to xmlpp(output)
351
359
  end
352
360
 
353
- it "processes metadata, amendment" do
354
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
361
+ it "processes metadata, amendment, stage 40" do
362
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
355
363
  = Document title
356
364
  Author
357
365
  :docfile: test.adoc
@@ -365,10 +373,11 @@ RSpec.describe Metanorma::ISO do
365
373
  :updates: ISO 17301-1:2030
366
374
  :amendment-number: 1
367
375
  INPUT
368
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
376
+ output = <<~OUTPUT
369
377
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
370
378
  <bibdata type="standard">
371
379
  <docidentifier type="ISO">ISO 17301-1:2030/DAmd 1</docidentifier>
380
+ <docidentifier type='iso-undated'>ISO 17301-1/DAmd 1</docidentifier>
372
381
  <docidentifier type="iso-with-lang">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
373
382
  <docidentifier type="iso-reference">ISO 17301-1:2030/DAmd 1(E)</docidentifier>
374
383
  <docnumber>17301</docnumber>
@@ -417,10 +426,12 @@ RSpec.describe Metanorma::ISO do
417
426
  <sections/>
418
427
  </iso-standard>
419
428
  OUTPUT
429
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
430
+ .to be_equivalent_to xmlpp(output)
420
431
  end
421
432
 
422
- it "processes metadata, amendment" do
423
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
433
+ it "processes metadata, amendment, published" do
434
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
424
435
  = Document title
425
436
  Author
426
437
  :docfile: test.adoc
@@ -433,10 +444,11 @@ RSpec.describe Metanorma::ISO do
433
444
  :updates: ISO 17301-1:2030
434
445
  :amendment-number: 1
435
446
  INPUT
436
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
447
+ output = <<~OUTPUT
437
448
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
438
449
  <bibdata type="standard">
439
450
  <docidentifier type="ISO">ISO 17301-1:2030/Amd 1</docidentifier>
451
+ <docidentifier type='iso-undated'>ISO 17301-1/Amd 1</docidentifier>
440
452
  <docidentifier type="iso-with-lang">ISO 17301-1:2030/Amd 1(E)</docidentifier>
441
453
  <docidentifier type="iso-reference">ISO 17301-1:2030/Amd 1(E)</docidentifier>
442
454
  <docnumber>17301</docnumber>
@@ -485,10 +497,12 @@ RSpec.describe Metanorma::ISO do
485
497
  <sections/>
486
498
  </iso-standard>
487
499
  OUTPUT
500
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
501
+ .to be_equivalent_to xmlpp(output)
488
502
  end
489
503
 
490
- it "processes metadata, corrigendum" do
491
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
504
+ it "processes metadata, corrigendum, stage 30" do
505
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
492
506
  = Document title
493
507
  Author
494
508
  :docfile: test.adoc
@@ -502,11 +516,11 @@ RSpec.describe Metanorma::ISO do
502
516
  :updates: ISO 17301-1:2030
503
517
  :corrigendum-number: 3
504
518
  INPUT
505
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
506
- #{' '}
519
+ output = <<~OUTPUT
507
520
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
508
521
  <bibdata type="standard">
509
522
  <docidentifier type="ISO">ISO 17301-1:2030/CD Cor.3</docidentifier>
523
+ <docidentifier type='iso-undated'>ISO 17301-1/CD Cor.3</docidentifier>
510
524
  <docidentifier type="iso-with-lang">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
511
525
  <docidentifier type="iso-reference">ISO 17301-1:2030/CD Cor.3(E)</docidentifier>
512
526
  <docnumber>17301</docnumber>
@@ -555,10 +569,12 @@ RSpec.describe Metanorma::ISO do
555
569
  <sections/>
556
570
  </iso-standard>
557
571
  OUTPUT
572
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
573
+ .to be_equivalent_to xmlpp(output)
558
574
  end
559
575
 
560
- it "processes metadata, corrigendum" do
561
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
576
+ it "processes metadata, corrigendum, stage 50" do
577
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
562
578
  = Document title
563
579
  Author
564
580
  :docfile: test.adoc
@@ -572,10 +588,11 @@ RSpec.describe Metanorma::ISO do
572
588
  :updates: ISO 17301-1:2030
573
589
  :corrigendum-number: 3
574
590
  INPUT
575
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
591
+ output = <<~OUTPUT
576
592
  <iso-standard xmlns='https://www.metanorma.org/ns/iso' type="semantic" version="#{Metanorma::ISO::VERSION}">
577
593
  <bibdata type='standard'>
578
594
  <docidentifier type='ISO'>ISO 17301-1:2030/FDCor.3</docidentifier>
595
+ <docidentifier type='iso-undated'>ISO 17301-1/FDCor.3</docidentifier>
579
596
  <docidentifier type='iso-with-lang'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
580
597
  <docidentifier type='iso-reference'>ISO 17301-1:2030/FDCor.3(E)</docidentifier>
581
598
  <docnumber>17301</docnumber>
@@ -624,10 +641,12 @@ RSpec.describe Metanorma::ISO do
624
641
  <sections/>
625
642
  </iso-standard>
626
643
  OUTPUT
644
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
645
+ .to be_equivalent_to xmlpp(output)
627
646
  end
628
647
 
629
- it "processes metadata, corrigendum" do
630
- output = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
648
+ it "processes metadata, corrigendum, published" do
649
+ input = Asciidoctor.convert(<<~"INPUT", *OPTIONS)
631
650
  = Document title
632
651
  Author
633
652
  :docfile: test.adoc
@@ -640,10 +659,11 @@ RSpec.describe Metanorma::ISO do
640
659
  :updates: ISO 17301-1:2030
641
660
  :corrigendum-number: 3
642
661
  INPUT
643
- expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
662
+ output = <<~OUTPUT
644
663
  <iso-standard type="semantic" version="#{Metanorma::ISO::VERSION}" xmlns="https://www.metanorma.org/ns/iso">
645
664
  <bibdata type="standard">
646
665
  <docidentifier type="ISO">ISO 17301-1:2030/Cor.3</docidentifier>
666
+ <docidentifier type='iso-undated'>ISO 17301-1/Cor.3</docidentifier>
647
667
  <docidentifier type="iso-with-lang">ISO 17301-1:2030/Cor.3(E)</docidentifier>
648
668
  <docidentifier type="iso-reference">ISO 17301-1:2030/Cor.3(E)</docidentifier>
649
669
  <docnumber>17301</docnumber>
@@ -692,5 +712,7 @@ RSpec.describe Metanorma::ISO do
692
712
  <sections/>
693
713
  </iso-standard>
694
714
  OUTPUT
715
+ expect(xmlpp(input.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
716
+ .to be_equivalent_to xmlpp(output)
695
717
  end
696
718
  end
@@ -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>
@@ -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>
@@ -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>
@@ -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