metanorma-iso 1.5.8 → 1.5.9

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 (25) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/basicdoc.rng +4 -11
  3. data/lib/asciidoctor/iso/front.rb +3 -12
  4. data/lib/asciidoctor/iso/isodoc.rng +13 -6
  5. data/lib/asciidoctor/iso/isostandard.rng +8 -1
  6. data/lib/isodoc/iso/iso.amendment.xsl +242 -49
  7. data/lib/isodoc/iso/iso.international-standard.xsl +242 -49
  8. data/lib/metanorma/iso/version.rb +1 -1
  9. data/metanorma-iso.gemspec +1 -1
  10. data/spec/asciidoctor-iso/amd_spec.rb +7 -7
  11. data/spec/asciidoctor-iso/base_spec.rb +6 -6
  12. data/spec/isodoc/amd_spec.rb +18 -3
  13. data/spec/isodoc/blocks_spec.rb +1 -1
  14. data/spec/isodoc/i18n_spec.rb +17 -4
  15. data/spec/isodoc/inline_spec.rb +1 -1
  16. data/spec/isodoc/iso_spec.rb +2 -2
  17. data/spec/isodoc/postproc_spec.rb +4 -1
  18. data/spec/isodoc/ref_spec.rb +4 -1
  19. data/spec/isodoc/section_spec.rb +2 -2
  20. data/spec/isodoc/table_spec.rb +1 -1
  21. data/spec/isodoc/terms_spec.rb +1 -1
  22. data/spec/isodoc/xref_spec.rb +11 -11
  23. data/spec/metanorma/processor_spec.rb +1 -1
  24. data/spec/spec_helper.rb +1 -1
  25. metadata +4 -4
data/spec/asciidoctor-iso/base_spec.rb CHANGED
@@ -91,7 +91,7 @@ RSpec.describe Asciidoctor::ISO do
91
91
  :copyright-year: 2000
92
92
  INPUT
93
93
  <?xml version="1.0" encoding="UTF-8"?>
94
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
94
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
95
95
  <bibdata type="standard">
96
96
  <title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
97
97
  <title language="en" format="text/plain" type="title-intro">Introduction</title>
@@ -173,7 +173,7 @@ RSpec.describe Asciidoctor::ISO do
173
173
 
174
174
 
175
175
  it "processes complex metadata" do
