relaton-itu 1.10.2 → 1.13.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 -24
  3. data/grammars/basicdoc.rng +26 -7
  4. data/grammars/biblio.rng +204 -54
  5. data/grammars/isodoc.rng +176 -3
  6. data/grammars/itu.rng +3 -0
  7. data/grammars/reqt.rng +19 -1
  8. data/lib/relaton_itu/itu_bibliographic_item.rb +1 -1
  9. data/lib/relaton_itu/scrapper.rb +2 -1
  10. data/lib/relaton_itu/version.rb +1 -1
  11. data/relaton-itu.gemspec +1 -1
  12. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4ed2f429bff8900cca3d2d94c5139f0b2f5c0d2d3e64be5ba25113e158f66ea4
4
- data.tar.gz: 69e8bec23ab1faed23e0ffc119b8119c053affcde4a017370aad0621fc962f52
3
+ metadata.gz: 8038f6181bd82cd6b34bdb0c61de9b1b51f2603ab5745893d7ae6d3cd0de7399
4
+ data.tar.gz: 5feba36bfc100aae3f9aa6be0d8e16189cf21e2ec1ba12089755deee2fa5cc91
5
5
  SHA512:
6
- metadata.gz: 328204530044854bfbb6018d8ac29d5c9d77966d42cba2c68251337b5afd207b2ca88b18ac4c06be916cfbe1e1351d140328fcfd9386399598be140e908dbfd6
7
- data.tar.gz: 852af0debcff9966bc15c0eb220349ceae6ac008a00daa057864dc74d0f6a15377f11faafccdba4f5958b0d054fd1a63847366f016778381e0d5108f42f0b6ad
6
+ metadata.gz: 00c0d6d0c0d5e13f8737cdd05968558737390895d823c2ab126b626b10121d20ed259d5768adb6a86e5bde0b5b3cd94458e290103e8b01ae78708c01fef33b3f
7
+ data.tar.gz: b77460ec8cba6ea7e48a061fe1332617e0ff1b8ce8550c9ad11e8c35f5371d7dda977d01e21409d22dbd87ca638bfa9a4f7bcb48815f7aab833a47c4a452050a
data/.github/workflows/rake.yml CHANGED
@@ -10,27 +10,4 @@ on:
10
10
 
11
11
  jobs:
12
12
  rake:
13
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
14
- runs-on: ${{ matrix.os }}
15
- continue-on-error: ${{ matrix.experimental }}
16
- strategy:
17
- fail-fast: false
18
- matrix:
19
- ruby: [ '3.0', '2.7', '2.6', '2.5' ]
20
- os: [ ubuntu-latest, windows-latest, macos-latest ]
21
- experimental: [ false ]
22
- steps:
23
- - uses: actions/checkout@v2
24
- with:
25
- submodules: true
26
-
27
- # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
28
- - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
29
- run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
30
-
31
- - uses: ruby/setup-ruby@v1
32
- with:
33
- ruby-version: ${{ matrix.ruby }}
34
- bundler-cache: true
35
-
36
- - run: bundle exec rake
13
+ uses: relaton/support/.github/workflows/rake.yml@master
data/grammars/basicdoc.rng CHANGED
@@ -173,9 +173,11 @@
173
173
  <data type="dateTime"/>
174
174
  </attribute>
175
175
  </optional>
176
- <attribute name="from">
177
- <data type="IDREF"/>
178
- </attribute>
176
+ <optional>
177
+ <attribute name="from">
178
+ <data type="IDREF"/>
179
+ </attribute>
180
+ </optional>
179
181
  <optional>
180
182
  <attribute name="to">
181
183
  <data type="IDREF"/>
@@ -624,6 +626,9 @@
624
626
  <choice>
625
627
  <ref name="PureTextElement"/>
626
628
  <ref name="stem"/>
629
+ <ref name="eref"/>
630
+ <ref name="xref"/>
631
+ <ref name="hyperlink"/>
627
632
  </choice>
628
633
  </zeroOrMore>
629
634
  </element>
@@ -634,6 +639,9 @@
634
639
  <choice>
635
640
  <ref name="PureTextElement"/>
636
641
  <ref name="stem"/>
642
+ <ref name="eref"/>
643
+ <ref name="xref"/>
644
+ <ref name="hyperlink"/>
637
645
  </choice>
638
646
  </zeroOrMore>
