relaton-ieee 1.7.3 → 1.9.0

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/.github/workflows/rake.yml +1 -11
  3. data/.rubocop.yml +1 -1
  4. data/Gemfile +1 -1
  5. data/grammars/basicdoc.rng +165 -20
  6. data/grammars/biblio.rng +5 -6
  7. data/grammars/isodoc.rng +532 -16
  8. data/grammars/reqt.rng +31 -2
  9. data/lib/relaton_ieee/hit_collection.rb +2 -2
  10. data/lib/relaton_ieee/version.rb +1 -1
  11. data/relaton_ieee.gemspec +3 -8
  12. metadata +8 -22
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c71b1afdda50aaebc26383824489fd07ed9e0894103822ea10b2e94efe958e0b
4
- data.tar.gz: 38e409de1ae94996527825c92f518bd50945ba306fbf3b9ad98dcaf7eea8d0d0
3
+ metadata.gz: dc70675477b3d216a6e596b63c89e2fd867cb725372226d45fdd67da6d1f170e
4
+ data.tar.gz: 0e24be2cab28dd83370e90e19fb3058432005a475f299c0d79eb216177a0054b
5
5
  SHA512:
6
- metadata.gz: 31d10b674df67f259230fe535746c82e88c30521a53b16db5e6240a68fbc788737f94837d141e58e0f579cba934d048d992dbb72b4b9317e85d529b06dc8aa2e
7
- data.tar.gz: 0fc38f39a5854357ef65e0def1944a0fb4321d6e00d8a04b22b99e888de6f274224c816cc074b66a8100b965ad646dd6f638531d28245132f84b3b8b8bfa2901
6
+ metadata.gz: 05e9abb808f6517cfd8dd9f85b0b033594a8bbfb7c179f18e5db493c9b3afac4d9fb9adf902b32a5d7444791770894e449341c2cbfd4380a254cf232b01e41ac
7
+ data.tar.gz: db0577970220cfcb39ca1b00083851a7d49630e61870d8e3cd2de330ac8ea5d8fe14c6c9afd6640662b9e04e05428acec4bda234b34f2f02527b32b125a62c7a
data/.github/workflows/rake.yml CHANGED
@@ -16,19 +16,9 @@ jobs:
16
16
  strategy:
17
17
  fail-fast: false
18
18
  matrix:
19
- ruby: [ '2.7', '2.6', '2.5', '2.4' ]
19
+ ruby: [ '3.0', '2.7', '2.6', '2.5' ]
20
20
  os: [ ubuntu-latest, windows-latest, macos-latest ]
21
21
  experimental: [ false ]
22
- include:
23
- - ruby: '3.0'
24
- os: 'ubuntu-latest'
25
- experimental: true
26
- - ruby: '3.0'
27
- os: 'windows-latest'
28
- experimental: true
29
- - ruby: '3.0'
30
- os: 'macos-latest'
31
- experimental: true
32
22
  steps:
33
23
  - uses: actions/checkout@v2
34
24
  with:
data/.rubocop.yml CHANGED
@@ -5,6 +5,6 @@
5
5
  inherit_from:
6
6
  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
7
7
  AllCops:
8
- TargetRubyVersion: 2.4
8
+ TargetRubyVersion: 2.5
9
9
  Rails:
10
10
  Enabled: false
data/Gemfile CHANGED
@@ -3,5 +3,5 @@ source "https://rubygems.org"
3
3
  # Specify your gem's dependencies in relaton_ieee.gemspec
4
4
  gemspec
5
5
 
6
- gem "rake", "~> 12.0"
6
+ gem "rake", "~> 13.0"
7
7
  gem "rspec", "~> 3.0"
data/grammars/basicdoc.rng CHANGED
@@ -1,9 +1,10 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
- <include href="biblio.rng"/>
4
- <start>
5
- <ref name="document"/>
6
- </start>
3
+ <include href="biblio.rng">
4
+ <start>
5
+ <ref name="document"/>
6
+ </start>
7
+ </include>
7
8
  <define name="document">
8
9
  <element name="document">
9
10
  <optional>
@@ -43,13 +44,16 @@
43
44
  </attribute>
44
45
  </optional>
45
46
  <optional>
46
- <ref name="section-title"/>
47
+ <attribute name="language"/>
47
48
  </optional>
48
49
  <optional>
49
- <ref name="BasicBlock"/>
50
+ <attribute name="script"/>
51
+ </optional>
52
+ <optional>
53
+ <ref name="section-title"/>
50
54
  </optional>
51
55
  <zeroOrMore>
52
- <ref name="note"/>
56
+ <ref name="BasicBlock"/>
53
57
  </zeroOrMore>
54
58
  </define>
55
59
  <define name="references">
@@ -92,6 +96,10 @@
92
96
  <ref name="example"/>
93
97
  <ref name="review"/>
94
98
  <ref name="pre"/>
99
+ <ref name="note"/>
100
+ <ref name="pagebreak"/>
101
+ <ref name="hr"/>
102
+ <ref name="bookmark"/>
95
103
  </choice>
96
104
  </define>
97
105
  <define name="paragraph">
@@ -188,6 +196,14 @@
188
196
  <data type="boolean"/>
189
197
  </attribute>
190
198
  </optional>
199
+ <optional>
200
+ <attribute name="subsequence"/>
201
+ </optional>
202
+ <optional>
203
+ <attribute name="inequality">
204
+ <data type="boolean"/>
205
+ </attribute>
206
+ </optional>
191
207
  <ref name="stem"/>
192
208
  <optional>
193
209
  <ref name="dl"/>
@@ -241,6 +257,9 @@
241
257
  <data type="boolean"/>
242
258
  </attribute>
243
259
  </optional>
260
+ <optional>
261
+ <attribute name="subsequence"/>
262
+ </optional>
244
263
  <optional>
