metanorma-iso 1.0.4 → 1.0.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -27,11 +27,11 @@ module IsoDoc
27
27
  end
28
28
 
29
29
  def docstatus(isoxml, _out)
30
- docstatus = isoxml.at(ns("//status/stage"))
30
+ docstatus = isoxml.at(ns("//bibdata/status/stage"))
31
31
  if docstatus
32
32
  set(:stage, docstatus.text)
33
33
  set(:stage_int, docstatus.text.to_i)
34
- abbr = stage_abbrev(docstatus.text, isoxml.at(ns("//status/iteration")),
34
+ abbr = stage_abbrev(docstatus.text, isoxml.at(ns("//bibdata/status/iteration")),
35
35
  isoxml.at(ns("//version/draft")))
36
36
  set(:stageabbr, abbr)
37
37
  end
@@ -77,11 +77,11 @@ module IsoDoc
77
77
  end
78
78
 
79
79
  def title(isoxml, _out)
80
- intro = isoxml.at(ns("//title-intro[@language='en']"))
81
- main = isoxml.at(ns("//title-main[@language='en']"))
82
- part = isoxml.at(ns("//title-part[@language='en']"))
83
- partnumber = isoxml.at(ns("//project-number/@part"))
84
- subpartnumber = isoxml.at(ns("//project-number/@subpart"))
80
+ intro = isoxml.at(ns("//bibdata//title-intro[@language='en']"))
81
+ main = isoxml.at(ns("//bibdata//title-main[@language='en']"))
82
+ part = isoxml.at(ns("//bibdata//title-part[@language='en']"))
83
+ partnumber = isoxml.at(ns("//bibdata//project-number/@part"))
84
+ subpartnumber = isoxml.at(ns("//bibdata//project-number/@subpart"))
85
85
 
86
86
  set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
87
87
  main = compose_title(main, intro, part, partnumber, subpartnumber, "en")
@@ -91,11 +91,11 @@ module IsoDoc
91
91
  end
92
92
 
93
93
  def subtitle(isoxml, _out)
94
- intro = isoxml.at(ns("//title-intro[@language='fr']"))
95
- main = isoxml.at(ns("//title-main[@language='fr']"))
96
- part = isoxml.at(ns("//title-part[@language='fr']"))
97
- partnumber = isoxml.at(ns("//project-number/@part"))
98
- subpartnumber = isoxml.at(ns("//project-number/@subpart"))
94
+ intro = isoxml.at(ns("//bibdata//title-intro[@language='fr']"))
95
+ main = isoxml.at(ns("//bibdata//title-main[@language='fr']"))
96
+ part = isoxml.at(ns("//bibdata//title-part[@language='fr']"))
97
+ partnumber = isoxml.at(ns("//bibdata//project-number/@part"))
98
+ subpartnumber = isoxml.at(ns("//bibdata//project-number/@subpart"))
99
99
  set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
100
100
  main = compose_title(main, intro, part, partnumber, subpartnumber, "fr")
101
101
  set(:docsubtitle, main)
@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
31
31
 
32
32
  spec.add_dependency "asciidoctor", "~> 1.5.7"
33
33
  spec.add_dependency "ruby-jing"
34
- spec.add_dependency "isodoc", "~> 0.8.9"
34
+ spec.add_dependency "isodoc", "~> 0.9.0"
35
35
  spec.add_dependency "iev", "~> 0.2.0"
36
- spec.add_dependency "relaton", "~> 0.1.3"
36
+ spec.add_dependency "relaton", "~> 0.2.0"
37
37
  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
38
38
 
39
39
  spec.add_development_dependency "bundler", "~> 1.15"
@@ -47,5 +47,5 @@ Gem::Specification.new do |spec|
47
47
  spec.add_development_dependency "simplecov", "~> 0.15"
48
48
  spec.add_development_dependency "timecop", "~> 0.9"
49
49
  spec.add_development_dependency "metanorma", "~> 0.2.6"
50
- spec.add_development_dependency "isobib", "~> 0.2.0"
50
+ spec.add_development_dependency "isobib", "~> 0.3.0"
51
51
  end
@@ -189,7 +189,7 @@ r = 1 %</stem>
189
189
  <title>Normative References</title>
190
190
  <bibitem id="iso216" type="standard">
191
191
  <title format="text/plain">Reference</title>
192
- <docidentifier>ISO 216</docidentifier>
192
+ <docidentifier>ISO 216:2001</docidentifier>
193
193
  <date type="published">
194
194
  <on>2001</on>
195
195
  </date>
@@ -656,7 +656,7 @@ r = 1 %</stem>
656
656
  <title>Normative References</title>
657
657
  <bibitem id="iso123" type="standard">
658
658
  <title format="text/plain">Standard</title>
659
- <docidentifier>ISO 123</docidentifier>
659
+ <docidentifier>ISO 123:--</docidentifier>
660
660
  <date type="published">
661
661
  <on>--</on>
662
662
  </date>
@@ -109,7 +109,7 @@ EOS
109
109
  expect(File.exist?("#{Dir.home}/.iev.pstore")).to be true
110
110
 
111
111
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
112
- entry = db.load_entry("ISO 123:2001")
112
+ entry = db.load_entry("ISO(ISO 123:2001)")
113
113
  expect(entry["fetched"].to_s).to eq(Date.today.to_s)
114
114
  expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_DATED)