639
647
  </element>
@@ -641,7 +649,12 @@
641
649
  <define name="tt">
642
650
  <element name="tt">
643
651
  <zeroOrMore>
644
- <ref name="PureTextElement"/>
652
+ <choice>
653
+ <ref name="PureTextElement"/>
654
+ <ref name="eref"/>
655
+ <ref name="xref"/>
656
+ <ref name="hyperlink"/>
657
+ </choice>
645
658
  </zeroOrMore>
646
659
  </element>
647
660
  </define>
@@ -822,7 +835,9 @@
822
835
  <attribute name="alt"/>
823
836
  </optional>
824
837
  <ref name="CitationType"/>
825
- <text/>
838
+ <oneOrMore>
839
+ <ref name="PureTextElement"/>
840
+ </oneOrMore>
826
841
  </define>
827
842
  <define name="hyperlink">
828
843
  <element name="link">
@@ -835,7 +850,9 @@
835
850
  <optional>
836
851
  <attribute name="alt"/>
837
852
  </optional>
838
- <text/>
853
+ <oneOrMore>
854
+ <ref name="PureTextElement"/>
855
+ </oneOrMore>
839
856
  </element>
840
857
  </define>
841
858
  <define name="xref">
@@ -849,7 +866,9 @@
849
866
  <optional>
850
867
  <attribute name="alt"/>
851
868
  </optional>
852
- <text/>
869
+ <oneOrMore>
870
+ <ref name="PureTextElement"/>
871
+ </oneOrMore>
853
872
  </element>
854
873
  </define>
855
874
  <define name="fn">
data/grammars/biblio.rng CHANGED
@@ -225,9 +225,9 @@
225
225
  <zeroOrMore>
226
226
  <ref name="forename"/>
227
227
  </zeroOrMore>
228
- <zeroOrMore>
229
- <ref name="initial"/>
230
- </zeroOrMore>
228
+ <optional>
229
+ <ref name="formatted-initials"/>
230
+ </optional>
231
231
  <ref name="surname"/>
232
232
  <zeroOrMore>
233
233
  <ref name="addition"/>
@@ -247,8 +247,8 @@
247
247
  <ref name="LocalizedString"/>
248
248
  </element>
249
249
  </define>
250
- <define name="initial">
251
- <element name="initial">
250
+ <define name="formatted-initials">
251
+ <element name="formatted-initials">
252
252
  <ref name="LocalizedString"/>
253
253
  </element>
254
254
  </define>
@@ -264,6 +264,9 @@
264
264
  </define>
265
265
  <define name="forename">
266
266
  <element name="forename">
267
+ <optional>
268
+ <attribute name="initial"/>
269
+ </optional>
267
270
  <ref name="LocalizedString"/>
268
271
  </element>
269
272
  </define>
@@ -527,7 +530,7 @@
527
530
  </define>
528
531
  <define name="LocalityType">
529
532
  <data type="string">
530
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
533
+ <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
531
534
  </data>
532
535
  </define>
533
536
  <define name="referenceFrom">
@@ -614,12 +617,103 @@
614
617
  <optional>
615
618
  <ref name="fetched"/>
616
619
  </optional>
617
- <choice>
618
- <oneOrMore>
619
- <ref name="btitle"/>
620
- </oneOrMore>
620
+ <optional>
621
621
  <ref name="formattedref"/>
