metanorma-iso 3.1.2 → 3.1.3
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.
- checksums.yaml +4 -4
- data/lib/isodoc/iso/iso.amendment.xsl +276 -157
- data/lib/isodoc/iso/iso.international-standard.xsl +276 -157
- data/lib/isodoc/iso/metadata.rb +20 -32
- data/lib/isodoc/iso/presentation_bibdata.rb +0 -29
- data/lib/isodoc/iso/presentation_section.rb +2 -2
- data/lib/metanorma/iso/biblio-standoc.rng +0 -49
- data/lib/metanorma/iso/biblio.rng +11 -1
- data/lib/metanorma/iso/cleanup.rb +20 -35
- data/lib/metanorma/iso/front_contributor.rb +34 -173
- data/lib/metanorma/iso/isodoc.rng +6 -1
- data/lib/metanorma/iso/relaton-iso.rng +0 -50
- data/lib/metanorma/iso/validate.rb +7 -4
- data/lib/metanorma/iso/version.rb +1 -1
- metadata +2 -2
|
@@ -67,14 +67,6 @@
|
|
|
67
67
|
</group>
|
|
68
68
|
</element>
|
|
69
69
|
</define>
|
|
70
|
-
<define name="editorialgroup">
|
|
71
|
-
<element name="editorialgroup">
|
|
72
|
-
<ref name="ISOProjectGroup"/>
|
|
73
|
-
</element>
|
|
74
|
-
<optional>
|
|
75
|
-
<ref name="approvalgroup"/>
|
|
76
|
-
</optional>
|
|
77
|
-
</define>
|
|
78
70
|
</include>
|
|
79
71
|
<define name="BibDataExtensionType" combine="interleave">
|
|
80
72
|
<optional>
|
|
@@ -112,33 +104,6 @@ Used for legacy ISO documents</a:documentation>
|
|
|
112
104
|
<ref name="DocumentType"/>
|
|
113
105
|
</element>
|
|
114
106
|
</define>
|
|
115
|
-
<define name="ISOProjectGroup">
|
|
116
|
-
<zeroOrMore>
|
|
117
|
-
<ref name="agency"/>
|
|
118
|
-
</zeroOrMore>
|
|
119
|
-
<oneOrMore>
|
|
120
|
-
<ref name="technical-committee"/>
|
|
121
|
-
</oneOrMore>
|
|
122
|
-
<zeroOrMore>
|
|
123
|
-
<ref name="subcommittee"/>
|
|
124
|
-
</zeroOrMore>
|
|
125
|
-
<zeroOrMore>
|
|
126
|
-
<ref name="workgroup"/>
|
|
127
|
-
</zeroOrMore>
|
|
128
|
-
<optional>
|
|
129
|
-
<ref name="secretariat"/>
|
|
130
|
-
</optional>
|
|
131
|
-
</define>
|
|
132
|
-
<define name="approvalgroup">
|
|
133
|
-
<element name="approvalgroup">
|
|
134
|
-
<ref name="ISOProjectGroup"/>
|
|
135
|
-
</element>
|
|
136
|
-
</define>
|
|
137
|
-
<define name="agency">
|
|
138
|
-
<element name="agency">
|
|
139
|
-
<text/>
|
|
140
|
-
</element>
|
|
141
|
-
</define>
|
|
142
107
|
<define name="horizontal">
|
|
143
108
|
<element name="horizontal">
|
|
144
109
|
<data type="boolean"/>
|
|
@@ -179,21 +144,6 @@ Used for legacy ISO documents</a:documentation>
|
|
|
179
144
|
<data type="int"/>
|
|
180
145
|
</element>
|
|
181
146
|
</define>
|
|
182
|
-
<define name="subcommittee">
|
|
183
|
-
<element name="subcommittee">
|
|
184
|
-
<ref name="IsoWorkgroup"/>
|
|
185
|
-
</element>
|
|
186
|
-
</define>
|
|
187
|
-
<define name="workgroup">
|
|
188
|
-
<element name="workgroup">
|
|
189
|
-
<ref name="IsoWorkgroup"/>
|
|
190
|
-
</element>
|
|
191
|
-
</define>
|
|
192
|
-
<define name="secretariat">
|
|
193
|
-
<element name="secretariat">
|
|
194
|
-
<text/>
|
|
195
|
-
</element>
|
|
196
|
-
</define>
|
|
197
147
|
<define name="stagename">
|
|
198
148
|
<element name="stagename">
|
|
199
149
|
<optional>
|
|
@@ -12,13 +12,17 @@ require "iev"
|
|
|
12
12
|
module Metanorma
|
|
13
13
|
module Iso
|
|
14
14
|
class Converter < Standoc::Converter
|
|
15
|
+
COMMITTEE_XPATH = <<~XPATH.freeze
|
|
16
|
+
//contributor[role/description = 'committee']/organization/subdivision
|
|
17
|
+
XPATH
|
|
18
|
+
|
|
15
19
|
def isosubgroup_validate(root)
|
|
16
|
-
root.xpath("
|
|
20
|
+
root.xpath("#{COMMITTEE_XPATH}[@type = 'Technical committee']/@subtype").each do |t|
|
|
17
21
|
%w{TC PC JTC JPC}.include?(t.text) or
|
|
18
22
|
@log.add("Document Attributes", nil,
|
|
19
23
|
"invalid technical committee type #{t}")
|
|
20
24
|
end
|
|
21
|
-
root.xpath("
|
|
25
|
+
root.xpath("#{COMMITTEE_XPATH}[@type = 'Subcommittee']/@subtype").each do |t|
|
|
22
26
|
%w{SC JSC}.include?(t.text) or
|
|
23
27
|
@log.add("Document Attributes", nil,
|
|
24
28
|
"invalid subcommittee type #{t}")
|
|
@@ -60,12 +64,11 @@ module Metanorma
|
|
|
60
64
|
prec = t.at("./preceding-sibling::text()[last()]")
|
|
61
65
|
!prec.nil? && /\b(see|refer to)\p{Zs}*\Z/mi.match(prec) or next
|
|
62
66
|
unless target = bibitemids[t["bibitemid"]]
|
|
63
|
-
#unless target = root.at("//bibitem[@anchor = '#{t['bibitemid']}']")
|
|
67
|
+
# unless target = root.at("//bibitem[@anchor = '#{t['bibitemid']}']")
|
|
64
68
|
@log.add("Bibliography", t,
|
|
65
69
|
"'#{t} is not pointing to a real reference")
|
|
66
70
|
next
|
|
67
71
|
end
|
|
68
|
-
#target.at("./ancestor::references[@normative = 'true']") and
|
|
69
72
|
target[:norm] and
|
|
70
73
|
@log.add("Style", t,
|
|
71
74
|
"'see #{t}' is pointing to a normative reference")
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-iso
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1.
|
|
4
|
+
version: 3.1.3
|
|
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-
|
|
11
|
+
date: 2025-08-18 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-standoc
|