115
115
 
@@ -134,7 +134,7 @@ EOS
134
134
  expect(File.exist?("test.relaton.pstore")).to be false
135
135
 
136
136
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
137
- entry = db.load_entry("ISO 123:2001")
137
+ entry = db.load_entry("ISO(ISO 123:2001)")
138
138
  expect(entry).to_not be nil
139
139
 
140
140
  system "rm ~/.relaton-bib.pstore"
@@ -156,11 +156,11 @@ EOS
156
156
  expect(File.exist?("test.relaton.pstore")).to be true
157
157
 
158
158
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
159
- entry = db.load_entry("ISO 123:2001")
159
+ entry = db.load_entry("ISO(ISO 123:2001)")
160
160
  expect(entry).to_not be nil
161
161
 
162
162
  db = Relaton::Db.new "test.relaton.pstore", nil
163
- entry = db.load_entry("ISO 123:2001")
163
+ entry = db.load_entry("ISO(ISO 123:2001)")
164
164
  expect(entry).to_not be nil
165
165
 
166
166
  system "rm ~/.relaton-bib.pstore"
@@ -171,7 +171,7 @@ EOS
171
171
  it "fetches uncached references" do
172
172
  system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
173
173
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
174
- db.save_entry("ISO 123:2001",
174
+ db.save_entry("ISO(ISO 123:2001)",
175
175
  {
176
176
  "fetched" => Date.today.to_s,
177
177
  "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
@@ -189,10 +189,10 @@ EOS
189
189
  * [[[iso124,ISO 124:2014]]] _Standard_
190
190
  INPUT
191
191
 
192
- entry = db.load_entry("ISO 123:2001")
192
+ entry = db.load_entry("ISO(ISO 123:2001)")
193
193
  expect(entry["fetched"].to_s).to eq(Date.today.to_s)
194
194
  expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
195
- entry = db.load_entry("ISO 124:2014")
195
+ entry = db.load_entry("ISO(ISO 124:2014)")
196
196
  expect(entry["fetched"].to_s).to eq(Date.today.to_s)
197
197
  expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_124_DATED)
198
198
 
@@ -221,7 +221,7 @@ EOS
221
221
  * [[[iso123,ISO 123]]] _Standard_
222
222
  INPUT
223
223
 
224
- entry = db.load_entry("ISO 123")
224
+ entry = db.load_entry("ISO(ISO 123)")
225
225
  expect(entry["fetched"].to_s).to eq(Date.today.to_s)
226
226
  expect(entry["bib"].to_xml).to be_equivalent_to(ISOBIB_123_UNDATED)
227
227
 
@@ -233,7 +233,7 @@ EOS
233
233
  system "mv ~/.relaton-bib.pstore ~/.relaton-bib.pstore1"
234
234
 
235
235
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
236
- db.save_entry("ISO 123:2001",
236
+ db.save_entry("ISO(ISO 123:2001)",
237
237
  {
238
238
  "fetched" => (Date.today - 90),
239
239
  "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
@@ -248,7 +248,7 @@ EOS
248
248
  * [[[iso123,ISO 123:2001]]] _Standard_
249
249
  INPUT
250
250
 
251
- entry = db.load_entry("ISO 123:2001")
251
+ entry = db.load_entry("ISO(ISO 123:2001)")
252
252
  expect(entry["fetched"].to_s).to eq((Date.today - 90).to_s)
253
253
  expect(entry["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
254
254
 
@@ -261,13 +261,13 @@ EOS
261
261
  system "rm test.relaton.pstore"
262
262
 
263
263
  db = Relaton::Db.new "#{Dir.home}/.relaton-bib.pstore", nil
264
- db.save_entry("ISO 123:2001",
264
+ db.save_entry("ISO(ISO 123:2001)",
265
265
  {
266
266
  "fetched" => Date.today,
267
267
  "bib" => IsoBibItem.from_xml(ISO_123_SHORT)
268
268
  }
269
269
  )
270
- db.save_entry("ISO 124",
270
+ db.save_entry("ISO(ISO 124)",
271
271
  {
272
272
  "fetched" => Date.today,
273
273
  "bib" => IsoBibItem.from_xml(ISO_124_SHORT)
@@ -275,7 +275,7 @@ EOS
275
275
  )
276
276
 
277
277
  localdb = Relaton::Db.new "test.relaton.pstore", nil
278
- localdb.save_entry("ISO 124",
278
+ localdb.save_entry("ISO(ISO 124)",
279
279
  {
280
280
  "fetched" => Date.today,
281
281
  "bib" => IsoBibItem.from_xml(ISO_124_SHORT_ALT)
@@ -306,10 +306,10 @@ EOS
306
306
 
307
307
  expect(strip_guid(Asciidoctor.convert(input, backend: :iso, header_footer: true))).to be_equivalent_to(output)
308
308
 
309
- expect(db.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
310
- expect(db.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT)
311
- expect(localdb.load_entry("ISO 123:2001")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
312
- expect(localdb.load_entry("ISO 124")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
309
+ expect(db.load_entry("ISO(ISO 123:2001)")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
310
+ expect(db.load_entry("ISO(ISO 124)")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT)
311
+ expect(localdb.load_entry("ISO(ISO 123:2001)")["bib"].to_xml).to be_equivalent_to(ISO_123_SHORT)
312
+ expect(localdb.load_entry("ISO(ISO 124)")["bib"].to_xml).to be_equivalent_to(ISO_124_SHORT_ALT)
313
313
 
314
314
  system "rm ~/.relaton-bib.pstore"
315
315
  system "mv ~/.relaton-bib.pstore1 ~/.relaton-bib.pstore"
@@ -45,7 +45,7 @@ RSpec.describe Asciidoctor::ISO do
45
45
  <title>Normative References</title>
46
46
  <bibitem id="iso123" type="standard">
47
47
  <title format="text/plain">Standard</title>
48
- <docidentifier>ISO 123</docidentifier>
48
+ <docidentifier>ISO 123:1066-1067</docidentifier>
49
49
  <date type="published">
50
50
  <from>1066</from>
51
51
  <to>1067</to>
@@ -84,7 +84,7 @@ RSpec.describe Asciidoctor::ISO do
84
84
  <uri type="src">https://www.iso.org/standard/23281.html</uri>
85
85
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>
86
86
  <uri type="rss">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>
87
- <docidentifier>ISO 123</docidentifier>
87
+ <docidentifier type="ISO">ISO 123:2001</docidentifier>
88
88
  <date type="published">
89
89
  <on>2001</on>
90
90
  </date>
@@ -177,7 +177,7 @@ RSpec.describe Asciidoctor::ISO do
177
177
  <uri type="src">https://www.iso.org/standard/21071.html</uri>
178
178
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
179
179
  <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
180
- <docidentifier>ISO/IEC 12382</docidentifier>
180
+ <docidentifier type="ISO">ISO/IEC 12382:1992</docidentifier>
181
181
  <date type="published">
182
182
  <on>1992</on>
183
183
  </date>
@@ -232,7 +232,7 @@ RSpec.describe Asciidoctor::ISO do
232
232
  <uri type="src">https://www.iso.org/standard/61884.html</uri>
233
233
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
234
234
  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
235
- <docidentifier>ISO 124</docidentifier>
235
+ <docidentifier type="ISO">ISO 124:2014</docidentifier>
236
236
  <date type="published">
237
237
  <on>2014</on>
238
238
  </date>
@@ -291,7 +291,7 @@ RSpec.describe Asciidoctor::ISO do
291
291
  <title>Normative References</title>
292
292
  <bibitem id="iso123" type="standard">
293
293
  <title format="text/plain">Standard</title>
294
- <docidentifier>ISO 123</docidentifier>
294
+ <docidentifier>ISO 123:--</docidentifier>
295
295
  <date type="published">
296
296
  <on>--</on>
297
297
  </date>
@@ -326,7 +326,7 @@ RSpec.describe Asciidoctor::ISO do
326
326
  <title>Normative References</title>
327
327
  <bibitem id="iso123" type="standard">
328
328
  <title format="text/plain">Standard</title>
329
- <docidentifier>ISO 123</docidentifier>
329
+ <docidentifier>ISO 123:1066 (all parts)</docidentifier>
330
330
  <date type="published">
331
331
  <on>1066</on>
332
332
  </date>
@@ -352,7 +352,7 @@ RSpec.describe Asciidoctor::ISO do
352
352
  [bibliography]
353
353
  == Normative References
354
354
 
355
- * [[[iso123,IETF RFC 8341]]] _Standard_
355
+ * [[[iso123,IETF(RFC 8341)]]] _Standard_
356
356
  INPUT
357
357
  #{BLANK_HDR}
358
358
  <sections>
@@ -361,7 +361,7 @@ RSpec.describe Asciidoctor::ISO do
361
361
  <title>Normative References</title>
362
362
  <bibitem type="" id="iso123">
363
363
  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
364
- <docidentifier>8341</docidentifier>
364
+ <docidentifier type="IETF">RFC 8341</docidentifier>
365
365
  <date type="published">
366
366
  <on>2018</on>
367
367
  </date>
@@ -508,7 +508,7 @@ RSpec.describe Asciidoctor::ISO do
508
508
  def mock_isobib_get_123
509
509
  expect(Isobib::IsoBibliography).to receive(:get).with("ISO 123", nil, {}) do
510
510
  IsoBibItem.from_xml(<<~"OUTPUT")
511
- <bibitem type=\"international-standard\" id=\"ISO123\">\n <title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\n <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n <docidentifier>ISO 123</docidentifier>\n <date type=\"published\">\n <on>2001</on>\n </date>\n <contributor>\n <role type=\"publisher\"/>\n <organization>\n <name>International Organization for Standardization</name>\n <abbreviation>ISO</abbreviation>\n <uri>www.iso.org</uri>\n </organization>\n </contributor>\n <edition>3</edition>\n <language>en</language>\n <language>fr</language>\n <script>Latn</script>\n <status>Published</status>\n <copyright>\n <from>2001</from>\n <owner>\n <organization>\n <name>ISO</name>\n <abbreviation></abbreviation>\n </organization>\n </owner>\n </copyright>\n <relation type=\"obsoletes\">\n <bibitem>\n <formattedref>ISO 123:1985</formattedref>\n </bibitem>\n </relation>\n <relation type=\"updates\">\n <bibitem>\n <formattedref>ISO 123:2001</formattedref>\n </bibitem>\n </relation>\n</bibitem>
511
+ <bibitem type=\"international-standard\" id=\"ISO123\">\n <title format=\"text/plain\" language=\"en\" script=\"Latn\">Rubber latex -- Sampling</title>\n <title format=\"text/plain\" language=\"fr\" script=\"Latn\">Latex de caoutchouc -- ?chantillonnage</title>\n <uri type=\"src\">https://www.iso.org/standard/23281.html</uri>\n <uri type=\"obp\">https://www.iso.org/obp/ui/#!iso:std:23281:en</uri>\n <uri type=\"rss\">https://www.iso.org/contents/data/standard/02/32/23281.detail.rss</uri>\n <docidentifier type="ISO">ISO 123:2001</docidentifier>\n <date type=\"published\">\n <on>2001</on>\n </date>\n <contributor>\n <role type=\"publisher\"/>\n <organization>\n <name>International Organization for Standardization</name>\n <abbreviation>ISO</abbreviation>\n <uri>www.iso.org</uri>\n </organization>\n </contributor>\n <edition>3</edition>\n <language>en</language>\n <language>fr</language>\n <script>Latn</script>\n <status>Published</status>\n <copyright>\n <from>2001</from>\n <owner>\n <organization>\n <name>ISO</name>\n <abbreviation></abbreviation>\n </organization>\n </owner>\n </copyright>\n <relation type=\"obsoletes\">\n <bibitem>\n <formattedref>ISO 123:1985</formattedref>\n </bibitem>\n </relation>\n <relation type=\"updates\">\n <bibitem>\n <formattedref>ISO 123:2001</formattedref>\n </bibitem>\n </relation>\n</bibitem>
512
512
  OUTPUT
513
513
  end
514
514
  end
@@ -522,7 +522,7 @@ RSpec.describe Asciidoctor::ISO do
522
522
  <uri type="src">https://www.iso.org/standard/61884.html</uri>
523
523
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:61884:en</uri>
524
524
  <uri type="rss">https://www.iso.org/contents/data/standard/06/18/61884.detail.rss</uri>
525
- <docidentifier>ISO 124</docidentifier>
525
+ <docidentifier type="ISO">ISO 124:2014</docidentifier>
526
526
  <date type="published">
527
527
  <on>2014</on>
528
528
  </date>
@@ -572,7 +572,7 @@ RSpec.describe Asciidoctor::ISO do
572
572
  <uri type="src">https://www.iso.org/standard/21071.html</uri>
573
573
  <uri type="obp">https://www.iso.org/obp/ui/#!iso:std:21071:en</uri>
574
574
  <uri type="rss">https://www.iso.org/contents/data/standard/02/10/21071.detail.rss</uri>
575
- <docidentifier>ISO/IEC 12382</docidentifier>
575
+ <docidentifier type="ISO">ISO/IEC 12382:1992</docidentifier>
576
576
  <date type="published">
577
577
  <on>1992</on>
578
578
  </date>
@@ -630,7 +630,7 @@ end
630
630
  IsoBibItem.from_xml(<<~"OUTPUT")
631
631
  <bibitem id="RFC8341">
632
632
  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
633
- <docidentifier>8341</docidentifier>
633
+ <docidentifier type="IETF">RFC 8341</docidentifier>
634
634
  <date type="published">
635
635
  <on>2018</on>
636
636
  </date>
@@ -1,7 +1,7 @@
1
1
  MIME-Version: 1.0
2
- Content-Type: multipart/related; boundary="----=_NextPart_64b56c80.e800.431f"
2
+ Content-Type: multipart/related; boundary="----=_NextPart_50578807.7902.4498"
3
3
 
4
- ------=_NextPart_64b56c80.e800.431f
4
+ ------=_NextPart_50578807.7902.4498
5
5
  Content-Location: file:///C:/Doc/spec/assets/iso.htm
6
6
  Content-Type: text/html; charset="utf-8"
7
7
 
@@ -843,11 +843,11 @@ Switzerland<p class="MsoNormal"></p></span></p>
843
843
  <p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes">&#xA0;</span>TOC
844
844
  \o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
845
845
  <span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
846
- <a href="#_Toc91959334">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
846
+ <a href="#_Toc407577335">Foreword<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
847
847
  <span style="mso-tab-count:1 dotted">. </span>
848
848
  </span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
849
849
  <span style="mso-element:field-begin"></span></span>
850
- <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc91959334 \h </span>
850
+ <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"> PAGEREF _Toc407577335 \h </span>
851
851
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-separator"></span></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">1</span>
852
852
  <span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"></span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB"><span style="mso-element:field-end"></span></span></a></span></span></p>
853
853
 
@@ -880,7 +880,7 @@ Switzerland<p class="MsoNormal"></p></span></p>
880
880
  </html>
881
881
 
882
882
 
883
- ------=_NextPart_64b56c80.e800.431f
883
+ ------=_NextPart_50578807.7902.4498
884
884
  Content-Location: file:///C:/Doc/spec/assets/iso_files/filelist.xml
885
885
  Content-Transfer-Encoding: base64
886
886
  Content-Type: application/xml
@@ -890,7 +890,7 @@ ICAgICAgIDxvOk1haW5GaWxlIEhSZWY9Ii4uL3NwZWMvYXNzZXRzL2lzby5odG0iLz4gIDxvOkZp
890
890
  bGUgSFJlZj0iZmlsZWxpc3QueG1sIi8+CiAgPG86RmlsZSBIUmVmPSJoZWFkZXIuaHRtbCIvPgo8
891
891
  L3htbD4K
892
892
 
893
- ------=_NextPart_64b56c80.e800.431f
893
+ ------=_NextPart_50578807.7902.4498
894
894
  Content-Location: file:///C:/Doc/spec/assets/iso_files/header.html
895
895
  Content-Transfer-Encoding: base64
896
896
  Content-Type: text/html charset="utf-8"
@@ -1083,4 +1083,4 @@ cD4NCg0KPHAgY2xhc3M9TXNvRm9vdGVyPjxzcGFuIGxhbmc9RU4tQVUgc3R5bGU9J2ZvbnQtc2l6
1083
1083
  ZToxMC4wcHQ7Jz7CqQ0KJm5ic3A7Jm5ic3A74oCTIEFsbCByaWdodHMgcmVzZXJ2ZWQ8bzpwPjwv
1084
1084
  bzpwPjwvc3Bhbj48L3A+DQoNCjwvZGl2Pg0KDQoNCg0KPC9ib2R5Pg0KDQo8L2h0bWw+DQo=
1085
1085
 
1086
- ------=_NextPart_64b56c80.e800.431f--
1086
+ ------=_NextPart_50578807.7902.4498--
@@ -147,14 +147,14 @@ RSpec.describe IsoDoc::Iso do
147
147
  <h1 class="ForewordTitle">Foreword</h1>
148
148
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">
149
149
  <a href="#IEV">IEV</a>
150
- <a href="#ISO20483">ISO 20483:2013&#8211;2014</a>
150
+ <a href="#ISO20483">ISO 20483</a>
151
151
  </p>
152
152
  </div>
153
153
  <p class="zzSTDTitle1"/>
154
154
  <div>
155
155
  <h1>1.&#160; Normative references</h1>
156
156
  <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>
157
- <p id="ISO20483" class="NormRef">ISO 20483:2013&#8211;2014, <i> Cereals and pulses</i></p>
157
+ <p id="ISO20483" class="NormRef">ISO 20483, <i> Cereals and pulses</i></p>
158
158
  </div>
159
159
  </div>
160
160
  </body>
@@ -6,11 +6,13 @@ RSpec.describe IsoDoc do
6
6
  system "rm -f test.html"
7
7
  IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", filename: "test"}).convert("test", <<~"INPUT", false)
8
8
  <iso-standard xmlns="http://riboseinc.com/isoxml">
9
+ <bibdata>
9
10
  <title>
10
11
  <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
11
12
  <title-main language="en" format="text/plain">Specifications and test methods</title-main>
12
13
  <title-part language="en" format="text/plain">Rice</title-part>
13
14
  </title>
15
+ </bibdata>
14
16
  <preface><foreword>
15
17
  <note>
16
18
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
@@ -30,11 +32,13 @@ RSpec.describe IsoDoc do
30
32
  system "rm -f test.html"
31
33
  IsoDoc::Iso::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
32
34
  <iso-standard xmlns="http://riboseinc.com/isoxml">
35
+ <bibdata>
33
36
  <title>
34
37
  <title-intro language="en" format="text/plain">Cereals and pulses</title-intro>
35
38
  <title-main language="en" format="text/plain">Specifications and test methods</title-main>
36
39
  <title-part language="en" format="text/plain">Rice</title-part>
37
40
  </title>
41
+ </bibdata>
38
42
  <preface><foreword>
39
43
  <note>
40
44
  <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>
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.0.4
4
+ version: 1.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-09-01 00:00:00.000000000 Z
11
+ date: 2018-09-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 0.8.9
47
+ version: 0.9.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 0.8.9
54
+ version: 0.9.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: iev
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.1.3
75
+ version: 0.2.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.1.3
82
+ version: 0.2.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: metanorma-standoc
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
254
254
  requirements:
255
255
  - - "~>"
256
256
  - !ruby/object:Gem::Version
257
- version: 0.2.0
257
+ version: 0.3.0
258
258
  type: :development
259
259
  prerelease: false
260
260
  version_requirements: !ruby/object:Gem::Requirement
261
261
  requirements:
262
262
  - - "~>"
263
263
  - !ruby/object:Gem::Version
264
- version: 0.2.0
264
+ version: 0.3.0
265
265
  description: |
266
266
  metanorma-iso lets you write ISO standards in AsciiDoc syntax.
267
267