622
- </choice>
622
+ </optional>
623
+ <oneOrMore>
624
+ <ref name="btitle"/>
625
+ </oneOrMore>
626
+ <zeroOrMore>
627
+ <ref name="bsource"/>
628
+ </zeroOrMore>
629
+ <oneOrMore>
630
+ <ref name="docidentifier"/>
631
+ </oneOrMore>
632
+ <optional>
633
+ <ref name="docnumber"/>
634
+ </optional>
635
+ <zeroOrMore>
636
+ <ref name="bdate"/>
637
+ </zeroOrMore>
638
+ <zeroOrMore>
639
+ <ref name="contributor"/>
640
+ </zeroOrMore>
641
+ <optional>
642
+ <ref name="edition"/>
643
+ </optional>
644
+ <zeroOrMore>
645
+ <ref name="version"/>
646
+ </zeroOrMore>
647
+ <zeroOrMore>
648
+ <ref name="biblionote"/>
649
+ </zeroOrMore>
650
+ <zeroOrMore>
651
+ <ref name="language"/>
652
+ </zeroOrMore>
653
+ <zeroOrMore>
654
+ <ref name="script"/>
655
+ </zeroOrMore>
656
+ <zeroOrMore>
657
+ <ref name="bibabstract"/>
658
+ </zeroOrMore>
659
+ <optional>
660
+ <ref name="status"/>
661
+ </optional>
662
+ <zeroOrMore>
663
+ <ref name="copyright"/>
664
+ </zeroOrMore>
665
+ <zeroOrMore>
666
+ <ref name="docrelation"/>
667
+ </zeroOrMore>
668
+ <zeroOrMore>
669
+ <ref name="series"/>
670
+ </zeroOrMore>
671
+ <optional>
672
+ <ref name="medium"/>
673
+ </optional>
674
+ <zeroOrMore>
675
+ <ref name="bplace"/>
676
+ </zeroOrMore>
677
+ <zeroOrMore>
678
+ <ref name="bprice"/>
679
+ </zeroOrMore>
680
+ <zeroOrMore>
681
+ <ref name="extent"/>
682
+ </zeroOrMore>
683
+ <optional>
684
+ <ref name="bibliographic_size"/>
685
+ </optional>
686
+ <zeroOrMore>
687
+ <ref name="accesslocation"/>
688
+ </zeroOrMore>
689
+ <zeroOrMore>
690
+ <ref name="license"/>
691
+ </zeroOrMore>
692
+ <zeroOrMore>
693
+ <ref name="bclassification"/>
694
+ </zeroOrMore>
695
+ <zeroOrMore>
696
+ <ref name="bkeyword"/>
697
+ </zeroOrMore>
698
+ <optional>
699
+ <ref name="validity"/>
700
+ </optional>
701
+ </define>
702
+ <define name="ReducedBibliographicItem">
703
+ <optional>
704
+ <attribute name="type">
705
+ <ref name="BibItemType"/>
706
+ </attribute>
707
+ </optional>
708
+ <optional>
709
+ <ref name="fetched"/>
710
+ </optional>
711
+ <optional>
712
+ <ref name="formattedref"/>
713
+ </optional>
714
+ <zeroOrMore>
715
+ <ref name="btitle"/>
716
+ </zeroOrMore>
623
717
  <zeroOrMore>
624
718
  <ref name="bsource"/>
625
719
  </zeroOrMore>
@@ -638,9 +732,9 @@
638
732
  <optional>
639
733
  <ref name="edition"/>
640
734
  </optional>
641
- <optional>
735
+ <zeroOrMore>
642
736
  <ref name="version"/>
643
- </optional>
737
+ </zeroOrMore>
644
738
  <zeroOrMore>
645
739
  <ref name="biblionote"/>
646
740
  </zeroOrMore>
@@ -677,6 +771,9 @@
677
771
  <zeroOrMore>
678
772
  <ref name="extent"/>
679
773
  </zeroOrMore>
774
+ <optional>
775
+ <ref name="bibliographic_size"/>
776
+ </optional>
680
777
  <zeroOrMore>
681
778
  <ref name="accesslocation"/>
682
779
  </zeroOrMore>
@@ -830,6 +927,12 @@
830
927
  <data type="boolean"/>
831
928
  </attribute>
832
929
  </optional>
930
+ <optional>
931
+ <attribute name="language"/>
932
+ </optional>
933
+ <optional>
934
+ <attribute name="script"/>
935
+ </optional>
833
936
  <text/>
834
937
  </element>
835
938
  </define>
@@ -848,17 +951,46 @@
848
951
  </define>
849
952
  <define name="bplace">
850
953
  <element name="place">
851
- <optional>
852
- <attribute name="uri">
853
- <data type="anyURI"/>
854
- </attribute>
855
- </optional>
856
- <optional>
857
- <attribute name="region"/>
858
- </optional>
954
+ <choice>
955
+ <text/>
956
+ <group>
957
+ <ref name="bibliocity"/>
958
+ <zeroOrMore>
959
+ <ref name="biblioregion"/>
960
+ </zeroOrMore>
961
+ <zeroOrMore>
962
+ <ref name="bibliocountry"/>
963
+ </zeroOrMore>
964
+ </group>
965
+ </choice>
966
+ </element>
967
+ </define>
968
+ <define name="bibliocity">
969
+ <element name="city">
859
970
  <text/>