245
264
  <attribute name="lang"/>
246
265
  </optional>
@@ -266,6 +285,9 @@
266
285
  <attribute name="id">
267
286
  <data type="ID"/>
268
287
  </attribute>
288
+ <optional>
289
+ <attribute name="alt"/>
290
+ </optional>
269
291
  <optional>
270
292
  <ref name="tname"/>
271
293
  </optional>
@@ -285,9 +307,15 @@
285
307
  <data type="boolean"/>
286
308
  </attribute>
287
309
  </optional>
310
+ <optional>
311
+ <attribute name="subsequence"/>
312
+ </optional>
288
313
  <optional>
289
314
  <attribute name="alt"/>
290
315
  </optional>
316
+ <optional>
317
+ <attribute name="summary"/>
318
+ </optional>
291
319
  <optional>
292
320
  <attribute name="uri">
293
321
  <data type="anyURI"/>
@@ -313,12 +341,16 @@
313
341
  </define>
314
342
  <define name="tname">
315
343
  <element name="name">
316
- <text/>
317
- </element>
318
- </define>
319
- <define name="tclass">
320
- <element name="name">
321
- <text/>
344
+ <oneOrMore>
345
+ <choice>
346
+ <ref name="PureTextElement"/>
347
+ <ref name="eref"/>
348
+ <ref name="stem"/>
349
+ <ref name="keyword"/>
350
+ <ref name="xref"/>
351
+ <ref name="hyperlink"/>
352
+ </choice>
353
+ </oneOrMore>
322
354
  </element>
323
355
  </define>
324
356
  <define name="thead">
@@ -370,6 +402,16 @@
370
402
  </choice>
371
403
  </attribute>
372
404
  </optional>
405
+ <optional>
406
+ <attribute name="valign">
407
+ <choice>
408
+ <value>top</value>
409
+ <value>middle</value>
410
+ <value>bottom</value>
411
+ <value>baseline</value>
412
+ </choice>
413
+ </attribute>
414
+ </optional>
373
415
  <choice>
374
416
  <zeroOrMore>
375
417
  <ref name="TextElement"/>
@@ -397,6 +439,16 @@
397
439
  </choice>
398
440
  </attribute>
399
441
  </optional>
442
+ <optional>
443
+ <attribute name="valign">
444
+ <choice>
445
+ <value>top</value>
446
+ <value>middle</value>
447
+ <value>bottom</value>
448
+ <value>baseline</value>
449
+ </choice>
450
+ </attribute>
451
+ </optional>
400
452
  <choice>
401
453
  <zeroOrMore>
402
454
  <ref name="TextElement"/>
@@ -417,6 +469,12 @@
417
469
  <data type="boolean"/>
418
470
  </attribute>
419
471
  </optional>
472
+ <optional>
473
+ <attribute name="subsequence"/>
474
+ </optional>
475
+ <optional>
476
+ <ref name="tname"/>
477
+ </optional>
420
478
  <oneOrMore>
421
479
  <choice>
422
480
  <ref name="formula"/>
@@ -481,17 +539,25 @@
481
539
  </attribute>
482
540
  </optional>
483
541
  <optional>
484
- <ref name="source"/>
542
+ <attribute name="subsequence"/>
485
543
  </optional>
486
544
  <optional>
487
- <ref name="tname"/>
545
+ <attribute name="class"/>
488
546
  </optional>
489
547
  <optional>
490
- <ref name="tclass"/>
548
+ <ref name="source"/>
549
+ </optional>
550
+ <optional>
551
+ <ref name="tname"/>
491
552
  </optional>
492
553
  <choice>
493
554
  <ref name="image"/>
555
+ <ref name="video"/>
556
+ <ref name="audio"/>
494
557
  <ref name="pre"/>
558
+ <oneOrMore>
559
+ <ref name="paragraph-with-footnote"/>
560
+ </oneOrMore>
495
561
  <zeroOrMore>
496
562
  <ref name="figure"/>
497
563
  </zeroOrMore>
@@ -529,6 +595,8 @@
529
595
  <ref name="pagebreak"/>
530
596
  <ref name="bookmark"/>
531
597
  <ref name="image"/>
598
+ <ref name="index"/>
599
+ <ref name="index-xref"/>
532
600
  </choice>
533
601
  </define>
534
602
  <define name="PureTextElement">
@@ -553,14 +621,20 @@
553
621
  <define name="em">
554
622
  <element name="em">
555
623
  <zeroOrMore>
556
- <ref name="PureTextElement"/>
624
+ <choice>
625
+ <ref name="PureTextElement"/>
626
+ <ref name="stem"/>
627
+ </choice>
557
628
  </zeroOrMore>
558
629
  </element>
559
630
  </define>
560
631
  <define name="strong">
561
632
  <element name="strong">
562
633
  <zeroOrMore>
563
- <ref name="PureTextElement"/>
634
+ <choice>
635
+ <ref name="PureTextElement"/>
636
+ <ref name="stem"/>
637
+ </choice>
564
638
  </zeroOrMore>
565
639
  </element>
566
640
  </define>
@@ -653,6 +727,65 @@
653
727
  <empty/>
654
728
  </element>
655
729
  </define>
