metanorma-iso 2.1.6 → 2.1.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/iso/iso.amendment.xsl +73 -39
- data/lib/isodoc/iso/iso.international-standard.xsl +73 -39
- data/lib/isodoc/iso/presentation_xml_convert.rb +4 -6
- data/lib/metanorma/iso/cleanup.rb +0 -1
- data/lib/metanorma/iso/front_id.rb +19 -28
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/isodoc/ref_spec.rb +123 -76
- data/spec/metanorma/base_spec.rb +15 -2
- data/spec/metanorma/section_spec.rb +2 -2
- data/spec/vcr_cassettes/withdrawn_iso.yml +21 -21
- metadata +2 -2
data/spec/isodoc/ref_spec.rb
CHANGED
|
@@ -197,7 +197,7 @@ RSpec.describe IsoDoc do
|
|
|
197
197
|
for food and animal feeding stuffs according to the Dumas combustion
|
|
198
198
|
method</em> (see
|
|
199
199
|
|
|
200
|
-
<link target="http://www.icc.or.at"/> )
|
|
200
|
+
<link target="http://www.icc.or.at"/> ) [ICC 167]
|
|
201
201
|
</formattedref>
|
|
202
202
|
<docidentifier type="ICC">ICC 167</docidentifier>
|
|
203
203
|
</bibitem>
|
|
@@ -209,12 +209,12 @@ RSpec.describe IsoDoc do
|
|
|
209
209
|
<references id="_bibliography" normative="false" obligation="informative" displayorder="3">
|
|
210
210
|
<title depth="1">Bibliography</title>
|
|
211
211
|
<bibitem id="ISBN" type="book">
|
|
212
|
-
<formattedref><em>Chemicals for analytical laboratory use</em>. ISBN.</formattedref>
|
|
212
|
+
<formattedref><em>Chemicals for analytical laboratory use</em>. n.p.: n.d. ISBN.</formattedref>
|
|
213
213
|
<docidentifier type="ISBN">ISBN</docidentifier>
|
|
214
214
|
<docidentifier type="metanorma">[1]</docidentifier>
|
|
215
215
|
</bibitem>
|
|
216
216
|
<bibitem id="ISSN" type="journal">
|
|
217
|
-
<formattedref><em>Instruments for analytical laboratory use</em>. ISSN.</formattedref>
|
|
217
|
+
<formattedref><em>Instruments for analytical laboratory use</em>. n.d. ISSN.</formattedref>
|
|
218
218
|
<docidentifier type="ISSN">ISSN</docidentifier>
|
|
219
219
|
<docidentifier type="metanorma">[2]</docidentifier>
|
|
220
220
|
</bibitem>
|
|
@@ -244,13 +244,13 @@ RSpec.describe IsoDoc do
|
|
|
244
244
|
<docidentifier type="metanorma">[10]</docidentifier>
|
|
245
245
|
</bibitem>
|
|
246
246
|
<bibitem id="ref11">
|
|
247
|
-
<formattedref><em>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</em
|
|
247
|
+
<formattedref><em><span class="stddocTitle">Internet Calendaring and Scheduling Core Object Specification (iCalendar)</span></em></formattedref>
|
|
248
248
|
<docidentifier type='metanorma-ordinal'>[4]</docidentifier>
|
|
249
249
|
<docidentifier type="IETF">IETF RFC 10</docidentifier>
|
|
250
250
|
</bibitem>
|
|
251
251
|
<bibitem id="ref12">
|
|
252
252
|
<formattedref format="application/x-isodoc+xml">CitationWorks. 2019.
|
|
253
|
-
<em>How to cite a reference</em
|
|
253
|
+
<em>How to cite a reference</em>. [IETF RFC 20]</formattedref>
|
|
254
254
|
<docidentifier type="metanorma">[Citn]</docidentifier>
|
|
255
255
|
<docidentifier type="IETF">IETF RFC 20</docidentifier>
|
|
256
256
|
</bibitem>
|
|
@@ -261,76 +261,123 @@ RSpec.describe IsoDoc do
|
|
|
261
261
|
|
|
262
262
|
html = <<~OUTPUT
|
|
263
263
|
#{HTML_HDR}
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
264
|
+
<br/>
|
|
265
|
+
<div>
|
|
266
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
267
|
+
<p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
|
|
268
|
+
<a href='#ISO712'>ISO 712</a>
|
|
269
|
+
<a href='#ISBN'>[1]</a>
|
|
270
|
+
<a href='#ISSN'>[2]</a>
|
|
271
|
+
<a href='#ISO16634'>ISO 16634:--</a>
|
|
272
|
+
<a href='#ref1'>ICC 167</a>
|
|
273
|
+
<a href='#ref10'>[10]</a>
|
|
274
|
+
<a href='#ref12'>Citn</a>
|
|
275
|
+
</p>
|
|
276
|
+
</div>
|
|
277
|
+
<p class='zzSTDTitle1'/>
|
|
278
|
+
<div>
|
|
279
|
+
<h1>1 Normative References</h1>
|
|
280
|
+
<p>
|
|
281
|
+
The following documents are referred to in the text in such a way that
|
|
282
|
+
some or all of their content constitutes requirements of this
|
|
283
|
+
document. For dated references, only the edition cited applies. For
|
|
284
|
+
undated references, the latest edition of the referenced document
|
|
285
|
+
(including any amendments) applies.
|
|
286
|
+
</p>
|
|
287
|
+
<p id='ISO712' class='NormRef'>
|
|
288
|
+
ISO 712,
|
|
289
|
+
<i>Cereals and cereal products</i>
|
|
290
|
+
</p>
|
|
291
|
+
<p id='ISO16634' class='NormRef'>
|
|
292
|
+
ISO 16634:-- (all parts)
|
|
293
|
+
<a class='FootnoteRef' href='#fn:1'>
|
|
294
|
+
<sup>1</sup>
|
|
295
|
+
</a>
|
|
296
|
+
,
|
|
297
|
+
<i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
|
|
298
|
+
</p>
|
|
299
|
+
<p id='ISO20483' class='NormRef'>
|
|
300
|
+
ISO 20483:2013-2014,
|
|
301
|
+
<i>Cereals and pulses</i>
|
|
302
|
+
</p>
|
|
303
|
+
<p id='ref1' class='NormRef'>
|
|
304
|
+
ICC 167,
|
|
305
|
+
<span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
|
|
306
|
+
.
|
|
307
|
+
<i>
|
|
308
|
+
Determination of the protein content in cereal and cereal products
|
|
309
|
+
for food and animal feeding stuffs according to the Dumas combustion
|
|
310
|
+
method
|
|
311
|
+
</i>
|
|
312
|
+
(see
|
|
313
|
+
<a href='http://www.icc.or.at'>http://www.icc.or.at</a>
|
|
314
|
+
) [ICC 167]
|
|
315
|
+
</p>
|
|
316
|
+
<div class='Note'>
|
|
317
|
+
<p>
|
|
318
|
+
<span class='note_label'>NOTE</span>
|
|
319
|
+
This is an annotation of ISO 20483:2013-2014
|
|
320
|
+
</p>
|
|
321
|
+
</div>
|
|
322
|
+
</div>
|
|
323
|
+
<br/>
|
|
324
|
+
<div>
|
|
325
|
+
<h1 class='Section3'>Bibliography</h1>
|
|
326
|
+
<p id='ISBN' class='Biblio'>
|
|
327
|
+
[1]
|
|
328
|
+
<i>Chemicals for analytical laboratory use</i>
|
|
329
|
+
. n.p.: n.d. ISBN.
|
|
330
|
+
</p>
|
|
331
|
+
<p id='ISSN' class='Biblio'>
|
|
332
|
+
[2]
|
|
333
|
+
<i>Instruments for analytical laboratory use</i>
|
|
334
|
+
. n.d. ISSN.
|
|
335
|
+
</p>
|
|
336
|
+
<div class='Note'>
|
|
337
|
+
<p>
|
|
338
|
+
<span class='note_label'>NOTE</span>
|
|
339
|
+
This is an annotation of document ISSN.
|
|
340
|
+
</p>
|
|
341
|
+
</div>
|
|
342
|
+
<div class='Note'>
|
|
343
|
+
<p>
|
|
344
|
+
<span class='note_label'>NOTE</span>
|
|
345
|
+
This is another annotation of document ISSN.
|
|
346
|
+
</p>
|
|
347
|
+
</div>
|
|
348
|
+
<p id='ISO3696' class='Biblio'>
|
|
349
|
+
[3] ISO 3696,
|
|
350
|
+
<i>Water for analytical laboratory use</i>
|
|
351
|
+
</p>
|
|
352
|
+
<p id='ref10' class='Biblio'>
|
|
353
|
+
[10]
|
|
354
|
+
<span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
|
|
355
|
+
.
|
|
356
|
+
<i>
|
|
357
|
+
Determination of the protein content in cereal and cereal products
|
|
358
|
+
for food and animal feeding stuffs according to the Dumas combustion
|
|
359
|
+
method
|
|
360
|
+
</i>
|
|
361
|
+
(see
|
|
362
|
+
<a href='http://www.icc.or.at'>http://www.icc.or.at</a>
|
|
363
|
+
)
|
|
364
|
+
</p>
|
|
365
|
+
<p id='ref11' class='Biblio'>
|
|
366
|
+
[4] IETF RFC 10,
|
|
367
|
+
<i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
|
|
368
|
+
</p>
|
|
369
|
+
<p id='ref12' class='Biblio'>
|
|
370
|
+
Citn IETF RFC 20, CitationWorks. 2019.
|
|
371
|
+
<i>How to cite a reference</i>
|
|
372
|
+
. [IETF RFC 20]
|
|
373
|
+
</p>
|
|
374
|
+
</div>
|
|
375
|
+
<aside id='fn:1' class='footnote'>
|
|
376
|
+
<p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
|
|
377
|
+
</aside>
|
|
378
|
+
</div>
|
|
379
|
+
</body>
|
|
380
|
+
</html>
|
|
334
381
|
OUTPUT
|
|
335
382
|
expect(xmlpp(IsoDoc::Iso::PresentationXMLConvert.new({})
|
|
336
383
|
.convert("test", input, true))
|
|
@@ -372,7 +419,7 @@ RSpec.describe IsoDoc do
|
|
|
372
419
|
<em>
|
|
373
420
|
<span class='stddocTitle'>IGNF. (IGN France) Registry</span>
|
|
374
421
|
</em>
|
|
375
|
-
[website]. Available from:
|
|
422
|
+
[website]. n.d. Available from:
|
|
376
423
|
<span class='biburl'>
|
|
377
424
|
<link target='https://registre.ign.fr/ign/IGNF/'>https://registre.ign.fr/ign/IGNF/</link>
|
|
378
425
|
</span>
|
data/spec/metanorma/base_spec.rb
CHANGED
|
@@ -940,8 +940,8 @@ RSpec.describe Metanorma::ISO do
|
|
|
940
940
|
INPUT
|
|
941
941
|
expect(xmlpp(output.sub(%r{<boilerplate>.*</boilerplate>}m, "")))
|
|
942
942
|
.to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
943
|
-
|
|
944
|
-
|
|
943
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso" type="semantic" version="#{Metanorma::ISO::VERSION}">
|
|
944
|
+
<bibdata type='standard'>
|
|
945
945
|
<contributor>
|
|
946
946
|
<role type='author'/>
|
|
947
947
|
<organization>
|
|
@@ -1008,6 +1008,9 @@ RSpec.describe Metanorma::ISO do
|
|
|
1008
1008
|
<title type='title-intro' format='text/plain' language='en' script='Latn'>Rubber latex</title>
|
|
1009
1009
|
<title type='title-main' format='text/plain' language='en' script='Latn'>Sampling</title>
|
|
1010
1010
|
<title type='main' format='text/plain' language='en' script='Latn'>Rubber latex — Sampling</title>
|
|
1011
|
+
<title type='title-intro' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc</title>
|
|
1012
|
+
<title type='title-main' format='text/plain' language='fr' script='Latn'>Échantillonnage</title>
|
|
1013
|
+
<title type='main' format='text/plain' language='fr' script='Latn'>Latex de caoutchouc — Échantillonnage</title>
|
|
1011
1014
|
<uri type='src'>https://www.iso.org/standard/23281.html</uri>
|
|
1012
1015
|
<uri type='obp'>https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
|
|
1013
1016
|
<uri type='rss'>https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
|
|
@@ -1025,6 +1028,7 @@ RSpec.describe Metanorma::ISO do
|
|
|
1025
1028
|
</contributor>
|
|
1026
1029
|
<edition>3</edition>
|
|
1027
1030
|
<language>en</language>
|
|
1031
|
+
<language>fr</language>
|
|
1028
1032
|
<script>Latn</script>
|
|
1029
1033
|
<abstract format='text/plain' language='en' script='Latn'>
|
|
1030
1034
|
This International Standard specifies procedures for sampling natural
|
|
@@ -1033,6 +1037,15 @@ RSpec.describe Metanorma::ISO do
|
|
|
1033
1037
|
contained in drums, tank cars or tanks. The procedures may also be
|
|
1034
1038
|
used for sampling plastics dispersions.
|
|
1035
1039
|
</abstract>
|
|
1040
|
+
<abstract format='text/plain' language='fr' script='Latn'>
|
|
1041
|
+
La présente Norme internationale spécifie des méthodes
|
|
1042
|
+
d’échantillonnage pour des concentrés de latex de caoutchouc naturel
|
|
1043
|
+
et pour échantillonner des latex de caoutchouc synthétique et des
|
|
1044
|
+
latex artificiels. Elle s’applique également à l’échantillonnage de
|
|
1045
|
+
latex de caoutchouc contenus dans des fûts, citernes routières ou de
|
|
1046
|
+
stockage. Le mode opératoire peut aussi être utilisé pour
|
|
1047
|
+
l’échantillonnage de dispersions de plastiques.
|
|
1048
|
+
</abstract>
|
|
1036
1049
|
<status>
|
|
1037
1050
|
<stage>90</stage>
|
|
1038
1051
|
<substage>93</substage>
|