860
971
  </element>
861
972
  </define>
973
+ <define name="biblioregion">
974
+ <element name="region">
975
+ <ref name="RegionType"/>
976
+ </element>
977
+ </define>
978
+ <define name="bibliocountry">
979
+ <element name="country">
980
+ <ref name="RegionType"/>
981
+ </element>
982
+ </define>
983
+ <define name="RegionType">
984
+ <optional>
985
+ <attribute name="iso"/>
986
+ </optional>
987
+ <optional>
988
+ <attribute name="recommended">
989
+ <data type="boolean"/>
990
+ </attribute>
991
+ </optional>
992
+ <text/>
993
+ </define>
862
994
  <define name="bprice">
863
995
  <element name="price">
864
996
  <attribute name="currency"/>
@@ -922,9 +1054,29 @@
922
1054
  <text/>
923
1055
  </element>
924
1056
  </define>
1057
+ <define name="sizevalue">
1058
+ <element name="value">
1059
+ <attribute name="type"/>
1060
+ <text/>
1061
+ </element>
1062
+ </define>
1063
+ <define name="bibliographic_size">
1064
+ <element name="size">
1065
+ <oneOrMore>
1066
+ <ref name="sizevalue"/>
1067
+ </oneOrMore>
1068
+ </element>
1069
+ </define>
925
1070
  <define name="extent">
926
1071
  <element name="extent">
927
- <ref name="BibItemLocality"/>
1072
+ <choice>
1073
+ <zeroOrMore>
1074
+ <ref name="locality"/>
1075
+ </zeroOrMore>
1076
+ <zeroOrMore>
1077
+ <ref name="localityStack"/>
1078
+ </zeroOrMore>
1079
+ </choice>
928
1080
  </element>
929
1081
  </define>
930
1082
  <define name="series">
@@ -934,36 +1086,34 @@
934
1086
  <ref name="SeriesType"/>
935
1087
  </attribute>
936
1088
  </optional>
937
- <choice>
1089
+ <optional>
938
1090
  <ref name="formattedref"/>
939
- <group>
940
- <ref name="btitle"/>
941
- <optional>
942
- <ref name="bplace"/>
943
- </optional>
944
- <optional>
945
- <ref name="seriesorganization"/>
946
- </optional>
947
- <optional>
948
- <ref name="abbreviation"/>
949
- </optional>
950
- <optional>
951
- <ref name="seriesfrom"/>
952
- </optional>
953
- <optional>
954
- <ref name="seriesto"/>
955
- </optional>
956
- <optional>
957
- <ref name="seriesnumber"/>
958
- </optional>
959
- <optional>
960
- <ref name="seriespartnumber"/>
961
- </optional>
962
- <optional>
963
- <ref name="seriesrun"/>
964
- </optional>
965
- </group>
966
- </choice>
1091
+ </optional>
1092
+ <ref name="btitle"/>
1093
+ <optional>
1094
+ <ref name="bplace"/>
1095
+ </optional>
1096
+ <optional>
1097
+ <ref name="seriesorganization"/>
1098
+ </optional>
1099
+ <optional>
1100
+ <ref name="abbreviation"/>
1101
+ </optional>
1102
+ <optional>
1103
+ <ref name="seriesfrom"/>
1104
+ </optional>
1105
+ <optional>
1106
+ <ref name="seriesto"/>
1107
+ </optional>
1108
+ <optional>
1109
+ <ref name="seriesnumber"/>
1110
+ </optional>
1111
+ <optional>
1112
+ <ref name="seriespartnumber"/>
1113
+ </optional>
1114
+ <optional>
1115
+ <ref name="seriesrun"/>
1116
+ </optional>
967
1117
  </element>
968
1118
  </define>
969
1119
  <define name="SeriesType">
@@ -1122,7 +1272,7 @@
1122
1272
  </element>
1123
1273
  </optional>
1124
1274
  <element name="bibitem">
1125
- <ref name="BibliographicItem"/>
1275
+ <ref name="ReducedBibliographicItem"/>
1126
1276
  </element>
1127
1277
  <choice>
1128
1278
  <zeroOrMore>
@@ -1147,9 +1297,9 @@
1147
1297
  <optional>
1148
1298
  <ref name="revision-date"/>
1149
1299
  </optional>
