metanorma-iec 2.7.2 → 2.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7,13 +7,12 @@ module IsoDoc
7
7
  def docstatus(isoxml, _out)
8
8
  docstatus = isoxml.at(ns("//bibdata/status/stage"))
9
9
  substage = isoxml.at(ns("//bibdata/status/substage"))
10
- published_default(isoxml)
10
+ published = published_default(isoxml)
11
11
  if docstatus
12
12
  set(:stage, docstatus.text)
13
13
  set(:stage_int, docstatus.text.to_i)
14
14
  set(:statusabbr, substage["abbreviation"])
15
- unpublished(docstatus.text) and
16
- set(:stageabbr, docstatus["abbreviation"])
15
+ !published and set(:stageabbr, docstatus["abbreviation"])
17
16
  end
18
17
  revdate = isoxml.at(ns("//bibdata/version/revision-date"))
19
18
  set(:revdate, revdate&.text)
@@ -51,10 +50,6 @@ module IsoDoc
51
50
  b1 = isoxml&.at(ns("//bibdata/ext/horizontal[@language = 'fr']"))&.text
52
51
  b1 and set(:horizontal_fr, status_print(b1))
53
52
  end
54
-
55
- def unpublished(status)
56
- status.to_i.positive? && status.to_i < 60
57
- end
58
53
  end
59
54
  end
60
55
  end
@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
76
76
  <ref name="flavor">
77
77
  <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
78
78
  </ref>
79
- <optional>
80
- <ref name="editorialgroup">
81
- <a:documentation>Groups associated with the production of the standards document, typically within
82
- a standards definition organization</a:documentation>
83
- </ref>
84
- </optional>
85
79
  <zeroOrMore>
86
80
  <ref name="ics">
87
81
  <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
130
124
  However we prefer not to hardcode it, given ongoing extension.</a:documentation>
131
125
  <text/>
132
126
  </define>
133
- <define name="editorialgroup">
134
- <a:documentation>A group associated with the production of the standards document, typically within
135
- a standards definition organization</a:documentation>
136
- <element name="editorialgroup">
137
- <oneOrMore>
138
- <ref name="technical-committee">
139
- <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
140
- </ref>
141
- </oneOrMore>
142
- </element>
143
- </define>
144
- <define name="technical-committee">
145
- <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
146
- <element name="technical-committee">
147
- <ref name="IsoWorkgroup"/>
148
- </element>
149
- </define>
150
- <define name="IsoWorkgroup">
151
- <optional>
152
- <attribute name="number">
153
- <a:documentation>Numeric identifier of the technical committee</a:documentation>
154
- </attribute>
155
- </optional>
156
- <optional>
157
- <attribute name="type">
158
- <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
159
- </attribute>
160
- </optional>
161
- <optional>
162
- <attribute name="identifier">
163
- <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
164
- </attribute>
165
- </optional>
166
- <optional>
167
- <attribute name="prefix">
168
- <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
169
- typically indicating its type</a:documentation>
170
- </attribute>
171
- </optional>
172
- <text>
173
- <a:documentation>Name of the technical committee</a:documentation>
174
- </text>
175
- </define>
176
127
  <define name="ics">
177
128
  <a:documentation>Classification taken from the International Classification of Standards.
178
129
  ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>
@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
242
242
  </choice>
243
243
  </define>
244
244
  <define name="roledescription">
245
+ <a:documentation>A more detailed description of the role of the contributor
246
+ Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
245
247
  <element name="description">
246
248
  <ref name="LocalizedMarkedUpString"/>
247
249
  </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
443
445
  </oneOrMore>
444
446
  <zeroOrMore>
445
447
  <ref name="subdivision">
446
- <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
448
+ <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
449
+ Multiple subdivisions can be specified for an organization, with no implication of hierarchical
450
+ relation between them
451
+ Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
447
452
  </ref>
448
453
  </zeroOrMore>
449
454
  <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
485
490
  <a:documentation>The type of subdivision</a:documentation>
486
491
  </attribute>
487
492
  </optional>
493
+ <optional>
494
+ <attribute name="subtype">
495
+ <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
496
+ </attribute>
497
+ </optional>
488
498
  <ref name="OrganizationType">
489
499
  <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
490
500
  </ref>
@@ -166,8 +166,6 @@ module Metanorma
166
166
  a = node.attr("secretary") and xml.secretary a
167
167
  a = node.attr("interest-to-committees") and xml.interest_to_committees a
168
168
  end
169
-
170
- def metadata_approval_committee(node, xml); end
171
169
  end
172
170
  end
173
171
  end
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <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">
3
- <!-- VERSION v2.1.0 -->
3
+ <!-- VERSION v2.1.2 -->
4
4
 
5
5
  <!--
6
6
  ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
123
123
  <a:documentation>Notes whose scope is the current block</a:documentation>
124
124
  </ref>
125
125
  </zeroOrMore>
126
+ <ref name="BlockSource">
127
+ <a:documentation>Bibliographic source for the information in the list.
128
+ Sources are currently only rendered in metanorma-plateau</a:documentation>
129
+ </ref>
126
130
  </define>
127
131
  <define name="OlBody">
128
132
  <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
140
144
  <a:documentation>Notes whose scope is the current block</a:documentation>
141
145
  </ref>
142
146
  </zeroOrMore>
147
+ <ref name="BlockSource">
148
+ <a:documentation>Bibliographic source for the information in the list.
149
+ Sources are currently only rendered in metanorma-plateau</a:documentation>
150
+ </ref>
143
151
  </define>
144
152
  <define name="OlAttributes">
145
153
  <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
188
196
  <a:documentation>Notes whose scope is the current block</a:documentation>
189
197
  </ref>
190
198
  </zeroOrMore>
199
+ <ref name="BlockSource">
200
+ <a:documentation>Bibliographic source for the information in the list.
201
+ Sources are currently only rendered in metanorma-plateau</a:documentation>
202
+ </ref>
191
203
  </define>
192
204
  <define name="dt">
193
205
  <element name="dt">
@@ -871,6 +883,12 @@ titlecase, or lowercase</a:documentation>
871
883
  </oneOrMore>
872
884
  </element>
873
885
  </define>
886
+ <define name="ParagraphFnBody" combine="interleave">
887
+ <ref name="BlockSource">
888
+ <a:documentation>Bibliographic source for the information in the paragraph
889
+ parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
890
+ </ref>
891
+ </define>
874
892
  <define name="BasicBlock" combine="choice">
875
893
  <ref name="columnbreak"/>
876
894
  </define>
@@ -2233,6 +2251,11 @@ used in document amendments</a:documentation>
2233
2251
  <ref name="RequiredId"/>
2234
2252
  <ref name="NumberingAttributes"/>
2235
2253
  <ref name="BlockAttributes"/>
2254
+ <optional>
2255
+ <attribute name="type">
2256
+ <a:documentation>Semantic classification of note</a:documentation>
2257
+ </attribute>
2258
+ </optional>
2236
2259
  <oneOrMore>
2237
2260
  <choice>
2238
2261
  <a:documentation>Content of the term note</a:documentation>
@@ -63,11 +63,6 @@
63
63
  </group>
64
64
  </element>
65
65
  </define>
66
- <define name="editorialgroup">
67
- <element name="editorialgroup">
68
- <ref name="ISOProjectGroup"/>
69
- </element>
70
- </define>
71
66
  </include>
72
67
  <define name="BibDataExtensionType" combine="interleave">
73
68
  <optional>
@@ -130,33 +125,6 @@ Used for legacy ISO documents</a:documentation>
130
125
  <ref name="DocumentType"/>
131
126
  </element>
132
127
  </define>
133
- <define name="ISOProjectGroup">
134
- <zeroOrMore>
135
- <ref name="agency"/>
136
- </zeroOrMore>
137
- <oneOrMore>
138
- <ref name="technical-committee"/>
139
- </oneOrMore>
140
- <zeroOrMore>
141
- <ref name="subcommittee"/>
142
- </zeroOrMore>
143
- <zeroOrMore>
144
- <ref name="workgroup"/>
145
- </zeroOrMore>
146
- <optional>
147
- <ref name="secretariat"/>
148
- </optional>
149
- </define>
150
- <define name="approvalgroup">
151
- <element name="approvalgroup">
152
- <ref name="ISOProjectGroup"/>
153
- </element>
154
- </define>
155
- <define name="agency">
156
- <element name="agency">
157
- <text/>
158
- </element>
159
- </define>
160
128
  <define name="fast_track">
161
129
  <element name="fast-track">
162
130
  <data type="boolean"/>
@@ -202,21 +170,6 @@ Used for legacy ISO documents</a:documentation>
202
170
  <data type="int"/>
203
171
  </element>
204
172
  </define>
205
- <define name="subcommittee">
206
- <element name="subcommittee">
207
- <ref name="IsoWorkgroup"/>
208
- </element>
209
- </define>
210
- <define name="workgroup">
211
- <element name="workgroup">
212
- <ref name="IsoWorkgroup"/>
213
- </element>
214
- </define>
215
- <define name="secretariat">
216
- <element name="secretariat">
217
- <text/>
218
- </element>
219
- </define>
220
173
  <define name="stagename">
221
174
  <element name="stagename">
222
175
  <optional>
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.7.2".freeze
3
+ VERSION = "2.7.4".freeze
4
4
  end
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iec
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.2
4
+ version: 2.7.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-08-04 00:00:00.000000000 Z
11
+ date: 2025-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso