relaton-ecma 1.10.0 → 1.12.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ca778af82623cb27d57531139ebeb9f13b0b6e61ea497101b467c46da1046a80
4
- data.tar.gz: 5092e42f8e6cb1722a414c7c0e71773df689b469f360ed5834c1ead2555cae9d
3
+ metadata.gz: 371657d6011650a581f1ac6ddbcfad2ba68b059f94b077a328cbaa292c0d9835
4
+ data.tar.gz: c1387ef9600e7e9affcb404c5e3deeaf6b2373bac7d73618f30fdd33dd8985af
5
5
  SHA512:
6
- metadata.gz: 65bbeb5771590e091e81f89701675de17703c6ef28bfa5e843104f87a1489173abb4788673016442acf883c512cafcce08c03fbc9ff0dcc3b74db44a9eeefdcb
7
- data.tar.gz: e82f7b9b07e3bf815e74d72abcead5161e03c47344e7a6e03f1854c85e71a60b9f961a9d1233f4c9a5c8818f4876a7a131c16f0215bc542ebbdb980a3be107de
6
+ metadata.gz: e7b5f65fd1bb32eb9097d7ec159cd46fa232fc5bcc951d6ce49e3c2561bd0a5659a05a0885071c88b373f52405fb05b97b2a8e03fe48bcbb9cc720631783f259
7
+ data.tar.gz: 42969483766860ca4d03a106a60373d380b89bb827827a95757157299bebfadcde79821e426535f1d178344bdcf74bd0c3cec1eae39ccccc1f2a50008a38444a
@@ -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/biblio.rng CHANGED
@@ -209,9 +209,6 @@
209
209
  <zeroOrMore>
210
210
  <ref name="contact"/>
211
211
  </zeroOrMore>
212
- <zeroOrMore>
213
- <ref name="uri"/>
214
- </zeroOrMore>
215
212
  </element>
216
213
  </define>
217
214
  <define name="fullname">
@@ -530,7 +527,7 @@
530
527
  </define>
531
528
  <define name="LocalityType">
532
529
  <data type="string">
533
- <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>
530
+ <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>
534
531
  </data>
535
532
  </define>
536
533
  <define name="referenceFrom">
@@ -617,12 +614,103 @@
617
614
  <optional>
618
615
  <ref name="fetched"/>
619
616
  </optional>
620
- <choice>
621
- <oneOrMore>
622
- <ref name="btitle"/>
623
- </oneOrMore>
617
+ <optional>
624
618
  <ref name="formattedref"/>
625
- </choice>
619
+ </optional>
620
+ <oneOrMore>
621
+ <ref name="btitle"/>
622
+ </oneOrMore>
623
+ <zeroOrMore>
624
+ <ref name="bsource"/>
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>
626
714
  <zeroOrMore>
627
715
  <ref name="bsource"/>
628
716
  </zeroOrMore>
@@ -641,9 +729,9 @@
641
729
  <optional>
642
730
  <ref name="edition"/>
643
731
  </optional>
644
- <optional>
732
+ <zeroOrMore>
645
733
  <ref name="version"/>
646
- </optional>
734
+ </zeroOrMore>
647
735
  <zeroOrMore>
648
736
  <ref name="biblionote"/>
649
737
  </zeroOrMore>
@@ -680,6 +768,9 @@
680
768
  <zeroOrMore>
681
769
  <ref name="extent"/>
682
770
  </zeroOrMore>
771
+ <optional>
772
+ <ref name="bibliographic_size"/>
773
+ </optional>
683
774
  <zeroOrMore>
684
775
  <ref name="accesslocation"/>
685
776
  </zeroOrMore>
@@ -828,6 +919,17 @@
828
919
  <optional>
829
920
  <attribute name="scope"/>
830
921
  </optional>
922
+ <optional>
923
+ <attribute name="primary">
924
+ <data type="boolean"/>
925
+ </attribute>
926
+ </optional>
927
+ <optional>
928
+ <attribute name="language"/>
929
+ </optional>
930
+ <optional>
931
+ <attribute name="script"/>
932
+ </optional>
831
933
  <text/>
832
934
  </element>
833
935
  </define>
@@ -846,17 +948,46 @@
846
948
  </define>
847
949
  <define name="bplace">
848
950
  <element name="place">
