metanorma-iso 1.3.26 → 1.3.27
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/biblio.rng +1 -1
- data/lib/asciidoctor/iso/cleanup.rb +1 -1
- data/lib/asciidoctor/iso/front_id.rb +1 -1
- data/lib/asciidoctor/iso/isodoc.rng +427 -0
- data/lib/asciidoctor/iso/isostandard.rng +3 -0
- data/lib/asciidoctor/iso/reqt.rng +23 -0
- data/lib/asciidoctor/iso/term_lookup_cleanup.rb +2 -2
- data/lib/asciidoctor/iso/validate.rb +1 -5
- data/lib/asciidoctor/iso/validate_title.rb +1 -1
- data/lib/isodoc/iso/base_convert.rb +53 -67
- data/lib/isodoc/iso/html/isodoc.scss +4 -0
- data/lib/isodoc/iso/html/style-human.scss +3 -0
- data/lib/isodoc/iso/html/style-iso.scss +3 -0
- data/lib/isodoc/iso/html/word_iso_intro.html +4 -0
- data/lib/isodoc/iso/metadata.rb +1 -1
- data/lib/isodoc/iso/xref.rb +105 -0
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/asciidoctor-iso/amd_spec.rb +7 -7
- data/spec/asciidoctor-iso/base_spec.rb +5 -5
- data/spec/asciidoctor-iso/cleanup_spec.rb +1 -1
- data/spec/asciidoctor-iso/macros_spec.rb +20 -6
- data/spec/asciidoctor-iso/refs_spec.rb +1 -1
- data/spec/isodoc/amd_spec.rb +48 -2
- data/spec/isodoc/blocks_spec.rb +112 -27
- data/spec/isodoc/inline_spec.rb +2 -2
- data/spec/isodoc/metadata_spec.rb +86 -4
- data/spec/isodoc/postproc_spec.rb +1 -1
- data/spec/isodoc/ref_spec.rb +4 -4
- data/spec/isodoc/table_spec.rb +8 -8
- data/spec/isodoc/terms_spec.rb +4 -4
- data/spec/isodoc/xref_spec.rb +24 -18
- metadata +3 -2
|
@@ -101,7 +101,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
101
101
|
<title language="fr" format="text/plain" type="title-intro">Introduction Française</title>
|
|
102
102
|
<title language="fr" format="text/plain" type="title-main">Titre Principal</title>
|
|
103
103
|
<title language="fr" format="text/plain" type="title-part">Part du Titre</title>
|
|
104
|
-
<docidentifier type="
|
|
104
|
+
<docidentifier type="ISO">ISO/PreWD3 1000-1</docidentifier>
|
|
105
105
|
<docidentifier type='iso-with-lang'>ISO/PreWD3 1000-1(E)</docidentifier>
|
|
106
106
|
<docidentifier type='iso-reference'>ISO/PreWD3 1000-1:2000(E)</docidentifier>
|
|
107
107
|
<docnumber>1000</docnumber>
|
|
@@ -192,7 +192,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
192
192
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
193
193
|
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
|
194
194
|
<bibdata type="standard">
|
|
195
|
-
<docidentifier type="
|
|
195
|
+
<docidentifier type="ISO">ISO/IEC/IETF/TR 1000-1-1:2001</docidentifier>
|
|
196
196
|
<docidentifier type='iso-with-lang'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
|
|
197
197
|
<docidentifier type='iso-reference'>ISO/IEC/IETF/TR 1000-1-1:2001(X)</docidentifier>
|
|
198
198
|
<docidentifier type="iso-tc">2000</docidentifier>
|
|
@@ -304,7 +304,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
304
304
|
INPUT
|
|
305
305
|
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
|
306
306
|
<bibdata type="standard">
|
|
307
|
-
<docidentifier type="
|
|
307
|
+
<docidentifier type="ISO">ISO/DTS 1000.2</docidentifier>
|
|
308
308
|
<docidentifier type='iso-with-lang'>ISO/DTS 1000.2(F)</docidentifier>
|
|
309
309
|
<docidentifier type='iso-reference'>ISO/DTS 1000.2(F)</docidentifier>
|
|
310
310
|
<docnumber>1000</docnumber>
|
|
@@ -370,7 +370,7 @@ OUTPUT
|
|
|
370
370
|
INPUT
|
|
371
371
|
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
|
372
372
|
<bibdata type="standard">
|
|
373
|
-
<docidentifier type="
|
|
373
|
+
<docidentifier type="ISO">ISO 1000</docidentifier>
|
|
374
374
|
<docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
|
|
375
375
|
<docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
|
|
376
376
|
<docnumber>1000</docnumber>
|
|
@@ -436,7 +436,7 @@ OUTPUT
|
|
|
436
436
|
INPUT
|
|
437
437
|
<iso-standard xmlns="https://www.metanorma.org/ns/iso">
|
|
438
438
|
<bibdata type="standard">
|
|
439
|
-
<docidentifier type="
|
|
439
|
+
<docidentifier type="ISO">ISO 1000</docidentifier>
|
|
440
440
|
<docidentifier type='iso-with-lang'>ISO 1000(E)</docidentifier>
|
|
441
441
|
<docidentifier type='iso-reference'>ISO 1000(E)</docidentifier>
|
|
442
442
|
<docnumber>1000</docnumber>
|
|
@@ -654,7 +654,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
654
654
|
<abbreviation>ISO</abbreviation>
|
|
655
655
|
</organization>
|
|
656
656
|
</contributor>
|
|
657
|
-
<note format="text/plain"
|
|
657
|
+
<note format="text/plain" type="ISO DATE">The standard is in press</note>
|
|
658
658
|
</bibitem>
|
|
659
659
|
</references>
|
|
660
660
|
</bibliography>
|
|
@@ -234,11 +234,16 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
234
234
|
|
|
235
235
|
== Terms and Definitions
|
|
236
236
|
|
|
237
|
-
=== name
|
|
237
|
+
=== name identity
|
|
238
|
+
|
|
239
|
+
[[name-check]]
|
|
240
|
+
=== name check
|
|
238
241
|
|
|
239
242
|
paragraph
|
|
240
243
|
|
|
241
|
-
term:[name] is a term
|
|
244
|
+
term:[name check] is a term
|
|
245
|
+
|
|
246
|
+
term:[name identity] is a term
|
|
242
247
|
|
|
243
248
|
Moreover, term:[missing] is a term
|
|
244
249
|
XML
|
|
@@ -268,14 +273,23 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
268
273
|
</p>
|
|
269
274
|
</li>
|
|
270
275
|
</ul>
|
|
271
|
-
<term id='term-name'>
|
|
272
|
-
|
|
276
|
+
<term id='term-name-identity'>
|
|
277
|
+
<preferred>name identity</preferred>
|
|
278
|
+
</term>
|
|
279
|
+
<term id='name-check'>
|
|
280
|
+
<preferred>name check</preferred>
|
|
273
281
|
<definition>
|
|
274
282
|
<p id='_'>paragraph</p>
|
|
275
283
|
<p id='_'>
|
|
276
|
-
<em>name</em>
|
|
284
|
+
<em>name check</em>
|
|
285
|
+
(
|
|
286
|
+
<xref target='name-check'/>
|
|
287
|
+
) is a term
|
|
288
|
+
</p>
|
|
289
|
+
<p id='_'>
|
|
290
|
+
<em>name identity</em>
|
|
277
291
|
(
|
|
278
|
-
<xref target='term-name'/>
|
|
292
|
+
<xref target='term-name-identity'/>
|
|
279
293
|
) is a term
|
|
280
294
|
</p>
|
|
281
295
|
<p id="_">Moreover, (<strong>term “missing” not resolved</strong>) is a term
|
|
@@ -32,7 +32,7 @@ RSpec.describe Asciidoctor::ISO do
|
|
|
32
32
|
<abbreviation>ISO</abbreviation>
|
|
33
33
|
</organization>
|
|
34
34
|
</contributor>
|
|
35
|
-
<note format="text/plain"
|
|
35
|
+
<note format="text/plain" type="ISO DATE">The standard is in press</note>
|
|
36
36
|
</bibitem>
|
|
37
37
|
</references>
|
|
38
38
|
</bibliography>
|
data/spec/isodoc/amd_spec.rb
CHANGED
|
@@ -491,7 +491,7 @@ OUTPUT
|
|
|
491
491
|
<title language='fr' format='text/plain' type='title-main'>Titre Principal</title>
|
|
492
492
|
<title language='fr' format='text/plain' type='title-part'>Part du Titre</title>
|
|
493
493
|
<title language='fr' format='text/plain' type='title-amd'>Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport</title>
|
|
494
|
-
<docidentifier type='
|
|
494
|
+
<docidentifier type='ISO'>ISO/PreNWIP3 17301-1:2016/Amd.1</docidentifier>
|
|
495
495
|
<docidentifier type='iso-with-lang'>ISO/PreNWIP3 17301-1:2016/Amd.1(E)</docidentifier>
|
|
496
496
|
<docidentifier type='iso-reference'>ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)</docidentifier>
|
|
497
497
|
<docnumber>17301</docnumber>
|
|
@@ -563,7 +563,53 @@ OUTPUT
|
|
|
563
563
|
<sections/>
|
|
564
564
|
</iso-standard>
|
|
565
565
|
INPUT
|
|
566
|
-
{:agency=>"ISO",
|
|
566
|
+
{:agency=>"ISO",
|
|
567
|
+
:authors=>[],
|
|
568
|
+
:authors_affiliations=>{},
|
|
569
|
+
:createddate=>"2016-05-01",
|
|
570
|
+
:docnumber=>"ISO/PreNWIP3 17301-1:2016/Amd.1",
|
|
571
|
+
:docnumber_lang=>"ISO/PreNWIP3 17301-1:2016/Amd.1(E)",
|
|
572
|
+
:docnumber_reference=>"ISO/PreNWIP3 17301-1:2016/Amd.1:2017(E)",
|
|
573
|
+
:docnumeric=>"17301",
|
|
574
|
+
:docsubtitle=>"Introduction Française — Titre Principal — Partie 1: Part du Titre",
|
|
575
|
+
:docsubtitleamd=>"Fraction massique de matière étrangère, riz usiné (non gluant), diviseurs d’échantillon et recommandations relatives aux conditions d’entreposage et de transport",
|
|
576
|
+
:docsubtitleamdlabel=>"AMENDMENT 1",
|
|
577
|
+
:docsubtitlecorrlabel=>"RECTIFICATIF TECHNIQUE 2",
|
|
578
|
+
:docsubtitleintro=>"Introduction Française",
|
|
579
|
+
:docsubtitlemain=>"Titre Principal",
|
|
580
|
+
:docsubtitlepart=>"Part du Titre",
|
|
581
|
+
:docsubtitlepartlabel=>"Partie 1",
|
|
582
|
+
:doctitle=>"Introduction — Main Title — Title — Part 1: Title Part",
|
|
583
|
+
:doctitleamd=>"Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions",
|
|
584
|
+
:doctitleamdlabel=>"AMENDMENT 1",
|
|
585
|
+
:doctitlecorrlabel=>"TECHNICAL CORRIGENDUM 2",
|
|
586
|
+
:doctitleintro=>"Introduction",
|
|
587
|
+
:doctitlemain=>"Main Title — Title",
|
|
588
|
+
:doctitlepart=>"Title Part",
|
|
589
|
+
:doctitlepartlabel=>"Part 1",
|
|
590
|
+
:doctype=>"Amendment",
|
|
591
|
+
:docyear=>"2017",
|
|
592
|
+
:draft=>"0.3.4",
|
|
593
|
+
:draftinfo=>" (draft 0.3.4, 2000-01-01)",
|
|
594
|
+
:edition=>"2",
|
|
595
|
+
:editorialgroup=>["A 1", "B 2", "C 3"],
|
|
596
|
+
:ics=>"1, 2, 3",
|
|
597
|
+
:keywords=>[],
|
|
598
|
+
:obsoletes=>nil,
|
|
599
|
+
:obsoletes_part=>nil,
|
|
600
|
+
:publisher=>"International Organization for Standardization",
|
|
601
|
+
:revdate=>"2000-01-01",
|
|
602
|
+
:revdate_monthyear=>"January 2000",
|
|
603
|
+
:sc=>"B 2",
|
|
604
|
+
:secretariat=>"SECRETARIAT",
|
|
605
|
+
:stage=>"10",
|
|
606
|
+
:stage_int=>10,
|
|
607
|
+
:stageabbr=>"NWIP",
|
|
608
|
+
:statusabbr=>"PreNWIP3",
|
|
609
|
+
:tc=>"A 1",
|
|
610
|
+
:tc_docnumber=>[],
|
|
611
|
+
:unpublished=>true,
|
|
612
|
+
:wg=>"C 3"}
|
|
567
613
|
OUTPUT
|
|
568
614
|
end
|
|
569
615
|
|
data/spec/isodoc/blocks_spec.rb
CHANGED
|
@@ -8,12 +8,10 @@ RSpec.describe IsoDoc do
|
|
|
8
8
|
<formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
|
|
9
9
|
<stem type="AsciiMath">r = 1 %</stem>
|
|
10
10
|
<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
|
|
11
|
-
<dt>
|
|
12
|
-
|
|
13
|
-
</dt>
|
|
14
|
-
<dd>
|
|
15
|
-
<p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
|
|
16
|
-
</dd>
|
|
11
|
+
<dt> <stem type="AsciiMath">r</stem> </dt>
|
|
12
|
+
<dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p> </dd>
|
|
13
|
+
<dt> <stem type="AsciiMath">s_1</stem> </dt>
|
|
14
|
+
<dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the other repeatability limit.</p> </dd>
|
|
17
15
|
</dl>
|
|
18
16
|
<note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
|
|
19
17
|
<p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
|
|
@@ -26,29 +24,55 @@ RSpec.describe IsoDoc do
|
|
|
26
24
|
</iso-standard>
|
|
27
25
|
INPUT
|
|
28
26
|
#{HTML_HDR}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
27
|
+
<br/>
|
|
28
|
+
<div>
|
|
29
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
30
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
|
|
31
|
+
<p>
|
|
32
|
+
<span class='stem'>(#(r = 1 %)#)</span>
|
|
33
|
+
</p>
|
|
34
|
+
</div>
|
|
35
|
+
<p style='page-break-after:avoid;'>where</p>
|
|
36
|
+
<dl id='_e4fe94fe-1cde-49d9-b1ad-743293b7e21d' class='formula_dl'>
|
|
37
|
+
<dt>
|
|
38
|
+
<span class='stem'>(#(r)#)</span>
|
|
39
|
+
</dt>
|
|
40
|
+
<dd>
|
|
41
|
+
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
|
|
42
|
+
</dd>
|
|
43
|
+
<dt>
|
|
44
|
+
<span class='stem'>(#(s_1)#)</span>
|
|
45
|
+
</dt>
|
|
46
|
+
<dd>
|
|
47
|
+
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the other repeatability limit.</p>
|
|
48
|
+
</dd>
|
|
49
|
+
</dl>
|
|
50
|
+
<div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
|
|
51
|
+
<p>
|
|
52
|
+
<span class='note_label'>NOTE</span>
|
|
53
|
+
  [durationUnits] is essentially a duration statement without
|
|
54
|
+
the "P" prefix. "P" is unnecessary because between "G" and "U"
|
|
55
|
+
duration is always expressed.
|
|
56
|
+
</p>
|
|
57
|
+
</div>
|
|
58
|
+
</div>
|
|
59
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
|
|
60
|
+
<p>
|
|
61
|
+
<span class='stem'>(#(r = 1 %)#)</span>
|
|
62
|
+
  (1)
|
|
63
|
+
</p>
|
|
64
|
+
</div>
|
|
65
|
+
</div>
|
|
66
|
+
</div>
|
|
67
|
+
<p class='zzSTDTitle1'/>
|
|
68
|
+
</div>
|
|
69
|
+
</body>
|
|
70
|
+
</html>
|
|
47
71
|
OUTPUT
|
|
48
72
|
end
|
|
49
73
|
|
|
50
74
|
it "processes formulae (Word)" do
|
|
51
|
-
expect((IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div>\s*<h1 class="ForewordTitle">}m, '<div><h1 class="ForewordTitle">').sub(%r{<p>\ </p>\s*</div>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
75
|
+
expect(xmlpp(IsoDoc::Iso::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(%r{^.*<div>\s*<h1 class="ForewordTitle">}m, '<div><h1 class="ForewordTitle">').sub(%r{<p>\ </p>\s*</div>.*$}m, ""))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
52
76
|
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
53
77
|
<preface><foreword>
|
|
54
78
|
<formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
|
|
@@ -60,6 +84,8 @@ RSpec.describe IsoDoc do
|
|
|
60
84
|
<dd>
|
|
61
85
|
<p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
|
|
62
86
|
</dd>
|
|
87
|
+
<dt> <stem type="AsciiMath">s_1</stem> </dt>
|
|
88
|
+
<dd> <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the other repeatability limit.</p> </dd>
|
|
63
89
|
</dl>
|
|
64
90
|
<note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
|
|
65
91
|
<p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
|
|
@@ -73,7 +99,7 @@ RSpec.describe IsoDoc do
|
|
|
73
99
|
INPUT
|
|
74
100
|
<div>
|
|
75
101
|
<h1 class='ForewordTitle'>Foreword</h1>
|
|
76
|
-
<div id='_be9158af-7e93-4ee2-90c5-26d31c181934' class='formula'>
|
|
102
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181934'><div class='formula'>
|
|
77
103
|
<p>
|
|
78
104
|
<span class='stem'>(#(r = 1 %)#)</span>
|
|
79
105
|
</p>
|
|
@@ -90,6 +116,16 @@ RSpec.describe IsoDoc do
|
|
|
90
116
|
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
|
|
91
117
|
</td>
|
|
92
118
|
</tr>
|
|
119
|
+
<tr>
|
|
120
|
+
<td valign='top' align='left'>
|
|
121
|
+
<p align='left' style='margin-left:0pt;text-align:left;'>
|
|
122
|
+
<span class='stem'>(#(s_1)#)</span>
|
|
123
|
+
</p>
|
|
124
|
+
</td>
|
|
125
|
+
<td valign='top'>
|
|
126
|
+
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the other repeatability limit.</p>
|
|
127
|
+
</td>
|
|
128
|
+
</tr>
|
|
93
129
|
</table>
|
|
94
130
|
<div id='_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0' class='Note'>
|
|
95
131
|
<p class='Note'>
|
|
@@ -100,16 +136,65 @@ RSpec.describe IsoDoc do
|
|
|
100
136
|
always expressed.
|
|
101
137
|
</p>
|
|
102
138
|
</div>
|
|
103
|
-
|
|
139
|
+
</div>
|
|
140
|
+
<div id='_be9158af-7e93-4ee2-90c5-26d31c181935'><div class='formula'>
|
|
104
141
|
<p>
|
|
105
142
|
<span class='stem'>(#(r = 1 %)#)</span>
|
|
106
143
|
<span style='mso-tab-count:1'>  </span>
|
|
107
144
|
(1)
|
|
108
145
|
</p>
|
|
109
146
|
</div>
|
|
147
|
+
</div>
|
|
110
148
|
</div>
|
|
111
149
|
OUTPUT
|
|
112
150
|
end
|
|
113
151
|
|
|
152
|
+
it "processes formulae with single definition list entry" do
|
|
153
|
+
expect(xmlpp(IsoDoc::Iso::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
|
|
154
|
+
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
155
|
+
<preface><foreword>
|
|
156
|
+
<formula id="_be9158af-7e93-4ee2-90c5-26d31c181934" unnumbered="true">
|
|
157
|
+
<stem type="AsciiMath">r = 1 %</stem>
|
|
158
|
+
<dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d">
|
|
159
|
+
<dt>
|
|
160
|
+
<stem type="AsciiMath">r</stem>
|
|
161
|
+
</dt>
|
|
162
|
+
<dd>
|
|
163
|
+
<p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>
|
|
164
|
+
</dd>
|
|
165
|
+
</dl>
|
|
166
|
+
<note id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0">
|
|
167
|
+
<p id="_511aaa98-4116-42af-8e5b-c87cdf5bfdc8">[durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p>
|
|
168
|
+
</note>
|
|
169
|
+
</formula>
|
|
170
|
+
<formula id="_be9158af-7e93-4ee2-90c5-26d31c181935">
|
|
171
|
+
<stem type="AsciiMath">r = 1 %</stem>
|
|
172
|
+
</formula>
|
|
173
|
+
</foreword></preface>
|
|
174
|
+
</iso-standard>
|
|
175
|
+
INPUT
|
|
176
|
+
#{HTML_HDR}
|
|
177
|
+
<br/>
|
|
178
|
+
<div>
|
|
179
|
+
<h1 class="ForewordTitle">Foreword</h1>
|
|
180
|
+
<div id="_be9158af-7e93-4ee2-90c5-26d31c181934"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span></p></div>
|
|
181
|
+
<span class='zzMoveToFollowing'>
|
|
182
|
+
where
|
|
183
|
+
<span class='stem'>(#(r)#)</span>
|
|
184
|
+
</span>
|
|
185
|
+
<p id='_1b99995d-ff03-40f5-8f2e-ab9665a69b77'>is the repeatability limit.</p>
|
|
186
|
+
|
|
187
|
+
<div id="_83083c7a-6c85-43db-a9fa-4d8edd0c9fc0" class="Note"><p><span class="note_label">NOTE</span>  [durationUnits] is essentially a duration statement without the "P" prefix. "P" is unnecessary because between "G" and "U" duration is always expressed.</p></div>
|
|
188
|
+
</div>
|
|
189
|
+
|
|
190
|
+
<div id="_be9158af-7e93-4ee2-90c5-26d31c181935"><div class="formula"><p><span class="stem">(#(r = 1 %)#)</span>  (1)</p></div></div>
|
|
191
|
+
</div>
|
|
192
|
+
<p class="zzSTDTitle1"/>
|
|
193
|
+
</div>
|
|
194
|
+
</body>
|
|
195
|
+
</html>
|
|
196
|
+
OUTPUT
|
|
197
|
+
end
|
|
198
|
+
|
|
114
199
|
|
|
115
200
|
end
|
data/spec/isodoc/inline_spec.rb
CHANGED
|
@@ -243,7 +243,7 @@ RSpec.describe IsoDoc do
|
|
|
243
243
|
<a href="#ISO712">ISO 712, Clause 1</a>
|
|
244
244
|
<a href="#ISO712">ISO 712, 1.5</a>
|
|
245
245
|
<a href="#ISO712">A</a>
|
|
246
|
-
<a href="#ISO712">ISO 712, </a>
|
|
246
|
+
<a href="#ISO712">ISO 712, Whole of text</a>
|
|
247
247
|
<a href="#ISO712">ISO 712, Prelude 7</a>
|
|
248
248
|
<a href="#ISO712">A</a>
|
|
249
249
|
</p>
|
|
@@ -251,7 +251,7 @@ RSpec.describe IsoDoc do
|
|
|
251
251
|
<p class="zzSTDTitle1"/>
|
|
252
252
|
<div>
|
|
253
253
|
<h1>1  Normative references</h1>
|
|
254
|
-
<p id="ISO712" class="NormRef">ISO 712, <i>
|
|
254
|
+
<p id="ISO712" class="NormRef">ISO 712, <i>Cereals and cereal products</i></p>
|
|
255
255
|
</div>
|
|
256
256
|
</div>
|
|
257
257
|
</body>
|
|
@@ -16,7 +16,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
|
16
16
|
<title type="title-intro" language="fr" format="text/plain">Céréales et légumineuses</title>
|
|
17
17
|
<title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
|
|
18
18
|
<title type="title-part" language="fr" format="text/plain">Riz</title>
|
|
19
|
-
<docidentifier type="
|
|
19
|
+
<docidentifier type="ISO">ISO/PreCD3 17301-1</docidentifier>
|
|
20
20
|
<docidentifier type="iso-with-lang">ISO/PreCD3 17301-1 (E)</docidentifier>
|
|
21
21
|
<docidentifier type="iso-reference">ISO/PreCD3 17301-1:2000 (E)</docidentifier>
|
|
22
22
|
<docidentifier type="iso-tc">17301</docidentifier>
|
|
@@ -78,7 +78,51 @@ RSpec.describe IsoDoc::Iso::Metadata do
|
|
|
78
78
|
</bibdata>
|
|
79
79
|
</iso-standard>
|
|
80
80
|
INPUT
|
|
81
|
-
{:accesseddate=>"2012",
|
|
81
|
+
{:accesseddate=>"2012",
|
|
82
|
+
:activateddate=>"2013",
|
|
83
|
+
:agency=>"ISO",
|
|
84
|
+
:authors=>[],
|
|
85
|
+
:authors_affiliations=>{},
|
|
86
|
+
:createddate=>"2010–2011",
|
|
87
|
+
:docnumber=>"ISO/PreCD3 17301-1",
|
|
88
|
+
:docnumber_lang=>"ISO/PreCD3 17301-1 (E)",
|
|
89
|
+
:docnumber_reference=>"ISO/PreCD3 17301-1:2000 (E)",
|
|
90
|
+
:docnumeric=>"1730",
|
|
91
|
+
:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1: Riz",
|
|
92
|
+
:docsubtitleintro=>"Céréales et légumineuses",
|
|
93
|
+
:docsubtitlemain=>"Spécification et méthodes d'essai",
|
|
94
|
+
:docsubtitlepart=>"Riz",
|
|
95
|
+
:docsubtitlepartlabel=>"Partie 1",
|
|
96
|
+
:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1: Rice",
|
|
97
|
+
:doctitleintro=>"Cereals and pulses",
|
|
98
|
+
:doctitlemain=>"Specifications and test methods",
|
|
99
|
+
:doctitlepart=>"Rice",
|
|
100
|
+
:doctitlepartlabel=>"Part 1",
|
|
101
|
+
:doctype=>"International Standard",
|
|
102
|
+
:docyear=>"2016",
|
|
103
|
+
:draft=>"0.4",
|
|
104
|
+
:draftinfo=>" (draft 0.4, 2016-05-01)",
|
|
105
|
+
:edition=>"2",
|
|
106
|
+
:editorialgroup=>["TC 34", "SC 4", "WG 3"],
|
|
107
|
+
:ics=>nil,
|
|
108
|
+
:keywords=>["kw2", "kw1"],
|
|
109
|
+
:obsoleteddate=>"2014",
|
|
110
|
+
:obsoletes=>nil,
|
|
111
|
+
:obsoletes_part=>nil,
|
|
112
|
+
:publisheddate=>"2011",
|
|
113
|
+
:publisher=>"International Organization for Standardization",
|
|
114
|
+
:revdate=>"2016-05-01",
|
|
115
|
+
:revdate_monthyear=>"May 2016",
|
|
116
|
+
:sc=>"SC 4",
|
|
117
|
+
:secretariat=>"GB",
|
|
118
|
+
:stage=>"30",
|
|
119
|
+
:stage_int=>30,
|
|
120
|
+
:stageabbr=>"CD",
|
|
121
|
+
:statusabbr=>"PreCD3",
|
|
122
|
+
:tc=>"TC 34",
|
|
123
|
+
:tc_docnumber=>["17301", "17302"],
|
|
124
|
+
:unpublished=>true,
|
|
125
|
+
:wg=>"WG 3"}
|
|
82
126
|
OUTPUT
|
|
83
127
|
end
|
|
84
128
|
|
|
@@ -100,7 +144,7 @@ OUTPUT
|
|
|
100
144
|
<title type="title-main" language="fr" format="text/plain">Spécification et méthodes d'essai</title>
|
|
101
145
|
<title type="title-part" language="fr" format="text/plain">Riz</title>
|
|
102
146
|
</title>
|
|
103
|
-
<docidentifier type="
|
|
147
|
+
<docidentifier type="ISO">ISO/IEC/CD 17301-1-3</docidentifier>
|
|
104
148
|
<docidentifier type="iso-with-lang">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
|
|
105
149
|
<docidentifier type="iso-reference">ISO/IEC/CD 17301-1-3 (E)</docidentifier>
|
|
106
150
|
<docidentifier type="iso-tc">17301</docidentifier>
|
|
@@ -159,7 +203,45 @@ OUTPUT
|
|
|
159
203
|
</bibdata>
|
|
160
204
|
</iso-standard>
|
|
161
205
|
INPUT
|
|
162
|
-
{:agency=>"ISO/IEC",
|
|
206
|
+
{:agency=>"ISO/IEC",
|
|
207
|
+
:authors=>[],
|
|
208
|
+
:authors_affiliations=>{},
|
|
209
|
+
:docnumber=>"ISO/IEC/CD 17301-1-3",
|
|
210
|
+
:docnumber_lang=>"ISO/IEC/CD 17301-1-3 (E)",
|
|
211
|
+
:docnumber_reference=>"ISO/IEC/CD 17301-1-3 (E)",
|
|
212
|
+
:docnumeric=>nil,
|
|
213
|
+
:docsubtitle=>"Céréales et légumineuses — Spécification et méthodes d'essai — Partie 1–3: Riz",
|
|
214
|
+
:docsubtitleintro=>"Céréales et légumineuses",
|
|
215
|
+
:docsubtitlemain=>"Spécification et méthodes d'essai",
|
|
216
|
+
:docsubtitlepart=>"Riz",
|
|
217
|
+
:docsubtitlepartlabel=>"Partie 1–3",
|
|
218
|
+
:doctitle=>"Cereals and pulses — Specifications and test methods — Part 1–3: Rice",
|
|
219
|
+
:doctitleintro=>"Cereals and pulses",
|
|
220
|
+
:doctitlemain=>"Specifications and test methods",
|
|
221
|
+
:doctitlepart=>"Rice",
|
|
222
|
+
:doctitlepartlabel=>"Part 1–3",
|
|
223
|
+
:doctype=>"International Standard",
|
|
224
|
+
:docyear=>"2016",
|
|
225
|
+
:draft=>nil,
|
|
226
|
+
:draftinfo=>"",
|
|
227
|
+
:edition=>nil,
|
|
228
|
+
:editorialgroup=>["ABC 34", "DEF 4", "GHI 3"],
|
|
229
|
+
:ics=>"1.2.3, 1.2.3",
|
|
230
|
+
:keywords=>[],
|
|
231
|
+
:obsoletes=>"IEC 8121",
|
|
232
|
+
:obsoletes_part=>"3.1",
|
|
233
|
+
:publisher=>"International Organization for Standardization and International Electrotechnical Commission",
|
|
234
|
+
:revdate=>nil,
|
|
235
|
+
:revdate_monthyear=>nil,
|
|
236
|
+
:sc=>"DEF 4",
|
|
237
|
+
:secretariat=>"XXXX",
|
|
238
|
+
:stage=>"60",
|
|
239
|
+
:stage_int=>60,
|
|
240
|
+
:statusabbr=>"IS",
|
|
241
|
+
:tc=>"ABC 34",
|
|
242
|
+
:tc_docnumber=>["17301"],
|
|
243
|
+
:unpublished=>false,
|
|
244
|
+
:wg=>"GHI 3"}
|
|
163
245
|
OUTPUT
|
|
164
246
|
end
|
|
165
247
|
|