176
- expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~'OUTPUT')
176
+ expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true).sub(%r{<boilerplate>.*</boilerplate>}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
177
177
  = Document title
178
178
  Author
179
179
  :docfile: test.adoc
@@ -191,7 +191,7 @@ RSpec.describe Asciidoctor::ISO do
191
191
  :doctype: technical-report
192
192
  INPUT
193
193
  <?xml version="1.0" encoding="UTF-8"?>
194
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
194
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
195
195
  <bibdata type="standard">
196
196
  <docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
197
197
  <docidentifier type='iso-with-lang'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
@@ -294,7 +294,7 @@ RSpec.describe Asciidoctor::ISO do
294
294
  :doctype: technical-specification
295
295
  :iteration: 2
296
296
  INPUT
297
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
297
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
298
298
  <bibdata type="standard">
299
299
  <docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
300
300
  <docidentifier type='iso-with-lang'>ISO/DTS 1000.2(F)</docidentifier>
@@ -360,7 +360,7 @@ OUTPUT
360
360
  :docnumber: 1000
361
361
  :docstage: 60
362
362
  INPUT
363
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
363
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
364
364
  <bibdata type="standard">
365
365
  <docidentifier type="ISO">ISO 1000</docidentifier>
366
366
  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
@@ -426,7 +426,7 @@ OUTPUT
426
426
  :docstage: 60
427
427
  :docsubstage: 00
428
428
  INPUT
429
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
429
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
430
430
  <bibdata type="standard">
431
431
  <docidentifier type="ISO">ISO 1000</docidentifier>
432
432
  <docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
data/spec/isodoc/amd_spec.rb CHANGED
@@ -57,12 +57,17 @@ RSpec.describe IsoDoc do
57
57
  </iso-standard>
58
58
  INPUT
59
59
  <?xml version='1.0'?>
60
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
60
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
61
61
  <bibdata>
62
62
  <ext>
63
63
  <doctype>amendment</doctype>
64
64
  </ext>
65
65
  </bibdata>
66
+ <local_bibdata>
67
+ <ext>
68
+ <doctype>amendment</doctype>
69
+ </ext>
70
+ </local_bibdata>
66
71
  <preface>
67
72
  <foreword>
68
73
  <p>
@@ -218,12 +223,17 @@ RSpec.describe IsoDoc do
218
223
  </iso-standard>
219
224
  INPUT
220
225
  <?xml version='1.0'?>
221
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
226
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
222
227
  <bibdata>
223
228
  <ext>
224
229
  <doctype>amendment</doctype>
225
230
  </ext>
226
231
  </bibdata>
232
+ <local_bibdata>
233
+ <ext>
234
+ <doctype>amendment</doctype>
235
+ </ext>
236
+ </local_bibdata>
227
237
  <preface>
228
238
  <foreword obligation='informative'>
229
239
  <title>Foreword</title>
@@ -396,12 +406,17 @@ RSpec.describe IsoDoc do
396
406
  </iso-standard>
397
407
  INPUT
398
408
  presxml = <<~OUTPUT
399
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
409
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
400
410
  <bibdata>
401
411
  <ext>
402
412
  <doctype>amendment</doctype>
403
413
  </ext>
404
414
  </bibdata>
415
+ <local_bibdata>
416
+ <ext>
417
+ <doctype>amendment</doctype>
418
+ </ext>
419
+ </local_bibdata>
405
420
  <boilerplate>
406
421
  <copyright-statement>
407
422
  <clause>
data/spec/isodoc/blocks_spec.rb CHANGED
@@ -272,7 +272,7 @@ RSpec.describe IsoDoc do
272
272
  </iso-standard>
273
273
  INPUT
274
274
  <?xml version='1.0'?>
275
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
275
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
276
276
  <preface>
277
277
  <foreword>
278
278
  <formula id='_be9158af-7e93-4ee2-90c5-26d31c181934' unnumbered='true'>
data/spec/isodoc/i18n_spec.rb CHANGED
@@ -72,10 +72,13 @@ RSpec.describe IsoDoc do
72
72
  INPUT
73
73
 
74
74
  presxml = <<~OUTPUT
75
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
75
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
76
76
  <bibdata>
77
77
  <language>en</language>
78
78
  </bibdata>
79
+ <local_bibdata>
80
+ <language>en</language>
81
+ </local_bibdata>
79
82
  <preface>
80
83
  <foreword obligation='informative'>
81
84
  <title>Foreword</title>
@@ -311,10 +314,13 @@ RSpec.describe IsoDoc do
311
314
  </bibliography>
312
315
  </iso-standard>
313
316
  INPUT
314
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
317
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
315
318
  <bibdata>
316
319
  <language>tlh</language>
317
320
  </bibdata>
321
+ <local_bibdata>
322
+ <language>tlh</language>
323
+ </local_bibdata>
318
324
  <preface>
319
325
  <foreword obligation='informative'>
320
326
  <title>Foreword</title>
@@ -520,10 +526,13 @@ RSpec.describe IsoDoc do
520
526
  INPUT
521
527
 
522
528
  presxml = <<~OUTPUT
523
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
529
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
524
530
  <bibdata>
525
531
  <language>fr</language>
526
532
  </bibdata>
533
+ <local_bibdata>
534
+ <language>fr</language>
535
+ </local_bibdata>
527
536
  <preface>
528
537
  <foreword obligation='informative'>
529
538
  <title>Foreword</title>
@@ -770,11 +779,15 @@ OUTPUT
770
779
  </iso-standard>
771
780
  INPUT
772
781
  presxml = <<~OUTPUT
773
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
782
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
774
783
  <bibdata>
775
784
  <language>zh</language>
776
785
  <script>Hans</script>
777
786
  </bibdata>
787
+ <local_bibdata>
788
+ <language>zh</language>
789
+ <script>Hans</script>
790
+ </local_bibdata>
778
791
  <preface>
779
792
  <foreword obligation='informative'>
780
793
  <title>Foreword</title>
data/spec/isodoc/inline_spec.rb CHANGED
@@ -229,7 +229,7 @@ RSpec.describe IsoDoc do
229
229
  </iso-standard>
230
230
  INPUT
231
231
  <?xml version='1.0'?>
232
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
232
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
233
233
  <preface>
234
234
  <foreword>
235
235
  <p>
data/spec/isodoc/iso_spec.rb CHANGED
@@ -175,7 +175,7 @@ end
175
175
  </iso-standard>
176
176
  INPUT
177
177
  <?xml version='1.0'?>
178
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
178
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
179
179
  <preface>
180
180
  <foreword>
181
181
  <example id='samplecode'>
@@ -231,7 +231,7 @@ OUTPUT
231
231
  </iso-standard>
232
232
  INPUT
233
233
  <?xml version='1.0'?>
234
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
234
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
235
235
  <preface>
236
236
  <foreword>
237
237
  <example id='samplecode'>
data/spec/isodoc/postproc_spec.rb CHANGED
@@ -611,10 +611,13 @@ documentation.</p>
611
611
  INPUT
612
612
 
613
613
  presxml = <<~OUTPUT
614
- <iso-standard xmlns="http://riboseinc.com/isoxml">
614
+ <iso-standard xmlns="http://riboseinc.com/isoxml" type="presentation">
615
615
  <bibdata type="standard">
616
616
  <status><stage>30</stage></status>
617
617
  </bibdata>
618
+ <local_bibdata type="standard">
619
+ <status><stage>30</stage></status>
620
+ </local_bibdata>
618
621
  <boilerplate>
619
622
  <copyright-statement>
620
623
  <clause inline-header="true">
data/spec/isodoc/ref_spec.rb CHANGED
@@ -121,10 +121,13 @@ RSpec.describe IsoDoc do
121
121
  </iso-standard>
122
122
  INPUT
123
123
  presxml = <<~OUTPUT
124
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
124
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
125
125
  <bibdata>
126
126
  <language>en</language>
127
127
  </bibdata>
128
+ <local_bibdata>
129
+ <language>en</language>
130
+ </local_bibdata>
128
131
  <preface>
129
132
  <foreword>
130
133
  <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
data/spec/isodoc/section_spec.rb CHANGED
@@ -70,7 +70,7 @@ RSpec.describe IsoDoc do
70
70
  INPUT
71
71
 
72
72
  presxml = <<~OUTPUT
73
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
73
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
74
74
  <preface>
75
75
  <foreword obligation='informative'>
76
76
  <title>Foreword</title>
@@ -361,7 +361,7 @@ OUTPUT
361
361
  INPUT
362
362
 
363
363
  presxml = <<~OUTPUT
364
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
364
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
365
365
  <sections>
366
366
  <clause id='D' obligation='normative'>
367
367
  <title depth='1'>1<tab/>Scope</title>
data/spec/isodoc/table_spec.rb CHANGED
@@ -61,7 +61,7 @@ RSpec.describe IsoDoc do
61
61
  </iso-standard>
62
62
  INPUT
63
63
  <?xml version='1.0'?>
64
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
64
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
65
65
  <preface>
66
66
  <foreword>
67
67
  <table id='tableD-1' alt='tool tip' summary='long desc'>
data/spec/isodoc/terms_spec.rb CHANGED
@@ -53,7 +53,7 @@ RSpec.describe IsoDoc do
53
53
  </iso-standard>
54
54
  INPUT
55
55
  presxml = <<~OUTPUT
56
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
56
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
57
57
  <sections>
58
58
  <terms id='_terms_and_definitions' obligation='normative'>
59
59
  <title depth='1'>1<tab/>Terms and Definitions</title>
data/spec/isodoc/xref_spec.rb CHANGED
@@ -56,7 +56,7 @@ RSpec.describe IsoDoc do
56
56
  </iso-standard>
57
57
  INPUT
58
58
  <?xml version='1.0'?>
59
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
59
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
60
60
  <preface>
61
61
  <foreword>
62
62
  <p>
@@ -202,7 +202,7 @@ RSpec.describe IsoDoc do
202
202
  </iso-standard>
203
203
  INPUT
204
204
  <?xml version='1.0'?>
205
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
205
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
206
206
  <preface>
207
207
  <foreword id='fwd'>
208
208
  <p>
@@ -322,7 +322,7 @@ RSpec.describe IsoDoc do
322
322
  </iso-standard>
323
323
  INPUT
324
324
  <?xml version='1.0'?>
325
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
325
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
326
326
  <preface>
327
327
  <foreword id='fwd'>
328
328
  <p>
@@ -435,7 +435,7 @@ RSpec.describe IsoDoc do
435
435
  </iso-standard>
436
436
  INPUT
437
437
  <?xml version='1.0'?>
438
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
438
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
439
439
  <preface>
440
440
  <foreword>
441
441
  <p>
@@ -568,7 +568,7 @@ RSpec.describe IsoDoc do
568
568
  </iso-standard>
569
569
  INPUT
570
570
  <?xml version='1.0'?>
571
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
571
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
572
572
  <preface>
573
573
  <foreword>
574
574
  <p>
@@ -729,7 +729,7 @@ RSpec.describe IsoDoc do
729
729
  </iso-standard>
730
730
  INPUT
731
731
  <?xml version='1.0'?>
732
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
732
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
733
733
  <preface>
734
734
  <foreword>
735
735
  <p>
@@ -863,7 +863,7 @@ RSpec.describe IsoDoc do
863
863
  </iso-standard>
864
864
  INPUT
865
865
  <?xml version='1.0'?>
866
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
866
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
867
867
  <preface>
868
868
  <foreword>
869
869
  <p>
@@ -998,7 +998,7 @@ RSpec.describe IsoDoc do
998
998
  </iso-standard>
999
999
  INPUT
1000
1000
  <?xml version='1.0'?>
1001
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
1001
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1002
1002
  <preface>
1003
1003
  <foreword obligation='informative'>
1004
1004
  <title>Foreword</title>
@@ -1198,7 +1198,7 @@ RSpec.describe IsoDoc do
1198
1198
  </iso-standard>
1199
1199
  INPUT
1200
1200
  <?xml version='1.0'?>
1201
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
1201
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1202
1202
  <preface>
1203
1203
  <foreword>
1204
1204
  <p>
@@ -1318,7 +1318,7 @@ RSpec.describe IsoDoc do
1318
1318
  </iso-standard>
1319
1319
  INPUT
1320
1320
  <?xml version='1.0'?>
1321
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
1321
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1322
1322
  <preface>
1323
1323
  <foreword>
1324
1324
  <p>
@@ -1422,7 +1422,7 @@ RSpec.describe IsoDoc do
1422
1422
  </iso-standard>
1423
1423
  INPUT
1424
1424
  <?xml version='1.0'?>
1425
- <iso-standard xmlns='http://riboseinc.com/isoxml'>
1425
+ <iso-standard xmlns='http://riboseinc.com/isoxml' type="presentation">
1426
1426
  <preface>
1427
1427
  <foreword>
1428
1428
  <p>
data/spec/metanorma/processor_spec.rb CHANGED
@@ -15,7 +15,7 @@ RSpec.describe Metanorma::Iso::Processor do
15
15
 
16
16
  it "registers output formats against metanorma" do
17
17
  expect(processor.output_formats.sort.to_s).to be_equivalent_to <<~"OUTPUT"
18
- [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
18
+ [[:doc, "doc"], [:html, "html"], [:html_alt, "alt.html"], [:isosts, "iso.sts.xml"], [:pdf, "pdf"], [:presentation, "presentation.xml"], [:rxl, "rxl"], [:sts, "sts.xml"], [:xml, "xml"]]
19
19
  OUTPUT
20
20
  end
21
21
 
data/spec/spec_helper.rb CHANGED
@@ -117,7 +117,7 @@ BOILERPLATE =
117
117
 
118
118
  BLANK_HDR = <<~"HDR"
119
119
  <?xml version="1.0" encoding="UTF-8"?>
120
- <iso-standard xmlns="https://www.metanorma.org/ns/iso">
120
+ <iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
121
121
  <bibdata type="standard">
122
122
  <contributor>
123
123
  <role type="author"/>
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: 1.5.8
4
+ version: 1.5.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-09-11 00:00:00.000000000 Z
11
+ date: 2020-09-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: ruby-jing
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.5.0
47
+ version: 1.6.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.5.0
54
+ version: 1.6.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: tokenizer
57
57
  requirement: !ruby/object:Gem::Requirement