730
+ <define name="index">
731
+ <element name="index">
732
+ <optional>
733
+ <attribute name="to">
734
+ <data type="IDREF"/>
735
+ </attribute>
736
+ </optional>
737
+ <element name="primary">
738
+ <oneOrMore>
739
+ <ref name="PureTextElement"/>
740
+ </oneOrMore>
741
+ </element>
742
+ <optional>
743
+ <element name="secondary">
744
+ <oneOrMore>
745
+ <ref name="PureTextElement"/>
746
+ </oneOrMore>
747
+ </element>
748
+ </optional>
749
+ <optional>
750
+ <element name="tertiary">
751
+ <oneOrMore>
752
+ <ref name="PureTextElement"/>
753
+ </oneOrMore>
754
+ </element>
755
+ </optional>
756
+ </element>
757
+ </define>
758
+ <define name="index-xref">
759
+ <element name="index-xref">
760
+ <attribute name="also">
761
+ <data type="boolean"/>
762
+ </attribute>
763
+ <element name="primary">
764
+ <oneOrMore>
765
+ <ref name="PureTextElement"/>
766
+ </oneOrMore>
767
+ </element>
768
+ <optional>
769
+ <element name="secondary">
770
+ <oneOrMore>
771
+ <ref name="PureTextElement"/>
772
+ </oneOrMore>
773
+ </element>
774
+ </optional>
775
+ <optional>
776
+ <element name="tertiary">
777
+ <oneOrMore>
778
+ <ref name="PureTextElement"/>
779
+ </oneOrMore>
780
+ </element>
781
+ </optional>
782
+ <element name="target">
783
+ <oneOrMore>
784
+ <ref name="PureTextElement"/>
785
+ </oneOrMore>
786
+ </element>
787
+ </element>
788
+ </define>
656
789
  <!-- bare ID element, used for referencing arbitrary spans of text -->
657
790
  <define name="bookmark">
658
791
  <element name="bookmark">
@@ -778,6 +911,9 @@
778
911
  <optional>
779
912
  <attribute name="alt"/>
780
913
  </optional>
914
+ <optional>
915
+ <attribute name="title"/>
916
+ </optional>
781
917
  <optional>
782
918
  <attribute name="longdesc">
783
919
  <data type="anyURI"/>
@@ -786,7 +922,7 @@
786
922
  </element>
787
923
  </define>
788
924
  <define name="video">
789
- <element name="image">
925
+ <element name="video">
790
926
  <attribute name="id">
791
927
  <data type="ID"/>
792
928
  </attribute>
@@ -816,6 +952,9 @@
816
952
  <optional>
817
953
  <attribute name="alt"/>
818
954
  </optional>
955
+ <optional>
956
+ <attribute name="title"/>
957
+ </optional>
819
958
  <optional>
820
959
  <attribute name="longdesc">
821
960
  <data type="anyURI"/>
@@ -827,7 +966,7 @@
827
966
  </element>
828
967
  </define>
829
968
  <define name="audio">
830
- <element name="image">
969
+ <element name="audio">
831
970
  <attribute name="id">
832
971
  <data type="ID"/>
833
972
  </attribute>
@@ -841,6 +980,9 @@
841
980
  <optional>
842
981
  <attribute name="alt"/>
843
982
  </optional>
983
+ <optional>
984
+ <attribute name="title"/>
985
+ </optional>
844
986
  <optional>
845
987
  <attribute name="longdesc">
846
988
  <data type="anyURI"/>
@@ -925,6 +1067,9 @@
925
1067
  <value>alphabet_upper</value>
926
1068
  </choice>
927
1069
  </attribute>
1070
+ <optional>
1071
+ <attribute name="start"/>
1072
+ </optional>
928
1073
  <oneOrMore>
929
1074
  <ref name="li"/>
930
1075
  </oneOrMore>
data/grammars/biblio.rng CHANGED
@@ -124,7 +124,7 @@
124
124
  <value>application/tei+xml</value>
125
125
  <value>text/x-asciidoc</value>
126
126
  <value>text/markdown</value>
127
- <value>application/x-isodoc+xml</value>
127
+ <value>application/x-metanorma+xml</value>
128
128
  <text/>
129
129
  </choice>
130
130
  </attribute>
@@ -452,6 +452,7 @@
452
452
  <attribute name="type">
453
453
  <choice>
454
454
  <value>isni</value>
455
+ <value>orcid</value>
455
456
  <value>uri</value>
456
457
  </choice>
457
458
  </attribute>
@@ -461,10 +462,7 @@
461
462
  <define name="org-identifier">
462
463
  <element name="identifier">
463
464
  <attribute name="type">
464
- <choice>
465
- <value>orcid</value>
466
- <value>uri</value>
467
- </choice>
465
+ <data type="string" datatypeLibrary=""/>
468
466
  </attribute>
469
467
  <text/>
470
468
  </element>
@@ -789,6 +787,7 @@
789
787
  <value>adapted</value>
790
788
  <value>vote-started</value>
791
789
  <value>vote-ended</value>
790
+ <value>announced</value>
792
791
  </choice>
793
792
  </define>
794
793
  <define name="bdate">
@@ -1106,7 +1105,7 @@
1106
1105
  <value>complementOf</value>
1107
1106
  <value>obsoletes</value>
1108
1107
  <value>obsoletedBy</value>
1109
- <value>cited</value>
1108
+ <value>cites</value>
1110
1109
  <value>isCitedIn</value>
1111
1110
  </choice>
1112
1111
  </define>
data/grammars/isodoc.rng CHANGED
@@ -45,6 +45,11 @@
45
45
  <optional>
46
46
  <attribute name="alt"/>
47
47
  </optional>
48
+ <optional>
49
+ <attribute name="updatetype">
50
+ <data type="boolean"/>
51
+ </attribute>
52
+ </optional>
48
53
  <text/>
49
54
  </element>
50
55
  </define>
@@ -55,6 +60,13 @@
55
60
  <param name="pattern">\i\c*|\c+#\c+</param>
56
61
  </data>
57
62
  </attribute>
63
+ <optional>
64
+ <attribute name="to">
65
+ <data type="string">
66
+ <param name="pattern">\i\c*|\c+#\c+</param>
67
+ </data>
68
+ </attribute>
69
+ </optional>
58
70
  <optional>
59
71
  <attribute name="type">
60
72
  <ref name="ReferenceFormat"/>
@@ -79,6 +91,35 @@
79
91
  <text/>