849
- <optional>
850
- <attribute name="uri">
851
- <data type="anyURI"/>
852
- </attribute>
853
- </optional>
854
- <optional>
855
- <attribute name="region"/>
856
- </optional>
951
+ <choice>
952
+ <text/>
953
+ <group>
954
+ <ref name="bibliocity"/>
955
+ <zeroOrMore>
956
+ <ref name="biblioregion"/>
957
+ </zeroOrMore>
958
+ <zeroOrMore>
959
+ <ref name="bibliocountry"/>
960
+ </zeroOrMore>
961
+ </group>
962
+ </choice>
963
+ </element>
964
+ </define>
965
+ <define name="bibliocity">
966
+ <element name="city">
857
967
  <text/>
858
968
  </element>
859
969
  </define>
970
+ <define name="biblioregion">
971
+ <element name="region">
972
+ <ref name="RegionType"/>
973
+ </element>
974
+ </define>
975
+ <define name="bibliocountry">
976
+ <element name="country">
977
+ <ref name="RegionType"/>
978
+ </element>
979
+ </define>
980
+ <define name="RegionType">
981
+ <optional>
982
+ <attribute name="iso"/>
983
+ </optional>
984
+ <optional>
985
+ <attribute name="recommended">
986
+ <data type="boolean"/>
987
+ </attribute>
988
+ </optional>
989
+ <text/>
990
+ </define>
860
991
  <define name="bprice">
861
992
  <element name="price">
862
993
  <attribute name="currency"/>
@@ -920,9 +1051,29 @@
920
1051
  <text/>
921
1052
  </element>
922
1053
  </define>
1054
+ <define name="sizevalue">
1055
+ <element name="value">
1056
+ <attribute name="type"/>
1057
+ <text/>
1058
+ </element>
1059
+ </define>
1060
+ <define name="bibliographic_size">
1061
+ <element name="size">
1062
+ <oneOrMore>
1063
+ <ref name="sizevalue"/>
1064
+ </oneOrMore>
1065
+ </element>
1066
+ </define>
923
1067
  <define name="extent">
924
1068
  <element name="extent">
925
- <ref name="BibItemLocality"/>
1069
+ <choice>
1070
+ <zeroOrMore>
1071
+ <ref name="locality"/>
1072
+ </zeroOrMore>
1073
+ <zeroOrMore>
1074
+ <ref name="localityStack"/>
1075
+ </zeroOrMore>
1076
+ </choice>
926
1077
  </element>
927
1078
  </define>
928
1079
  <define name="series">
@@ -932,36 +1083,34 @@
932
1083
  <ref name="SeriesType"/>
933
1084
  </attribute>
934
1085
  </optional>
935
- <choice>
1086
+ <optional>
936
1087
  <ref name="formattedref"/>
937
- <group>
938
- <ref name="btitle"/>
939
- <optional>
940
- <ref name="bplace"/>
941
- </optional>
942
- <optional>
943
- <ref name="seriesorganization"/>
944
- </optional>
945
- <optional>
946
- <ref name="abbreviation"/>
947
- </optional>
948
- <optional>
949
- <ref name="seriesfrom"/>
950
- </optional>
951
- <optional>
952
- <ref name="seriesto"/>
953
- </optional>
954
- <optional>
955
- <ref name="seriesnumber"/>
956
- </optional>
957
- <optional>
958
- <ref name="seriespartnumber"/>
959
- </optional>
960
- <optional>
961
- <ref name="seriesrun"/>
962
- </optional>
963
- </group>
964
- </choice>
1088
+ </optional>
1089
+ <ref name="btitle"/>
1090
+ <optional>
1091
+ <ref name="bplace"/>
1092
+ </optional>
1093
+ <optional>
1094
+ <ref name="seriesorganization"/>
1095
+ </optional>
1096
+ <optional>
1097
+ <ref name="abbreviation"/>
1098
+ </optional>
1099
+ <optional>
1100
+ <ref name="seriesfrom"/>
1101
+ </optional>
1102
+ <optional>
1103
+ <ref name="seriesto"/>
1104
+ </optional>
1105
+ <optional>
1106
+ <ref name="seriesnumber"/>
1107
+ </optional>
1108
+ <optional>
1109
+ <ref name="seriespartnumber"/>
1110
+ </optional>
1111
+ <optional>
1112
+ <ref name="seriesrun"/>
1113
+ </optional>
965
1114
  </element>
966
1115
  </define>
967
1116
  <define name="SeriesType">
@@ -1120,7 +1269,7 @@
1120
1269
  </element>
1121
1270
  </optional>
1122
1271
  <element name="bibitem">
1123
- <ref name="BibliographicItem"/>
1272
+ <ref name="ReducedBibliographicItem"/>
1124
1273
  </element>
1125
1274
  <choice>
1126
1275
  <zeroOrMore>
