relaton-un 1.13.0 → 1.14.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: 0b37f016e6944eaa2e983119d76cc4b62109d8f4df890ca8c833001ab5fd4997
4
- data.tar.gz: f90ac6b1fc8424ba5691b6fbf80ff277bcfa29137efe42429744a0e570f1d398
3
+ metadata.gz: 31151aa246ce23bc8c206f01e01e95a6de1663d2ebfa4c3b1dc44ac47f831cb1
4
+ data.tar.gz: fbe48be2bc80864088ee02602fba8ef119f0981fe0caf07f8a69e435ad1170fe
5
5
  SHA512:
6
- metadata.gz: 25c6b8bc6ed1b4cd4eca39fa8b0a9f7459cb112266fe918c5274e9f798c8b407378cf824aa8fa4381442a774ad622e9a66949b92ae1f13fd597456d4c7f4023e
7
- data.tar.gz: 036f4d0581f42869752aed2431b2211f55e42c6bf6aeb77d60f31cf7d71a32c371786720b478fcbd5b55cdf1f77283baa1f38c9fd0372509cb827972b701a0a1
6
+ metadata.gz: 2335b0f9afb8fd506ce5b107a4bcdbe484e320df9aa32a2d10a90da3d9af656e94bc39fe1eccae2be76dd6647d2e4092b6e510d8f2bba6f1551a5dc9fef640c4
7
+ data.tar.gz: 59ecf1ca8f3f3b1e7b498b543406f2faf26e6cade82e031e12b05462d606fefa6dda0f2532d777f5fc333da8ee5f13e96b7db623741b07f87cd9591d004d24ed
@@ -5,7 +5,6 @@ name: rake
5
5
  on:
6
6
  push:
7
7
  branches: [ master, main ]
8
- tags: [ v* ]
9
8
  pull_request:
10
9
 
11
10
  jobs:
@@ -0,0 +1,22 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ name: release
4
+
5
+ on:
6
+ workflow_dispatch:
7
+ inputs:
8
+ next_version:
9
+ description: |
10
+ Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
11
+ required: true
12
+ default: 'skip'
13
+ push:
14
+ tags: [ v* ]
15
+
16
+ jobs:
17
+ release:
18
+ uses: relaton/support/.github/workflows/release.yml@master
19
+ with:
20
+ next_version: ${{ github.event.inputs.next_version }}
21
+ secrets:
22
+ rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}
data/README.adoc CHANGED
@@ -43,38 +43,24 @@ item = hits[0].fetch
43
43
  [source,ruby]
44
44
  ----
45
45
  item.to_xml
46
- => "<bibitem id="TRADE/CEFACT/2004/32" type="standard">
47
- <title type="main" format="text/plain" language="en" script="Latn">SECRETARIAT REVIEW OF UN/LOCODE, 19 DECEMBER 2003 / SUBMITTED BY THE SECRETARIAT</title>
48
- <uri type="pdf">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/pdf/G0430683.pdf?OpenElement</uri>
49
- <uri type="word">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/doc/G0430683.DOC?OpenElement</uri>
50
- <docidentifier type="UN">TRADE/CEFACT/2004/32</docidentifier>
51
- <docnumber>TRADE/CEFACT/2004/32</docnumber>
46
+ => "<bibitem id="TRADE-CEFACT-2004-32" type="standard" schema-version="v1.2.1">
47
+ <fetched>2022-12-05</fetched>
52
48
  ...
53
49
  </bibitem>"
54
50
  ----
55
- With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
51
+ With argument `bibdata: true` it outputs XML wrapped by `bibdata` element and adds flavor `ext` element.
56
52
  [source,ruby]
57
53
  ----
58
54
  item.to_xml bibdata: true
59
- => "<bibdata type="standard">
60
- <fetched>2020-03-13</fetched>
61
- <title type="main" format="text/plain" language="en" script="Latn">SECRETARIAT REVIEW OF UN/LOCODE, 19 DECEMBER 2003 / SUBMITTED BY THE SECRETARIAT</title>
62
- <uri type="pdf">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/pdf/G0430683.pdf?OpenElement</uri>
63
- <uri type="word">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/doc/G0430683.DOC?OpenElement</uri>
64
- <docidentifier type="UN">TRADE/CEFACT/2004/32</docidentifier>
65
- <docnumber>TRADE/CEFACT/2004/32</docnumber>
55
+ => "<bibdata type="standard" schema-version="v1.2.1">
56
+ <fetched>2022-12-05</fetched>
66
57
  ...
67
- <ext>
58
+ <ext schema-version="v1.0.0">
68
59
  <editorialgroup>
