metanorma-iec 2.1.6 → 2.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iec/iec.international-standard.xsl +15 -6
  3. data/lib/metanorma/iec/version.rb +1 -1
  4. data/spec/isodoc/iev_spec.rb +2 -2
  5. data/spec/isodoc/ref_spec.rb +110 -109
  6. data/spec/metanorma/base_spec.rb +0 -10
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 908bfed791fccdb7828a63b15a133a61e1591de49e3b32a8f99f1c14adc0a0d5
4
- data.tar.gz: 915402d4accbb80e50f68870646e41a285f306937a2eb7df0a2b1fdd947ea1c2
3
+ metadata.gz: 4afce5e220b03c361d1e929740e285055336eab64aa92a0856365a7ad85211af
4
+ data.tar.gz: a8a7ffc0585f3c39ad6987df9480ee8d8141262ab3f9abab6000677dcf2892b3
5
5
  SHA512:
6
- metadata.gz: 529609068f93529b989566f73f250fb274dd984b85e2a3bce30ef90c97dfe7142543e7fa5471f3dd538f49a02ceab009705bc665a667ed791133bf8306b475fa
7
- data.tar.gz: 863f607e319df46c67b4964baa8f27b575a6225c3217e3d26e55d718c6d6743dd4cb63be99d20e6800d20c0583b6e2a91fa40421352576fc9075c77334bf4d20
6
+ metadata.gz: b3b5db6bd6b3c2066e0c241accb161ec82a43776bb5837436ad5597524abe4a12dcbe70b7d9ad74dba3e19f0c3b2cdd12502da27ad501679f1838cff9a787626
7
+ data.tar.gz: ed78bec4055ad094af71ceb2593d0463910f97960aa33efc66197b19e7c85482d3d27b7079c1aab8d3408be711bdaf715b97eb2649fff2e12c3a587651fb0343
data/lib/isodoc/iec/iec.international-standard.xsl CHANGED
@@ -2364,6 +2364,9 @@
2364
2364
  <xsl:attribute-set name="import-style">
2365
2365
  </xsl:attribute-set>
2366
2366
 
2367
+ <xsl:attribute-set name="component-style">
2368
+ </xsl:attribute-set>
2369
+
2367
2370
  <xsl:attribute-set name="recommendation-style">
2368
2371
 
2369
2372
  </xsl:attribute-set>
@@ -8297,41 +8300,47 @@
8297
8300
  </fo:block>
8298
8301
  </xsl:template>
8299
8302
 
8300
- <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit']">
8303
+ <xsl:template match="*[local-name() = 'inherit'] | *[local-name() = 'component'][@class = 'inherit'] | *[local-name() = 'div'][@type = 'requirement-inherit'] | *[local-name() = 'div'][@type = 'recommendation-inherit'] | *[local-name() = 'div'][@type = 'permission-inherit']">
8301
8304
  <fo:block xsl:use-attribute-sets="inherit-style">
8302
8305
  <xsl:text>Dependency </xsl:text><xsl:apply-templates/>
8303
8306
  </fo:block>
8304
8307
  </xsl:template>
8305
8308
 
8306
- <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description']">
8309
+ <xsl:template match="*[local-name() = 'description'] | *[local-name() = 'component'][@class = 'description'] | *[local-name() = 'div'][@type = 'requirement-description'] | *[local-name() = 'div'][@type = 'recommendation-description'] | *[local-name() = 'div'][@type = 'permission-description']">
8307
8310
  <fo:block xsl:use-attribute-sets="description-style">
8308
8311
  <xsl:apply-templates/>
8309
8312
  </fo:block>
8310
8313
  </xsl:template>
8311
8314
 
8312
- <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification']">
8315
+ <xsl:template match="*[local-name() = 'specification'] | *[local-name() = 'component'][@class = 'specification'] | *[local-name() = 'div'][@type = 'requirement-specification'] | *[local-name() = 'div'][@type = 'recommendation-specification'] | *[local-name() = 'div'][@type = 'permission-specification']">
8313
8316
  <fo:block xsl:use-attribute-sets="specification-style">
8314
8317
  <xsl:apply-templates/>
8315
8318
  </fo:block>
8316
8319
  </xsl:template>
8317
8320
 
8318
- <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target']">
8321
+ <xsl:template match="*[local-name() = 'measurement-target'] | *[local-name() = 'component'][@class = 'measurement-target'] | *[local-name() = 'div'][@type = 'requirement-measurement-target'] | *[local-name() = 'div'][@type = 'recommendation-measurement-target'] | *[local-name() = 'div'][@type = 'permission-measurement-target']">
8319
8322
  <fo:block xsl:use-attribute-sets="measurement-target-style">
8320
8323
  <xsl:apply-templates/>
8321
8324
  </fo:block>
8322
8325
  </xsl:template>
8323
8326
 
8324
- <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification']">
8327
+ <xsl:template match="*[local-name() = 'verification'] | *[local-name() = 'component'][@class = 'verification'] | *[local-name() = 'div'][@type = 'requirement-verification'] | *[local-name() = 'div'][@type = 'recommendation-verification'] | *[local-name() = 'div'][@type = 'permission-verification']">
8325
8328
  <fo:block xsl:use-attribute-sets="verification-style">
8326
8329
  <xsl:apply-templates/>
8327
8330
  </fo:block>
8328
8331
  </xsl:template>
8329
8332
 
8330
- <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import']">
8333
+ <xsl:template match="*[local-name() = 'import'] | *[local-name() = 'component'][@class = 'import'] | *[local-name() = 'div'][@type = 'requirement-import'] | *[local-name() = 'div'][@type = 'recommendation-import'] | *[local-name() = 'div'][@type = 'permission-import']">
8331
8334
  <fo:block xsl:use-attribute-sets="import-style">
8332
8335
  <xsl:apply-templates/>
8333
8336
  </fo:block>
8334
8337
  </xsl:template>
8338
+
8339
+ <xsl:template match="*[local-name() = 'div'][starts-with(@type, 'requirement-component')] | *[local-name() = 'div'][starts-with(@type, 'recommendation-component')] | *[local-name() = 'div'][starts-with(@type, 'permission-component')]">
8340
+ <fo:block xsl:use-attribute-sets="component-style">
8341
+ <xsl:apply-templates/>
8342
+ </fo:block>
8343
+ </xsl:template>
8335
8344
  <!-- ========== -->
8336
8345
  <!-- END -->
8337
8346
  <!-- ========== -->
data/lib/metanorma/iec/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  module Metanorma
2
2
  module Iec
3
- VERSION = "2.1.6".freeze
3
+ VERSION = "2.1.7".freeze
4
4
  end
5
5
  end
6
6
 
data/spec/isodoc/iev_spec.rb CHANGED
@@ -203,7 +203,7 @@ RSpec.describe IsoDoc do
203
203
  <p id='_'>There are no normative references in this document.</p>
204
204
  <bibitem id='A'>
205
205
  <formattedref format='application/x-isodoc+xml'>
206
- <em>TITLE</em>
206
+ <em>TITLE</em> [B]
207
207
  </formattedref>
208
208
  <docidentifier>B</docidentifier>
209
209
  </bibitem>
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
213
213
  <p id='_'>There are no normative references in this document.</p>
214
214
  <bibitem id='A'>
215
215
  <formattedref format='application/x-isodoc+xml'>
216
- <em>TITLE</em>
216
+ <em>TITLE</em> [B]
217
217
  </formattedref>
218
218
  <docidentifier type='metanorma-ordinal'>[1]</docidentifier>
219
219
  <docidentifier>B</docidentifier>
data/spec/isodoc/ref_spec.rb CHANGED
@@ -113,7 +113,7 @@ RSpec.describe IsoDoc::Iec do
113
113
  <title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
114
114
  <docidentifier type="IETF">RFC 10</docidentifier>
115
115
  </bibitem>
116
- <bibitem id="ref12">
116
+ <bibitem id="ref12" type="standard">
117
117
  <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
118
118
  <docidentifier type="metanorma">[Citn]</docidentifier>
119
119
  <docidentifier type="IETF">RFC 20</docidentifier>
@@ -159,7 +159,7 @@ RSpec.describe IsoDoc::Iec do
159
159
  <docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
160
160
  </bibitem>
161
161
  <bibitem id="ref1">
162
- <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
162
+ <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>) [ICC 167]</formattedref>
163
163
  <docidentifier type="ICC">ICC 167</docidentifier>
164
164
  </bibitem>
165
165
  <note><name>NOTE</name><p>This is an annotation of ISO 20483:2013-2014</p></note>
@@ -167,12 +167,12 @@ RSpec.describe IsoDoc::Iec do
167
167
  </references><references id="_bibliography" obligation="informative" normative="false" displayorder="3">
168
168
  <title depth="1">Bibliography</title>
169
169
  <bibitem id="ISBN" type="book">
170
- <formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
170
+ <formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
171
171
  <docidentifier type="ISBN">ISBN</docidentifier>
172
172
  <docidentifier type="metanorma">[1]</docidentifier>
173
173
  </bibitem>
174
174
  <bibitem id="ISSN" type="journal">
175
- <formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
175
+ <formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
176
176
  <docidentifier type="ISSN">ISSN</docidentifier>
177
177
  <docidentifier type="metanorma">[2]</docidentifier>
