metanorma-iso 1.1.2 → 1.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/iso/html/isodoc.scss +22 -2
- data/lib/isodoc/iso/html_convert.rb +58 -0
- data/lib/isodoc/iso/word_convert.rb +60 -4
- data/lib/metanorma/iso/version.rb +1 -1
- data/spec/assets/iso.doc +29 -12
- data/spec/isodoc/i18n_spec.rb +236 -236
- data/spec/isodoc/inline_spec.rb +2 -2
- data/spec/isodoc/iso_spec.rb +29 -48
- data/spec/isodoc/postproc_spec.rb +60 -28
- data/spec/isodoc/section_spec.rb +37 -37
- data/spec/isodoc/terms_spec.rb +25 -32
- data/spec/isodoc/xref_spec.rb +113 -123
- data/spec/metanorma/processor_spec.rb +1 -1
- metadata +2 -2
data/spec/isodoc/inline_spec.rb
CHANGED
|
@@ -184,7 +184,7 @@ RSpec.describe IsoDoc do
|
|
|
184
184
|
</div>
|
|
185
185
|
<p class="zzSTDTitle1"/>
|
|
186
186
|
<div>
|
|
187
|
-
<h1>1
|
|
187
|
+
<h1>1  Normative references</h1>
|
|
188
188
|
<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>
|
|
189
189
|
<p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
|
|
190
190
|
</div>
|
|
@@ -251,7 +251,7 @@ RSpec.describe IsoDoc do
|
|
|
251
251
|
</div>
|
|
252
252
|
<p class="zzSTDTitle1"/>
|
|
253
253
|
<div>
|
|
254
|
-
<h1>1
|
|
254
|
+
<h1>1  Normative references</h1>
|
|
255
255
|
<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>
|
|
256
256
|
<p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
|
|
257
257
|
</div>
|
data/spec/isodoc/iso_spec.rb
CHANGED
|
@@ -153,7 +153,7 @@ RSpec.describe IsoDoc::Iso do
|
|
|
153
153
|
</div>
|
|
154
154
|
<p class="zzSTDTitle1"/>
|
|
155
155
|
<div>
|
|
156
|
-
<h1>1
|
|
156
|
+
<h1>1  Normative references</h1>
|
|
157
157
|
<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>
|
|
158
158
|
<p id="ISO20483" class="NormRef">ISO 20483, <i> Cereals and pulses</i></p>
|
|
159
159
|
</div>
|
|
@@ -175,17 +175,16 @@ end
|
|
|
175
175
|
</iso-standard>
|
|
176
176
|
INPUT
|
|
177
177
|
#{HTML_HDR}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
<p>Hello</p>
|
|
184
|
-
</div>
|
|
178
|
+
<br/>
|
|
179
|
+
<div>
|
|
180
|
+
<h1 class="ForewordTitle">Foreword</h1>
|
|
181
|
+
<div id="samplecode" class="example">
|
|
182
|
+
<p><span class="example_label">EXAMPLE</span>  Hello</p>
|
|
185
183
|
</div>
|
|
186
|
-
<p class="zzSTDTitle1"/>
|
|
187
184
|
</div>
|
|
188
|
-
|
|
185
|
+
<p class="zzSTDTitle1"/>
|
|
186
|
+
</div>
|
|
187
|
+
</body>
|
|
189
188
|
</html>
|
|
190
189
|
OUTPUT
|
|
191
190
|
end
|
|
@@ -205,21 +204,19 @@ end
|
|
|
205
204
|
</iso-standard>
|
|
206
205
|
INPUT
|
|
207
206
|
#{HTML_HDR}
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
<
|
|
216
|
-
<p class="example-title">EXAMPLE 2</p>
|
|
217
|
-
<p>Hello</p>
|
|
218
|
-
</div>
|
|
207
|
+
<br/>
|
|
208
|
+
<div>
|
|
209
|
+
<h1 class="ForewordTitle">Foreword</h1>
|
|
210
|
+
<div id="samplecode" class="example">
|
|
211
|
+
<p><span class="example_label">EXAMPLE 1</span>  Hello</p>
|
|
212
|
+
</div>
|
|
213
|
+
<div id="samplecode2" class="example">
|
|
214
|
+
<p><span class="example_label">EXAMPLE 2</span>  Hello</p>
|
|
219
215
|
</div>
|
|
220
|
-
<p class="zzSTDTitle1"/>
|
|
221
216
|
</div>
|
|
222
|
-
|
|
217
|
+
<p class="zzSTDTitle1"/>
|
|
218
|
+
</div>
|
|
219
|
+
</body>
|
|
223
220
|
</html>
|
|
224
221
|
OUTPUT
|
|
225
222
|
end
|
|
@@ -247,14 +244,9 @@ end
|
|
|
247
244
|
</p>
|
|
248
245
|
<div>
|
|
249
246
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
250
|
-
<
|
|
251
|
-
<
|
|
252
|
-
|
|
253
|
-
<td valign="top" class="example">
|
|
254
|
-
<p>Hello</p>
|
|
255
|
-
</td>
|
|
256
|
-
</tr>
|
|
257
|
-
</table>
|
|
247
|
+
<div id="samplecode" class="example">
|
|
248
|
+
<p><span class="example_label">EXAMPLE</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
249
|
+
</div>
|
|
258
250
|
</div>
|
|
259
251
|
<p> </p>
|
|
260
252
|
</div>
|
|
@@ -298,22 +290,12 @@ end
|
|
|
298
290
|
</p>
|
|
299
291
|
<div>
|
|
300
292
|
<h1 class="ForewordTitle">Foreword</h1>
|
|
301
|
-
<
|
|
302
|
-
<
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
</tr>
|
|
308
|
-
</table>
|
|
309
|
-
<table id="samplecode2" class="example" cellspacing="0" cellpadding="0" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-collapse:collapse;">
|
|
310
|
-
<tr>
|
|
311
|
-
<td valign="top" class="example_label" style="width:82.8pt;padding:0 0 0 0;margin-left:0pt">EXAMPLE 2</td>
|
|
312
|
-
<td valign="top" class="example">
|
|
313
|
-
<p>Hello</p>
|
|
314
|
-
</td>
|
|
315
|
-
</tr>
|
|
316
|
-
</table>
|
|
293
|
+
<div id="samplecode" class="example">
|
|
294
|
+
<p><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
295
|
+
</div>
|
|
296
|
+
<div id="samplecode2" class="example">
|
|
297
|
+
<p><span class="example_label">EXAMPLE 2</span><span style="mso-tab-count:1">  </span>Hello</p>
|
|
298
|
+
</div>
|
|
317
299
|
</div>
|
|
318
300
|
<p> </p>
|
|
319
301
|
</div>
|
|
@@ -330,5 +312,4 @@ end
|
|
|
330
312
|
OUTPUT
|
|
331
313
|
end
|
|
332
314
|
|
|
333
|
-
|
|
334
315
|
end
|
|
@@ -116,10 +116,10 @@ RSpec.describe IsoDoc do
|
|
|
116
116
|
<div class="Section3"><a name="P" id="P"></a>
|
|
117
117
|
<h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
|
|
118
118
|
<div><a name="Q" id="Q"></a>
|
|
119
|
-
<p class="h2Annex">A.1
|
|
119
|
+
<p class="h2Annex">A.1 Annex A.1</p>
|
|
120
120
|
</div>
|
|
121
121
|
<div><a name="Q2" id="Q2"></a>
|
|
122
|
-
<p class="h2Annex">Appendix 1
|
|
122
|
+
<p class="h2Annex">Appendix 1 An Appendix</p>
|
|
123
123
|
</div>
|
|
124
124
|
</div>
|
|
125
125
|
</div>
|
|
@@ -155,7 +155,7 @@ RSpec.describe IsoDoc do
|
|
|
155
155
|
expect(word).to be_equivalent_to <<~"OUTPUT"
|
|
156
156
|
<div class="WordSection3">
|
|
157
157
|
<p class="zzSTDTitle1"></p>
|
|
158
|
-
<div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1
|
|
158
|
+
<div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1<span style="mso-tab-count:1">  </span>Terms and definitions</h1><p class="MsoNormal">For the purposes of this document,
|
|
159
159
|
the following terms and definitions apply.</p>
|
|
160
160
|
<p class="MsoNormal">ISO and IEC maintain terminological databases for use in
|
|
161
161
|
standardization at the following addresses:</p>
|
|
@@ -219,7 +219,7 @@ RSpec.describe IsoDoc do
|
|
|
219
219
|
<p class="MsoToc1"><span lang="EN-GB" xml:lang="EN-GB"><span style="mso-element:field-begin"></span><span style="mso-spacerun:yes"> </span>TOC
|
|
220
220
|
\o "1-2" \h \z \u <span style="mso-element:field-separator"></span></span>
|
|
221
221
|
<span class="MsoHyperlink"><span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
|
|
222
|
-
<a href="#_Toc">1
|
|
222
|
+
<a href="#_Toc">1 Clause 4<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
223
223
|
<span style="mso-tab-count:1 dotted">. </span>
|
|
224
224
|
</span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
225
225
|
<span style="mso-element:field-begin"></span></span>
|
|
@@ -230,7 +230,7 @@ RSpec.describe IsoDoc do
|
|
|
230
230
|
<p class="MsoToc2">
|
|
231
231
|
<span class="MsoHyperlink">
|
|
232
232
|
<span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
|
|
233
|
-
<a href="#_Toc">1.1
|
|
233
|
+
<a href="#_Toc">1.1 Introduction to this<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
234
234
|
<span style="mso-tab-count:1 dotted">. </span>
|
|
235
235
|
</span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
236
236
|
<span style="mso-element:field-begin"></span></span>
|
|
@@ -243,7 +243,7 @@ RSpec.describe IsoDoc do
|
|
|
243
243
|
<p class="MsoToc2">
|
|
244
244
|
<span class="MsoHyperlink">
|
|
245
245
|
<span lang="EN-GB" style="mso-no-proof:yes" xml:lang="EN-GB">
|
|
246
|
-
<a href="#_Toc">1.2
|
|
246
|
+
<a href="#_Toc">1.2 Clause 4.2<span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
247
247
|
<span style="mso-tab-count:1 dotted">. </span>
|
|
248
248
|
</span><span lang="EN-GB" class="MsoTocTextSpan" xml:lang="EN-GB">
|
|
249
249
|
<span style="mso-element:field-begin"></span></span>
|
|
@@ -296,16 +296,16 @@ RSpec.describe IsoDoc do
|
|
|
296
296
|
<main class="main-section"><button onclick="topFunction()" id="myBtn" title="Go to top">Top</button>
|
|
297
297
|
<p class="zzSTDTitle1"></p>
|
|
298
298
|
<div>
|
|
299
|
-
<h1>1
|
|
299
|
+
<h1>1  Clause 4</h1>
|
|
300
300
|
<a rel="footnote" href="#fn:3" epub:type="footnote" id="fnref:1">
|
|
301
301
|
<sup>1</sup>
|
|
302
302
|
</a>
|
|
303
303
|
<div id="N">
|
|
304
304
|
|
|
305
|
-
<h2>1.1
|
|
305
|
+
<h2>1.1 Introduction to this<a rel="footnote" href="#fn:2" epub:type="footnote" id="fnref:2"><sup>2</sup></a></h2>
|
|
306
306
|
</div>
|
|
307
307
|
<div id="O">
|
|
308
|
-
<h2>1.2
|
|
308
|
+
<h2>1.2 Clause 4.2</h2>
|
|
309
309
|
<p>A<a rel="footnote" href="#fn:2" epub:type="footnote"><sup>2</sup></a></p>
|
|
310
310
|
</div>
|
|
311
311
|
</div>
|
|
@@ -434,30 +434,62 @@ RSpec.describe IsoDoc do
|
|
|
434
434
|
word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
|
|
435
435
|
sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
|
|
436
436
|
expect(word).to be_equivalent_to <<~"OUTPUT"
|
|
437
|
-
|
|
437
|
+
<div class="WordSection3">
|
|
438
438
|
<p class="zzSTDTitle1"></p>
|
|
439
|
-
<p class="MsoNormal"
|
|
439
|
+
<p class="MsoNormal">
|
|
440
|
+
<br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
|
|
441
|
+
</p>
|
|
440
442
|
<div class="Section3"><a name="P" id="P"></a>
|
|
441
|
-
<
|
|
442
|
-
<
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
443
|
+
<div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851c" id="_63112cbc-cde0-435f-9553-e0b8c4f5851c"></a>
|
|
444
|
+
<p class="MsoNormal"><span class="example_label">EXAMPLE 1</span><span style="mso-tab-count:1">  </span>'1M', '01M', and '0001M' all describe the calendar month January.</p>
|
|
445
|
+
</div>
|
|
446
|
+
<div class="example"><a name="_63112cbc-cde0-435f-9553-e0b8c4f5851d" id="_63112cbc-cde0-435f-9553-e0b8c4f5851d"></a>
|
|
447
|
+
<p class="MsoNormal"><span class="example_label">EXAMPLE 2</span><span style="mso-tab-count:1">  </span>'2M', '02M', and '0002M' all describe the calendar month February.</p>
|
|
448
|
+
</div>
|
|
449
|
+
</div>
|
|
450
|
+
</div>
|
|
451
|
+
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
452
|
+
<div class="colophon"></div>
|
|
453
|
+
|
|
454
|
+
OUTPUT
|
|
455
|
+
end
|
|
456
|
+
|
|
457
|
+
it "processes figure keys (Word)" do
|
|
458
|
+
FileUtils.rm_f "test.doc"
|
|
459
|
+
FileUtils.rm_f "test.html"
|
|
460
|
+
IsoDoc::Iso::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
|
|
461
|
+
<iso-standard xmlns="http://riboseinc.com/isoxml">
|
|
462
|
+
<annex id="P" inline-header="false" obligation="normative">
|
|
463
|
+
<figure id="samplecode">
|
|
464
|
+
<p>Hello</p>
|
|
465
|
+
<p>Key</p>
|
|
466
|
+
<dl>
|
|
467
|
+
<dt><p>A</p></dt>
|
|
468
|
+
<dd><p>B</p></dd>
|
|
469
|
+
</dl>
|
|
470
|
+
</figure>
|
|
471
|
+
</annex>
|
|
472
|
+
</iso-standard>
|
|
473
|
+
INPUT
|
|
474
|
+
word = File.read("test.doc").sub(/^.*<div class="WordSection3">/m, '<div class="WordSection3">').
|
|
475
|
+
sub(%r{<div style="mso-element:footnote-list"/>.*$}m, "")
|
|
476
|
+
expect(word).to be_equivalent_to <<~"OUTPUT"
|
|
477
|
+
<div class="WordSection3">
|
|
478
|
+
<p class="zzSTDTitle1"></p>
|
|
479
|
+
<p class="MsoNormal">
|
|
480
|
+
<br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
|
|
481
|
+
</p>
|
|
482
|
+
<div class="Section3"><a name="P" id="P"></a>
|
|
483
|
+
<div class="figure"><a name="samplecode" id="samplecode"></a>
|
|
484
|
+
<p class="MsoNormal">Hello</p>
|
|
485
|
+
<p class="MsoNormal">Key</p>
|
|
486
|
+
<p class="MsoNormal"><b>Key</b></p><div class="figdl"><table class="figdl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;" class="MsoNormal"><p class="MsoNormal">A</p></p></td><td valign="top"><p class="MsoNormal">B</p></td></tr></table></div>
|
|
487
|
+
</div>
|
|
457
488
|
</div>
|
|
458
489
|
</div>
|
|
459
490
|
<br clear="all" style="page-break-before:left;mso-break-type:section-break"/>
|
|
460
|
-
<div class="colophon"></div>
|
|
491
|
+
<div class="colophon"></div>
|
|
492
|
+
|
|
461
493
|
OUTPUT
|
|
462
494
|
end
|
|
463
495
|
|
data/spec/isodoc/section_spec.rb
CHANGED
|
@@ -77,22 +77,22 @@ RSpec.describe IsoDoc do
|
|
|
77
77
|
</div>
|
|
78
78
|
<br/>
|
|
79
79
|
<div class="Section3" id="B">
|
|
80
|
-
<h1 class="IntroTitle">0
|
|
80
|
+
<h1 class="IntroTitle">0  Introduction</h1>
|
|
81
81
|
<div id="C">
|
|
82
|
-
<h2>0.1
|
|
82
|
+
<h2>0.1 Introduction Subsection</h2>
|
|
83
83
|
</div>
|
|
84
84
|
<p>This is patent boilerplate</p>
|
|
85
85
|
</div>
|
|
86
86
|
<p class="zzSTDTitle1"/>
|
|
87
87
|
<div id="D">
|
|
88
|
-
<h1>1
|
|
88
|
+
<h1>1  Scope</h1>
|
|
89
89
|
<p id="E">Text</p>
|
|
90
90
|
</div>
|
|
91
91
|
<div>
|
|
92
|
-
<h1>2
|
|
92
|
+
<h1>2  Normative references</h1>
|
|
93
93
|
<p>There are no normative references in this document.</p>
|
|
94
94
|
</div>
|
|
95
|
-
<div id="H"><h1>3
|
|
95
|
+
<div id="H"><h1>3  Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
|
|
96
96
|
the following terms and definitions apply.</p>
|
|
97
97
|
<p>ISO and IEC maintain terminological databases for use in
|
|
98
98
|
standardization at the following addresses:</p>
|
|
@@ -104,15 +104,15 @@ RSpec.describe IsoDoc do
|
|
|
104
104
|
<a href="http://www.electropedia.org">http://www.electropedia.org</a>
|
|
105
105
|
</p> </li> </ul>
|
|
106
106
|
<div id="I">
|
|
107
|
-
<h2>3.1
|
|
107
|
+
<h2>3.1 Normal Terms</h2>
|
|
108
108
|
<p class="TermNum" id="J">3.1.1</p>
|
|
109
109
|
<p class="Terms" style="text-align:left;">Term2</p>
|
|
110
110
|
|
|
111
|
-
</div><div id="K"><h2>3.2
|
|
111
|
+
</div><div id="K"><h2>3.2 Symbols and abbreviated terms</h2>
|
|
112
112
|
<dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
|
|
113
113
|
</div></div>
|
|
114
114
|
<div id="L" class="Symbols">
|
|
115
|
-
<h1>4
|
|
115
|
+
<h1>4  Symbols and abbreviated terms</h1>
|
|
116
116
|
<dl>
|
|
117
117
|
<dt>
|
|
118
118
|
<p>Symbol</p>
|
|
@@ -121,25 +121,25 @@ RSpec.describe IsoDoc do
|
|
|
121
121
|
</dl>
|
|
122
122
|
</div>
|
|
123
123
|
<div id="M">
|
|
124
|
-
<h1>5
|
|
124
|
+
<h1>5  Clause 4</h1>
|
|
125
125
|
<div id="N">
|
|
126
|
-
<h2>5.1
|
|
126
|
+
<h2>5.1 Introduction</h2>
|
|
127
127
|
</div>
|
|
128
128
|
<div id="O">
|
|
129
|
-
<h2>5.2
|
|
129
|
+
<h2>5.2 Clause 4.2</h2>
|
|
130
130
|
</div>
|
|
131
131
|
</div>
|
|
132
132
|
<br/>
|
|
133
133
|
<div id="P" class="Section3">
|
|
134
134
|
<h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
|
|
135
135
|
<div id="Q">
|
|
136
|
-
<h2>A.1
|
|
136
|
+
<h2>A.1 Annex A.1</h2>
|
|
137
137
|
<div id="Q1">
|
|
138
|
-
<h3>A.1.1
|
|
138
|
+
<h3>A.1.1 Annex A.1a</h3>
|
|
139
139
|
</div>
|
|
140
140
|
</div>
|
|
141
141
|
<div id="Q2">
|
|
142
|
-
<h2>Appendix 1
|
|
142
|
+
<h2>Appendix 1 An Appendix</h2>
|
|
143
143
|
</div>
|
|
144
144
|
|
|
145
145
|
</div>
|
|
@@ -237,9 +237,9 @@ OUTPUT
|
|
|
237
237
|
</div>
|
|
238
238
|
<p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
|
|
239
239
|
<div class="Section3" id="B">
|
|
240
|
-
<h1 class="IntroTitle">0
|
|
240
|
+
<h1 class="IntroTitle">0<span style="mso-tab-count:1">  </span>Introduction</h1>
|
|
241
241
|
<div id="C">
|
|
242
|
-
<h2>0.1
|
|
242
|
+
<h2>0.1 Introduction Subsection</h2>
|
|
243
243
|
</div>
|
|
244
244
|
<p>This is patent boilerplate</p>
|
|
245
245
|
</div>
|
|
@@ -249,14 +249,14 @@ OUTPUT
|
|
|
249
249
|
<div class="WordSection3">
|
|
250
250
|
<p class="zzSTDTitle1"/>
|
|
251
251
|
<div id="D">
|
|
252
|
-
<h1>1
|
|
252
|
+
<h1>1<span style="mso-tab-count:1">  </span>Scope</h1>
|
|
253
253
|
<p id="E">Text</p>
|
|
254
254
|
</div>
|
|
255
255
|
<div>
|
|
256
|
-
<h1>2
|
|
256
|
+
<h1>2<span style="mso-tab-count:1">  </span>Normative references</h1>
|
|
257
257
|
<p>There are no normative references in this document.</p>
|
|
258
258
|
</div>
|
|
259
|
-
<div id="H"><h1>3
|
|
259
|
+
<div id="H"><h1>3<span style="mso-tab-count:1">  </span>Terms, definitions, symbols and abbreviated terms</h1><p>For the purposes of this document,
|
|
260
260
|
the following terms and definitions apply.</p>
|
|
261
261
|
<p>ISO and IEC maintain terminological databases for use in
|
|
262
262
|
standardization at the following addresses:</p>
|
|
@@ -268,15 +268,15 @@ OUTPUT
|
|
|
268
268
|
<a href="http://www.electropedia.org">http://www.electropedia.org</a>
|
|
269
269
|
</p> </li> </ul>
|
|
270
270
|
<div id="I">
|
|
271
|
-
<h2>3.1
|
|
271
|
+
<h2>3.1 Normal Terms</h2>
|
|
272
272
|
<p class="TermNum" id="J">3.1.1</p>
|
|
273
273
|
<p class="Terms" style="text-align:left;">Term2</p>
|
|
274
274
|
|
|
275
|
-
</div><div id="K"><h2>3.2
|
|
275
|
+
</div><div id="K"><h2>3.2 Symbols and abbreviated terms</h2>
|
|
276
276
|
<table class="dl"><tr><td valign="top" align="left"><p align="left" style="margin-left:0pt;text-align:left;">Symbol</p></td><td valign="top">Definition</td></tr></table>
|
|
277
277
|
</div></div>
|
|
278
278
|
<div id="L" class="Symbols">
|
|
279
|
-
<h1>4
|
|
279
|
+
<h1>4<span style="mso-tab-count:1">  </span>Symbols and abbreviated terms</h1>
|
|
280
280
|
<table class="dl">
|
|
281
281
|
<tr>
|
|
282
282
|
<td valign="top" align="left">
|
|
@@ -287,25 +287,25 @@ OUTPUT
|
|
|
287
287
|
</table>
|
|
288
288
|
</div>
|
|
289
289
|
<div id="M">
|
|
290
|
-
<h1>5
|
|
290
|
+
<h1>5<span style="mso-tab-count:1">  </span>Clause 4</h1>
|
|
291
291
|
<div id="N">
|
|
292
|
-
<h2>5.1
|
|
292
|
+
<h2>5.1 Introduction</h2>
|
|
293
293
|
</div>
|
|
294
294
|
<div id="O">
|
|
295
|
-
<h2>5.2
|
|
295
|
+
<h2>5.2 Clause 4.2</h2>
|
|
296
296
|
</div>
|
|
297
297
|
</div>
|
|
298
298
|
<p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
|
|
299
299
|
<div id="P" class="Section3">
|
|
300
300
|
<h1 class="Annex"><b>Annex A</b><br/>(normative)<br/><br/><b>Annex</b></h1>
|
|
301
301
|
<div id="Q">
|
|
302
|
-
<h2>A.1
|
|
302
|
+
<h2>A.1 Annex A.1</h2>
|
|
303
303
|
<div id="Q1">
|
|
304
|
-
<h3>A.1.1
|
|
304
|
+
<h3>A.1.1 Annex A.1a</h3>
|
|
305
305
|
</div>
|
|
306
306
|
</div>
|
|
307
307
|
<div id="Q2">
|
|
308
|
-
<h2>Appendix 1
|
|
308
|
+
<h2>Appendix 1 An Appendix</h2>
|
|
309
309
|
</div>
|
|
310
310
|
</div>
|
|
311
311
|
<p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
|
|
@@ -337,7 +337,7 @@ OUTPUT
|
|
|
337
337
|
INPUT
|
|
338
338
|
#{HTML_HDR}
|
|
339
339
|
<p class="zzSTDTitle1"/>
|
|
340
|
-
<div id="H"><h1>1
|
|
340
|
+
<div id="H"><h1>1  Terms and definitions</h1><p>For the purposes of this document,
|
|
341
341
|
the following terms and definitions apply.</p>
|
|
342
342
|
<p>ISO and IEC maintain terminological databases for use in
|
|
343
343
|
standardization at the following addresses:</p>
|
|
@@ -386,11 +386,11 @@ OUTPUT
|
|
|
386
386
|
#{HTML_HDR}
|
|
387
387
|
<p class="zzSTDTitle1"/>
|
|
388
388
|
<div>
|
|
389
|
-
<h1>1
|
|
389
|
+
<h1>1  Normative references</h1>
|
|
390
390
|
<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>
|
|
391
391
|
<p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
|
|
392
392
|
</div>
|
|
393
|
-
<div id="H"><h1>2
|
|
393
|
+
<div id="H"><h1>2  Terms and definitions</h1><p>For the purposes of this document, the terms and definitions
|
|
394
394
|
given in <a href="#ISO712">ISO 712</a> and the following apply.</p>
|
|
395
395
|
<p>ISO and IEC maintain terminological databases for use in
|
|
396
396
|
standardization at the following addresses:</p>
|
|
@@ -438,11 +438,11 @@ OUTPUT
|
|
|
438
438
|
#{HTML_HDR}
|
|
439
439
|
<p class="zzSTDTitle1"/>
|
|
440
440
|
<div>
|
|
441
|
-
<h1>1
|
|
441
|
+
<h1>1  Normative references</h1>
|
|
442
442
|
<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>
|
|
443
443
|
<p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products?~@~I?~@~T?~@~IDetermination of moisture content?~@~I?~@~T?~@~IReference method</i></p>
|
|
444
444
|
</div>
|
|
445
|
-
<div id="H"><h1>2
|
|
445
|
+
<div id="H"><h1>2  Terms and definitions</h1><p>For the purposes of this document,
|
|
446
446
|
the terms and definitions given in <a href="#ISO712">ISO 712</a>, <a href="#ISO712">ISO 712</a> and <a href="#ISO712">ISO 712</a> apply.</p>
|
|
447
447
|
<p>ISO and IEC maintain terminological databases for use in
|
|
448
448
|
standardization at the following addresses:</p>
|
|
@@ -471,7 +471,7 @@ OUTPUT
|
|
|
471
471
|
INPUT
|
|
472
472
|
#{HTML_HDR}
|
|
473
473
|
<p class="zzSTDTitle1"/>
|
|
474
|
-
<div id="H"><h1>1
|
|
474
|
+
<div id="H"><h1>1  Terms and definitions</h1><p>No terms and definitions are listed in this document.</p>
|
|
475
475
|
<p>ISO and IEC maintain terminological databases for use in
|
|
476
476
|
standardization at the following addresses:</p>
|
|
477
477
|
|
|
@@ -505,12 +505,12 @@ OUTPUT
|
|
|
505
505
|
#{HTML_HDR}
|
|
506
506
|
<p class="zzSTDTitle1"/>
|
|
507
507
|
<div id="M">
|
|
508
|
-
<h1>1
|
|
508
|
+
<h1>1  Clause 4</h1>
|
|
509
509
|
<div id="N">
|
|
510
|
-
<h2>1.1
|
|
510
|
+
<h2>1.1 Introduction</h2>
|
|
511
511
|
</div>
|
|
512
512
|
<div id="O">
|
|
513
|
-
<span class="zzMoveToFollowing"><b>1.2
|
|
513
|
+
<span class="zzMoveToFollowing"><b>1.2 Clause 4.2 </b></span>
|
|
514
514
|
</div>
|
|
515
515
|
</div>
|
|
516
516
|
</div>
|