metanorma-iec 2.1.2 → 2.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iec/iec.international-standard.xsl +339 -117
  3. data/lib/metanorma/iec/biblio.rng +102 -5
  4. data/lib/metanorma/iec/isodoc.rng +33 -0
  5. data/lib/metanorma/iec/isostandard.rng +3 -6
  6. data/lib/metanorma/iec/version.rb +1 -1
  7. data/spec/isodoc/ref_spec.rb +1 -1
  8. data/spec/metanorma/base_spec.rb +0 -12
  9. data/spec/metanorma/cleanup_spec.rb +1 -4
  10. data/spec/metanorma/iev_spec.rb +3 -12
  11. data/spec/spec_helper.rb +0 -3
  12. metadata +3 -3
data/lib/metanorma/iec/biblio.rng CHANGED
@@ -623,6 +623,97 @@
623
623
  <zeroOrMore>
624
624
  <ref name="bsource"/>
625
625
  </zeroOrMore>
626
+ <oneOrMore>
627
+ <ref name="docidentifier"/>
628
+ </oneOrMore>
629
+ <optional>
630
+ <ref name="docnumber"/>
631
+ </optional>
632
+ <zeroOrMore>
633
+ <ref name="bdate"/>
634
+ </zeroOrMore>
635
+ <zeroOrMore>
636
+ <ref name="contributor"/>
637
+ </zeroOrMore>
638
+ <optional>
639
+ <ref name="edition"/>
640
+ </optional>
641
+ <zeroOrMore>
642
+ <ref name="version"/>
643
+ </zeroOrMore>
644
+ <zeroOrMore>
645
+ <ref name="biblionote"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="language"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="script"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="bibabstract"/>
655
+ </zeroOrMore>
656
+ <optional>
657
+ <ref name="status"/>
658
+ </optional>
659
+ <zeroOrMore>
660
+ <ref name="copyright"/>
661
+ </zeroOrMore>
662
+ <zeroOrMore>
663
+ <ref name="docrelation"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="series"/>
667
+ </zeroOrMore>
668
+ <optional>
669
+ <ref name="medium"/>
670
+ </optional>
671
+ <zeroOrMore>
672
+ <ref name="bplace"/>
673
+ </zeroOrMore>
674
+ <zeroOrMore>
675
+ <ref name="bprice"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="extent"/>
679
+ </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
683
+ <zeroOrMore>
684
+ <ref name="accesslocation"/>
685
+ </zeroOrMore>
686
+ <zeroOrMore>
687
+ <ref name="license"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="bclassification"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bkeyword"/>
694
+ </zeroOrMore>
695
+ <optional>
696
+ <ref name="validity"/>
697
+ </optional>
698
+ </define>
699
+ <define name="ReducedBibliographicItem">
700
+ <optional>
701
+ <attribute name="type">
702
+ <ref name="BibItemType"/>
703
+ </attribute>
704
+ </optional>
705
+ <optional>
706
+ <ref name="fetched"/>
707
+ </optional>
708
+ <optional>
709
+ <ref name="formattedref"/>
710
+ </optional>
711
+ <zeroOrMore>
712
+ <ref name="btitle"/>
713
+ </zeroOrMore>
714
+ <zeroOrMore>
715
+ <ref name="bsource"/>
716
+ </zeroOrMore>
626
717
  <zeroOrMore>
627
718
  <ref name="docidentifier"/>
628
719
  </zeroOrMore>
@@ -638,9 +729,9 @@
638
729
  <optional>
639
730
  <ref name="edition"/>
640
731
  </optional>
641
- <optional>
732
+ <zeroOrMore>
642
733
  <ref name="version"/>
643
- </optional>
734
+ </zeroOrMore>
644
735
  <zeroOrMore>
645
736
  <ref name="biblionote"/>
646
737
  </zeroOrMore>
@@ -833,6 +924,12 @@
833
924
  <data type="boolean"/>
834
925
  </attribute>
835
926
  </optional>
927
+ <optional>
928
+ <attribute name="language"/>
929
+ </optional>
930
+ <optional>
931
+ <attribute name="script"/>
932
+ </optional>
836
933
  <text/>
837
934
  </element>
838
935
  </define>
@@ -1172,7 +1269,7 @@
1172
1269
  </element>
1173
1270
  </optional>