1150
- <zeroOrMore>
1300
+ <optional>
1151
1301
  <ref name="draft"/>
1152
- </zeroOrMore>
1302
+ </optional>
1153
1303
  </element>
1154
1304
  </define>
1155
1305
  <define name="vedition">
data/grammars/isodoc.rng CHANGED
@@ -32,6 +32,54 @@
32
32
  <ref name="DocumentType"/>
33
33
  </element>
34
34
  </define>
35
+ <define name="admonition">
36
+ <element name="admonition">
37
+ <attribute name="type">
38
+ <ref name="AdmonitionType"/>
39
+ </attribute>
40
+ <optional>
41
+ <attribute name="class"/>
42
+ </optional>
43
+ <attribute name="id">
44
+ <data type="ID"/>
45
+ </attribute>
46
+ <optional>
47
+ <attribute name="uri">
48
+ <data type="anyURI"/>
49
+ </attribute>
50
+ </optional>
51
+ <optional>
52
+ <attribute name="coverpage">
53
+ <data type="boolean"/>
54
+ </attribute>
55
+ </optional>
56
+ <optional>
57
+ <attribute name="notag">
58
+ <data type="boolean"/>
59
+ </attribute>
60
+ </optional>
61
+ <optional>
62
+ <ref name="tname"/>
63
+ </optional>
64
+ <zeroOrMore>
65
+ <ref name="paragraph-with-footnote"/>
66
+ </zeroOrMore>
67
+ <zeroOrMore>
68
+ <ref name="note"/>
69
+ </zeroOrMore>
70
+ </element>
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>
35
83
  <define name="index">
36
84
  <element name="index">
37
85
  <optional>
@@ -79,6 +127,11 @@
79
127
  <data type="boolean"/>
80
128
  </attribute>
81
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
82
135
  <ref name="BibliographicItem"/>
83
136
  </element>
84
137
  </define>
@@ -152,9 +205,7 @@
152
205
  <data type="boolean"/>
153
206
  </attribute>
154
207
  </optional>
155
- <oneOrMore>
156
- <ref name="PureTextElement"/>
157
- </oneOrMore>
208
+ <ref name="XrefBody"/>
158
209
  </element>
159
210
  </define>
160
211
  <define name="erefType">
@@ -188,6 +239,42 @@
188
239
  <ref name="PureTextElement"/>
189
240
  </oneOrMore>
190
241
  </define>
242
+ <define name="localityStack">
243
+ <element name="localityStack">
244
+ <optional>
245
+ <attribute name="connective">
246
+ <choice>
247
+ <value>and</value>
248
+ <value>or</value>
249
+ <value>from</value>
250
+ <value>to</value>
251
+ <value/>
252
+ </choice>
253
+ </attribute>
254
+ </optional>
255
+ <zeroOrMore>
256
+ <ref name="locality"/>
257
+ </zeroOrMore>
258
+ </element>
259
+ </define>
260
+ <define name="sourceLocalityStack">
261
+ <element name="sourceLocalityStack">
262
+ <optional>
263
+ <attribute name="connective">
264
+ <choice>
265
+ <value>and</value>
266
+ <value>or</value>
267
+ <value>from</value>
268
+ <value>to</value>
269
+ <value/>
270
+ </choice>
271
+ </attribute>
272
+ </optional>
273
+ <zeroOrMore>
274
+ <ref name="sourceLocality"/>
275
+ </zeroOrMore>
276
+ </element>
277
+ </define>
191
278
  <define name="ul">
192
279
  <element name="ul">
193
280
  <attribute name="id">
@@ -211,6 +298,9 @@
211
298
  <ref name="MultilingualRenderingType"/>
212
299
  </attribute>
213
300
  </optional>
301
+ <optional>
302
+ <ref name="tname"/>
303
+ </optional>
214
304
  <oneOrMore>
215
305
  <ref name="ul_li"/>
216
306
  </oneOrMore>
@@ -253,6 +343,9 @@
253
343
  </choice>
254
344
  </attribute>
255
345
  </optional>
346
+ <optional>
347
+ <ref name="tname"/>
348
+ </optional>
256
349
  <oneOrMore>
257
350
  <ref name="li"/>
258
351
  </oneOrMore>
@@ -289,6 +382,9 @@
289
382
  <ref name="MultilingualRenderingType"/>
290
383
  </attribute>