@@ -1145,9 +1294,9 @@
1145
1294
  <optional>
1146
1295
  <ref name="revision-date"/>
1147
1296
  </optional>
1148
- <zeroOrMore>
1297
+ <optional>
1149
1298
  <ref name="draft"/>
1150
- </zeroOrMore>
1299
+ </optional>
1151
1300
  </element>
1152
1301
  </define>
1153
1302
  <define name="vedition">
data/grammars/isodoc.rng CHANGED
@@ -32,6 +32,43 @@
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>
35
72
  <define name="index">
36
73
  <element name="index">
37
74
  <optional>
@@ -79,6 +116,11 @@
79
116
  <data type="boolean"/>
80
117
  </attribute>
81
118
  </optional>
119
+ <optional>
120
+ <attribute name="suppress_identifier">
121
+ <data type="boolean"/>
122
+ </attribute>
123
+ </optional>
82
124
  <ref name="BibliographicItem"/>
83
125
  </element>
84
126
  </define>
@@ -152,9 +194,7 @@
152
194
  <data type="boolean"/>
153
195
  </attribute>
154
196
  </optional>
155
- <oneOrMore>
156
- <ref name="PureTextElement"/>
157
- </oneOrMore>
197
+ <ref name="XrefBody"/>
158
198
  </element>
159
199
  </define>
160
200
  <define name="erefType">
@@ -188,6 +228,42 @@
188
228
  <ref name="PureTextElement"/>
189
229
  </oneOrMore>
190
230
  </define>
231
+ <define name="localityStack">
232
+ <element name="localityStack">
233
+ <optional>
234
+ <attribute name="connective">
235
+ <choice>
236
+ <value>and</value>
237
+ <value>or</value>
238
+ <value>from</value>
239
+ <value>to</value>
240
+ <value/>
241
+ </choice>
242
+ </attribute>
243
+ </optional>
244
+ <zeroOrMore>
245
+ <ref name="locality"/>
246
+ </zeroOrMore>
247
+ </element>
248
+ </define>
249
+ <define name="sourceLocalityStack">
250
+ <element name="sourceLocalityStack">
251
+ <optional>
252
+ <attribute name="connective">
253
+ <choice>
254
+ <value>and</value>
255
+ <value>or</value>
256
+ <value>from</value>
257
+ <value>to</value>
258
+ <value/>
259
+ </choice>
260
+ </attribute>
261
+ </optional>
262
+ <zeroOrMore>
263
+ <ref name="sourceLocality"/>
264
+ </zeroOrMore>
265
+ </element>
266
+ </define>
191
267
  <define name="ul">
192
268
  <element name="ul">
193
269
  <attribute name="id">
@@ -211,6 +287,9 @@
211
287
  <ref name="MultilingualRenderingType"/>
212
288
  </attribute>
213
289
  </optional>
290
+ <optional>
291
+ <ref name="tname"/>
292
+ </optional>
214
293
  <oneOrMore>
215
294
  <ref name="ul_li"/>
216
295
  </oneOrMore>
@@ -253,6 +332,9 @@
253
332
  </choice>
254
333
  </attribute>
255
334
  </optional>
335
+ <optional>
336
+ <ref name="tname"/>
337
+ </optional>
256
338
  <oneOrMore>
257
339
  <ref name="li"/>
258
340
  </oneOrMore>
@@ -289,6 +371,9 @@
289
371
  <ref name="MultilingualRenderingType"/>
290
372
  </attribute>
291
373
  </optional>
374
+ <optional>
375
+ <ref name="tname"/>
376
+ </optional>
292
377
  <oneOrMore>
293
378
  <ref name="dt"/>
294
379
  <ref name="dd"/>
@@ -623,6 +708,9 @@
623
708
  <optional>
624
709
  <attribute name="tag"/>
625
710
  </optional>
711
+ <optional>
712
+ <attribute name="type"/>
713
+ </optional>
626
714
  <optional>
627
715
  <attribute name="multilingual-rendering">
628
716
  <ref name="MultilingualRenderingType"/>
@@ -658,6 +746,9 @@
658
746
  <optional>
659
747
  <attribute name="tag"/>
660
748
  </optional>
749
+ <optional>
750
+ <attribute name="type"/>
751
+ </optional>
661
752
  <optional>
662
753
  <attribute name="multilingual-rendering">
663
754
  <ref name="MultilingualRenderingType"/>
@@ -817,6 +908,16 @@
817
908
  <ref name="MultilingualRenderingType"/>
818
909
  </attribute>
819
910
  </optional>
