metanorma-iso 1.5.4 → 1.5.9

Sign up to get free protection for your applications and to get access to all the features.
@@ -57,18 +57,23 @@ 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>
69
- <xref target='N'>[N]</xref>
70
- <xref target='note1'>[note1]</xref>
71
- <xref target='note2'>[note2]</xref>
74
+ <xref target='N'>[scope], Note</xref>
75
+ <xref target='note1'>[widgets1], Note 1</xref>
76
+ <xref target='note2'>[widgets1], Note 2</xref>
72
77
  <xref target='AN'>A.1, Note</xref>
73
78
  <xref target='Anote1'>A.2, Note 1</xref>
74
79
  <xref target='Anote2'>A.2, Note 2</xref>
@@ -86,7 +91,7 @@ RSpec.describe IsoDoc do
86
91
  </p>
87
92
  </note>
88
93
  <p>
89
- <xref target='N'>[n]</xref>
94
+ <xref target='N'>Note</xref>
90
95
  </p>
91
96
  </clause>
92
97
  <terms id='terms'/>
@@ -94,22 +99,22 @@ RSpec.describe IsoDoc do
94
99
  <title depth="1">Widgets</title>
95
100
  <clause id='widgets1' inline-header="true">
96
101
  <note id='note1'>
97
- <name>NOTE</name>
102
+ <name>NOTE 1</name>
98
103
  <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
99
104
  These results are based on a study carried out on three different
100
105
  types of kernel.
101
106
  </p>
102
107
  </note>
103
108
  <note id='note2'>
104
- <name>NOTE</name>
109
+ <name>NOTE 2</name>
105
110
  <p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83a'>
106
111
  These results are based on a study carried out on three different
107
112
  types of kernel.
108
113
  </p>
109
114
  </note>
110
115
  <p>
111
- <xref target='note1'>[note1]</xref>
112
- <xref target='note2'>[note2]</xref>
116
+ <xref target='note1'>Note 1</xref>
117
+ <xref target='note2'>Note 2</xref>
113
118
  </p>
114
119
  </clause>
115
120
  </clause>
@@ -218,19 +223,24 @@ 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>
230
240
  <p id='A'>
231
241
  This is a preamble
232
- <xref target='C'>[C]</xref>
233
- <xref target='C1'>[C1]</xref>
242
+ <xref target='C'>0.1</xref>
243
+ <xref target='C1'>0.2</xref>
234
244
  <xref target='D'>[D]</xref>
235
245
  <xref target='H'>[H]</xref>
236
246
  <xref target='I'>[I]</xref>
@@ -250,7 +260,7 @@ RSpec.describe IsoDoc do
250
260
  <introduction id='B' obligation='informative'>
251
261
  <title depth="1">Introduction</title>
252
262
  <clause id='C' inline-header='false' obligation='informative'>
253
- <title depth="1">Introduction Subsection</title>
263
+ <title depth="2">Introduction Subsection</title>
254
264
  </clause>
255
265
  <clause id='C1' inline-header='true' obligation='informative'>Text</clause>
256
266
  </introduction>
@@ -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>
@@ -435,7 +450,7 @@ RSpec.describe IsoDoc do
435
450
  <introduction id='B' obligation='informative'>
436
451
  <title depth='1'>Introduction</title>
437
452
  <clause id='C' inline-header='false' obligation='informative'>
438
- <title depth='1'>Introduction Subsection</title>
453
+ <title depth='2'>Introduction Subsection</title>
439
454
  </clause>
440
455
  </introduction>
441
456
  <clause id='B1'>
@@ -548,7 +563,7 @@ RSpec.describe IsoDoc do
548
563
  <div class='Section3' id='B'>
549
564
  <h1 class='IntroTitle'>Introduction</h1>
550
565
  <div id='C'>
551
- <h1>Introduction Subsection</h1>
566
+ <h2>Introduction Subsection</h2>
552
567
  </div>
553
568
  </div>
554
569
  <br/>
@@ -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'>
@@ -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>
@@ -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>
@@ -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'>
@@ -271,7 +271,7 @@ end
271
271
  <h1 class="ForewordTitle">Foreword</h1>
272
272
  <div id="samplecode" class="example">
273
273
  <p><span class="example_label">EXAMPLE 1</span>&#160; </p>
274
- <div class="Quote">Hello<p class="QuoteAttribution"/></div>
274
+ <div class="Quote">Hello</div>
275
275
  </div>
276
276
  <div id="samplecode2" class="example">
277
277
  <p><span class="example_label">EXAMPLE 2&#160;&#8212; Title</span>&#160; Hello</p>
@@ -330,7 +330,7 @@ end
330
330
 
331
331
 
332
332
  it "processes sequences of examples (Word)" do
333
- expect(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>")).to be_equivalent_to <<~"OUTPUT"
333
+ expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<body/m, "<body").sub(%r{</body>.*$}m, "</body>"))).to be_equivalent_to xmlpp(<<~"OUTPUT")
334
334
  <iso-standard xmlns='http://riboseinc.com/isoxml'>
335
335
  <preface>
336
336
  <foreword>
@@ -361,7 +361,7 @@ end
361
361
  <h1 class="ForewordTitle">Foreword</h1>
362
362
  <div id="samplecode" class="example">
363
363
  <p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">&#160; </span></p>
364
- <div class="Quote">Hello<p class="QuoteAttribution"/></div>
364
+ <div class="Quote">Hello</div>
365
365
  </div>
366
366
  <div id="samplecode2" class="example">
367
367
  <p><span class="example_label">EXAMPLE 2&#160;&#8212; Title</span><span style="mso-tab-count:1">&#160; </span>Hello</p>
@@ -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">
@@ -1,7 +1,7 @@
1
1
  require "spec_helper"
2
2
 
3
3
  RSpec.describe IsoDoc do
4
- it "processes IsoXML bibliographies (Presentation XML)" do
4
+ it "processes IsoXML bibliographies" do
5
5
  input = <<~INPUT
6
6
  <iso-standard xmlns="http://riboseinc.com/isoxml">
7
7
  <bibdata>
@@ -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'>
@@ -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>
@@ -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'>
@@ -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>
@@ -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>
@@ -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"], [: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
 
@@ -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"/>