291
384
  </optional>
385
+ <optional>
386
+ <ref name="tname"/>
387
+ </optional>
292
388
  <oneOrMore>
293
389
  <ref name="dt"/>
294
390
  <ref name="dd"/>
@@ -623,6 +719,9 @@
623
719
  <optional>
624
720
  <attribute name="tag"/>
625
721
  </optional>
722
+ <optional>
723
+ <attribute name="type"/>
724
+ </optional>
626
725
  <optional>
627
726
  <attribute name="multilingual-rendering">
628
727
  <ref name="MultilingualRenderingType"/>
@@ -658,6 +757,9 @@
658
757
  <optional>
659
758
  <attribute name="tag"/>
660
759
  </optional>
760
+ <optional>
761
+ <attribute name="type"/>
762
+ </optional>
661
763
  <optional>
662
764
  <attribute name="multilingual-rendering">
663
765
  <ref name="MultilingualRenderingType"/>
@@ -817,6 +919,16 @@
817
919
  <ref name="MultilingualRenderingType"/>
818
920
  </attribute>
819
921
  </optional>
922
+ <optional>
923
+ <attribute name="coverpage">
924
+ <data type="boolean"/>
925
+ </attribute>
926
+ </optional>
927
+ <optional>
928
+ <attribute name="notag">
929
+ <data type="boolean"/>
930
+ </attribute>
931
+ </optional>
820
932
  <oneOrMore>
821
933
  <choice>
822
934
  <ref name="paragraph"/>
@@ -1098,6 +1210,16 @@
1098
1210
  </define>
1099
1211
  </include>
1100
1212
  <!-- end overrides -->
1213
+ <define name="image" combine="choice">
1214
+ <element name="svg">
1215
+ <oneOrMore>
1216
+ <choice>
1217
+ <text/>
1218
+ <ref name="AnyElement"/>
1219
+ </choice>
1220
+ </oneOrMore>
1221
+ </element>
1222
+ </define>
1101
1223
  <define name="MultilingualRenderingType">
1102
1224
  <choice>
1103
1225
  <value>common</value>
@@ -1134,6 +1256,7 @@
1134
1256
  <ref name="concept"/>
1135
1257
  <ref name="add"/>
1136
1258
  <ref name="del"/>
1259
+ <ref name="span"/>
1137
1260
  </choice>
1138
1261
  </define>
1139
1262
  <define name="add">
@@ -1160,6 +1283,19 @@
1160
1283
  </choice>
1161
1284
  </element>
1162
1285
  </define>
1286
+ <define name="span">
1287
+ <element name="span">
1288
+ <optional>
1289
+ <attribute name="class"/>
1290
+ </optional>
1291
+ <optional>
1292
+ <attribute name="style"/>
1293
+ </optional>
1294
+ <oneOrMore>
1295
+ <ref name="TextElement"/>
1296
+ </oneOrMore>
1297
+ </element>
1298
+ </define>
1163
1299
  <define name="concept">
1164
1300
  <element name="concept">
1165
1301
  <optional>
@@ -1950,6 +2086,7 @@
1950
2086
  <value>compare</value>
1951
2087
  <value>contrast</value>
1952
2088
  <value>see</value>
2089
+ <value>seealso</value>
1953
2090
  </choice>
1954
2091
  </define>
1955
2092
  <define name="deprecates">
@@ -2372,6 +2509,16 @@
2372
2509
  <text/>
2373
2510
  </element>
2374
2511
  </optional>
2512
+ <optional>
2513
+ <element name="amendment">
2514
+ <text/>
2515
+ </element>
2516
+ </optional>
2517
+ <optional>
2518
+ <element name="corrigendum">
2519
+ <text/>
2520
+ </element>
2521
+ </optional>
2375
2522
  <optional>
2376
2523
  <element name="language">
2377
2524
  <text/>
@@ -2631,4 +2778,30 @@
2631
2778
  </zeroOrMore>
2632
2779
  </element>
2633
2780
  </define>