911
+ <optional>
912
+ <attribute name="coverpage">
913
+ <data type="boolean"/>
914
+ </attribute>
915
+ </optional>
916
+ <optional>
917
+ <attribute name="notag">
918
+ <data type="boolean"/>
919
+ </attribute>
920
+ </optional>
820
921
  <oneOrMore>
821
922
  <choice>
822
923
  <ref name="paragraph"/>
@@ -1098,6 +1199,16 @@
1098
1199
  </define>
1099
1200
  </include>
1100
1201
  <!-- end overrides -->
1202
+ <define name="image" combine="choice">
1203
+ <element name="svg">
1204
+ <oneOrMore>
1205
+ <choice>
1206
+ <text/>
1207
+ <ref name="AnyElement"/>
1208
+ </choice>
1209
+ </oneOrMore>
1210
+ </element>
1211
+ </define>
1101
1212
  <define name="MultilingualRenderingType">
1102
1213
  <choice>
1103
1214
  <value>common</value>
@@ -1134,6 +1245,7 @@
1134
1245
  <ref name="concept"/>
1135
1246
  <ref name="add"/>
1136
1247
  <ref name="del"/>
1248
+ <ref name="span"/>
1137
1249
  </choice>
1138
1250
  </define>
1139
1251
  <define name="add">
@@ -1160,6 +1272,14 @@
1160
1272
  </choice>
1161
1273
  </element>
1162
1274
  </define>
1275
+ <define name="span">
1276
+ <element name="span">
1277
+ <attribute name="class"/>
1278
+ <oneOrMore>
1279
+ <ref name="TextElement"/>
1280
+ </oneOrMore>
1281
+ </element>
1282
+ </define>
1163
1283
  <define name="concept">
1164
1284
  <element name="concept">
1165
1285
  <optional>
@@ -1950,6 +2070,7 @@
1950
2070
  <value>compare</value>
1951
2071
  <value>contrast</value>
1952
2072
  <value>see</value>
2073
+ <value>seealso</value>
1953
2074
  </choice>
1954
2075
  </define>
1955
2076
  <define name="deprecates">
@@ -2631,4 +2752,30 @@
2631
2752
  </zeroOrMore>
2632
2753
  </element>
2633
2754
  </define>
2755
+ <define name="XrefBody">
2756
+ <zeroOrMore>
2757
+ <ref name="XrefTarget"/>
2758
+ </zeroOrMore>
2759
+ <oneOrMore>
2760
+ <ref name="PureTextElement"/>
2761
+ </oneOrMore>
2762
+ </define>
2763
+ <define name="XrefTarget">
2764
+ <element name="location">
2765
+ <attribute name="target">
2766
+ <data type="string">
2767
+ <param name="pattern">\i\c*|\c+#\c+</param>
2768
+ </data>
2769
+ </attribute>
2770
+ <attribute name="connective">
2771
+ <choice>
2772
+ <value>and</value>
2773
+ <value>or</value>
2774
+ <value>from</value>
2775
+ <value>to</value>
2776
+ <value/>
2777
+ </choice>
2778
+ </attribute>
2779
+ </element>
2780
+ </define>
2634
2781
  </grammar>
@@ -21,7 +21,7 @@ module RelatonEcma
21
21
  warn "[relaton-ecma] (\"#{code}\") found #{result.docidentifier.first.id}"
22
22
  else
23
23
  warn "[relaton-ecma] WARNING no match found online for #{code}. "\
24
- "The code must be exactly like it is on the standards website."
24
+ "The code must be exactly like it is on the standards website."
25
25
  end
26
26
  result
27
27
  end
@@ -1,3 +1,3 @@
1
1
  module RelatonEcma
2
- VERSION = "1.10.0".freeze
2
+ VERSION = "1.12.0".freeze
3
3
  end
data/relaton_ecma.gemspec CHANGED
@@ -37,5 +37,5 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
37
37
  spec.add_development_dependency "vcr"
38
38
  spec.add_development_dependency "webmock"
39
39
 
40
- spec.add_dependency "relaton-bib", "~> 1.10.0"
40
+ spec.add_dependency "relaton-bib", "~> 1.12.0"
41
41
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-ecma
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.0
4
+ version: 1.12.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-01-30 00:00:00.000000000 Z
11
+ date: 2022-06-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: equivalent-xml
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.10.0
117
+ version: 1.12.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.10.0
124
+ version: 1.12.0
125
125
  description: "RelatonEcma: retrieve ECMA Standards for bibliographic use \nusing the
126
126
  BibliographicItem model.\n"
127
127
  email: