metanorma-iso 1.2.3 → 1.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/iso/basicdoc.rng +992 -0
  3. data/lib/asciidoctor/iso/biblio.rng +222 -40
  4. data/lib/asciidoctor/iso/cleanup.rb +2 -4
  5. data/lib/asciidoctor/iso/isodoc.rng +159 -802
  6. data/lib/asciidoctor/iso/isostandard.rng +77 -23
  7. data/lib/asciidoctor/iso/section.rb +1 -1
  8. data/lib/metanorma/iso/version.rb +1 -1
  9. data/spec/asciidoctor-iso/blocks_spec.rb +3 -3
  10. data/spec/asciidoctor-iso/cleanup_spec.rb +7 -7
  11. data/spec/asciidoctor-iso/refs_spec.rb +1 -1
  12. data/spec/isodoc/postproc_spec.rb +3 -3
  13. data/spec/isodoc/xref_spec.rb +10 -10
  14. metadata +3 -2
data/lib/asciidoctor/iso/isostandard.rng CHANGED
@@ -92,6 +92,12 @@
92
92
  <data type="ID"/>
93
93
  </attribute>
94
94
  </optional>
95
+ <optional>
96
+ <attribute name="language"/>
97
+ </optional>
98
+ <optional>
99
+ <attribute name="script"/>
100
+ </optional>
95
101
  <optional>
96
102
  <attribute name="obligation">
97
103
  <choice>
@@ -118,6 +124,12 @@
118
124
  <data type="ID"/>
119
125
  </attribute>
120
126
  </optional>
127
+ <optional>
128
+ <attribute name="language"/>
129
+ </optional>
130
+ <optional>
131
+ <attribute name="script"/>
132
+ </optional>
121
133
  <optional>
122
134
  <attribute name="obligation">
123
135
  <choice>
@@ -149,6 +161,12 @@
149
161
  <data type="ID"/>
150
162
  </attribute>
151
163
  </optional>
164
+ <optional>
165
+ <attribute name="language"/>
166
+ </optional>
167
+ <optional>
168
+ <attribute name="script"/>
169
+ </optional>
152
170
  <optional>
153
171
  <attribute name="inline-header">
154
172
  <data type="boolean"/>
@@ -212,6 +230,12 @@
212
230
  <data type="ID"/>
213
231
  </attribute>
214
232
  </optional>
233
+ <optional>
234
+ <attribute name="language"/>
235
+ </optional>
236
+ <optional>
237
+ <attribute name="script"/>
238
+ </optional>
215
239
  <optional>
216
240
  <attribute name="obligation">
217
241
  <choice>
@@ -230,6 +254,12 @@
230
254
  <data type="ID"/>
231
255
  </attribute>
232
256
  </optional>
257
+ <optional>
258
+ <attribute name="language"/>
259
+ </optional>
260
+ <optional>
261
+ <attribute name="script"/>
262
+ </optional>
233
263
  <optional>
234
264
  <attribute name="obligation">
235
265
  <choice>
@@ -303,6 +333,12 @@
303
333
  <data type="ID"/>
304
334
  </attribute>
305
335
  </optional>
336
+ <optional>
337
+ <attribute name="language"/>
338
+ </optional>
339
+ <optional>
340
+ <attribute name="script"/>
341
+ </optional>
306
342
  <optional>
307
343
  <attribute name="inline-header">
308
344
  <data type="boolean"/>
@@ -525,6 +561,29 @@
525
561
  <value>guide</value>
526
562
  </choice>
527
563
  </define>
564
+ <define name="structuredidentifier">
565
+ <element name="structuredidentifier">
566
+ <optional>
567
+ <attribute name="type"/>
568
+ </optional>
569
+ <group>
570
+ <ref name="documentnumber"/>
571
+ <optional>
572
+ <ref name="tc-documentnumber"/>
573
+ </optional>
574
+ </group>
575
+ </element>
576
+ </define>
577
+ <define name="foreword">
578
+ <element name="foreword">
579
+ <ref name="Basic-Section"/>
580
+ </element>
581
+ </define>
582
+ <define name="introduction">
583
+ <element name="introduction">
584
+ <ref name="Content-Section"/>
585
+ </element>
586
+ </define>
528
587
  </include>