178
178
  </bibitem>
@@ -188,11 +188,11 @@ RSpec.describe IsoDoc::Iec do
188
188
  <docidentifier type="metanorma">[10]</docidentifier>
189
189
  </bibitem>
190
190
  <bibitem id="ref11">
191
- <formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em>.</formattedref>
191
+ <formattedref><em><span class='stddocTitle'>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
192
192
  <docidentifier type='metanorma-ordinal'>[4]</docidentifier>
193
193
  <docidentifier type="IETF">IETF RFC 10</docidentifier>
194
194
  </bibitem>
195
- <bibitem id="ref12">
195
+ <bibitem id="ref12" type="standard">
196
196
  <formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
197
197
  <docidentifier type="metanorma">[Citn]</docidentifier>
198
198
  <docidentifier type="IETF">IETF RFC 20</docidentifier>
@@ -219,109 +219,110 @@ RSpec.describe IsoDoc::Iec do
219
219
  </p>
220
220
  </div>
221
221
  #{IEC_TITLE1}
222
- <div>
223
- <h1>1&#160; Normative References</h1>
224
- <p>
225
- The following documents are referred to in the text in such a way that
226
- some or all of their content constitutes requirements of this
227
- document. For dated references, only the edition cited applies. For
228
- undated references, the latest edition of the referenced document
229
- (including any amendments) applies.
230
- </p>
231
- <p id='ISO712' class='NormRef'>
232
- [110], ISO 712,
233
- <i>Cereals and cereal products</i>
234
- </p>
235
- <p id='ISO16634' class='NormRef'>
236
- ISO 16634:-- (all parts)
237
- <a class='FootnoteRef' href='#fn:1'>
238
- <sup>1</sup>
239
- </a>
240
- ,
241
- <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
242
- </p>
243
- <p id='ISO20483' class='NormRef'>
244
- ISO 20483:2013-2014,
245
- <i>Cereals and pulses</i>
246
- </p>
247
- <p id='ref1' class='NormRef'>
248
- ICC 167,
249
- <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
250
- .
251
- <i>
252
- Determination of the protein content in cereal and cereal products
253
- for food and animal feeding stuffs according to the Dumas combustion
254
- method
255
- </i>
256
- (see
257
- <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
258
- )
259
- </p>
260
- <div class='Note'>
261
- <p>
262
- <span class='note_label'>NOTE</span>
263
- &#160; This is an annotation of ISO 20483:2013-2014
264
- </p>
265
- </div>
266
- <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
267
- </div>
268
- <br/>
269
- <div>
270
- <h1 class='Section3'>Bibliography</h1>
271
- <p id='ISBN' class='Biblio'>
272
- [1]&#160;
273
- <i>Chemicals for analytical laboratory use</i>. ISBN.
274
- </p>
275
- <p id='ISSN' class='Biblio'>
276
- [2]&#160;
277
- <i>Instruments for analytical laboratory use</i>. ISSN.
278
- </p>
279
- <div class='Note'>
280
- <p>
281
- <span class='note_label'>NOTE</span>
282
- &#160; This is an annotation of document ISSN.
283
- </p>
284
- </div>
285
- <div class='Note'>
286
- <p>
287
- <span class='note_label'>NOTE</span>
288
- &#160; This is another annotation of document ISSN.
289
- </p>
290
- </div>
291
- <p id='ISO3696' class='Biblio'>
292
- [3]&#160; ISO 3696,
293
- <i>Water for analytical laboratory use</i>
294
- </p>
295
- <p id='ref10' class='Biblio'>
296
- [10]&#160;
297
- <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
298
- .
299
- <i>
300
- Determination of the protein content in cereal and cereal products
301
- for food and animal feeding stuffs according to the Dumas combustion
302
- method
303
- </i>
304
- (see
305
- <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
306
- )
307
- </p>
308
- <p id='ref11' class='Biblio'>
309
- [4]&#160; IETF RFC 10,
310
- <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>.
311
- </p>
312
- <p id='ref12' class='Biblio'>
313
- Citn&#160; IETF RFC 20, CitationWorks. 2019.
314
- <i>How to cite a reference</i>
315
- .
316
- </p>
317
- </div>
318
- <aside id='fn:1' class='footnote'>
319
- <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
320
- </aside>
321
- </div>
322
- </body>
323
- </html>
324
-
222
+ <div>
223
+ <h1>1&#xa0; Normative References</h1>
224
+ <p>
225
+ The following documents are referred to in the text in such a way that
226
+ some or all of their content constitutes requirements of this
227
+ document. For dated references, only the edition cited applies. For
228
+ undated references, the latest edition of the referenced document
229
+ (including any amendments) applies.
230
+ </p>
231
+ <p id='ISO712' class='NormRef'>
232
+ [110], ISO 712,
233
+ <i>Cereals and cereal products</i>
234
+ </p>
235
+ <p id='ISO16634' class='NormRef'>
236
+ ISO 16634:-- (all parts)
237
+ <a class='FootnoteRef' href='#fn:1'>
238
+ <sup>1</sup>
239
+ </a>
240
+ ,
241
+ <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
242
+ </p>
243
+ <p id='ISO20483' class='NormRef'>
244
+ ISO 20483:2013-2014,
245
+ <i>Cereals and pulses</i>
246
+ </p>
247
+ <p id='ref1' class='NormRef'>
248
+ ICC 167,
249
+ <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
250
+ .
251
+ <i>
252
+ Determination of the protein content in cereal and cereal products
253
+ for food and animal feeding stuffs according to the Dumas combustion
254
+ method
255
+ </i>
256
+ (see
257
+ <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
258
+ ) [ICC 167]
259
+ </p>
260
+ <div class='Note'>
261
+ <p>
262
+ <span class='note_label'>NOTE</span>
263
+ &#xa0; This is an annotation of ISO 20483:2013-2014
264
+ </p>
265
+ </div>
266
+ <p id='zip_ffs' class='NormRef'>[5] Title 5</p>
267
+ </div>
268
+ <br/>
269
+ <div>
270
+ <h1 class='Section3'>Bibliography</h1>
271
+ <p id='ISBN' class='Biblio'>
272
+ [1]&#xa0;
273
+ <i>Chemicals for analytical laboratory use</i>
274
+ . n.p.: n.d. ISBN.
275
+ </p>
276
+ <p id='ISSN' class='Biblio'>
277
+ [2]&#xa0;
278
+ <i>Instruments for analytical laboratory use</i>
279
+ . n.d. ISSN.
280
+ </p>
281
+ <div class='Note'>
282
+ <p>
283
+ <span class='note_label'>NOTE</span>
284
+ &#xa0; This is an annotation of document ISSN.
285
+ </p>
286
+ </div>
287
+ <div class='Note'>
288
+ <p>
289
+ <span class='note_label'>NOTE</span>
290
+ &#xa0; This is another annotation of document ISSN.
291
+ </p>
292
+ </div>
293
+ <p id='ISO3696' class='Biblio'>
294
+ [3]&#xa0; ISO 3696,
295
+ <i>Water for analytical laboratory use</i>
296
+ </p>
297
+ <p id='ref10' class='Biblio'>
298
+ [10]&#xa0;
299
+ <span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
300
+ .
301
+ <i>
302
+ Determination of the protein content in cereal and cereal products
303
+ for food and animal feeding stuffs according to the Dumas combustion
304
+ method
305
+ </i>
306
+ (see
307
+ <a href='http://www.icc.or.at'>http://www.icc.or.at</a>
308
+ )
309
+ </p>
310
+ <p id='ref11' class='Biblio'>
311
+ [4]&#xa0; IETF RFC 10,
312
+ <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
313
+ </p>
314
+ <p id='ref12' class='Biblio'>
315
+ Citn&#xa0; IETF RFC 20, CitationWorks. 2019.
316
+ <i>How to cite a reference</i>
317
+ .
318
+ </p>
319
+ </div>
320
+ <aside id='fn:1' class='footnote'>
321
+ <p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
322
+ </aside>
323
+ </div>
324
+ </body>
325
+ </html>
325
326
  OUTPUT
326
327
  expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
327
328
  .convert("test", input, true).sub(
data/spec/metanorma/base_spec.rb CHANGED
@@ -89,7 +89,6 @@ RSpec.describe Metanorma::Iec do
89
89
  :title-intro-fr: Introduction Française
90
90
  :title-main-fr: Titre Principal
91
91
  :title-part-fr: Part du Titre
92
- :library-ics: 1,2,3
93
92
  :accessibility-color-inside: true
94
93
  :price-code: XC
95
94
  :cen-processing: true
@@ -176,15 +175,6 @@ RSpec.describe Metanorma::Iec do
176
175
  <workgroup number='31' type='C1'>WG1</workgroup>
177
176
  <secretariat>SECRETARIAT</secretariat>
178
177
  </editorialgroup>
179
- <ics>
180
- <code>1</code>
181
- </ics>
182
- <ics>
183
- <code>2</code>
184
- </ics>
185
- <ics>
186
- <code>3</code>
187
- </ics>
188
178
  <structuredidentifier>
189
179
  <project-number part='1'>IEC 1000</project-number>
190
180
  </structuredidentifier>
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.1.6
4
+ version: 2.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-08 00:00:00.000000000 Z
11
+ date: 2022-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-iso