69
60
  <committee>Committee on Trade</committee>
70
61
  <committee>Centre for Trade Facilitation and Electronic Business</committee>
71
62
  </editorialgroup>
72
- <distribution>general</distribution>
73
- <session>
74
- <number>10</number>
75
- <agenda-id>12</agenda-id>
76
- </session>
77
- <job_number>G0430683</job_number>
63
+ ...
78
64
  </ext>
79
65
  </bibdata>"
80
66
  ----
@@ -120,7 +106,7 @@ bib_hash = RelatonUn::HashConverter.hash_to_bib hash
120
106
  => {:id=>"TRADE/CEFACT/2004/32",
121
107
  ...
122
108
 
123
- RelatonUn::UnBibliographicItem.new bib_hash
109
+ RelatonUn::UnBibliographicItem.new **bib_hash
124
110
  => #<RelatonUn::UnBibliographicItem:0x007fdc5e061908
125
111
  ...
126
112
  ----
@@ -1,10 +1,5 @@
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>
7
- </include>
8
3
  <define name="document">
9
4
  <element name="document">
10
5
  <optional>
@@ -688,6 +683,9 @@
688
683
  </define>
689
684
  <define name="underline">
690
685
  <element name="underline">
686
+ <optional>
687
+ <attribute name="style"/>
688
+ </optional>
691
689
  <zeroOrMore>
692
690
  <ref name="PureTextElement"/>
693
691
  </zeroOrMore>
@@ -1125,26 +1123,4 @@
1125
1123
  </zeroOrMore>
1126
1124
  </element>
1127
1125
  </define>
1128
- <define name="ext">
1129
- <element name="ext">
1130
- <ref name="BibDataExtensionType"/>
1131
- </element>
1132
- </define>
1133
- <define name="BibDataExtensionType">
1134
- <ref name="doctype"/>
1135
- </define>
1136
- <define name="doctype">
1137
- <element name="doctype">
1138
- <ref name="DocumentType"/>
1139
- </element>
1140
- </define>
1141
- <define name="DocumentType">
1142
- <value>document</value>
1143
- </define>
1144
- <define name="BibData">
1145
- <ref name="BibliographicItem"/>
1146
- <optional>
1147
- <ref name="ext"/>
1148
- </optional>
1149
- </define>
1150
1126
  </grammar>
@@ -0,0 +1,164 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <!--
4
+ Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
5
+ of relaton
6
+
7
+ Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
8
+ (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
9
+ -->
10
+ <include href="biblio.rng">
11
+ <define name="BibData">
12
+ <ref name="BibliographicItem"/>
13
+ <optional>
14
+ <ref name="ext"/>
15
+ </optional>
16
+ </define>
17
+ </include>
18
+ <define name="ext">
19
+ <element name="ext">
20
+ <ref name="BibDataExtensionType"/>
21
+ </element>
22
+ </define>
23
+ <define name="BibDataExtensionType">
24
+ <optional>
25
+ <attribute name="schema-version"/>
26
+ </optional>
27
+ <ref name="doctype"/>
28
+ <optional>
29
+ <ref name="docsubtype"/>
30
+ </optional>
31
+ <optional>
32
+ <ref name="editorialgroup"/>
33
+ </optional>
34
+ <zeroOrMore>
35
+ <ref name="ics"/>
36
+ </zeroOrMore>
37
+ <zeroOrMore>
38
+ <ref name="structuredidentifier"/>
39
+ </zeroOrMore>
40
+ </define>
41
+ <define name="doctype">
42
+ <element name="doctype">
43
+ <optional>
44
+ <attribute name="abbreviation"/>
45
+ </optional>
46
+ <ref name="DocumentType"/>
47
+ </element>
48
+ </define>
49
+ <define name="DocumentType">
50
+ <text/>
51
+ </define>
52
+ <define name="docsubtype">
53
+ <element name="subdoctype">
54
+ <ref name="DocumentSubtype"/>
55
+ </element>
56
+ </define>
57
+ <define name="DocumentSubtype">
58
+ <text/>
59
+ </define>
60
+ <define name="editorialgroup">
61
+ <element name="editorialgroup">
62
+ <oneOrMore>
63
+ <ref name="technical-committee"/>
64
+ </oneOrMore>
65
+ </element>
66
+ </define>
67
+ <define name="technical-committee">
68
+ <element name="technical-committee">
69
+ <ref name="IsoWorkgroup"/>
70
+ </element>
71
+ </define>
72
+ <define name="IsoWorkgroup">
73
+ <optional>
74
+ <attribute name="number"/>
75
+ </optional>
76
+ <optional>
77
+ <attribute name="type"/>
78
+ </optional>
79
+ <optional>
80
+ <attribute name="identifier"/>
81
+ </optional>
82
+ <optional>
83
+ <attribute name="prefix"/>
84
+ </optional>
85
+ <text/>
86
+ </define>
87
+ <define name="ics">
88
+ <element name="ics">
89
+ <element name="code">
90
+ <text/>
91
+ </element>
92
+ <optional>
93
+ <element name="text">
94
+ <text/>
95
+ </element>
96
+ </optional>
97
+ </element>
98
+ </define>
99
+ <define name="structuredidentifier">
100
+ <element name="structuredidentifier">
101
+ <optional>
102
+ <attribute name="type"/>
103
+ </optional>
104
+ <oneOrMore>
105
+ <element name="agency">
106
+ <text/>
107
+ </element>
108
+ </oneOrMore>
109
+ <optional>
110
+ <element name="class">
111
+ <text/>
112
+ </element>
113
+ </optional>
114
+ <element name="docnumber">
115
+ <text/>
116
+ </element>
117
+ <optional>
118
+ <element name="partnumber">
119
+ <text/>
120
+ </element>
121
+ </optional>
122
+ <optional>
123
+ <element name="edition">
124
+ <text/>
125
+ </element>
126
+ </optional>
127
+ <optional>
128
+ <element name="version">
129
+ <text/>
130
+ </element>
131
+ </optional>
132
+ <optional>
133
+ <element name="supplementtype">
134
+ <text/>
135
+ </element>
136
+ </optional>
137
+ <optional>
138
+ <element name="supplementnumber">
139
+ <text/>
140
+ </element>
141
+ </optional>
142
+ <optional>
143
+ <element name="amendment">
144
+ <text/>
145
+ </element>
146
+ </optional>
147
+ <optional>
148
+ <element name="corrigendum">
149
+ <text/>
150
+ </element>
151
+ </optional>
152
+ <optional>
153
+ <element name="language">
154
+ <text/>
155
+ </element>
156
+ </optional>
157
+ <optional>
158
+ <element name="year">
159
+ <text/>
160
+ </element>
161
+ </optional>
162
+ </element>
163
+ </define>
164
+ </grammar>
data/grammars/biblio.rng CHANGED
@@ -33,9 +33,10 @@
33
33
  <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
34
34
  </data>
35
35
  </define>
36
- <start>
37
- <ref name="bibitem"/>
38
- </start>
36
+ <!-- start = bibitem -->
37
+ <define name="BibData">
38
+ <ref name="BibliographicItem"/>
39
+ </define>
39
40
  <define name="status">
40
41
  <element name="status">
41
42
  <ref name="stage"/>
@@ -73,8 +74,14 @@
73
74
  <text/>
74
75
  </element>
75
76
  </define>
76
- <define name="script">
77
+ <define name="locale">
77
78
  <a:documentation>ISO-639</a:documentation>
79
+ <element name="locale">
80
+ <text/>
81
+ </element>
82
+ </define>
83
+ <define name="script">
84
+ <a:documentation>ISO-3166</a:documentation>
78
85
  <element name="script">
79
86
  <text/>
80
87
  </element>
@@ -93,6 +100,9 @@
93
100
  <!-- multiple languages and scripts possible: comma delimit them if so -->
94
101
  <attribute name="language"/>
95
102
  </optional>
103
+ <optional>
104
+ <attribute name="locale"/>
105
+ </optional>
96
106
  <optional>
97
107
  <attribute name="script"/>
98
108
  </optional>
@@ -136,6 +146,9 @@
136
146
  <!-- multiple languages and scripts possible: comma delimit them if so -->
137
147
  <attribute name="language"/>
138
148
  </optional>
149
+ <optional>
150
+ <attribute name="locale"/>
151
+ </optional>
139
152
  <optional>
140
153
  <attribute name="script"/>
141
154
  </optional>
@@ -158,27 +171,30 @@
158
171
  </define>
159
172
  <define name="contributor">
160
173
  <element name="contributor">
161
- <zeroOrMore>
174
+ <oneOrMore>
162
175
  <ref name="role"/>
163
- </zeroOrMore>
176
+ </oneOrMore>
164
177
  <ref name="ContributorInfo"/>
165
178
  </element>
166
179
  </define>
167
180
  <define name="role">
168
181
  <element name="role">
169
- <optional>
170
- <attribute name="type">
171
- <choice>
172
- <value>author</value>
173
- <value>performer</value>
174
- <value>publisher</value>
175
- <value>editor</value>
176
- <value>adapter</value>
177
- <value>translator</value>
178
- <value>distributor</value>
179
- </choice>
180
- </attribute>
181
- </optional>
182
+ <attribute name="type">
183
+ <choice>
184
+ <value>author</value>
185
+ <value>performer</value>
186
+ <value>publisher</value>
187
+ <value>editor</value>
188
+ <value>adapter</value>
189
+ <value>translator</value>
190
+ <value>distributor</value>
191
+ <value>realizer</value>
192
+ <value>owner</value>
193
+ <value>authorizer</value>
194
+ <value>enabler</value>
195
+ <value>subject</value>
196
+ </choice>
197
+ </attribute>
182
198
  <zeroOrMore>
183
199
  <ref name="roledescription"/>
184
200
  </zeroOrMore>
@@ -500,6 +516,17 @@
500
516
  </define>
501
517
  <define name="localityStack">
502
518
  <element name="localityStack">
519
+ <optional>
520
+ <attribute name="connective">
521
+ <choice>
522
+ <value>and</value>
523
+ <value>or</value>
524
+ <value>from</value>
525
+ <value>to</value>
526
+ <value/>
527
+ </choice>
528
+ </attribute>
529
+ </optional>
503
530
  <zeroOrMore>
504
531
  <ref name="locality"/>
505
532
  </zeroOrMore>
@@ -512,6 +539,17 @@
512
539
  </define>
513
540
  <define name="sourceLocalityStack">
514
541
  <element name="sourceLocalityStack">
542
+ <optional>
543
+ <attribute name="connective">
544
+ <choice>
545
+ <value>and</value>
546
+ <value>or</value>
547
+ <value>from</value>
548
+ <value>to</value>
549
+ <value/>
550
+ </choice>
551
+ </attribute>
552
+ </optional>
515
553
  <zeroOrMore>
516
554
  <ref name="sourceLocality"/>
517
555
  </zeroOrMore>
@@ -614,6 +652,9 @@
614
652
  <ref name="BibItemType"/>
615
653
  </attribute>
616
654
  </optional>
655
+ <optional>
656
+ <attribute name="schema-version"/>
657
+ </optional>
617
658
  <optional>
618
659
  <ref name="fetched"/>
619
660
  </optional>
@@ -650,6 +691,9 @@
650
691
  <zeroOrMore>
651
692
  <ref name="language"/>
652
693
  </zeroOrMore>
694
+ <zeroOrMore>
695
+ <ref name="locale"/>
696
+ </zeroOrMore>
653
697
  <zeroOrMore>
654
698
  <ref name="script"/>
655
699
  </zeroOrMore>
@@ -705,6 +749,9 @@
705
749
  <ref name="BibItemType"/>
706
750
  </attribute>
707
751
  </optional>
752
+ <optional>
753
+ <attribute name="schema-version"/>
754
+ </optional>
708
755
  <optional>
709
756
  <ref name="fetched"/>
710
757
  </optional>
@@ -741,6 +788,9 @@
741
788
  <zeroOrMore>
742
789
  <ref name="language"/>
743
790
  </zeroOrMore>
791
+ <zeroOrMore>
792
+ <ref name="locale"/>
793
+ </zeroOrMore>
744
794
  <zeroOrMore>
745
795
  <ref name="script"/>
746
796
  </zeroOrMore>
@@ -854,6 +904,15 @@
854
904
  <optional>
855
905
  <attribute name="type"/>
856
906
  </optional>
907
+ <optional>
908
+ <attribute name="language"/>
909
+ </optional>
910
+ <optional>
911
+ <attribute name="locale"/>
912
+ </optional>
913
+ <optional>
914
+ <attribute name="script"/>
915
+ </optional>
857
916
  <data type="anyURI"/>
858
917
  </define>
859
918
  <define name="DateType">
@@ -882,6 +941,7 @@
882
941
  <value>vote-started</value>
883
942
  <value>vote-ended</value>
884
943
  <value>announced</value>
944
+ <value>stable-until</value>
885
945
  </choice>
886
946
  </define>
887
947
  <define name="bdate">
@@ -930,6 +990,9 @@
930
990
  <optional>
931
991
  <attribute name="language"/>
932
992
  </optional>
993
+ <optional>
994
+ <attribute name="locale"/>
995
+ </optional>
933
996
  <optional>
934
997
  <attribute name="script"/>
935
998
  </optional>
@@ -0,0 +1,11 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <include href="basicdoc.rng"/>
4
+ <include href="relaton-un.rng"/>
5
+ <start>
6
+ <choice>
7
+ <ref name="bibitem"/>
8
+ <ref name="bibdata"/>
9
+ </choice>
10
+ </start>
11
+ </grammar>
@@ -0,0 +1,149 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
3
+ <include href="biblio-standoc.rng">
4
+ <define name="DocumentType">
5
+ <choice>
6
+ <value>recommendation</value>
7
+ <value>plenary</value>
8
+ <value>addendum</value>
9
+ <value>communication</value>
10
+ <value>corrigendum</value>
11
+ <value>reissue</value>
12
+ <value>agenda</value>
13
+ <value>budgetary</value>
14
+ <value>sec-gen-notes</value>
15
+ <value>expert-report</value>
16
+ <value>resolution</value>
17
+ </choice>
18
+ </define>
19
+ <define name="editorialgroup">
20
+ <element name="editorialgroup">
21
+ <oneOrMore>
22
+ <ref name="committee"/>
23
+ </oneOrMore>
24
+ </element>
25
+ </define>
26
+ <define name="BibDataExtensionType">
27
+ <optional>
28
+ <attribute name="schema-version"/>
29
+ </optional>
30
+ <optional>
31
+ <ref name="doctype"/>
32
+ </optional>
33
+ <optional>
34
+ <ref name="docsubtype"/>
35
+ </optional>
36
+ <zeroOrMore>
37
+ <ref name="submissionlanguage"/>
38
+ </zeroOrMore>
39
+ <optional>
40
+ <ref name="editorialgroup"/>
41
+ </optional>
42
+ <zeroOrMore>
43
+ <ref name="ics"/>
44
+ </zeroOrMore>
45
+ <optional>
46
+ <ref name="distribution"/>
47
+ </optional>
48
+ <optional>
49
+ <ref name="session"/>
50
+ </optional>
51
+ <optional>
52
+ <ref name="job_number"/>
53
+ </optional>
54
+ </define>
55
+ </include>
56
+ <define name="session">
57
+ <element name="session">
58
+ <optional>
59
+ <ref name="session-number"/>
60
+ </optional>
61
+ <optional>
62
+ <ref name="session-date"/>
63
+ </optional>
64
+ <zeroOrMore>
65
+ <ref name="item-number"/>
66
+ </zeroOrMore>
67
+ <zeroOrMore>
68
+ <ref name="item-name"/>
69
+ </zeroOrMore>
70
+ <zeroOrMore>
71
+ <ref name="subitem-name"/>
72
+ </zeroOrMore>
73
+ <optional>
74
+ <ref name="collaborator"/>
75
+ </optional>
76
+ <optional>
77
+ <ref name="agenda-id"/>
78
+ </optional>
79
+ <optional>
80
+ <ref name="item-footnote"/>
81
+ </optional>
82
+ </element>
83
+ </define>
84
+ <define name="committee">
85
+ <element name="committee">
86
+ <text/>
87
+ </element>
88
+ </define>
89
+ <define name="session-number">
90
+ <element name="number">
91
+ <text/>
92
+ </element>
93
+ </define>
94
+ <define name="session-date">
95
+ <element name="session-date">
96
+ <data type="date"/>
97
+ </element>
98
+ </define>
99
+ <define name="item-number">
100
+ <element name="item-number">
101
+ <text/>
102
+ </element>
103
+ </define>
104
+ <define name="collaborator">
105
+ <element name="collaborator">
106
+ <text/>
107
+ </element>
108
+ </define>
109
+ <define name="agenda-id">
110
+ <element name="agenda-id">
111
+ <text/>
112
+ </element>
113
+ </define>
114
+ <define name="item-name">
115
+ <element name="item-name">
116
+ <text/>
117
+ </element>
118
+ </define>
119
+ <define name="subitem-name">
120
+ <element name="subitem-name">
121
+ <text/>
122
+ </element>
123
+ </define>
124
+ <define name="item-footnote">
125
+ <element name="item-footnote">
126
+ <text/>
127
+ </element>
128
+ </define>
129
+ <define name="submissionlanguage">
130
+ <element name="submissionlanguage">
131
+ <text/>
132
+ </element>
133
+ </define>
134
+ <define name="distribution">
135
+ <element name="distribution">
136
+ <choice>
137
+ <value>general</value>
138
+ <value>limited</value>
139
+ <value>restricted</value>
140
+ <value>provisional</value>
141
+ </choice>
142
+ </element>
143
+ </define>
144
+ <define name="job_number">
145
+ <element name="job_number">
146
+ <text/>
147
+ </element>
148
+ </define>
149
+ </grammar>