529
588
  <!-- end overrides -->
530
589
  <!--
@@ -581,29 +640,6 @@
581
640
  <ref name="Basic-Section"/>
582
641
  </element>
583
642
  </define>
584
- <define name="foreword">
585
- <element name="foreword">
586
- <ref name="Basic-Section"/>
587
- </element>
588
- </define>
589
- <define name="introduction">
590
- <element name="introduction">
591
- <ref name="Content-Section"/>
592
- </element>
593
- </define>
594
- <define name="structuredidentifier">
595
- <element name="structuredidentifier">
596
- <optional>
597
- <attribute name="type"/>
598
- </optional>
599
- <group>
600
- <ref name="documentnumber"/>
601
- <optional>
602
- <ref name="tc-documentnumber"/>
603
- </optional>
604
- </group>
605
- </element>
606
- </define>
607
643
  <define name="documentnumber">
608
644
  <element name="project-number">
609
645
  <optional>
@@ -662,6 +698,12 @@
662
698
  <data type="ID"/>
663
699
  </attribute>
664
700
  </optional>
701
+ <optional>
702
+ <attribute name="language"/>
703
+ </optional>
704
+ <optional>
705
+ <attribute name="script"/>
706
+ </optional>
665
707
  <optional>
666
708
  <attribute name="inline-header">
667
709
  <data type="boolean"/>
@@ -723,6 +765,12 @@
723
765
  <data type="ID"/>
724
766
  </attribute>
725
767
  </optional>
768
+ <optional>
769
+ <attribute name="language"/>
770
+ </optional>
771
+ <optional>
772
+ <attribute name="script"/>
773
+ </optional>
726
774
  <optional>
727
775
  <attribute name="inline-header">
728
776
  <data type="boolean"/>
@@ -755,6 +803,12 @@
755
803
  <data type="ID"/>
756
804
  </attribute>
757
805
  </optional>
806
+ <optional>
807
+ <attribute name="language"/>
808
+ </optional>
809
+ <optional>
810
+ <attribute name="script"/>
811
+ </optional>
758
812
  <optional>
759
813
  <attribute name="inline-header">
760
814
  <data type="boolean"/>
data/lib/asciidoctor/iso/section.rb CHANGED
@@ -5,7 +5,7 @@ module Asciidoctor
5
5
  module ISO
6
6
  class Converter < Standoc::Converter
7
7
  def section(node)
8
- a = { id: Standoc::Utils::anchor_or_uuid(node) }
8
+ a = section_attributes(node)
9
9
  noko do |xml|
10
10
  case sectiontype(node)
11
11
  when "introduction" then introduction_parse(a, xml, node)
data/lib/metanorma/iso/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ISO
3
- VERSION = "1.2.3".freeze
3
+ VERSION = "1.2.4".freeze
4
4
  end
5
5
  end
data/spec/asciidoctor-iso/blocks_spec.rb CHANGED
@@ -284,7 +284,7 @@ RSpec.describe Asciidoctor::ISO do
284
284
  <sections>
285
285
  <figure id="_">
286
286
  <name>Split-it-right sample divider</name>
287
- <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
287
+ <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
288
288
  </figure>
289
289
  </sections>
290
290
  </iso-standard>
@@ -301,7 +301,7 @@ RSpec.describe Asciidoctor::ISO do
301
301
  #{BLANK_HDR}
302
302
  <sections>
303
303
  <figure id="_">
304
- <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="4" width="3"/>
304
+ <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="3"/>
305
305
  </figure>
306
306
  </sections>
307
307
  </iso-standard>
@@ -318,7 +318,7 @@ RSpec.describe Asciidoctor::ISO do
318
318
  #{BLANK_HDR}
319
319
  <sections>
320
320
  <figure id="_">
321
- <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="4" width="auto"/>
321
+ <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="4" width="auto"/>
322
322
  </figure>
323
323
  </sections>
324
324
  </iso-standard>
data/spec/asciidoctor-iso/cleanup_spec.rb CHANGED
@@ -552,7 +552,7 @@ r = 1 %</stem>
552
552
  INPUT
553
553
  #{BLANK_HDR}
554
554
  <sections><figure id="_">
555
- <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
555
+ <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
556
556
  <fn reference="a">
557
557
  <p id="_">This is a footnote to a figure</p>
558
558
  </fn><fn reference="b">
@@ -576,7 +576,7 @@ r = 1 %</stem>
576
576
  INPUT
577
577
  #{BLANK_HDR}
578
578
  <sections><figure id="_">
579
- <image src="spec/examples/rice_images/rice_image1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
579
+ <image src="spec/examples/rice_images/rice_image1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
580
580
  <dl id="_">
581
581
  <dt>a</dt>
582
582
  <dd>
@@ -610,15 +610,15 @@ r = 1 %</stem>
610
610
  <sections>
611
611
  <figure id="figureC-2"><figure id="_">
612
612
  <name>Initial stages: No grains are fully gelatinized (ungelatinized starch granules are visible inside the kernels)</name>
613
- <image src="spec/examples/rice_images/rice_image3_1.png" id="_" imagetype="PNG" height="auto" width="auto"/>
613
+ <image src="spec/examples/rice_images/rice_image3_1.png" id="_" mimetype="image/png" height="auto" width="auto"/>
614
614
  </figure>
615
615
  <figure id="_">
616
616
  <name>Intermediate stages: Some fully gelatinized kernels are visible</name>
617
- <image src="spec/examples/rice_images/rice_image3_2.png" id="_" imagetype="PNG" height="auto" width="auto"/>
617
+ <image src="spec/examples/rice_images/rice_image3_2.png" id="_" mimetype="image/png" height="auto" width="auto"/>
618
618
  </figure>
619
619
  <figure id="_">
620
620
  <name>Final stages: All kernels are fully gelatinized</name>
621
- <image src="spec/examples/rice_images/rice_image3_3.png" id="_" imagetype="PNG" height="auto" width="auto"/>
621
+ <image src="spec/examples/rice_images/rice_image3_3.png" id="_" mimetype="image/png" height="auto" width="auto"/>
622
622
  </figure></figure>
623
623
  </sections>
624
624
  </iso-standard>
@@ -649,7 +649,7 @@ r = 1 %</stem>
649
649
 
650
650
  <clause id="_" inline-header="false" obligation="normative">
651
651
  <title>Clause</title>
652
- <p id="_"><fn reference="3">
652
+ <p id="_"><fn reference="2">
653
653
  <p id="_">Footnote2</p>
654
654
  </fn>
655
655
  </p>
@@ -668,7 +668,7 @@ r = 1 %</stem>
668
668
  <abbreviation>ISO</abbreviation>
669
669
  </organization>
670
670
  </contributor>
671
- <note format="text/plain" reference="2">ISO DATE: The standard is in press</note>
671
+ <note format="text/plain">ISO DATE: The standard is in press</note>
672
672
  </bibitem>
673
673
  </references>
674
674
  </bibliography>
data/spec/asciidoctor-iso/refs_spec.rb CHANGED
@@ -30,7 +30,7 @@ RSpec.describe Asciidoctor::ISO do
30
30
  <abbreviation>ISO</abbreviation>
31
31
  </organization>
32
32
  </contributor>
33
- <note format="text/plain" reference="1">ISO DATE: The standard is in press</note>
33
+ <note format="text/plain">ISO DATE: The standard is in press</note>
34
34
  </bibitem>
35
35
  </references>
36
36
  </bibliography>
data/spec/isodoc/postproc_spec.rb CHANGED
@@ -331,9 +331,9 @@ RSpec.describe IsoDoc do
331
331
  <preface><foreword>
332
332
  <figure id="_">
333
333
  <name>Split-it-right sample divider</name>
334
- <image src="spec/assets/rice_image1.png" id="_" imagetype="PNG"/>
335
- <image src="spec/assets/rice_image1.png" id="_" width="20000" height="300000" imagetype="PNG"/>
336
- <image src="spec/assets/rice_image1.png" id="_" width="99" height="auto" imagetype="PNG"/>
334
+ <image src="spec/assets/rice_image1.png" id="_" mimetype="image/png"/>
335
+ <image src="spec/assets/rice_image1.png" id="_" width="20000" height="300000" mimetype="image/png"/>
336
+ <image src="spec/assets/rice_image1.png" id="_" width="99" height="auto" mimetype="image/png"/>
337
337
  </figure>
338
338
  </foreword></preface>
339
339
  </iso-standard>
data/spec/isodoc/xref_spec.rb CHANGED
@@ -133,7 +133,7 @@ RSpec.describe IsoDoc do
133
133
  <clause id="scope"><title>Scope</title>
134
134
  <figure id="N">
135
135
  <name>Split-it-right sample divider</name>
136
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
136
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
137
137
  </figure>
138
138
  <p><xref target="N"/></p>
139
139
  </clause>
@@ -142,11 +142,11 @@ RSpec.describe IsoDoc do
142
142
  <clause id="widgets1">
143
143
  <figure id="note1">
144
144
  <name>Split-it-right sample divider</name>
145
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
145
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
146
146
  </figure>
147
147
  <figure id="note2">
148
148
  <name>Split-it-right sample divider</name>
149
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
149
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
150
150
  </figure>
151
151
  <p> <xref target="note1"/> <xref target="note2"/> </p>
152
152
  </clause>
@@ -156,17 +156,17 @@ RSpec.describe IsoDoc do
156
156
  <clause id="annex1a">
157
157
  <figure id="AN">
158
158
  <name>Split-it-right sample divider</name>
159
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
159
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
160
160
  </figure>
161
161
  </clause>
162
162
  <clause id="annex1b">
163
163
  <figure id="Anote1">
164
164
  <name>Split-it-right sample divider</name>
165
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
165
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
166
166
  </figure>
167
167
  <figure id="Anote2">
168
168
  <name>Split-it-right sample divider</name>
169
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
169
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
170
170
  </figure>
171
171
  </clause>
172
172
  </annex>
@@ -270,11 +270,11 @@ RSpec.describe IsoDoc do
270
270
  <figure id="N">
271
271
  <figure id="note1">
272
272
  <name>Split-it-right sample divider</name>
273
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
273
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
274
274
  </figure>
275
275
  <figure id="note2">
276
276
  <name>Split-it-right sample divider</name>
277
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
277
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
278
278
  </figure>
279
279
  </figure>
280
280
  <p> <xref target="note1"/> <xref target="note2"/> </p>
@@ -288,11 +288,11 @@ RSpec.describe IsoDoc do
288
288
  <figure id="AN">
289
289
  <figure id="Anote1">
290
290
  <name>Split-it-right sample divider</name>
291
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
291
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
292
292
  </figure>
293
293
  <figure id="Anote2">
294
294
  <name>Split-it-right sample divider</name>
295
- <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" imagetype="PNG"/>
295
+ <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
296
296
  </figure>
297
297
  </figure>
298
298
  </clause>
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.2.3
4
+ version: 1.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-29 00:00:00.000000000 Z
11
+ date: 2019-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -276,6 +276,7 @@ files:
276
276
  - docs/replacing-asciidoc.adoc
277
277
  - docs/styling-output-msword.adoc
278
278
  - lib/asciidoctor/iso/base.rb
279
+ - lib/asciidoctor/iso/basicdoc.rng
279
280
  - lib/asciidoctor/iso/biblio.rng
280
281
  - lib/asciidoctor/iso/cleanup.rb
281
282
  - lib/asciidoctor/iso/converter.rb