1174
1271
  <element name="bibitem">
1175
- <ref name="BibliographicItem"/>
1272
+ <ref name="ReducedBibliographicItem"/>
1176
1273
  </element>
1177
1274
  <choice>
1178
1275
  <zeroOrMore>
@@ -1197,9 +1294,9 @@
1197
1294
  <optional>
1198
1295
  <ref name="revision-date"/>
1199
1296
  </optional>
1200
- <zeroOrMore>
1297
+ <optional>
1201
1298
  <ref name="draft"/>
1202
- </zeroOrMore>
1299
+ </optional>
1203
1300
  </element>
1204
1301
  </define>
1205
1302
  <define name="vedition">
data/lib/metanorma/iec/isodoc.rng CHANGED
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -703,6 +719,9 @@
703
719
  <optional>
704
720
  <attribute name="tag"/>
705
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
706
725
  <optional>
707
726
  <attribute name="multilingual-rendering">
708
727
  <ref name="MultilingualRenderingType"/>
@@ -738,6 +757,9 @@
738
757
  <optional>
739
758
  <attribute name="tag"/>
740
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
741
763
  <optional>
742
764
  <attribute name="multilingual-rendering">
743
765
  <ref name="MultilingualRenderingType"/>
@@ -2059,6 +2081,7 @@
2059
2081
  <value>compare</value>
2060
2082
  <value>contrast</value>
2061
2083
  <value>see</value>
2084
+ <value>seealso</value>
2062
2085
  </choice>
2063
2086
  </define>
2064
2087
  <define name="deprecates">
@@ -2481,6 +2504,16 @@
2481
2504
  <text/>
2482
2505
  </element>
2483
2506
  </optional>
2507
+ <optional>
2508
+ <element name="amendment">
2509
+ <text/>
2510
+ </element>
2511
+ </optional>
2512
+ <optional>
2513
+ <element name="corrigendum">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2484
2517
  <optional>
2485
2518
  <element name="language">
2486
2519
  <text/>
data/lib/metanorma/iec/isostandard.rng CHANGED
@@ -45,7 +45,9 @@
45
45
  <ref name="horizontal"/>
46
46
  </optional>
47
47
  <ref name="editorialgroup"/>
48
- <ref name="approvalgroup"/>
48
+ <optional>
49
+ <ref name="approvalgroup"/>
50
+ </optional>
49
51
  <zeroOrMore>
50
52
  <ref name="ics"/>
51
53
  </zeroOrMore>
@@ -446,11 +448,6 @@
446
448
  <data type="int"/>
447
449
  </element>
448
450
  </define>
449
- <define name="approvalgroup">
450
- <element name="approvalgroup">
451
- <ref name="IsoWorkgroup"/>
452
- </element>
453
- </define>
454
451
  <define name="subcommittee">
455
452
  <element name="subcommittee">
456
453
  <ref name="IsoWorkgroup"/>
data/lib/metanorma/iec/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.1.2".freeze
3
+ VERSION = "2.1.5".freeze
4
4
  end
5
5
  end
6
6
 
data/spec/isodoc/ref_spec.rb CHANGED
@@ -263,7 +263,7 @@ RSpec.describe IsoDoc::Iec do
263
263
  &#160; This is an annotation of ISO 20483:2013-2014
264
264
  </p>
265
265
  </div>
266
- <p id='zip_ffs' class='NormRef'>[5], Title 5</p>
266
+ <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
267
267
  </div>
268
268
  <br/>
269
269
  <div>
data/spec/metanorma/base_spec.rb CHANGED
@@ -442,9 +442,6 @@ RSpec.describe Metanorma::Iec do
442
442
  <agency>IEC</agency>
443
443
  <agency>IETF</agency>
444
444
  <agency>ISO</agency>
445
- <technical-committee/>
446
- <subcommittee/>
447
- <workgroup/>
448
445
  </editorialgroup>
449
446
  <structuredidentifier>
450
447
  <project-number part='1' subpart='1'>IEC/IETF/ISO 1000</project-number>
@@ -680,9 +677,6 @@ RSpec.describe Metanorma::Iec do
680
677
  <doctype>standard</doctype>
681
678
  <editorialgroup>
682
679
  <agency>IEC</agency>
683
- <technical-committee/>
684
- <subcommittee/>
685
- <workgroup/>
686
680
  </editorialgroup>
687
681
  <structuredidentifier>
688
682
  <project-number>IEC 1000</project-number>
@@ -884,9 +878,6 @@ RSpec.describe Metanorma::Iec do
884
878
  <doctype>standard</doctype>
885
879
  <editorialgroup>
886
880
  <agency>IEC</agency>
887
- <technical-committee/>
888
- <subcommittee/>
889
- <workgroup/>
890
881
  </editorialgroup>
891
882
  <structuredidentifier>
892
883
  <project-number>IEC 1000</project-number>
@@ -952,9 +943,6 @@ RSpec.describe Metanorma::Iec do
952
943
  <doctype>standard</doctype>
953
944
  <editorialgroup>
954
945
  <agency>IEC</agency>
955
- <technical-committee/>
956
- <subcommittee/>
957
- <workgroup/>
958
946
  </editorialgroup>
959
947
  <structuredidentifier>
960
948
  <project-number>IEC 1000</project-number>
data/spec/metanorma/cleanup_spec.rb CHANGED
@@ -52,12 +52,9 @@ RSpec.describe Metanorma::Iec do
52
52
  </owner>
53
53
  </copyright>
54
54
  <ext>
55
- <doctype>article</doctype>
55
+ <doctype>standard</doctype>
56
56
  <editorialgroup>
57
57
  <agency>IEC</agency>
58
- <technical-committee/>
59
- <subcommittee/>
60
- <workgroup/>
61
58
  </editorialgroup>
62
59
  <stagename>International standard</stagename>
63
60
  <tc-sc-officers-note>
data/spec/metanorma/iev_spec.rb CHANGED
@@ -57,13 +57,10 @@ RSpec.describe Metanorma::Iec do
57
57
  </owner>
58
58
  </copyright>
59
59
  <ext>
60
- <doctype>article</doctype>
60
+ <doctype>standard</doctype>
61
61
  <subdoctype>vocabulary</subdoctype>
62
62
  <editorialgroup>
63
63
  <agency>IEC</agency>
64
- <technical-committee/>
65
- <subcommittee/>
66
- <workgroup/>
67
64
  </editorialgroup>
68
65
  <structuredidentifier>
69
66
  <project-number>IEC 60050</project-number>
@@ -146,13 +143,10 @@ RSpec.describe Metanorma::Iec do
146
143
  </owner>
147
144
  </copyright>
148
145
  <ext>
149
- <doctype>article</doctype>
146
+ <doctype>standard</doctype>
150
147
  <subdoctype>vocabulary</subdoctype>
151
148
  <editorialgroup>
152
149
  <agency>IEC</agency>
153
- <technical-committee/>
154
- <subcommittee/>
155
- <workgroup/>
156
150
  </editorialgroup>
157
151
  <structuredidentifier>
158
152
  <project-number>IEC 60050</project-number>
@@ -229,13 +223,10 @@ RSpec.describe Metanorma::Iec do
229
223
  </owner>
230
224
  </copyright>
231
225
  <ext>
232
- <doctype>article</doctype>
226
+ <doctype>standard</doctype>
233
227
  <subdoctype>vocabulary</subdoctype>
234
228
  <editorialgroup>
235
229
  <agency>IEC</agency>
236
- <technical-committee/>
237
- <subcommittee/>
238
- <workgroup/>
239
230
  </editorialgroup>
240
231
  <structuredidentifier>
241
232
  <project-number>IEC 60050</project-number>
data/spec/spec_helper.rb CHANGED
@@ -177,9 +177,6 @@ BLANK_HDR = <<~"HDR".freeze
177
177
  <doctype>standard</doctype>
178
178
  <editorialgroup>
179
179
  <agency>IEC</agency>
180
- <technical-committee/>
181
- <subcommittee/>
182
- <workgroup/>
183
180
  </editorialgroup>
184
181
  <stagename>International standard</stagename>
185
182
  </ext>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-06 00:00:00.000000000 Z
11
+ date: 2022-07-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
298
298
  - !ruby/object:Gem::Version
299
299
  version: '0'
300
300
  requirements: []
301
- rubygems_version: 3.3.7
301
+ rubygems_version: 3.3.16
302
302
  signing_key:
303
303
  specification_version: 4
304
304
  summary: metanorma-iec lets you write IEC standards in AsciiDoc.