2781
+ <define name="XrefBody">
2782
+ <zeroOrMore>
2783
+ <ref name="XrefTarget"/>
2784
+ </zeroOrMore>
2785
+ <oneOrMore>
2786
+ <ref name="PureTextElement"/>
2787
+ </oneOrMore>
2788
+ </define>
2789
+ <define name="XrefTarget">
2790
+ <element name="location">
2791
+ <attribute name="target">
2792
+ <data type="string">
2793
+ <param name="pattern">\i\c*|\c+#\c+</param>
2794
+ </data>
2795
+ </attribute>
2796
+ <attribute name="connective">
2797
+ <choice>
2798
+ <value>and</value>
2799
+ <value>or</value>
2800
+ <value>from</value>
2801
+ <value>to</value>
2802
+ <value/>
2803
+ </choice>
2804
+ </attribute>
2805
+ </element>
2806
+ </define>
2634
2807
  </grammar>
data/grammars/itu.rng CHANGED
@@ -19,6 +19,9 @@
19
19
  <value>steps</value>
20
20
  </attribute>
21
21
  </optional>
22
+ <optional>
23
+ <ref name="tname"/>
24
+ </optional>
22
25
  <oneOrMore>
23
26
  <ref name="li"/>
24
27
  </oneOrMore>
data/grammars/reqt.rng CHANGED
@@ -58,6 +58,14 @@
58
58
  <optional>
59
59
  <attribute name="type"/>
60
60
  </optional>
61
+ <optional>
62
+ <attribute name="tag"/>
63
+ </optional>
64
+ <optional>
65
+ <attribute name="multilingual-rendering">
66
+ <ref name="MultilingualRenderingType"/>
67
+ </attribute>
68
+ </optional>
61
69
  <optional>
62
70
  <ref name="reqtitle"/>
63
71
  </optional>
@@ -101,7 +109,9 @@
101
109
  </define>
102
110
  <define name="label">
103
111
  <element name="label">
104
- <text/>
112
+ <oneOrMore>
113
+ <ref name="TextElement"/>
114
+ </oneOrMore>
105
115
  </element>
106
116
  </define>
107
117
  <define name="subject">
@@ -175,6 +185,14 @@
175
185
  <data type="boolean"/>
176
186
  </attribute>
177
187
  </optional>
188
+ <optional>
189
+ <attribute name="tag"/>
190
+ </optional>
191
+ <optional>
192
+ <attribute name="multilingual-rendering">
193
+ <ref name="MultilingualRenderingType"/>
194
+ </attribute>
195
+ </optional>
178
196
  <oneOrMore>
179
197
  <ref name="BasicBlock"/>
180
198
  </oneOrMore>
data/lib/relaton_itu/itu_bibliographic_item.rb CHANGED
@@ -19,7 +19,7 @@ module RelatonItu
19
19
  # @return [RelatonItu::ItuBibliographicItem]
20
20
  def self.from_hash(hash)
21
21
  item_hash = ::RelatonItu::HashConverter.hash_to_bib(hash)
22
- new **item_hash
22
+ new(**item_hash)
23
23
  end
24
24
  end
25
25
  end
data/lib/relaton_itu/scrapper.rb CHANGED
@@ -187,7 +187,8 @@ module RelatonItu
187
187
  ref = r.at('./td/span[contains(@id, "title_e")]/nobr/a')
188
188
  fref = RelatonBib::FormattedRef.new(content: ref.text, language: "en",
189
189
  script: "Latn")
190
- bibitem = ItuBibliographicItem.new(formattedref: fref,
190
+ did = RelatonBib::DocumentIdentifier.new(id: ref.text, type: "ITU")
191
+ bibitem = ItuBibliographicItem.new(formattedref: fref, docid: [did],
191
192
  type: "standard")
192
193
  { type: "complements", bibitem: bibitem }
193
194
  end
data/lib/relaton_itu/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RelatonItu
2
- VERSION = "1.10.2".freeze
2
+ VERSION = "1.13.0".freeze
3
3
  end
data/relaton-itu.gemspec CHANGED
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
36
36
  spec.add_development_dependency "webmock"
37
37
 
38
38
  spec.add_dependency "mechanize", "~> 2.8.0"
39
- spec.add_dependency "relaton-bib", "~> 1.10.1"
39
+ spec.add_dependency "relaton-bib", "~> 1.13.0"
40
40
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-itu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.2
4
+ version: 1.13.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: 2022-03-29 00:00:00.000000000 Z
11
+ date: 2022-08-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -142,14 +142,14 @@ dependencies:
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.10.1
145
+ version: 1.13.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.10.1
152
+ version: 1.13.0
153
153
  description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
154
154
  model'
155
155
  email: