metanorma-iho 0.6.10 → 0.6.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/automerge.yml +31 -0
  3. data/lib/isodoc/iho/html/htmlstyle.css +1 -1
  4. data/lib/isodoc/iho/iho.specification.xsl +15 -3
  5. data/lib/isodoc/iho/iho.standard.xsl +15 -3
  6. data/lib/metanorma/iho/basicdoc.rng +0 -27
  7. data/lib/metanorma/iho/biblio-standoc.rng +164 -0
  8. data/lib/metanorma/iho/biblio.rng +45 -18
  9. data/lib/metanorma/iho/iho.rng +1 -84
  10. data/lib/metanorma/iho/isodoc.rng +22 -194
  11. data/lib/metanorma/iho/relaton-iho.rng +92 -0
  12. data/lib/metanorma/iho/version.rb +1 -1
  13. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 88630b7ecf636f3705ff06b6b7f313efb5fd3b622e85a2735b82659d170e8b6b
4
- data.tar.gz: e6b48482db3da8d4ceb13e3b8402a8d0004d3dfb1a392cc916eefbe0e5a8afa0
3
+ metadata.gz: 8e2932efe2b0d9d4c74dfade0995762321612169b447a63d3ec43755eacfc7d9
4
+ data.tar.gz: 5249aba965293f609dc36ea1312d8db2681dbeb8aadd49521276d8cf1c28aed4
5
5
  SHA512:
6
- metadata.gz: e15ca9e2d633cbd4e2b451edf2c5358d59e0ba25902d18683ab76381bf97956da513a8df4219c167ae9a5a79972218829cd526c52c06c1d161488a193f191aad
7
- data.tar.gz: 1b1b6f84b78af8db1cb2b195feacfdb53a6a47d1d7be212b015be60f34e664f3a57717c3a1a7c3a65209a5a861396bb0abf7aa9d7acff33a82f6515b68cf95d0
6
+ metadata.gz: 074e5f18de9479bf5ecbf62fc91ed37abb702a9edb4f7c2a85e5378fca0374bf55e7d19c82508cfc3cbcd256603e6e6e7b35354ddeb97c963017fb91a724b3df
7
+ data.tar.gz: 10e1e5c1127b604a105e2afd81a84ac6009176fc6f1b39abd9ae470fdeb2f4e76f23599949010c9558f7b44d22076df271d09dfa5bf7aba976d35d00799965e4
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/iho/html/htmlstyle.css CHANGED
@@ -395,7 +395,7 @@ div.figure {
395
395
  font-weight: 700;
396
396
  font-size: 1em;
397
397
  text-align: center; }
398
- div.figure > img {
398
+ div.figure > img, div.figure > svg {
399
399
  margin-left: auto;
400
400
  margin-right: auto;
401
401
  display: block;
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -4201,8 +4201,17 @@
4201
4201
  </fo:inline>
4202
4202
  </xsl:template> <!-- tt -->
4203
4203
 
4204
+ <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
4204
4205
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
4205
- <xsl:call-template name="add_spaces_to_sourcecode"/>
4206
+ <xsl:choose>
4207
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
4208
+ <!-- url -->
4209
+ <xsl:call-template name="add-zero-spaces-link-java"/>
4210
+ </xsl:when>
4211
+ <xsl:otherwise>
4212
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4213
+ </xsl:otherwise>
4214
+ </xsl:choose>
4206
4215
  </xsl:template>
4207
4216
 
4208
4217
  <xsl:template match="*[local-name()='underline']">
@@ -4558,8 +4567,11 @@
4558
4567
 
4559
4568
  <xsl:template name="add-zero-spaces-link-java">
4560
4569
  <xsl:param name="text" select="."/>
4570
+
4571
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
4572
+ <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
4561
4573
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4562
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
4574
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
4563
4575
  </xsl:template>
4564
4576
 
4565
4577
  <!-- add zero space after dash character (for table's entries) -->
@@ -8943,7 +8955,7 @@
8943
8955
 
8944
8956
  <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
8945
8957
 
8946
- <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">
8958
+ <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">
8947
8959
 
8948
8960
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8949
8961
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -4201,8 +4201,17 @@
4201
4201
  </fo:inline>
4202
4202
  </xsl:template> <!-- tt -->
4203
4203
 
4204
+ <xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
4204
4205
  <xsl:template match="*[local-name()='tt']/text()" priority="2">
4205
- <xsl:call-template name="add_spaces_to_sourcecode"/>
4206
+ <xsl:choose>
4207
+ <xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
4208
+ <!-- url -->
4209
+ <xsl:call-template name="add-zero-spaces-link-java"/>
4210
+ </xsl:when>
4211
+ <xsl:otherwise>
4212
+ <xsl:call-template name="add_spaces_to_sourcecode"/>
4213
+ </xsl:otherwise>
4214
+ </xsl:choose>
4206
4215
  </xsl:template>
4207
4216
 
4208
4217
  <xsl:template match="*[local-name()='underline']">
@@ -4558,8 +4567,11 @@
4558
4567
 
4559
4568
  <xsl:template name="add-zero-spaces-link-java">
4560
4569
  <xsl:param name="text" select="."/>
4570
+
4571
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
4572
+ <xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
4561
4573
  <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4562
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
4574
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
4563
4575
  </xsl:template>
4564
4576
 
4565
4577
  <!-- add zero space after dash character (for table's entries) -->
@@ -8943,7 +8955,7 @@
8943
8955
 
8944
8956
  <xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
8945
8957
 
8946
- <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">
8958
+ <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">
8947
8959
 
8948
8960
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8949
8961
  <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
data/lib/metanorma/iho/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/iho/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/iho/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/iho/iho.rng CHANGED
@@ -5,50 +5,11 @@
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-iho.rng"/>
8
9
  <include href="isodoc.rng">
9
10
  <start>
10
11
  <ref name="iho-standard"/>
11
12
  </start>
12
- <define name="DocumentType">
13
- <choice>
14
- <value>policy-and-procedures</value>
15
- <value>best-practices</value>
16
- <value>supporting-document</value>
17
- <value>report</value>
18
- <value>legal</value>
19
- <value>directives</value>
20
- <value>proposal</value>
21
- <value>standard</value>
22
- </choice>
23
- </define>
24
- <define name="editorialgroup">
25
- <element name="editorialgroup">
26
- <oneOrMore>
27
- <choice>
28
- <ref name="committee"/>
29
- <ref name="workgroup"/>
30
- <ref name="commission"/>
31
- </choice>
32
- </oneOrMore>
33
- </element>
34
- </define>
35
- <define name="BibDataExtensionType">
36
- <optional>
37
- <ref name="doctype"/>
38
- </optional>
39
- <optional>
40
- <ref name="docsubtype"/>
41
- </optional>
42
- <zeroOrMore>
43
- <ref name="editorialgroup"/>
44
- </zeroOrMore>
45
- <zeroOrMore>
46
- <ref name="ics"/>
47
- </zeroOrMore>
48
- <optional>
49
- <ref name="commentperiod"/>
50
- </optional>
51
- </define>
52
13
  <define name="annex">
53
14
  <element name="annex">
54
15
  <optional>
@@ -95,55 +56,11 @@
95
56
  </element>
96
57
  </define>
97
58
  </include>
98
- <define name="committee">
99
- <element name="committee">
100
- <ref name="IHO_Group"/>
101
- </element>
102
- </define>
103
- <define name="workgroup">
104
- <element name="workgroup">
105
- <ref name="IHO_Group"/>
106
- </element>
107
- </define>
108
- <define name="commission">
109
- <element name="commission">
110
- <ref name="IHO_Group"/>
111
- </element>
112
- </define>
113
- <define name="IHO_Group">
114
- <optional>
115
- <element name="name">
116
- <text/>
117
- </element>
118
- </optional>
119
- <element name="abbreviation">
120
- <text/>
121
- </element>
122
- <optional>
123
- <choice>
124
- <ref name="committee"/>
125
- <ref name="workgroup"/>
126
- <ref name="commission"/>
127
- </choice>
128
- </optional>
129
- </define>
130
59
  <define name="annex-appendix">
131
60
  <element name="appendix">
132
61
  <ref name="Clause-Section"/>
133
62
  </element>
134
63
  </define>
135
- <define name="commentperiod">
136
- <element name="commentperiod">
137
- <element name="from">
138
- <ref name="ISO8601Date"/>
139
- </element>
140
- <optional>
141
- <element name="to">
142
- <ref name="ISO8601Date"/>
143
- </element>
144
- </optional>
145
- </element>
146
- </define>
147
64
  <define name="iho-standard">
148
65
  <element name="iho-standard">
149
66
  <attribute name="version"/>
data/lib/metanorma/iho/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/iho/relaton-iho.rng ADDED
@@ -0,0 +1,92 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0">
3
+ <include href="biblio-standoc.rng">
4
+ <define name="DocumentType">
5
+ <choice>
6
+ <value>policy-and-procedures</value>
7
+ <value>best-practices</value>
8
+ <value>supporting-document</value>
9
+ <value>report</value>
10
+ <value>legal</value>
11
+ <value>directives</value>
12
+ <value>proposal</value>
13
+ <value>standard</value>
14
+ </choice>
15
+ </define>
16
+ <define name="editorialgroup">
17
+ <element name="editorialgroup">
18
+ <oneOrMore>
19
+ <choice>
20
+ <ref name="committee"/>
21
+ <ref name="workgroup"/>
22
+ <ref name="commission"/>
23
+ </choice>
24
+ </oneOrMore>
25
+ </element>
26
+ </define>
27
+ <define name="BibDataExtensionType">
28
+ <optional>
29
+ <attribute name="schema-version"/>
30
+ </optional>
31
+ <optional>
32
+ <ref name="doctype"/>
33
+ </optional>
34
+ <optional>
35
+ <ref name="docsubtype"/>
36
+ </optional>
37
+ <zeroOrMore>
38
+ <ref name="editorialgroup"/>
39
+ </zeroOrMore>
40
+ <zeroOrMore>
41
+ <ref name="ics"/>
42
+ </zeroOrMore>
43
+ <optional>
44
+ <ref name="commentperiod"/>
45
+ </optional>
46
+ </define>
47
+ </include>
48
+ <define name="committee">
49
+ <element name="committee">
50
+ <ref name="IHO_Group"/>
51
+ </element>
52
+ </define>
53
+ <define name="workgroup">
54
+ <element name="workgroup">
55
+ <ref name="IHO_Group"/>
56
+ </element>
57
+ </define>
58
+ <define name="commission">
59
+ <element name="commission">
60
+ <ref name="IHO_Group"/>
61
+ </element>
62
+ </define>
63
+ <define name="IHO_Group">
64
+ <optional>
65
+ <element name="name">
66
+ <text/>
67
+ </element>
68
+ </optional>
69
+ <element name="abbreviation">
70
+ <text/>
71
+ </element>
72
+ <optional>
73
+ <choice>
74
+ <ref name="committee"/>
75
+ <ref name="workgroup"/>
76
+ <ref name="commission"/>
77
+ </choice>
78
+ </optional>
79
+ </define>
80
+ <define name="commentperiod">
81
+ <element name="commentperiod">
82
+ <element name="from">
83
+ <ref name="ISO8601Date"/>
84
+ </element>
85
+ <optional>
86
+ <element name="to">
87
+ <ref name="ISO8601Date"/>
88
+ </element>
89
+ </optional>
90
+ </element>
91
+ </define>
92
+ </grammar>
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.6.10".freeze
3
+ VERSION = "0.6.11".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.10
4
+ version: 0.6.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: metanorma-generic
@@ -174,6 +174,7 @@ executables: []
174
174
  extensions: []
175
175
  extra_rdoc_files: []
176
176
  files:
177
+ - ".github/workflows/automerge.yml"
177
178
  - ".github/workflows/rake.yml"
178
179
  - ".github/workflows/release.yml"
179
180
  - ".gitignore"
@@ -218,12 +219,14 @@ files:
218
219
  - lib/metanorma-iho.rb
219
220
  - lib/metanorma/iho.rb
220
221
  - lib/metanorma/iho/basicdoc.rng
222
+ - lib/metanorma/iho/biblio-standoc.rng
221
223
  - lib/metanorma/iho/biblio.rng
222
224
  - lib/metanorma/iho/boilerplate.xml
223
225
  - lib/metanorma/iho/converter.rb
224
226
  - lib/metanorma/iho/iho.rng
225
227
  - lib/metanorma/iho/isodoc.rng
226
228
  - lib/metanorma/iho/processor.rb
229
+ - lib/metanorma/iho/relaton-iho.rng
227
230
  - lib/metanorma/iho/reqt.rng
228
231
  - lib/metanorma/iho/version.rb
229
232
  - lib/relaton/render/config.yml