metanorma-iso 1.3.23 → 1.3.24
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 +5 -0
- data/lib/asciidoctor/iso/cleanup.rb +10 -2
- data/lib/asciidoctor/iso/front.rb +9 -6
- data/lib/asciidoctor/iso/isodoc.rng +6 -3
- data/lib/asciidoctor/iso/macros.rb +21 -0
- data/lib/asciidoctor/iso/section.rb +6 -32
- data/lib/asciidoctor/iso/term_lookup_cleanup.rb +90 -0
- data/lib/asciidoctor/iso/validate.rb +1 -2
- data/lib/asciidoctor/iso/validate_section.rb +2 -2
- data/lib/isodoc/iso/base_convert.rb +0 -13
- data/lib/isodoc/iso/html/header.html +5 -5
- data/lib/isodoc/iso/html_convert.rb +7 -0
- data/lib/isodoc/iso/iso.international-standard.xsl +694 -287
- data/lib/isodoc/iso/metadata.rb +2 -0
- data/lib/metanorma/iso/processor.rb +2 -2
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/base_spec.rb +13 -7
- data/spec/asciidoctor-iso/blocks_spec.rb +6 -6
- data/spec/asciidoctor-iso/cleanup_spec.rb +13 -13
- data/spec/asciidoctor-iso/inline_spec.rb +1 -1
- data/spec/asciidoctor-iso/macros_spec.rb +273 -0
- data/spec/asciidoctor-iso/refs_spec.rb +4 -4
- data/spec/asciidoctor-iso/section_spec.rb +8 -8
- data/spec/isodoc/i18n_spec.rb +8 -8
- data/spec/isodoc/inline_spec.rb +2 -2
- data/spec/isodoc/iso_spec.rb +1 -1
- data/spec/isodoc/metadata_spec.rb +4 -2
- data/spec/isodoc/postproc_spec.rb +0 -105
- data/spec/isodoc/ref_spec.rb +2 -2
- data/spec/isodoc/section_spec.rb +5 -5
- data/spec/isodoc/xref_spec.rb +2 -2
- metadata +4 -3
- data/asciidoctor-iso.gemspec.old +0 -50
@@ -15,7 +15,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
15
15
|
INPUT
|
16
16
|
#{BLANK_HDR}
|
17
17
|
<sections>
|
18
|
-
</sections><bibliography><references id="_" obligation="informative">
|
18
|
+
</sections><bibliography><references id="_" obligation="informative" normative="true">
|
19
19
|
<title>Normative References</title>
|
20
20
|
<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>
|
21
21
|
<bibitem id="iso123" type="standard">
|
@@ -64,7 +64,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
64
64
|
</p>
|
65
65
|
</clause>
|
66
66
|
</sections>
|
67
|
-
<bibliography><references id="_" obligation="informative">
|
67
|
+
<bibliography><references id="_" obligation="informative" normative="true">
|
68
68
|
<title>Normative References</title>
|
69
69
|
<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>
|
70
70
|
<bibitem id="iso123" type="standard">
|
@@ -100,7 +100,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
100
100
|
#{BLANK_HDR}
|
101
101
|
<sections>
|
102
102
|
|
103
|
-
</sections><bibliography><references id="_" obligation="informative">
|
103
|
+
</sections><bibliography><references id="_" obligation="informative" normative="true">
|
104
104
|
<title>Normative References</title>
|
105
105
|
<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>
|
106
106
|
<bibitem id="iso123">
|
@@ -127,7 +127,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
127
127
|
#{BLANK_HDR}
|
128
128
|
<sections>
|
129
129
|
|
130
|
-
</sections><bibliography><references id="_" obligation="informative">
|
130
|
+
</sections><bibliography><references id="_" obligation="informative" normative="false">
|
131
131
|
<title>Bibliography</title>
|
132
132
|
<bibitem id="iso123">
|
133
133
|
<formattedref format="application/x-isodoc+xml">
|
@@ -84,7 +84,7 @@ standardization at the following addresses:</p>
|
|
84
84
|
<link target="http://www.electropedia.org"/>
|
85
85
|
</p> </li> </ul>
|
86
86
|
|
87
|
-
<term id="
|
87
|
+
<term id="term-term1">
|
88
88
|
<preferred>Term1</preferred>
|
89
89
|
</term>
|
90
90
|
</terms>
|
@@ -109,7 +109,7 @@ standardization at the following addresses:</p>
|
|
109
109
|
</li>
|
110
110
|
</ul>
|
111
111
|
<title>Normal Terms</title>
|
112
|
-
<term id="
|
112
|
+
<term id="term-term2">
|
113
113
|
<preferred>Term2</preferred>
|
114
114
|
</term>
|
115
115
|
</terms>
|
@@ -133,12 +133,12 @@ standardization at the following addresses:</p>
|
|
133
133
|
</clause>
|
134
134
|
<appendix id="_" inline-header="false" obligation="normative">
|
135
135
|
<title>Appendix 1</title>
|
136
|
-
</appendix></annex><bibliography><references id="_" obligation="informative">
|
136
|
+
</appendix></annex><bibliography><references id="_" obligation="informative" normative="true">
|
137
137
|
<title>Normative References</title>
|
138
138
|
<p id="_">There are no normative references in this document.</p>
|
139
139
|
</references><clause id="_" obligation="informative">
|
140
140
|
<title>Bibliography</title>
|
141
|
-
<references id="_" obligation="informative">
|
141
|
+
<references id="_" obligation="informative" normative="false">
|
142
142
|
<title>Bibliography Subsection</title>
|
143
143
|
</references>
|
144
144
|
</clause>
|
@@ -247,7 +247,7 @@ standardization at the following addresses:</p>
|
|
247
247
|
<p id="_">Foreword</p>
|
248
248
|
</foreword></preface><sections>
|
249
249
|
<terms id="_" obligation="normative">
|
250
|
-
<title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions
|
250
|
+
<title>Terms and definitions</title><p id="_">For the purposes of this document, the terms and definitions
|
251
251
|
given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
|
252
252
|
<p id="_">ISO and IEC maintain terminological databases for use in
|
253
253
|
standardization at the following addresses:</p>
|
@@ -259,7 +259,7 @@ standardization at the following addresses:</p>
|
|
259
259
|
<link target="http://www.electropedia.org"/>
|
260
260
|
</p> </li> </ul>
|
261
261
|
|
262
|
-
<term id="
|
262
|
+
<term id="term-term1">
|
263
263
|
<preferred>Term1</preferred>
|
264
264
|
</term>
|
265
265
|
</terms></sections>
|
@@ -296,13 +296,13 @@ standardization at the following addresses:</p>
|
|
296
296
|
<ul id='_'>
|
297
297
|
<li>
|
298
298
|
<p id='_'>
|
299
|
-
ISO Online browsing platform: available at
|
299
|
+
ISO Online browsing platform: available at
|
300
300
|
<link target='http://www.iso.org/obp'/>
|
301
301
|
</p>
|
302
302
|
</li>
|
303
303
|
<li>
|
304
304
|
<p id='_'>
|
305
|
-
IEC Electropedia: available at
|
305
|
+
IEC Electropedia: available at
|
306
306
|
<link target='http://www.electropedia.org'/>
|
307
307
|
</p>
|
308
308
|
</li>
|
data/spec/isodoc/i18n_spec.rb
CHANGED
@@ -59,11 +59,11 @@ RSpec.describe IsoDoc do
|
|
59
59
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
60
60
|
<title>An Appendix</title>
|
61
61
|
</appendix>
|
62
|
-
</annex><bibliography><references id="R" obligation="informative">
|
62
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
63
63
|
<title>Normative References</title>
|
64
64
|
</references><clause id="S" obligation="informative">
|
65
65
|
<title>Bibliography</title>
|
66
|
-
<references id="T" obligation="informative">
|
66
|
+
<references id="T" obligation="informative" normative="false">
|
67
67
|
<title>Bibliography Subsection</title>
|
68
68
|
</references>
|
69
69
|
</clause>
|
@@ -203,11 +203,11 @@ RSpec.describe IsoDoc do
|
|
203
203
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
204
204
|
<title>An Appendix</title>
|
205
205
|
</appendix>
|
206
|
-
</annex><bibliography><references id="R" obligation="informative">
|
206
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
207
207
|
<title>Normative References</title>
|
208
208
|
</references><clause id="S" obligation="informative">
|
209
209
|
<title>Bibliography</title>
|
210
|
-
<references id="T" obligation="informative">
|
210
|
+
<references id="T" obligation="informative" normative="false">
|
211
211
|
<title>Bibliography Subsection</title>
|
212
212
|
</references>
|
213
213
|
</clause>
|
@@ -347,11 +347,11 @@ RSpec.describe IsoDoc do
|
|
347
347
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
348
348
|
<title>An Appendix</title>
|
349
349
|
</appendix>
|
350
|
-
</annex><bibliography><references id="R" obligation="informative">
|
350
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
351
351
|
<title>Normative References</title>
|
352
352
|
</references><clause id="S" obligation="informative">
|
353
353
|
<title>Bibliography</title>
|
354
|
-
<references id="T" obligation="informative">
|
354
|
+
<references id="T" obligation="informative" normative="false">
|
355
355
|
<title>Bibliography Subsection</title>
|
356
356
|
</references>
|
357
357
|
</clause>
|
@@ -492,7 +492,7 @@ RSpec.describe IsoDoc do
|
|
492
492
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
493
493
|
<title>An Appendix</title>
|
494
494
|
</appendix>
|
495
|
-
</annex><bibliography><references id="R" obligation="informative">
|
495
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
496
496
|
<title>Normative References</title>
|
497
497
|
<bibitem id="ISO712" type="standard">
|
498
498
|
<title format="text/plain">Cereals and cereal products</title>
|
@@ -506,7 +506,7 @@ RSpec.describe IsoDoc do
|
|
506
506
|
</bibitem>
|
507
507
|
</references><clause id="S" obligation="informative">
|
508
508
|
<title>Bibliography</title>
|
509
|
-
<references id="T" obligation="informative">
|
509
|
+
<references id="T" obligation="informative" normative="false">
|
510
510
|
<title>Bibliography Subsection</title>
|
511
511
|
</references>
|
512
512
|
</clause>
|
data/spec/isodoc/inline_spec.rb
CHANGED
@@ -158,7 +158,7 @@ RSpec.describe IsoDoc do
|
|
158
158
|
<eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</stem>
|
159
159
|
</p>
|
160
160
|
</foreword></preface>
|
161
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
161
|
+
<bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
|
162
162
|
<bibitem id="ISO712" type="standard">
|
163
163
|
<title format="text/plain">Cereals and cereal products</title>
|
164
164
|
<docidentifier>ISO 712</docidentifier>
|
@@ -213,7 +213,7 @@ RSpec.describe IsoDoc do
|
|
213
213
|
<eref type="inline" bibitemid="ISO712" citeas="ISO 712">A</eref>
|
214
214
|
</p>
|
215
215
|
</foreword></preface>
|
216
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
216
|
+
<bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
|
217
217
|
<bibitem id="ISO712" type="standard">
|
218
218
|
<title format="text/plain">Cereals and cereal products</title>
|
219
219
|
<docidentifier>ISO 712</docidentifier>
|
data/spec/isodoc/iso_spec.rb
CHANGED
@@ -96,7 +96,7 @@ RSpec.describe IsoDoc::Iso do
|
|
96
96
|
<eref bibitemid="ISO20483"/>
|
97
97
|
</p>
|
98
98
|
</foreword></preface>
|
99
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
99
|
+
<bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
|
100
100
|
<bibitem type="international-standard" id="IEV">
|
101
101
|
<title format="text/plain" language="en" script="Latn">Electropedia:
|
102
102
|
The World's Online Electrotechnical Vocabulary</title>
|
@@ -18,6 +18,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
18
18
|
<title type="title-part" language="fr" format="text/plain">Riz</title>
|
19
19
|
<docidentifier type="iso">ISO/PreCD3 17301-1</docidentifier>
|
20
20
|
<docidentifier type="iso-with-lang">ISO/PreCD3 17301-1 (E)</docidentifier>
|
21
|
+
<docidentifier type="iso-reference">ISO/PreCD3 17301-1:2000 (E)</docidentifier>
|
21
22
|
<docidentifier type="iso-tc">17301</docidentifier>
|
22
23
|
<docidentifier type="iso-tc">17302</docidentifier>
|
23
24
|
<docnumber>1730</docnumber>
|
@@ -75,7 +76,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
75
76
|
</bibdata>
|
76
77
|
</iso-standard>
|
77
78
|
INPUT
|
78
|
-
{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010–2011", :docnumber=>"ISO/PreCD3 17301-1", :docnumber_lang=>"ISO/PreCD3 17301-1 (E)", :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", :publisher=>"International Organization for Standardization", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :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"}
|
79
|
+
{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>[], :authors_affiliations=>{}, :createddate=>"2010–2011", :docnumber=>"ISO/PreCD3 17301-1", :docnumber_lang=>"ISO/PreCD3 17301-1 (E)", :docnumber_reference=>"ISO/PreCD3 17301-1:2000 (E)", :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", :publisher=>"International Organization for Standardization", :revdate=>"2016-05-01", :revdate_monthyear=>"May 2016", :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"}
|
79
80
|
OUTPUT
|
80
81
|
end
|
81
82
|
|
@@ -99,6 +100,7 @@ OUTPUT
|
|
99
100
|
</title>
|
100
101
|
<docidentifier type="iso">ISO/IEC/CD 17301-1-3</docidentifier>
|
101
102
|
<docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
|
103
|
+
<docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
|
102
104
|
<docidentifier type="iso-tc">17301</docidentifier>
|
103
105
|
<contributor>
|
104
106
|
<role type="author"/>
|
@@ -155,7 +157,7 @@ OUTPUT
|
|
155
157
|
</bibdata>
|
156
158
|
</iso-standard>
|
157
159
|
INPUT
|
158
|
-
{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)", :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", :publisher=>"International Organization for Standardization and International Electrotechnical Commission", :revdate=>nil, :revdate_monthyear=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :statusabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>["17301"], :unpublished=>false, :wg=>"GHI 3"}
|
160
|
+
{:agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :docnumber=>"ISO/IEC/CD 17301-1-3", :docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)", :docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)", :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", :publisher=>"International Organization for Standardization and International Electrotechnical Commission", :revdate=>nil, :revdate_monthyear=>nil, :sc=>"DEF 4", :secretariat=>"XXXX", :stage=>"60", :stage_int=>60, :statusabbr=>"IS", :tc=>"ABC 34", :tc_docnumber=>["17301"], :unpublished=>false, :wg=>"GHI 3"}
|
159
161
|
OUTPUT
|
160
162
|
end
|
161
163
|
|
@@ -740,109 +740,4 @@ end
|
|
740
740
|
expect(word).to include '<p class="zzWarning">I am the Walrus</p>'
|
741
741
|
end
|
742
742
|
|
743
|
-
it "skips internal hyperlinks" do
|
744
|
-
FileUtils.rm_f "test.html"
|
745
|
-
FileUtils.rm_f "test.doc"
|
746
|
-
IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
|
747
|
-
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
748
|
-
<preface>
|
749
|
-
<foreword>
|
750
|
-
<p>
|
751
|
-
<xref target="scope"/>
|
752
|
-
<xref target="terms"/>
|
753
|
-
<xref target="_waxy_rice"/>
|
754
|
-
<xref target="N"/>
|
755
|
-
<xref target="N1"/>
|
756
|
-
<xref target="N2"/>
|
757
|
-
<xref target="N3"/>
|
758
|
-
<xref target="N4"/>
|
759
|
-
<xref target="N5"/>
|
760
|
-
<xref target="N6"/>
|
761
|
-
<xref target="N7"/>
|
762
|
-
<xref target="N8"/>
|
763
|
-
<xref target="N9"/>
|
764
|
-
<xref target="N10"/>
|
765
|
-
<eref bibitemid="ISO712"/>
|
766
|
-
</p>
|
767
|
-
</foreword>
|
768
|
-
</preface>
|
769
|
-
<sections>
|
770
|
-
<clause id="scope"><title>Scope</title>
|
771
|
-
<note id="N">
|
772
|
-
<p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
|
773
|
-
</note>
|
774
|
-
<figure id="N1">
|
775
|
-
<name>Split-it-right sample divider</name>
|
776
|
-
</figure>
|
777
|
-
<example id="N2">
|
778
|
-
<p>Hello</p>
|
779
|
-
</example>
|
780
|
-
<formula id="N3">
|
781
|
-
<stem type="AsciiMath">r = 1 %</stem>
|
782
|
-
</formula>
|
783
|
-
<table id="N4">
|
784
|
-
<name>Repeatability and reproducibility of husked rice yield</name>
|
785
|
-
<tbody>
|
786
|
-
<tr>
|
787
|
-
<td align="left">Number of laboratories retained after eliminating outliers</td>
|
788
|
-
<td align="center">13</td>
|
789
|
-
<td align="center">11</td>
|
790
|
-
</tr>
|
791
|
-
</tbody>
|
792
|
-
</table>
|
793
|
-
<ol id="N6">
|
794
|
-
<li id="N7"><p>A</p></li>
|
795
|
-
</ol>
|
796
|
-
<requirement id="N8">
|
797
|
-
<stem type="AsciiMath">r = 1 %</stem>
|
798
|
-
</requirement>
|
799
|
-
<recommendation id="N9">
|
800
|
-
<stem type="AsciiMath">r = 1 %</stem>
|
801
|
-
</requirement>
|
802
|
-
<permission id="N10">
|
803
|
-
<stem type="AsciiMath">r = 1 %</stem>
|
804
|
-
</requirement>
|
805
|
-
</clause>
|
806
|
-
<terms id="terms">
|
807
|
-
<term id="_waxy_rice"><preferred>waxy rice</preferred>
|
808
|
-
<termnote id="N5">
|
809
|
-
<p id="_b0cb3dfd-78fc-47dd-a339-84070d947463">The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.</p>
|
810
|
-
</termnote></term>
|
811
|
-
</terms>
|
812
|
-
</sections>
|
813
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
814
|
-
<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>
|
815
|
-
<bibitem id="ISO712" type="standard">
|
816
|
-
<title format="text/plain">Cereals or cereal products</title>
|
817
|
-
<title type="main" format="text/plain">Cereals and cereal products</title>
|
818
|
-
<docidentifier type="ISO">ISO 712</docidentifier>
|
819
|
-
<contributor>
|
820
|
-
<role type="publisher"/>
|
821
|
-
<organization>
|
822
|
-
<name>International Organization for Standardization</name>
|
823
|
-
</organization>
|
824
|
-
</contributor>
|
825
|
-
</bibitem>
|
826
|
-
</references>
|
827
|
-
</bibliography>
|
828
|
-
</iso-standard>
|
829
|
-
INPUT
|
830
|
-
expect(File.exist?("test.html")).to be true
|
831
|
-
html = File.read("test.html", encoding: "UTF-8").sub(/^.*<main class="main-section">/m, '<main class="main-section">').
|
832
|
-
sub(%r{</main>.*$}m, "</main>").sub(%r{^.*?<div>}m, "<div>").sub(%r{</div>.*$}m, "</div>")
|
833
|
-
expect(xmlpp(html)).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
834
|
-
<div>
|
835
|
-
<h1 class='ForewordTitle' id="toc0">Foreword</h1>
|
836
|
-
<p>
|
837
|
-
<a href='#scope'>Clause 1</a>
|
838
|
-
<a href='#terms'>Clause 3</a>
|
839
|
-
<a href='#_waxy_rice'>3.1</a>
|
840
|
-
Clause 1, Note Figure 1 Clause 1, Example Clause 1, Formula (1) Table 1
|
841
|
-
3.1, Note 1 Clause 1, List Clause 1 a) Clause 1, Requirement 1 Clause 1,
|
842
|
-
Recommendation 1 Clause 1, Permission 1
|
843
|
-
<a href='#ISO712'>ISO 712</a>
|
844
|
-
</p>
|
845
|
-
</div>
|
846
|
-
OUTPUT
|
847
|
-
end
|
848
743
|
end
|
data/spec/isodoc/ref_spec.rb
CHANGED
@@ -18,7 +18,7 @@ RSpec.describe IsoDoc do
|
|
18
18
|
<eref bibitemid="ref12"/>
|
19
19
|
</p>
|
20
20
|
</foreword></preface>
|
21
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
21
|
+
<bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
|
22
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
23
|
<bibitem id="ISO712" type="standard">
|
24
24
|
<title format="text/plain">Cereals or cereal products</title>
|
@@ -65,7 +65,7 @@ RSpec.describe IsoDoc do
|
|
65
65
|
</bibitem>
|
66
66
|
<note><p>This is an annotation of ISO 20483:2013-2014</p></note>
|
67
67
|
|
68
|
-
</references><references id="_bibliography" obligation="informative">
|
68
|
+
</references><references id="_bibliography" obligation="informative" normative="false">
|
69
69
|
<title>Bibliography</title>
|
70
70
|
<bibitem id="ISBN" type="ISBN">
|
71
71
|
<title format="text/plain">Chemicals for analytical laboratory use</title>
|
data/spec/isodoc/section_spec.rb
CHANGED
@@ -56,12 +56,12 @@ RSpec.describe IsoDoc do
|
|
56
56
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
57
57
|
<title>An Appendix</title>
|
58
58
|
</appendix>
|
59
|
-
<references id="Q3"><title>Annex Bibliography</title></references>
|
60
|
-
</annex><bibliography><references id="R" obligation="informative">
|
59
|
+
<references id="Q3" normative="false"><title>Annex Bibliography</title></references>
|
60
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
61
61
|
<title>Normative References</title>
|
62
62
|
</references><clause id="S" obligation="informative">
|
63
63
|
<title>Bibliography</title>
|
64
|
-
<references id="T" obligation="informative">
|
64
|
+
<references id="T" obligation="informative" normative="false">
|
65
65
|
<title>Bibliography Subsection</title>
|
66
66
|
</references>
|
67
67
|
</clause>
|
@@ -202,11 +202,11 @@ OUTPUT
|
|
202
202
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
203
203
|
<title>An Appendix</title>
|
204
204
|
</appendix>
|
205
|
-
</annex><bibliography><references id="R" obligation="informative">
|
205
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
206
206
|
<title>Normative References</title>
|
207
207
|
</references><clause id="S" obligation="informative">
|
208
208
|
<title>Bibliography</title>
|
209
|
-
<references id="T" obligation="informative">
|
209
|
+
<references id="T" obligation="informative" normative="false">
|
210
210
|
<title>Bibliography Subsection</title>
|
211
211
|
</references>
|
212
212
|
</clause>
|
data/spec/isodoc/xref_spec.rb
CHANGED
@@ -882,11 +882,11 @@ RSpec.describe IsoDoc do
|
|
882
882
|
<appendix id="Q2" inline-header="false" obligation="normative">
|
883
883
|
<title>An Appendix</title>
|
884
884
|
</appendix>
|
885
|
-
</annex><bibliography><references id="R" obligation="informative">
|
885
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
886
886
|
<title>Normative References</title>
|
887
887
|
</references><clause id="S" obligation="informative">
|
888
888
|
<title>Bibliography</title>
|
889
|
-
<references id="T" obligation="informative">
|
889
|
+
<references id="T" obligation="informative" normative="false">
|
890
890
|
<title>Bibliography Subsection</title>
|
891
891
|
</references>
|
892
892
|
</clause>
|
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.24
|
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-05-
|
11
|
+
date: 2020-05-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: ruby-jing
|
@@ -220,7 +220,6 @@ files:
|
|
220
220
|
- Makefile
|
221
221
|
- README.adoc
|
222
222
|
- Rakefile
|
223
|
-
- asciidoctor-iso.gemspec.old
|
224
223
|
- bin/rspec
|
225
224
|
- docs/asciiiso-syntax.adoc
|
226
225
|
- docs/guidance.adoc
|
@@ -239,8 +238,10 @@ files:
|
|
239
238
|
- lib/asciidoctor/iso/isodoc.rng
|
240
239
|
- lib/asciidoctor/iso/isostandard.rnc
|
241
240
|
- lib/asciidoctor/iso/isostandard.rng
|
241
|
+
- lib/asciidoctor/iso/macros.rb
|
242
242
|
- lib/asciidoctor/iso/reqt.rng
|
243
243
|
- lib/asciidoctor/iso/section.rb
|
244
|
+
- lib/asciidoctor/iso/term_lookup_cleanup.rb
|
244
245
|
- lib/asciidoctor/iso/validate.rb
|
245
246
|
- lib/asciidoctor/iso/validate_requirements.rb
|
246
247
|
- lib/asciidoctor/iso/validate_section.rb
|
data/asciidoctor-iso.gemspec.old
DELETED
@@ -1,50 +0,0 @@
|
|
1
|
-
# coding: utf-8
|
2
|
-
|
3
|
-
lib = File.expand_path("../lib", __FILE__)
|
4
|
-
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
5
|
-
require "asciidoctor/iso/version"
|
6
|
-
|
7
|
-
Gem::Specification.new do |spec|
|
8
|
-
spec.name = "asciidoctor-iso"
|
9
|
-
spec.version = Asciidoctor::ISO::VERSION
|
10
|
-
spec.authors = ["Ribose Inc."]
|
11
|
-
spec.email = ["open.source@ribose.com"]
|
12
|
-
|
13
|
-
spec.summary = "asciidoctor-iso lets you write ISO standards "\
|
14
|
-
"in AsciiDoc."
|
15
|
-
spec.description = <<~DESCRIPTION
|
16
|
-
asciidoctor-iso lets you write ISO standards in AsciiDoc syntax.
|
17
|
-
|
18
|
-
This gem is in active development.
|
19
|
-
DESCRIPTION
|
20
|
-
|
21
|
-
spec.homepage = "https://github.com/riboseinc/asciidoctor-iso"
|
22
|
-
spec.license = "BSD-2-Clause"
|
23
|
-
spec.post_install_message = "The asciidoctor-iso gem has been deprecated and has been replaced by metanorma-iso"
|
24
|
-
|
25
|
-
spec.bindir = "bin"
|
26
|
-
spec.require_paths = ["lib"]
|
27
|
-
spec.files = `git ls-files`.split("\n")
|
28
|
-
spec.test_files = `git ls-files -- {spec}/*`.split("\n")
|
29
|
-
spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
|
30
|
-
|
31
|
-
spec.add_dependency "asciidoctor", "~> 1.5.7"
|
32
|
-
spec.add_dependency "ruby-jing"
|
33
|
-
spec.add_dependency "isodoc", "~> 0.8.8"
|
34
|
-
spec.add_dependency "iev", "~> 0.2.0"
|
35
|
-
spec.add_dependency "relaton", "~> 0.1.3"
|
36
|
-
spec.add_dependency "metanorma-standoc", "~> 0.0.1"
|
37
|
-
|
38
|
-
spec.add_development_dependency "bundler", "~> 1.15"
|
39
|
-
spec.add_development_dependency "byebug"
|
40
|
-
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
41
|
-
spec.add_development_dependency "guard", "~> 2.14"
|
42
|
-
spec.add_development_dependency "guard-rspec", "~> 4.7"
|
43
|
-
spec.add_development_dependency "rake", "~> 12.0"
|
44
|
-
spec.add_development_dependency "rspec", "~> 3.6"
|
45
|
-
spec.add_development_dependency "rubocop", "~> 0.50"
|
46
|
-
spec.add_development_dependency "simplecov", "~> 0.15"
|
47
|
-
spec.add_development_dependency "timecop", "~> 0.9"
|
48
|
-
spec.add_development_dependency "metanorma", "~> 0.2.6"
|
49
|
-
spec.add_development_dependency "isobib", "~> 0.2.0"
|
50
|
-
end
|