metanorma-iso 1.3.16 → 1.3.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/asciidoctor/iso/base.rb +1 -1
- data/lib/asciidoctor/iso/cleanup.rb +5 -0
- data/lib/asciidoctor/iso/front.rb +1 -1
- data/lib/asciidoctor/iso/isostandard.rng +1 -1
- data/lib/asciidoctor/iso/validate_section.rb +1 -1
- data/lib/isodoc/iso/base_convert.rb +9 -2
- data/lib/isodoc/iso/metadata.rb +16 -7
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/base_spec.rb +5 -5
- data/spec/asciidoctor-iso/refs_spec.rb +13 -1
- data/spec/isodoc/metadata_spec.rb +3 -2
- data/spec/isodoc/ref_spec.rb +174 -0
- data/spec/spec_helper.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f43540e36abfb8c5efc0ea4ed12280723159eac0cfdd76ca9654ad90c92f0ccf
|
4
|
+
data.tar.gz: 1634a302b026965820392bfe701d13ce391f251592e30d6fb7cb7908cea207cd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 479f3cd417cf68c89a2b0c100b6a4ec04ed3934b009b6c8ca234e004025d709602b0e8df26a781b0e8731924d7266d8a6bbd6b1446132b10647a86d079d6230d
|
7
|
+
data.tar.gz: d9cf5fe5031b9be10cf46ec3be59e76081e4a77c5f03a487ed7ff939c43211d5b5bf696f54be3cd930acc59400ea7cb19beeea01143375dfbdced33944294120
|
data/lib/asciidoctor/iso/base.rb
CHANGED
@@ -11,7 +11,7 @@ module Asciidoctor
|
|
11
11
|
module ISO
|
12
12
|
class Converter < Standoc::Converter
|
13
13
|
XML_ROOT_TAG = "iso-standard".freeze
|
14
|
-
XML_NAMESPACE = "https://www.metanorma.
|
14
|
+
XML_NAMESPACE = "https://www.metanorma.org/ns/iso".freeze
|
15
15
|
|
16
16
|
def html_converter(node)
|
17
17
|
IsoDoc::Iso::HtmlConvert.new(html_extract_attributes(node))
|
@@ -58,6 +58,11 @@ module Asciidoctor
|
|
58
58
|
id.content = id_prefix(prefix, id)
|
59
59
|
end
|
60
60
|
|
61
|
+
def format_ref(ref, type, isopub)
|
62
|
+
ref = ref.sub(/ \(All Parts\)/i, "")
|
63
|
+
super
|
64
|
+
end
|
65
|
+
|
61
66
|
PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
|
62
67
|
OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
|
63
68
|
"@type = 'ISBN'".freeze
|
@@ -59,7 +59,7 @@ module Asciidoctor
|
|
59
59
|
|
60
60
|
def id_stage_abbr(stage, substage, node)
|
61
61
|
IsoDoc::Iso::Metadata.new("en", "Latn", {}).
|
62
|
-
|
62
|
+
status_abbrev(stage, substage, node.attr("iteration"),
|
63
63
|
node.attr("draft"))
|
64
64
|
end
|
65
65
|
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
-
<grammar ns="https://www.metanorma.
|
2
|
+
<grammar ns="https://www.metanorma.org/ns/iso" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
3
3
|
<!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
|
4
4
|
<include href="isodoc.rng">
|
5
5
|
<start>
|
@@ -144,7 +144,7 @@ module Asciidoctor
|
|
144
144
|
warn("ISO style: There are sections after the final Bibliography")
|
145
145
|
end
|
146
146
|
|
147
|
-
def style_warning(node, msg, text)
|
147
|
+
def style_warning(node, msg, text = nil)
|
148
148
|
return if @novalid
|
149
149
|
w = "ISO style: WARNING (#{Standoc::Utils::current_location(node)}): #{msg}"
|
150
150
|
w += ": #{text}" if text
|
@@ -10,8 +10,7 @@ module IsoDoc
|
|
10
10
|
end
|
11
11
|
|
12
12
|
def implicit_reference(b)
|
13
|
-
|
14
|
-
isocode == "IEV"
|
13
|
+
b&.at(ns("./docidentifier"))&.text == "IEV"
|
15
14
|
end
|
16
15
|
|
17
16
|
def introduction(isoxml, out)
|
@@ -189,6 +188,14 @@ module IsoDoc
|
|
189
188
|
def clausedelim
|
190
189
|
""
|
191
190
|
end
|
191
|
+
|
192
|
+
def format_ref(ref, prefix, isopub, date, allparts)
|
193
|
+
ref = ref.sub(/ \(All Parts\)/i, "")
|
194
|
+
ref = docid_prefix(prefix, ref)
|
195
|
+
return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
|
196
|
+
!/^\[.*\]$/.match(ref)
|
197
|
+
ref
|
198
|
+
end
|
192
199
|
end
|
193
200
|
end
|
194
201
|
end
|
data/lib/isodoc/iso/metadata.rb
CHANGED
@@ -28,7 +28,11 @@ module IsoDoc
|
|
28
28
|
"95": "(Withdrawal)",
|
29
29
|
}.freeze
|
30
30
|
|
31
|
-
def
|
31
|
+
def stage_abbr(stage)
|
32
|
+
self.class::STAGE_ABBRS[stage.to_sym] || "??"
|
33
|
+
end
|
34
|
+
|
35
|
+
def status_abbrev(stage, substage, iter, draft)
|
32
36
|
return "" unless stage
|
33
37
|
stage = self.class::STAGE_ABBRS[stage.to_sym] || "??"
|
34
38
|
stage = "PRF" if stage == "IS" && substage == "00"
|
@@ -43,17 +47,22 @@ module IsoDoc
|
|
43
47
|
if docstatus
|
44
48
|
set(:stage, docstatus.text)
|
45
49
|
set(:stage_int, docstatus.text.to_i)
|
46
|
-
set(:unpublished, docstatus.text
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
50
|
+
set(:unpublished, unpublished(docstatus.text))
|
51
|
+
set(:statusabbr, status_abbrev(docstatus.text,
|
52
|
+
isoxml&.at(ns("//bibdata/status/substage"))&.text,
|
53
|
+
isoxml&.at(ns("//bibdata/status/iteration"))&.text,
|
54
|
+
isoxml&.at(ns("//version/draft"))&.text))
|
55
|
+
unpublished(docstatus.text) and
|
56
|
+
set(:stageabbr, stage_abbr(docstatus.text))
|
52
57
|
end
|
53
58
|
revdate = isoxml.at(ns("//version/revision-date"))
|
54
59
|
set(:revdate, revdate&.text)
|
55
60
|
end
|
56
61
|
|
62
|
+
def unpublished(status)
|
63
|
+
status.to_i > 0 && status.to_i < 60
|
64
|
+
end
|
65
|
+
|
57
66
|
def docid(isoxml, _out)
|
58
67
|
dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso']"))
|
59
68
|
set(:docnumber, dn&.text)
|
@@ -89,7 +89,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
89
89
|
:library-ics: 1,2,3
|
90
90
|
INPUT
|
91
91
|
<?xml version="1.0" encoding="UTF-8"?>
|
92
|
-
<iso-standard xmlns="https://www.metanorma.
|
92
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
93
93
|
<bibdata type="standard">
|
94
94
|
<title language="en" format="text/plain" type="main">Introduction — Main Title — Title — Title Part</title>
|
95
95
|
<title language="en" format="text/plain" type="title-intro">Introduction</title>
|
@@ -185,7 +185,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
185
185
|
:copyright-year: 2001
|
186
186
|
INPUT
|
187
187
|
<?xml version="1.0" encoding="UTF-8"?>
|
188
|
-
<iso-standard xmlns="https://www.metanorma.
|
188
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
189
189
|
<bibdata type="standard">
|
190
190
|
<docidentifier type="iso">ISO/IEC/IETF 1000-1-1:2001</docidentifier>
|
191
191
|
<docidentifier type='iso-with-lang'>ISO/IEC/IETF 1000-1-1:2001 (X)</docidentifier>
|
@@ -293,7 +293,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
293
293
|
:docstage: 50
|
294
294
|
:language: fr
|
295
295
|
INPUT
|
296
|
-
<iso-standard xmlns="https://www.metanorma.
|
296
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
297
297
|
<bibdata type="standard">
|
298
298
|
<docidentifier type="iso">ISO/FDIS 1000</docidentifier>
|
299
299
|
<docidentifier type='iso-with-lang'>ISO/FDIS 1000 (F)</docidentifier>
|
@@ -356,7 +356,7 @@ OUTPUT
|
|
356
356
|
:docnumber: 1000
|
357
357
|
:docstage: 60
|
358
358
|
INPUT
|
359
|
-
<iso-standard xmlns="https://www.metanorma.
|
359
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
360
360
|
<bibdata type="standard">
|
361
361
|
<docidentifier type="iso">ISO 1000</docidentifier>
|
362
362
|
<docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
|
@@ -420,7 +420,7 @@ OUTPUT
|
|
420
420
|
:docstage: 60
|
421
421
|
:docsubstage: 00
|
422
422
|
INPUT
|
423
|
-
<iso-standard xmlns="https://www.metanorma.
|
423
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
424
424
|
<bibdata type="standard">
|
425
425
|
<docidentifier type="iso">ISO/PRF 1000</docidentifier>
|
426
426
|
<docidentifier type='iso-with-lang'>ISO/PRF 1000 (E)</docidentifier>
|
@@ -44,6 +44,11 @@ RSpec.describe Asciidoctor::ISO do
|
|
44
44
|
|
45
45
|
expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :iso, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
46
46
|
#{ASCIIDOC_BLANK_HDR}
|
47
|
+
|
48
|
+
== Clause
|
49
|
+
|
50
|
+
<<iso123>>
|
51
|
+
|
47
52
|
[bibliography]
|
48
53
|
== Normative References
|
49
54
|
|
@@ -51,7 +56,14 @@ RSpec.describe Asciidoctor::ISO do
|
|
51
56
|
INPUT
|
52
57
|
#{BLANK_HDR}
|
53
58
|
<sections>
|
54
|
-
|
59
|
+
<clause id='_' inline-header='false' obligation='normative'>
|
60
|
+
<title>Clause</title>
|
61
|
+
<p id='_'>
|
62
|
+
<eref type='inline' bibitemid='iso123' citeas='ISO 123:1066'/>
|
63
|
+
</p>
|
64
|
+
</clause>
|
65
|
+
</sections>
|
66
|
+
<bibliography><references id="_" obligation="informative">
|
55
67
|
<title>Normative References</title>
|
56
68
|
<p id="_">The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
|
57
69
|
<bibitem id="iso123" type="standard">
|
@@ -19,6 +19,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
19
19
|
<docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
|
20
20
|
<docidentifier type="iso-tc">17301</docidentifier>
|
21
21
|
<docidentifier type="iso-tc">17302</docidentifier>
|
22
|
+
<docnumber>1730</docnumber>
|
22
23
|
<date type="published"><on>2011</on></date>
|
23
24
|
<date type="accessed"><on>2012</on></date>
|
24
25
|
<date type="created"><from>2010</from><to>2011</to></date>
|
@@ -71,7 +72,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
71
72
|
</bibdata>
|
72
73
|
</iso-standard>
|
73
74
|
INPUT
|
74
|
-
{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010–2011", :docnumber=>"ISO/PreCD3 17301-1", :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz", :docsubtitleintro=>"Céréales et légumineuses", :docsubtitlemain=>"Spécification et méthodes d'essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie 1", :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part 1", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>["17301", "17302"], :unpublished=>true, :wg=>"WG 3"}
|
75
|
+
{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010–2011", :docnumber=>"ISO/PreCD3 17301-1", :docnumeric=>"1730", :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz", :docsubtitleintro=>"Céréales et légumineuses", :docsubtitlemain=>"Spécification et méthodes d'essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie 1", :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part 1", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :ics=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :stage=>"30", :stage_int=>30, :stageabbr=>"CD", :statusabbr=>"PreCD3", :tc=>"TC 34", :tc_docnumber=>["17301", "17302"], :unpublished=>true, :wg=>"WG 3"}
|
75
76
|
OUTPUT
|
76
77
|
end
|
77
78
|
|
@@ -147,7 +148,7 @@ OUTPUT
|
|
147
148
|
</bibdata>
|
148
149
|
</iso-standard>
|
149
150
|
INPUT
|
150
|
-
{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz", :docsubtitleintro=>"Céréales et légumineuses", :docsubtitlemain=>"Spécification et méthodes d'essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie 1–3", :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part 1–3", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :
|
151
|
+
{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :docnumeric=>nil, :docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz", :docsubtitleintro=>"Céréales et légumineuses", :docsubtitlemain=>"Spécification et méthodes d'essai", :docsubtitlepart=>"Riz", :docsubtitlepartlabel=>"Partie 1–3", :doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice", :doctitleintro=>"Cereals and pulses", :doctitlemain=>"Specifications and test methods", :doctitlepart=>"Rice", :doctitlepartlabel=>"Part 1–3", :doctype=>"International Standard", :docyear=>"2016", :draft=>nil, :draftinfo=>"", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :revdate=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :statusabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>["17301"], :unpublished=>false, :wg=>"GHI 3"}
|
151
152
|
OUTPUT
|
152
153
|
end
|
153
154
|
|
@@ -0,0 +1,174 @@
|
|
1
|
+
require "spec_helper"
|
2
|
+
|
3
|
+
RSpec.describe IsoDoc do
|
4
|
+
it "processes IsoXML bibliographies" do
|
5
|
+
expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
6
|
+
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
7
|
+
<bibdata>
|
8
|
+
<language>en</language>
|
9
|
+
</bibdata>
|
10
|
+
<preface><foreword>
|
11
|
+
<p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
|
12
|
+
<eref bibitemid="ISO712"/>
|
13
|
+
<eref bibitemid="ISBN"/>
|
14
|
+
<eref bibitemid="ISSN"/>
|
15
|
+
<eref bibitemid="ISO16634"/>
|
16
|
+
<eref bibitemid="ref1"/>
|
17
|
+
<eref bibitemid="ref10"/>
|
18
|
+
<eref bibitemid="ref12"/>
|
19
|
+
</p>
|
20
|
+
</foreword></preface>
|
21
|
+
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
22
|
+
<p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
|
23
|
+
<bibitem id="ISO712" type="standard">
|
24
|
+
<title format="text/plain">Cereals or cereal products</title>
|
25
|
+
<title type="main" format="text/plain">Cereals and cereal products</title>
|
26
|
+
<docidentifier type="ISO">ISO 712</docidentifier>
|
27
|
+
<contributor>
|
28
|
+
<role type="publisher"/>
|
29
|
+
<organization>
|
30
|
+
<name>International Organization for Standardization</name>
|
31
|
+
</organization>
|
32
|
+
</contributor>
|
33
|
+
</bibitem>
|
34
|
+
<bibitem id="ISO16634" type="standard">
|
35
|
+
<title language="x" format="text/plain">Cereals, pulses, milled cereal products, xxxx, oilseeds and animal feeding stuffs</title>
|
36
|
+
<title language="en" format="text/plain">Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</title>
|
37
|
+
<docidentifier type="ISO">ISO 16634:-- (all parts)</docidentifier>
|
38
|
+
<date type="published"><on>--</on></date>
|
39
|
+
<contributor>
|
40
|
+
<role type="publisher"/>
|
41
|
+
<organization>
|
42
|
+
<abbreviation>ISO</abbreviation>
|
43
|
+
</organization>
|
44
|
+
</contributor>
|
45
|
+
<note format="text/plain" reference="1">ISO DATE: Under preparation. (Stage at the time of publication ISO/DIS 16634)</note>
|
46
|
+
<extent type="part">
|
47
|
+
<referenceFrom>all</referenceFrom>
|
48
|
+
</extent>
|
49
|
+
|
50
|
+
</bibitem>
|
51
|
+
<bibitem id="ISO20483" type="standard">
|
52
|
+
<title format="text/plain">Cereals and pulses</title>
|
53
|
+
<docidentifier type="ISO">ISO 20483:2013-2014</docidentifier>
|
54
|
+
<date type="published"><from>2013</from><to>2014</to></date>
|
55
|
+
<contributor>
|
56
|
+
<role type="publisher"/>
|
57
|
+
<organization>
|
58
|
+
<name>International Organization for Standardization</name>
|
59
|
+
</organization>
|
60
|
+
</contributor>
|
61
|
+
</bibitem>
|
62
|
+
<bibitem id="ref1">
|
63
|
+
<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>
|
64
|
+
<docidentifier type="ICC">167</docidentifier>
|
65
|
+
</bibitem>
|
66
|
+
<note><p>This is an annotation of ISO 20483:2013-2014</p></note>
|
67
|
+
|
68
|
+
</references><references id="_bibliography" obligation="informative">
|
69
|
+
<title>Bibliography</title>
|
70
|
+
<bibitem id="ISBN" type="ISBN">
|
71
|
+
<title format="text/plain">Chemicals for analytical laboratory use</title>
|
72
|
+
<docidentifier type="ISBN">ISBN</docidentifier>
|
73
|
+
<docidentifier type="metanorma">[1]</docidentifier>
|
74
|
+
<contributor>
|
75
|
+
<role type="publisher"/>
|
76
|
+
<organization>
|
77
|
+
<abbreviation>ISBN</abbreviation>
|
78
|
+
</organization>
|
79
|
+
</contributor>
|
80
|
+
</bibitem>
|
81
|
+
<bibitem id="ISSN" type="ISSN">
|
82
|
+
<title format="text/plain">Instruments for analytical laboratory use</title>
|
83
|
+
<docidentifier type="ISSN">ISSN</docidentifier>
|
84
|
+
<docidentifier type="metanorma">[2]</docidentifier>
|
85
|
+
<contributor>
|
86
|
+
<role type="publisher"/>
|
87
|
+
<organization>
|
88
|
+
<abbreviation>ISSN</abbreviation>
|
89
|
+
</organization>
|
90
|
+
</contributor>
|
91
|
+
</bibitem>
|
92
|
+
<note><p>This is an annotation of document ISSN.</p></note>
|
93
|
+
<note><p>This is another annotation of document ISSN.</p></note>
|
94
|
+
<bibitem id="ISO3696" type="standard">
|
95
|
+
<title format="text/plain">Water for analytical laboratory use</title>
|
96
|
+
<docidentifier type="ISO">ISO 3696</docidentifier>
|
97
|
+
<contributor>
|
98
|
+
<role type="publisher"/>
|
99
|
+
<organization>
|
100
|
+
<abbreviation>ISO</abbreviation>
|
101
|
+
</organization>
|
102
|
+
</contributor>
|
103
|
+
</bibitem>
|
104
|
+
<bibitem id="ref10">
|
105
|
+
<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>
|
106
|
+
<docidentifier type="metanorma">[10]</docidentifier>
|
107
|
+
</bibitem>
|
108
|
+
<bibitem id="ref11">
|
109
|
+
<title>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</title>
|
110
|
+
<docidentifier type="IETF">RFC 10</docidentifier>
|
111
|
+
</bibitem>
|
112
|
+
<bibitem id="ref12">
|
113
|
+
<formattedref format="application/x-isodoc+xml">CitationWorks. 2019. <em>How to cite a reference</em>.</formattedref>
|
114
|
+
<docidentifier type="metanorma">[Citn]</docidentifier>
|
115
|
+
<docidentifier type="IETF">RFC 20</docidentifier>
|
116
|
+
</bibitem>
|
117
|
+
|
118
|
+
|
119
|
+
</references>
|
120
|
+
</bibliography>
|
121
|
+
</iso-standard>
|
122
|
+
INPUT
|
123
|
+
#{HTML_HDR}
|
124
|
+
<br/>
|
125
|
+
<div>
|
126
|
+
<h1 class="ForewordTitle">Foreword</h1>
|
127
|
+
<p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
|
128
|
+
<a href="#ISO712">ISO 712</a>
|
129
|
+
<a href="#ISBN">[1]</a>
|
130
|
+
<a href="#ISSN">[2]</a>
|
131
|
+
<a href="#ISO16634">ISO 16634:--</a>
|
132
|
+
<a href="#ref1">ICC 167</a>
|
133
|
+
<a href="#ref10">[10]</a>
|
134
|
+
<a href="#ref12">[Citn]</a>
|
135
|
+
</p>
|
136
|
+
</div>
|
137
|
+
<p class="zzSTDTitle1"/>
|
138
|
+
<div>
|
139
|
+
<h1>1  Normative references</h1>
|
140
|
+
<p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
|
141
|
+
<p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
|
142
|
+
<p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
|
143
|
+
<p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
|
144
|
+
<p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
|
145
|
+
<div id="" class="Note">
|
146
|
+
<p><span class="note_label">NOTE</span>  This is an annotation of ISO 20483:2013-2014</p>
|
147
|
+
</div>
|
148
|
+
</div>
|
149
|
+
<br/>
|
150
|
+
<div>
|
151
|
+
<h1 class="Section3">Bibliography</h1>
|
152
|
+
<p id="ISBN" class="Biblio">[1]  <i>Chemicals for analytical laboratory use</i></p>
|
153
|
+
<p id="ISSN" class="Biblio">[2]  <i>Instruments for analytical laboratory use</i></p>
|
154
|
+
<div id="" class="Note">
|
155
|
+
<p><span class="note_label">NOTE</span>  This is an annotation of document ISSN.</p>
|
156
|
+
</div>
|
157
|
+
<div id="" class="Note">
|
158
|
+
<p><span class="note_label">NOTE</span>  This is another annotation of document ISSN.</p>
|
159
|
+
</div>
|
160
|
+
<p id="ISO3696" class="Biblio">[3]  ISO 3696, <i>Water for analytical laboratory use</i></p>
|
161
|
+
<p id="ref10" class="Biblio">[10]  <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
|
162
|
+
<p id="ref11" class="Biblio">[5]  IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>
|
163
|
+
<p id="ref12" class="Biblio">[6]  Citn, CitationWorks. 2019. <i>How to cite a reference</i>.</p>
|
164
|
+
</div>
|
165
|
+
<aside id="fn:1" class="footnote">
|
166
|
+
<p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
|
167
|
+
</aside>
|
168
|
+
</div>
|
169
|
+
</body>
|
170
|
+
</html>
|
171
|
+
OUTPUT
|
172
|
+
end
|
173
|
+
|
174
|
+
end
|
data/spec/spec_helper.rb
CHANGED
@@ -106,7 +106,7 @@ BOILERPLATE =
|
|
106
106
|
|
107
107
|
BLANK_HDR = <<~"HDR"
|
108
108
|
<?xml version="1.0" encoding="UTF-8"?>
|
109
|
-
<iso-standard xmlns="https://www.metanorma.
|
109
|
+
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
110
110
|
<bibdata type="standard">
|
111
111
|
<contributor>
|
112
112
|
<role type="author"/>
|
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: 1.3.
|
4
|
+
version: 1.3.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-02-
|
11
|
+
date: 2020-02-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: ruby-jing
|
@@ -324,6 +324,7 @@ files:
|
|
324
324
|
- spec/isodoc/iso_spec.rb
|
325
325
|
- spec/isodoc/metadata_spec.rb
|
326
326
|
- spec/isodoc/postproc_spec.rb
|
327
|
+
- spec/isodoc/ref_spec.rb
|
327
328
|
- spec/isodoc/section_spec.rb
|
328
329
|
- spec/isodoc/terms_spec.rb
|
329
330
|
- spec/isodoc/xref_spec.rb
|