metanorma-un 0.9.10 → 0.9.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/un/html/htmlstyle.css +1 -1
  4. data/lib/isodoc/un/un.plenary-attachment.xsl +15 -3
  5. data/lib/isodoc/un/un.plenary.xsl +15 -3
  6. data/lib/isodoc/un/un.recommendation.xsl +15 -3
  7. data/lib/metanorma/un/basicdoc.rng +0 -27
  8. data/lib/metanorma/un/biblio-standoc.rng +164 -0
  9. data/lib/metanorma/un/biblio.rng +45 -18
  10. data/lib/metanorma/un/isodoc.rng +22 -194
  11. data/lib/metanorma/un/relaton-un.rng +149 -0
  12. data/lib/metanorma/un/un.rng +1 -141
  13. data/lib/metanorma/un/version.rb +1 -1
  14. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7b7eed9a4ee7a8a2f881a16841acb2d6d9310618d61b27994d70eebb9e0c2cc1
4
- data.tar.gz: '00018c02bdbbec199661eb6e5aa43b09240a22948528a9fde135142445c82d5b'
3
+ metadata.gz: f4bd4167f68195cbec758318d3bea161298067b3a6427ffd7cff07c32089b927
4
+ data.tar.gz: 86719aba4467288e566504a9a4ec0fc424d2b94f98c934451b5aab404b8ef3e5
5
5
  SHA512:
6
- metadata.gz: 63e67ef5e0bf08d8823bad86046701935fa38bec6e21fbdac22033903a49290dd0b854d564f8468625d9c28a3bfc217ce74b8582dfde386a689ea4c1c2dccc40
7
- data.tar.gz: 377c2a773f8c9d230506070943113c01009a49673607c92e93a4946b9ca060cc087f1ee8909fe8e6999a19c6a46b5e31df74359899a0a0eae5d614acd96162ec
6
+ metadata.gz: fa4a668dbe9603be670c3ee2d9a4d2c7e9fa9ae99fc2f8747b9a2eb756440025a868a449938ff1ecaa034bd4203967de150fca8f34e838d43a4d7b08d3e5d2ee
7
+ data.tar.gz: c4af28218a9eb52602ba1c6fe9f57a532cd5f0e94b7d0c0277564ed41a94dc2bb0ce9ef2e3b5a05d734f69883722f952bba1efa35019363f745d706c59ac63e0
data/.github/workflows/automerge.yml ADDED
@@ -0,0 +1,31 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ # source: https://github.com/marketplace/actions/merge-pull-requests#usage
4
+ name: automerge
5
+ on:
6
+ pull_request:
7
+ types:
8
+ - labeled
9
+ - unlabeled
10
+ - synchronize
11
+ - opened
12
+ - edited
13
+ - ready_for_review
14
+ - reopened
15
+ - unlocked
16
+ pull_request_review:
17
+ types:
18
+ - submitted
19
+ check_suite:
20
+ types:
21
+ - completed
22
+ status: {}
23
+ jobs:
24
+ automerge:
25
+ runs-on: ubuntu-latest
26
+ steps:
27
+ - id: automerge
28
+ name: automerge
29
+ uses: "pascalgn/automerge-action@v0.15.3"
30
+ env:
31
+ GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
data/lib/isodoc/un/html/htmlstyle.css CHANGED
@@ -389,7 +389,7 @@ p {
389
389
  font-weight: 700;
390
390
  font-size: 1em;
391
391
  text-align: center; }
392
- .figure > img {
392
+ .figure > img, .figure > svg {
393
393
  margin-left: auto;
394
394
  margin-right: auto;
395
395
  display: block;
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -4173,8 +4173,17 @@
4173
4173
  </fo:inline>
4174
4174
  </xsl:template> <!-- tt -->
4175
4175
 
4176
+ <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
4176
4177
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
4177
- <xsl:call-template name="add_spaces_to_sourcecode"/>
4178
+ <xsl:choose>
4179
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
4180
+ <!-- url -->
4181
+ <xsl:call-template name="add-zero-spaces-link-java"/>
4182
+ </xsl:when>
4183
+ <xsl:otherwise>
4184
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4185
+ </xsl:otherwise>
4186
+ </xsl:choose>
4178
4187
  </xsl:template>
4179
4188
 
4180
4189
  <xsl:template match="*[local-name()='underline']">
@@ -4530,8 +4539,11 @@
4530
4539
 
4531
4540
  <xsl:template name="add-zero-spaces-link-java">
4532
4541
  <xsl:param name="text" select="."/>
4542
+
4543
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
4544
+ <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
4533
4545
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4534
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
4546
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
4535
4547
  </xsl:template>
4536
4548
 
4537
4549
  <!-- add zero space after dash character (for table's entries) -->
@@ -8933,7 +8945,7 @@
8933
8945
 
8934
8946
  <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
8935
8947
 
8936
- <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8948
+ <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8937
8949
 
8938
8950
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8939
8951
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -4173,8 +4173,17 @@
4173
4173
  </fo:inline>
4174
4174
  </xsl:template> <!-- tt -->
4175
4175
 
4176
+ <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
4176
4177
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
4177
- <xsl:call-template name="add_spaces_to_sourcecode"/>
4178
+ <xsl:choose>
4179
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
4180
+ <!-- url -->
4181
+ <xsl:call-template name="add-zero-spaces-link-java"/>
4182
+ </xsl:when>
4183
+ <xsl:otherwise>
4184
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4185
+ </xsl:otherwise>
4186
+ </xsl:choose>
4178
4187
  </xsl:template>
4179
4188
 
4180
4189
  <xsl:template match="*[local-name()='underline']">
@@ -4530,8 +4539,11 @@
4530
4539
 
4531
4540
  <xsl:template name="add-zero-spaces-link-java">
4532
4541
  <xsl:param name="text" select="."/>
4542
+
4543
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
4544
+ <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
4533
4545
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4534
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
4546
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
4535
4547
  </xsl:template>
4536
4548
 
4537
4549
  <!-- add zero space after dash character (for table's entries) -->
@@ -8933,7 +8945,7 @@
8933
8945
 
8934
8946
  <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
8935
8947
 
8936
- <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8948
+ <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8937
8949
 
8938
8950
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8939
8951
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -4244,8 +4244,17 @@
4244
4244
  </fo:inline>
4245
4245
  </xsl:template> <!-- tt -->
4246
4246
 
4247
+ <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
4247
4248
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
4248
- <xsl:call-template name="add_spaces_to_sourcecode"/>
4249
+ <xsl:choose>
4250
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
4251
+ <!-- url -->
4252
+ <xsl:call-template name="add-zero-spaces-link-java"/>
4253
+ </xsl:when>
4254
+ <xsl:otherwise>
4255
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4256
+ </xsl:otherwise>
4257
+ </xsl:choose>
4249
4258
  </xsl:template>
4250
4259
 
4251
4260
  <xsl:template match="*[local-name()='underline']">
@@ -4601,8 +4610,11 @@
4601
4610
 
4602
4611
  <xsl:template name="add-zero-spaces-link-java">
4603
4612
  <xsl:param name="text" select="."/>
4613
+
4614
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
4615
+ <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
4604
4616
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4605
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
4617
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
4606
4618
  </xsl:template>
4607
4619
 
4608
4620
  <!-- add zero space after dash character (for table's entries) -->
@@ -9014,7 +9026,7 @@
9014
9026
 
9015
9027
  <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
9016
9028
 
9017
- <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
9029
+ <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
9018
9030
 
9019
9031
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
9020
9032
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
data/lib/metanorma/un/basicdoc.rng CHANGED
@@ -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>
@@ -1125,26 +1120,4 @@
1125
1120
  </zeroOrMore>
1126
1121
  </element>
1127
1122
  </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
1123
  </grammar>
data/lib/metanorma/un/biblio-standoc.rng ADDED
@@ -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
+ <value>document</value>
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/lib/metanorma/un/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"/>
@@ -170,27 +171,25 @@
170
171
  </define>
171
172
  <define name="contributor">
172
173
  <element name="contributor">
173
- <zeroOrMore>
174
+ <oneOrMore>
174
175
  <ref name="role"/>
175
- </zeroOrMore>
176
+ </oneOrMore>
176
177
  <ref name="ContributorInfo"/>
177
178
  </element>
178
179
  </define>
179
180
  <define name="role">
180
181
  <element name="role">
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
- </choice>
192
- </attribute>
193
- </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
+ </choice>
192
+ </attribute>
194
193
  <zeroOrMore>
195
194
  <ref name="roledescription"/>
196
195
  </zeroOrMore>
@@ -512,6 +511,17 @@
512
511
  </define>
513
512
  <define name="localityStack">
514
513
  <element name="localityStack">
514
+ <optional>
515
+ <attribute name="connective">
516
+ <choice>
517
+ <value>and</value>
518
+ <value>or</value>
519
+ <value>from</value>
520
+ <value>to</value>
521
+ <value/>
522
+ </choice>
523
+ </attribute>
524
+ </optional>
515
525
  <zeroOrMore>
516
526
  <ref name="locality"/>
517
527
  </zeroOrMore>
@@ -524,6 +534,17 @@
524
534
  </define>
525
535
  <define name="sourceLocalityStack">
526
536
  <element name="sourceLocalityStack">
537
+ <optional>
538
+ <attribute name="connective">
539
+ <choice>
540
+ <value>and</value>
541
+ <value>or</value>
542
+ <value>from</value>
543
+ <value>to</value>
544
+ <value/>
545
+ </choice>
546
+ </attribute>
547
+ </optional>
527
548
  <zeroOrMore>
528
549
  <ref name="sourceLocality"/>
529
550
  </zeroOrMore>
@@ -626,6 +647,9 @@
626
647
  <ref name="BibItemType"/>
627
648
  </attribute>
628
649
  </optional>
650
+ <optional>
651
+ <attribute name="schema-version"/>
652
+ </optional>
629
653
  <optional>
630
654
  <ref name="fetched"/>
631
655
  </optional>
@@ -720,6 +744,9 @@
720
744
  <ref name="BibItemType"/>
721
745
  </attribute>
722
746
  </optional>
747
+ <optional>
748
+ <attribute name="schema-version"/>
749
+ </optional>
723
750
  <optional>
724
751
  <ref name="fetched"/>
725
752
  </optional>
data/lib/metanorma/un/isodoc.rng CHANGED
@@ -19,19 +19,7 @@
19
19
  -->
20
20
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
21
21
  <include href="reqt.rng"/>
22
- <!-- include "biblio.rnc" { } -->
23
22
  <include href="basicdoc.rng">
24
- <start>
25
- <ref name="standard-document"/>
26
- </start>
27
- <define name="doctype">
28
- <element name="doctype">
29
- <optional>
30
- <attribute name="abbreviation"/>
31
- </optional>
32
- <ref name="DocumentType"/>
33
- </element>
34
- </define>
35
23
  <define name="admonition">
36
24
  <element name="admonition">
37
25
  <attribute name="type">
@@ -117,24 +105,6 @@
117
105
  </optional>
118
106
  </element>
119
107
  </define>
120
- <define name="bibitem">
121
- <element name="bibitem">
122
- <attribute name="id">
123
- <data type="ID"/>
124
- </attribute>
125
- <optional>
126
- <attribute name="hidden">
127
- <data type="boolean"/>
128
- </attribute>
129
- </optional>
130
- <optional>
131
- <attribute name="suppress_identifier">
132
- <data type="boolean"/>
133
- </attribute>
134
- </optional>
135
- <ref name="BibliographicItem"/>
136
- </element>
137
- </define>
138
108
  <define name="section-title">
139
109
  <element name="title">
140
110
  <zeroOrMore>
@@ -248,42 +218,6 @@
248
218
  <ref name="PureTextElement"/>
249
219
  </oneOrMore>
250
220
  </define>
251
- <define name="localityStack">
252
- <element name="localityStack">
253
- <optional>
254
- <attribute name="connective">
255
- <choice>
256
- <value>and</value>
257
- <value>or</value>
258
- <value>from</value>
259
- <value>to</value>
260
- <value/>
261
- </choice>
262
- </attribute>
263
- </optional>
264
- <zeroOrMore>
265
- <ref name="locality"/>
266
- </zeroOrMore>
267
- </element>
268
- </define>
269
- <define name="sourceLocalityStack">
270
- <element name="sourceLocalityStack">
271
- <optional>
272
- <attribute name="connective">
273
- <choice>
274
- <value>and</value>
275
- <value>or</value>
276
- <value>from</value>
277
- <value>to</value>
278
- <value/>
279
- </choice>
280
- </attribute>
281
- </optional>
282
- <zeroOrMore>
283
- <ref name="sourceLocality"/>
284
- </zeroOrMore>
285
- </element>
286
- </define>
287
221
  <define name="ul">
288
222
  <element name="ul">
289
223
  <attribute name="id">
@@ -827,21 +761,6 @@
827
761
  </zeroOrMore>
828
762
  </element>
829
763
  </define>
830
- <define name="BibDataExtensionType">
831
- <ref name="doctype"/>
832
- <optional>
833
- <ref name="docsubtype"/>
834
- </optional>
835
- <optional>
836
- <ref name="editorialgroup"/>
837
- </optional>
838
- <zeroOrMore>
839
- <ref name="ics"/>
840
- </zeroOrMore>
841
- <zeroOrMore>
842
- <ref name="structuredidentifier"/>
843
- </zeroOrMore>
844
- </define>
845
764
  <!-- TitleType = text -->
846
765
  <define name="sections">
847
766
  <element name="sections">
@@ -881,7 +800,7 @@
881
800
  <ref name="BasicBlock"/>
882
801
  </zeroOrMore>
883
802
  <zeroOrMore>
884
- <ref name="bibitem"/>
803
+ <ref name="doc_bibitem"/>
885
804
  <zeroOrMore>
886
805
  <ref name="note"/>
887
806
  </zeroOrMore>
@@ -1219,6 +1138,24 @@
1219
1138
  </define>
1220
1139
  </include>
1221
1140
  <!-- end overrides -->
1141
+ <define name="doc_bibitem">
1142
+ <element name="bibitem">
1143
+ <attribute name="id">
1144
+ <data type="ID"/>
1145
+ </attribute>
1146
+ <optional>
1147
+ <attribute name="hidden">
1148
+ <data type="boolean"/>
1149
+ </attribute>
1150
+ </optional>
1151
+ <optional>
1152
+ <attribute name="suppress_identifier">
1153
+ <data type="boolean"/>
1154
+ </attribute>
1155
+ </optional>
1156
+ <ref name="BibliographicItem"/>
1157
+ </element>
1158
+ </define>
1222
1159
  <define name="image" combine="choice">
1223
1160
  <element name="svg">
1224
1161
  <oneOrMore>
@@ -1237,14 +1174,6 @@
1237
1174
  <value>tag</value>
1238
1175
  </choice>
1239
1176
  </define>
1240
- <define name="docsubtype">
1241
- <element name="subdoctype">
1242
- <ref name="DocumentSubtype"/>
1243
- </element>
1244
- </define>
1245
- <define name="DocumentSubtype">
1246
- <text/>
1247
- </define>
1248
1177
  <define name="colgroup">
1249
1178
  <element name="colgroup">
1250
1179
  <oneOrMore>
@@ -1606,45 +1535,6 @@
1606
1535
  </choice>
1607
1536
  </element>
1608
1537
  </define>
1609
- <define name="editorialgroup">
1610
- <element name="editorialgroup">
1611
- <oneOrMore>
1612
- <ref name="technical-committee"/>
1613
- </oneOrMore>
1614
- </element>
1615
- </define>
1616
- <define name="technical-committee">
1617
- <element name="technical-committee">
1618
- <ref name="IsoWorkgroup"/>
1619
- </element>
1620
- </define>
1621
- <define name="IsoWorkgroup">
1622
- <optional>
1623
- <attribute name="number"/>
1624
- </optional>
1625
- <optional>
1626
- <attribute name="type"/>
1627
- </optional>
1628
- <optional>
1629
- <attribute name="identifier"/>
1630
- </optional>
1631
- <optional>
1632
- <attribute name="prefix"/>
1633
- </optional>
1634
- <text/>
1635
- </define>
1636
- <define name="ics">
1637
- <element name="ics">
1638
- <element name="code">
1639
- <text/>
1640
- </element>
1641
- <optional>
1642
- <element name="text">
1643
- <text/>
1644
- </element>
1645
- </optional>
1646
- </element>
1647
- </define>
1648
1538
  <define name="standard-document">
1649
1539
  <element name="standard-document">
1650
1540
  <attribute name="version"/>
@@ -2475,71 +2365,6 @@
2475
2365
  </optional>
2476
2366
  </element>
2477
2367
  </define>
2478
- <define name="structuredidentifier">
2479
- <element name="structuredidentifier">
2480
- <optional>
2481
- <attribute name="type"/>
2482
- </optional>
2483
- <oneOrMore>
2484
- <element name="agency">
2485
- <text/>
2486
- </element>
2487
- </oneOrMore>
2488
- <optional>
2489
- <element name="class">
2490
- <text/>
2491
- </element>
2492
- </optional>
2493
- <element name="docnumber">
2494
- <text/>
2495
- </element>
2496
- <optional>
2497
- <element name="partnumber">
2498
- <text/>
2499
- </element>
2500
- </optional>
2501
- <optional>
2502
- <element name="edition">
2503
- <text/>
2504
- </element>
2505
- </optional>
2506
- <optional>
2507
- <element name="version">
2508
- <text/>
2509
- </element>
2510
- </optional>
2511
- <optional>
2512
- <element name="supplementtype">
2513
- <text/>
2514
- </element>
2515
- </optional>
2516
- <optional>
2517
- <element name="supplementnumber">
2518
- <text/>
2519
- </element>
2520
- </optional>
2521
- <optional>
2522
- <element name="amendment">
2523
- <text/>
2524
- </element>
2525
- </optional>
2526
- <optional>
2527
- <element name="corrigendum">
2528
- <text/>
2529
- </element>
2530
- </optional>
2531
- <optional>
2532
- <element name="language">
2533
- <text/>
2534
- </element>
2535
- </optional>
2536
- <optional>
2537
- <element name="year">
2538
- <text/>
2539
- </element>
2540
- </optional>
2541
- </element>
2542
- </define>
2543
2368
  <define name="term-clause">
2544
2369
  <element name="clause">
2545
2370
  <optional>
@@ -2813,4 +2638,7 @@
2813
2638
  </attribute>
2814
2639
  </element>
2815
2640
  </define>
2641
+ <start>
2642
+ <ref name="standard-document"/>
2643
+ </start>
2816
2644
  </grammar>
data/lib/metanorma/un/relaton-un.rng ADDED
@@ -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>
data/lib/metanorma/un/un.rng CHANGED
@@ -5,6 +5,7 @@
5
5
  we cannot have a new default namespace: we will end up with a grammar with two different
6
6
  namespaces, one for isostandard and one for csand additions. And we do not want that.
7
7
  -->
8
+ <include href="relaton-un.rng"/>
8
9
  <include href="isodoc.rng">
9
10
  <start>
10
11
  <ref name="un-standard"/>
@@ -81,28 +82,6 @@
81
82
  </zeroOrMore>
82
83
  </element>
83
84
  </define>
84
- <define name="DocumentType">
85
- <choice>
86
- <value>recommendation</value>
87
- <value>plenary</value>
88
- <value>addendum</value>
89
- <value>communication</value>
90
- <value>corrigendum</value>
91
- <value>reissue</value>
92
- <value>agenda</value>
93
- <value>budgetary</value>
94
- <value>sec-gen-notes</value>
95
- <value>expert-report</value>
96
- <value>resolution</value>
97
- </choice>
98
- </define>
99
- <define name="editorialgroup">
100
- <element name="editorialgroup">
101
- <oneOrMore>
102
- <ref name="committee"/>
103
- </oneOrMore>
104
- </element>
105
- </define>
106
85
  <define name="sections">
107
86
  <element name="sections">
108
87
  <oneOrMore>
@@ -113,32 +92,6 @@
113
92
  </oneOrMore>
114
93
  </element>
115
94
  </define>
116
- <define name="BibDataExtensionType">
117
- <optional>
118
- <ref name="doctype"/>
119
- </optional>
120
- <optional>
121
- <ref name="docsubtype"/>
122
- </optional>
123
- <zeroOrMore>
124
- <ref name="submissionlanguage"/>
125
- </zeroOrMore>
126
- <optional>
127
- <ref name="editorialgroup"/>
128
- </optional>
129
- <zeroOrMore>
130
- <ref name="ics"/>
131
- </zeroOrMore>
132
- <optional>
133
- <ref name="distribution"/>
134
- </optional>
135
- <optional>
136
- <ref name="session"/>
137
- </optional>
138
- <optional>
139
- <ref name="job_number"/>
140
- </optional>
141
- </define>
142
95
  <define name="preface">
143
96
  <element name="preface">
144
97
  <optional>
@@ -253,99 +206,6 @@
253
206
  </group>
254
207
  </define>
255
208
  </include>
256
- <define name="session">
257
- <element name="session">
258
- <optional>
259
- <ref name="session-number"/>
260
- </optional>
261
- <optional>
262
- <ref name="session-date"/>
263
- </optional>
264
- <zeroOrMore>
265
- <ref name="item-number"/>
266
- </zeroOrMore>
267
- <zeroOrMore>
268
- <ref name="item-name"/>
269
- </zeroOrMore>
270
- <zeroOrMore>
271
- <ref name="subitem-name"/>
272
- </zeroOrMore>
273
- <optional>
274
- <ref name="collaborator"/>
275
- </optional>
276
- <optional>
277
- <ref name="agenda-id"/>
278
- </optional>
279
- <optional>
280
- <ref name="item-footnote"/>
281
- </optional>
282
- </element>
283
- </define>
284
- <define name="committee">
285
- <element name="committee">
286
- <text/>
287
- </element>
288
- </define>
289
- <define name="session-number">
290
- <element name="number">
291
- <text/>
292
- </element>
293
- </define>
294
- <define name="session-date">
295
- <element name="session-date">
296
- <data type="date"/>
297
- </element>
298
- </define>
299
- <define name="item-number">
300
- <element name="item-number">
301
- <text/>
302
- </element>
303
- </define>
304
- <define name="collaborator">
305
- <element name="collaborator">
306
- <text/>
307
- </element>
308
- </define>
309
- <define name="agenda-id">
310
- <element name="agenda-id">
311
- <text/>
312
- </element>
313
- </define>
314
- <define name="item-name">
315
- <element name="item-name">
316
- <text/>
317
- </element>
318
- </define>
319
- <define name="subitem-name">
320
- <element name="subitem-name">
321
- <text/>
322
- </element>
323
- </define>
324
- <define name="item-footnote">
325
- <element name="item-footnote">
326
- <text/>
327
- </element>
328
- </define>
329
- <define name="submissionlanguage">
330
- <element name="submissionlanguage">
331
- <text/>
332
- </element>
333
- </define>
334
- <define name="distribution">
335
- <element name="distribution">
336
- <choice>
337
- <value>general</value>
338
- <value>limited</value>
339
- <value>restricted</value>
340
- <value>provisional</value>
341
- </choice>
342
- </element>
343
- </define>
344
- <define name="job_number">
345
- <element name="job_number">
346
- <text/>
347
- </element>
348
- </define>
349
209
  <define name="un-standard">
350
210
  <element name="un-standard">
351
211
  <attribute name="version"/>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.9.10".freeze
3
+ VERSION = "0.9.11".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.10
4
+ version: 0.9.11
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-10-10 00:00:00.000000000 Z
11
+ date: 2022-10-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639
@@ -216,6 +216,7 @@ executables: []
216
216
  extensions: []
217
217
  extra_rdoc_files: []
218
218
  files:
219
+ - ".github/workflows/automerge.yml"
219
220
  - ".github/workflows/rake.yml"
220
221
  - ".github/workflows/release.yml"
221
222
  - ".gitignore"
@@ -262,12 +263,14 @@ files:
262
263
  - lib/metanorma/un.rb
263
264
  - lib/metanorma/un/UN_emblem_blue.svg
264
265
  - lib/metanorma/un/basicdoc.rng
266
+ - lib/metanorma/un/biblio-standoc.rng
265
267
  - lib/metanorma/un/biblio.rng
266
268
  - lib/metanorma/un/boilerplate.xml
267
269
  - lib/metanorma/un/converter.rb
268
270
  - lib/metanorma/un/input.rb
269
271
  - lib/metanorma/un/isodoc.rng
270
272
  - lib/metanorma/un/processor.rb
273
+ - lib/metanorma/un/relaton-un.rng
271
274
  - lib/metanorma/un/reqt.rng
272
275
  - lib/metanorma/un/un.rng
273
276
  - lib/metanorma/un/validate.rb