80
92
  </element>
81
93
  </define>
94
+ <define name="erefType">
95
+ <optional>
96
+ <attribute name="normative">
97
+ <data type="boolean"/>
98
+ </attribute>
99
+ </optional>
100
+ <attribute name="citeas"/>
101
+ <attribute name="type">
102
+ <ref name="ReferenceFormat"/>
103
+ </attribute>
104
+ <optional>
105
+ <attribute name="alt"/>
106
+ </optional>
107
+ <optional>
108
+ <attribute name="case">
109
+ <choice>
110
+ <value>capital</value>
111
+ <value>lowercase</value>
112
+ </choice>
113
+ </attribute>
114
+ </optional>
115
+ <optional>
116
+ <attribute name="droploc">
117
+ <data type="boolean"/>
118
+ </attribute>
119
+ </optional>
120
+ <ref name="CitationType"/>
121
+ <text/>
122
+ </define>
82
123
  <define name="ul">
83
124
  <element name="ul">
84
125
  <attribute name="id">
@@ -95,7 +136,7 @@
95
136
  </attribute>
96
137
  </optional>
97
138
  <oneOrMore>
98
- <ref name="li"/>
139
+ <ref name="ul_li"/>
99
140
  </oneOrMore>
100
141
  <zeroOrMore>
101
142
  <ref name="note"/>
@@ -163,6 +204,18 @@
163
204
  </zeroOrMore>
164
205
  </element>
165
206
  </define>
207
+ <define name="dt">
208
+ <element name="dt">
209
+ <optional>
210
+ <attribute name="id">
211
+ <data type="ID"/>
212
+ </attribute>
213
+ </optional>
214
+ <zeroOrMore>
215
+ <ref name="TextElement"/>
216
+ </zeroOrMore>
217
+ </element>
218
+ </define>
166
219
  <define name="example">
167
220
  <element name="example">
168
221
  <attribute name="id">
@@ -246,6 +299,12 @@
246
299
  <data type="boolean"/>
247
300
  </attribute>
248
301
  </optional>
302
+ <optional>
303
+ <attribute name="width"/>
304
+ </optional>
305
+ <optional>
306
+ <ref name="colgroup"/>
307
+ </optional>
249
308
  <optional>
250
309
  <ref name="tname"/>
251
310
  </optional>
@@ -501,6 +560,9 @@
501
560
  </define>
502
561
  <define name="BibDataExtensionType">
503
562
  <ref name="doctype"/>
563
+ <optional>
564
+ <ref name="docsubtype"/>
565
+ </optional>
504
566
  <optional>
505
567
  <ref name="editorialgroup"/>
506
568
  </optional>
@@ -762,15 +824,177 @@
762
824
  <ref name="paragraph"/>
763
825
  </element>
764
826
  </define>
827
+ <define name="em">
828
+ <element name="em">
829
+ <zeroOrMore>
830
+ <choice>
831
+ <ref name="PureTextElement"/>
832
+ <ref name="stem"/>
833
+ <ref name="index"/>
834
+ </choice>
835
+ </zeroOrMore>
836
+ </element>
837
+ </define>
838
+ <define name="strong">
839
+ <element name="strong">
840
+ <zeroOrMore>
841
+ <choice>
842
+ <ref name="PureTextElement"/>
843
+ <ref name="stem"/>
844
+ <ref name="index"/>
845
+ </choice>
846
+ </zeroOrMore>
847
+ </element>
848
+ </define>
849
+ <define name="tt">
850
+ <element name="tt">
851
+ <zeroOrMore>
852
+ <choice>
853
+ <ref name="PureTextElement"/>
854
+ <ref name="index"/>
855
+ </choice>
856
+ </zeroOrMore>
857
+ </element>
858
+ </define>
859
+ <define name="keyword">
860
+ <element name="keyword">
861
+ <zeroOrMore>
862
+ <choice>
863
+ <ref name="PureTextElement"/>
864
+ <ref name="index"/>
865
+ </choice>
866
+ </zeroOrMore>
867
+ </element>
868
+ </define>
869
+ <define name="strike">
870
+ <element name="strike">
871
+ <zeroOrMore>
872
+ <choice>
873
+ <ref name="PureTextElement"/>
874
+ <ref name="index"/>
875
+ </choice>
876
+ </zeroOrMore>
877
+ </element>
878
+ </define>
879
+ <define name="underline">
880
+ <element name="underline">
881
+ <zeroOrMore>
882
+ <choice>
883
+ <ref name="PureTextElement"/>
884
+ <ref name="index"/>
885
+ </choice>
886
+ </zeroOrMore>
887
+ </element>
888
+ </define>
889
+ <define name="smallcap">
890
+ <element name="smallcap">
891
+ <zeroOrMore>
892
+ <choice>
893
+ <ref name="PureTextElement"/>
894
+ <ref name="index"/>
895
+ </choice>
896
+ </zeroOrMore>
897
+ </element>
898
+ </define>
899
+ <define name="pagebreak">
900
+ <element name="pagebreak">
901
+ <optional>
902
+ <attribute name="orientation">
903
+ <choice>
904
+ <value>landscape</value>
905
+ <value>portrait</value>
906
+ </choice>
907
+ </attribute>
908
+ </optional>
909
+ </element>
910
+ </define>
765
911
  </include>
766
912
  <!-- end overrides -->
913
+ <define name="docsubtype">
914
+ <element name="subdoctype">
915
+ <ref name="DocumentSubtype"/>
916
+ </element>
917
+ </define>
918
+ <define name="DocumentSubtype">
919
+ <text/>
920
+ </define>
921
+ <define name="colgroup">
922
+ <element name="colgroup">
923
+ <oneOrMore>
924
+ <ref name="col"/>
925
+ </oneOrMore>
926
+ </element>
927
+ </define>
928
+ <define name="col">
929
+ <element name="col">
930
+ <attribute name="width"/>
931
+ </element>
932
+ </define>
933
+ <define name="BibItemType" combine="choice">
934
+ <value>internal</value>
935
+ </define>
767
936
  <define name="TextElement" combine="choice">
768
- <ref name="concept"/>
937
+ <choice>
938
+ <ref name="concept"/>
939
+ <ref name="add"/>
940
+ <ref name="del"/>
941
+ </choice>
942
+ </define>
943
+ <define name="add">
944
+ <element name="add">
945
+ <choice>
946
+ <ref name="PureTextElement"/>
947
+ <ref name="eref"/>
948
+ <ref name="stem"/>
949
+ <ref name="keyword"/>
950
+ <ref name="xref"/>
951
+ <ref name="hyperlink"/>
952
+ </choice>
953
+ </element>
954
+ </define>
955
+ <define name="del">
956
+ <element name="del">
957
+ <choice>
958
+ <ref name="PureTextElement"/>
959
+ <ref name="eref"/>
960
+ <ref name="stem"/>
961
+ <ref name="keyword"/>
962
+ <ref name="xref"/>
963
+ <ref name="hyperlink"/>
964
+ </choice>
965
+ </element>
769
966
  </define>
770
967
  <define name="concept">
771
968
  <element name="concept">
772
969
  <optional>
773
- <attribute name="term"/>
970
+ <attribute name="ital">
971
+ <data type="boolean"/>
972
+ </attribute>
973
+ </optional>
974
+ <optional>
975
+ <attribute name="ref">
976
+ <data type="boolean"/>
977
+ </attribute>
978
+ </optional>
979
+ <optional>
980
+ <element name="refterm">
981
+ <zeroOrMore>
982
+ <choice>
983
+ <ref name="PureTextElement"/>
984
+ <ref name="stem"/>
985
+ </choice>
986
+ </zeroOrMore>
987
+ </element>
988
+ </optional>
989
+ <optional>
990
+ <element name="renderterm">
991
+ <zeroOrMore>
992
+ <choice>
993
+ <ref name="PureTextElement"/>
994
+ <ref name="stem"/>
995
+ </choice>
996
+ </zeroOrMore>
997
+ </element>
774
998
  </optional>
775
999
  <choice>
776
1000
  <ref name="eref"/>
@@ -784,8 +1008,175 @@
784
1008
  <ref name="requirement"/>
785
1009
  <ref name="recommendation"/>
786
1010
  <ref name="permission"/>
1011
+ <ref name="imagemap"/>
1012
+ <ref name="svgmap"/>
1013
+ <ref name="inputform"/>
1014
+ </choice>
1015
+ </define>
1016
+ <define name="inputform">
1017
+ <element name="form">
1018
+ <attribute name="id">
1019
+ <data type="ID"/>
1020
+ </attribute>
1021
+ <attribute name="name"/>
1022
+ <attribute name="action"/>
1023
+ <optional>
1024
+ <attribute name="class"/>
1025
+ </optional>
1026
+ <zeroOrMore>
1027
+ <choice>
1028
+ <ref name="TextElement"/>
1029
+ <ref name="FormInput"/>
1030
+ </choice>
1031
+ </zeroOrMore>
1032
+ </element>
1033
+ </define>
1034
+ <define name="FormInput">
1035
+ <choice>
1036
+ <ref name="input"/>
1037
+ <ref name="formlabel"/>
1038
+ <ref name="select"/>
1039
+ <ref name="textarea"/>
787
1040
  </choice>
788
1041
  </define>
1042
+ <define name="InputType">
1043
+ <choice>
1044
+ <value>button</value>
1045
+ <value>checkbox</value>
1046
+ <value>date</value>
1047
+ <value>file</value>
1048
+ <value>password</value>
1049
+ <value>radio</value>
1050
+ <value>submit</value>
1051
+ <value>text</value>
1052
+ </choice>
1053
+ </define>
1054
+ <define name="input">
1055
+ <element name="input">
1056
+ <attribute name="type">
1057
+ <ref name="InputType"/>
1058
+ </attribute>
1059
+ <optional>
1060
+ <attribute name="checked">
1061
+ <data type="boolean"/>
1062
+ </attribute>
1063
+ </optional>
1064
+ <optional>
1065
+ <attribute name="disabled">
1066
+ <data type="boolean"/>
1067
+ </attribute>
1068
+ </optional>
1069
+ <optional>
1070
+ <attribute name="readonly">
1071
+ <data type="boolean"/>
1072
+ </attribute>
1073
+ </optional>
1074
+ <optional>
1075
+ <attribute name="maxlength">
1076
+ <data type="int"/>
1077
+ </attribute>
1078
+ </optional>
1079
+ <optional>
1080
+ <attribute name="minlength">
1081
+ <data type="int"/>
1082
+ </attribute>
1083
+ </optional>
1084
+ <optional>
1085
+ <attribute name="name"/>
1086
+ </optional>
1087
+ <optional>
1088
+ <attribute name="value"/>
1089
+ </optional>
1090
+ <optional>
1091
+ <attribute name="id">
1092
+ <data type="ID"/>
1093
+ </attribute>
1094
+ </optional>
1095
+ </element>
1096
+ </define>
1097
+ <define name="formlabel">
1098
+ <element name="label">
1099
+ <attribute name="for">
1100
+ <data type="IDREF"/>
1101
+ </attribute>
1102
+ <zeroOrMore>
1103
+ <ref name="PureTextElement"/>
1104
+ </zeroOrMore>
1105
+ </element>
1106
+ </define>
1107
+ <define name="select">
1108
+ <element name="select">
1109
+ <optional>
1110
+ <attribute name="name"/>
1111
+ </optional>
1112
+ <optional>
1113
+ <attribute name="value"/>
1114
+ </optional>
1115
+ <optional>
1116
+ <attribute name="id">
1117
+ <data type="ID"/>
1118
+ </attribute>
1119
+ </optional>
1120
+ <optional>
1121
+ <attribute name="disabled">
1122
+ <data type="boolean"/>
1123
+ </attribute>
1124
+ </optional>
1125
+ <optional>
1126
+ <attribute name="multiple">
1127
+ <data type="boolean"/>
1128
+ </attribute>
1129
+ </optional>
1130
+ <optional>
1131
+ <attribute name="size">
1132
+ <data type="int"/>
1133
+ </attribute>
1134
+ </optional>
1135
+ <oneOrMore>
1136
+ <ref name="option"/>
1137
+ </oneOrMore>
1138
+ </element>
1139
+ </define>
1140
+ <define name="option">
1141
+ <element name="option">
1142
+ <optional>
1143
+ <attribute name="disabled">
1144
+ <data type="boolean"/>
1145
+ </attribute>
1146
+ </optional>
1147
+ <optional>
1148
+ <attribute name="value"/>
1149
+ </optional>
1150
+ <zeroOrMore>
1151
+ <ref name="PureTextElement"/>
1152
+ </zeroOrMore>
1153
+ </element>
1154
+ </define>
1155
+ <define name="textarea">
1156
+ <element name="textarea">
1157
+ <optional>
1158
+ <attribute name="name"/>
1159
+ </optional>
1160
+ <optional>
1161
+ <attribute name="value"/>
1162
+ </optional>
1163
+ <optional>
1164
+ <attribute name="id">
1165
+ <data type="ID"/>
1166
+ </attribute>
1167
+ </optional>
1168
+ <optional>
1169
+ <attribute name="rows">
1170
+ <data type="int"/>
1171
+ </attribute>
1172
+ </optional>
1173
+ <optional>
1174
+ <attribute name="cols">
1175
+ <data type="int"/>
1176
+ </attribute>
1177
+ </optional>
1178
+ </element>
1179
+ </define>
789
1180
  <define name="bibliography">
790
1181
  <element name="bibliography">
791
1182
  <oneOrMore>
@@ -814,6 +1205,9 @@
814
1205
  <data type="boolean"/>
815
1206
  </attribute>
816
1207
  </optional>
1208
+ <optional>
1209
+ <attribute name="number"/>
1210
+ </optional>
817
1211
  <optional>
818
1212
  <attribute name="obligation">
819
1213
  <choice>
@@ -855,13 +1249,17 @@
855
1249
  </define>
856
1250
  <define name="IsoWorkgroup">
857
1251
  <optional>
858
- <attribute name="number">
859
- <data type="int"/>
860
- </attribute>
1252
+ <attribute name="number"/>
861
1253
  </optional>
862
1254
  <optional>
863
1255
  <attribute name="type"/>
864
1256
  </optional>
1257
+ <optional>
1258
+ <attribute name="identifier"/>
1259
+ </optional>
1260
+ <optional>
1261
+ <attribute name="prefix"/>
1262
+ </optional>
865
1263
  <text/>
866
1264
  </define>
867
1265
  <define name="ics">
@@ -869,9 +1267,11 @@
869
1267
  <element name="code">
870
1268
  <text/>
871
1269
  </element>
872
- <element name="text">
873
- <text/>
874
- </element>
1270
+ <optional>
1271
+ <element name="text">
1272
+ <text/>
1273
+ </element>
1274
+ </optional>
875
1275
  </element>
876
1276
  </define>
877
1277
  <define name="standard-document">
@@ -884,6 +1284,9 @@
884
1284
  </choice>
885
1285
  </attribute>
886
1286
  <ref name="bibdata"/>
1287
+ <optional>
1288
+ <ref name="misccontainer"/>
1289
+ </optional>
887
1290
  <optional>
888
1291
  <ref name="boilerplate"/>
889
1292
  </optional>
@@ -894,11 +1297,21 @@
894
1297
  <zeroOrMore>
895
1298
  <ref name="annex"/>
896
1299
  </zeroOrMore>
1300
+ <optional>
1301
+ <ref name="bibliography"/>
1302
+ </optional>
897
1303
  <zeroOrMore>
898
- <ref name="references"/>
1304
+ <ref name="indexsect"/>
899
1305
  </zeroOrMore>
900
1306
  </element>
901
1307
  </define>
1308
+ <define name="misccontainer">
1309
+ <element name="misc-container">
1310
+ <oneOrMore>
1311
+ <ref name="AnyElement"/>
1312
+ </oneOrMore>
1313
+ </element>
1314
+ </define>
902
1315
  <define name="preface">
903
1316
  <element name="preface">
904
1317
  <oneOrMore>
@@ -922,6 +1335,11 @@
922
1335
  <ref name="Content-Section"/>
923
1336
  </element>
924
1337
  </define>
1338
+ <define name="indexsect">
1339
+ <element name="indexsect">
1340
+ <ref name="Content-Section"/>
1341
+ </element>
1342
+ </define>
925
1343
  <define name="boilerplate">
926
1344
  <element name="boilerplate">
927
1345
  <optional>
@@ -1041,6 +1459,9 @@
1041
1459
  </choice>
1042
1460
  </attribute>
1043
1461
  </optional>
1462
+ <optional>
1463
+ <attribute name="number"/>
1464
+ </optional>
1044
1465
  <optional>
1045
1466
  <attribute name="type"/>
1046
1467
  </optional>
@@ -1094,29 +1515,32 @@
1094
1515
  <optional>
1095
1516
  <attribute name="type"/>
1096
1517
  </optional>
1518
+ <optional>
1519
+ <attribute name="number"/>
1520
+ </optional>
1097
1521
  <optional>
1098
1522
  <ref name="section-title"/>
1099
1523
  </optional>
1100
- <group>
1524
+ <choice>
1101
1525
  <choice>
1102
1526
  <group>
1103
- <zeroOrMore>
1527
+ <oneOrMore>
1104
1528
  <ref name="BasicBlock"/>
1105
- </zeroOrMore>
1529
+ </oneOrMore>
1106
1530
  <zeroOrMore>
1107
1531
  <ref name="note"/>
1108
1532
  </zeroOrMore>
1109
1533
  </group>
1110
1534
  <ref name="amend"/>
1111
1535
  </choice>
1112
- <zeroOrMore>
1536
+ <oneOrMore>
1113
1537
  <choice>
1114
1538
  <ref name="clause-subsection"/>
1115
1539
  <ref name="terms"/>
1116
1540
  <ref name="definitions"/>
1117
1541
  </choice>
1118
- </zeroOrMore>
1119
- </group>
1542
+ </oneOrMore>
1543
+ </choice>
1120
1544
  </define>
1121
1545
  <define name="Annex-Section">
1122
1546
  <optional>
@@ -1196,6 +1620,9 @@
1196
1620
  <optional>
1197
1621
  <attribute name="type"/>
1198
1622
  </optional>
1623
+ <optional>
1624
+ <attribute name="number"/>
1625
+ </optional>
1199
1626
  <optional>
1200
1627
  <attribute name="obligation">
1201
1628
  <choice>
@@ -1524,6 +1951,7 @@
1524
1951
  <value>add</value>
1525
1952
  <value>modify</value>
1526
1953
  <value>delete</value>
1954
+ <value>replace</value>
1527
1955
  </choice>
1528
1956
  </attribute>
1529
1957
  <optional>
@@ -1554,6 +1982,11 @@
1554
1982
  </optional>
1555
1983
  <optional>
1556
1984
  <element name="newcontent">
1985
+ <optional>
1986
+ <attribute name="id">
1987
+ <data type="ID"/>
1988
+ </attribute>
1989
+ </optional>
1557
1990
  <zeroOrMore>
1558
1991
  <ref name="BasicBlock"/>
1559
1992
  </zeroOrMore>
@@ -1587,4 +2020,87 @@
1587
2020
  <text/>
1588
2021
  </element>
1589
2022
  </define>
2023
+ <define name="imagemap">
2024
+ <element name="imagemap">
2025
+ <ref name="figure"/>
2026
+ <zeroOrMore>
2027
+ <element name="area">
2028
+ <attribute name="type">
2029
+ <choice>
2030
+ <value>rect</value>
2031
+ <value>circle</value>
2032
+ <value>ellipse</value>
2033
+ <value>poly</value>
2034
+ </choice>
2035
+ </attribute>
2036
+ <choice>
2037
+ <ref name="xref"/>
2038
+ <ref name="hyperlink"/>
2039
+ <ref name="eref"/>
2040
+ </choice>
2041
+ <oneOrMore>
2042
+ <element name="coords">
2043
+ <attribute name="x">
2044
+ <data type="float"/>
2045
+ </attribute>
2046
+ <attribute name="y">
2047
+ <data type="float"/>
2048
+ </attribute>
2049
+ </element>
2050
+ </oneOrMore>
2051
+ <optional>
2052
+ <element name="radius">
2053
+ <attribute name="x">
2054
+ <data type="float"/>
2055
+ </attribute>
2056
+ <optional>
2057
+ <attribute name="y">
2058
+ <data type="float"/>
2059
+ </attribute>
2060
+ </optional>
2061
+ </element>
2062
+ </optional>
2063
+ </element>
2064
+ </zeroOrMore>
2065
+ </element>
2066
+ </define>
2067
+ <define name="svgmap">
2068
+ <element name="svgmap">
2069
+ <ref name="figure"/>
2070
+ <zeroOrMore>
2071
+ <element name="target">
2072
+ <attribute name="href">
2073
+ <data type="anyURI"/>
2074
+ </attribute>
2075
+ <choice>
2076
+ <ref name="xref"/>
2077
+ <ref name="hyperlink"/>
2078
+ <ref name="eref"/>
2079
+ </choice>
2080
+ </element>
2081
+ </zeroOrMore>
2082
+ </element>
2083
+ </define>
2084
+ <define name="ul_li">
2085
+ <element name="li">
2086
+ <optional>
2087
+ <attribute name="id">
2088
+ <data type="ID"/>
2089
+ </attribute>
2090
+ </optional>
2091
+ <optional>
2092
+ <attribute name="uncheckedcheckbox">
2093
+ <data type="boolean"/>
2094
+ </attribute>
2095
+ </optional>
2096
+ <optional>
2097
+ <attribute name="checkedcheckbox">
2098
+ <data type="boolean"/>
2099
+ </attribute>
2100
+ </optional>
2101
+ <oneOrMore>
2102
+ <ref name="BasicBlock"/>
2103
+ </oneOrMore>
2104
+ </element>
2105
+ </define>
1590
2106
  </grammar>
data/grammars/reqt.rng CHANGED
@@ -30,15 +30,34 @@
30
30
  <data type="boolean"/>
31
31
  </attribute>
32
32
  </optional>
33
+ <optional>
34
+ <attribute name="number"/>
35
+ </optional>
33
36
  <optional>
34
37
  <attribute name="subsequence"/>
35
38
  </optional>
39
+ <optional>
40
+ <attribute name="keep-with-next">
41
+ <data type="boolean"/>
42
+ </attribute>
43
+ </optional>
44
+ <optional>
45
+ <attribute name="keep-lines-together">
46
+ <data type="boolean"/>
47
+ </attribute>
48
+ </optional>
36
49
  <attribute name="id">
37
50
  <data type="ID"/>
38
51
  </attribute>
39
52
  <optional>
40
53
  <attribute name="filename"/>
41
54
  </optional>
55
+ <optional>
56
+ <attribute name="model"/>
57
+ </optional>
58
+ <optional>
59
+ <attribute name="type"/>
60
+ </optional>
42
61
  <optional>
43
62
  <ref name="reqtitle"/>
44
63
  </optional>
@@ -48,9 +67,9 @@
48
67
  <optional>
49
68
  <ref name="subject"/>
50
69
  </optional>
51
- <optional>
70
+ <zeroOrMore>
52
71
  <ref name="reqinherit"/>
53
- </optional>
72
+ </zeroOrMore>
54
73
  <zeroOrMore>
55
74
  <ref name="classification"/>
56
75
  </zeroOrMore>
@@ -135,6 +154,16 @@
135
154
  <data type="boolean"/>
136
155
  </attribute>
137
156
  </optional>
157
+ <optional>
158
+ <attribute name="keep-with-next">
159
+ <data type="boolean"/>
160
+ </attribute>
161
+ </optional>
162
+ <optional>
163
+ <attribute name="keep-lines-together">
164
+ <data type="boolean"/>
165
+ </attribute>
166
+ </optional>
138
167
  <oneOrMore>
139
168
  <ref name="BasicBlock"/>
140
169
  </oneOrMore>
data/lib/relaton_ieee/hit_collection.rb CHANGED
@@ -15,7 +15,7 @@ module RelatonIeee
15
15
  # @param opts [Hash]
16
16
  def initialize(ref) # rubocop:disable Metrics/MethodLength
17
17
  super
18
- code = ref.sub /^IEEE\s(Std\s)?/, ""
18
+ code = ref.sub(/^IEEE\s(Std\s)?/, "")
19
19
  search = CGI.escape({ data: { searchTerm: code } }.to_json)
20
20
  url = "#{DOMAIN}/bin/standards/search?data=#{search}"
21
21
  resp = Faraday.get url
@@ -23,7 +23,7 @@ module RelatonIeee
23
23
  json = JSON.parse resp_json["message"]
24
24
  @array = json["response"]["searchResults"]["resultsMapList"]
25
25
  .reduce([]) do |s, hit|
26
- /^(?:\w+\s)?(?<id>[^-\/]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
26
+ /^(?:\w+\s)?(?<id>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
27
27
  next s unless id && code =~ %r{^#{id}}
28
28
 
29
29
  s << Hit.new(hit["record"].merge(code: id, year: year.to_i), self)
data/lib/relaton_ieee/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RelatonIeee
2
- VERSION = "1.7.3".freeze
2
+ VERSION = "1.9.0".freeze
3
3
  end
data/relaton_ieee.gemspec CHANGED
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
14
14
  "use using the IeeeBibliographicItem model"
15
15
  spec.homepage = "https://github.com/relaton/relaton-ieee"
16
16
  spec.license = "BSD-2-Clause"
17
- spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
17
+ spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
18
18
 
19
19
  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
20
20
 
@@ -31,17 +31,12 @@ Gem::Specification.new do |spec|
31
31
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
32
32
  spec.require_paths = ["lib"]
33
33
 
34
- # spec.add_development_dependency "debase"
35
34
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
36
35
  spec.add_development_dependency "pry-byebug"
37
- spec.add_development_dependency "rake", "~> 10.0"
38
- # spec.add_development_dependency "rspec", "~> 3.0"
39
- # spec.add_development_dependency "ruby-debug-ide"
40
- # spec.add_development_dependency "ruby-jing"
41
36
  spec.add_development_dependency "simplecov"
42
37
  spec.add_development_dependency "vcr"
43
38
  spec.add_development_dependency "webmock"
44
39
 
45
- spec.add_dependency "faraday", "~> 1.0.0"
46
- spec.add_dependency "relaton-bib", "~> 1.7.0"
40
+ spec.add_dependency "faraday", "~> 1.1"
41
+ spec.add_dependency "relaton-bib", "~> 1.9.0"
47
42
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-ieee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.3
4
+ version: 1.9.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-19 00:00:00.000000000 Z
11
+ date: 2021-08-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -38,20 +38,6 @@ dependencies:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
- - !ruby/object:Gem::Dependency
42
- name: rake
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: '10.0'
48
- type: :development
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: '10.0'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: simplecov
57
43
  requirement: !ruby/object:Gem::Requirement
@@ -100,28 +86,28 @@ dependencies:
100
86
  requirements:
101
87
  - - "~>"
102
88
  - !ruby/object:Gem::Version
103
- version: 1.0.0
89
+ version: '1.1'
104
90
  type: :runtime
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
94
  - - "~>"
109
95
  - !ruby/object:Gem::Version
110
- version: 1.0.0
96
+ version: '1.1'
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: relaton-bib
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
101
  - - "~>"
116
102
  - !ruby/object:Gem::Version
117
- version: 1.7.0
103
+ version: 1.9.0
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
107
  requirements:
122
108
  - - "~>"
123
109
  - !ruby/object:Gem::Version
124
- version: 1.7.0
110
+ version: 1.9.0
125
111
  description: 'RelatonIeee: retrieve IEEE Standards for bibliographic use using the
126
112
  IeeeBibliographicItem model'
127
113
  email:
@@ -171,14 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
171
157
  requirements:
172
158
  - - ">="
173
159
  - !ruby/object:Gem::Version
174
- version: 2.3.0
160
+ version: 2.5.0
175
161
  required_rubygems_version: !ruby/object:Gem::Requirement
176
162
  requirements:
177
163
  - - ">="
178
164
  - !ruby/object:Gem::Version
179
165
  version: '0'
180
166
  requirements: []
181
- rubygems_version: 3.0.6
167
+ rubygems_version: 3.2.3
182
168
  signing_key:
183
169
  specification_version: 4
184
170
  summary: 'RelatonIeee: retrieve IEEE Standards for bibliographic use using the IeeeBibliographicItem