isodoc 1.0.23 → 1.0.28
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/macos.yml +10 -2
- data/.github/workflows/ubuntu.yml +13 -3
- data/.github/workflows/windows.yml +10 -2
- data/isodoc.gemspec +1 -1
- data/lib/isodoc-yaml/i18n-en.yaml +3 -1
- data/lib/isodoc-yaml/i18n-fr.yaml +3 -1
- data/lib/isodoc-yaml/i18n-zh-Hans.yaml +3 -1
- data/lib/isodoc/base_style/reset.scss +1 -1
- data/lib/isodoc/convert.rb +1 -0
- data/lib/isodoc/function/blocks.rb +6 -1
- data/lib/isodoc/function/cleanup.rb +16 -2
- data/lib/isodoc/function/i18n.rb +5 -5
- data/lib/isodoc/function/inline.rb +77 -79
- data/lib/isodoc/function/inline_simple.rb +72 -0
- data/lib/isodoc/function/references.rb +49 -37
- data/lib/isodoc/function/section.rb +19 -8
- data/lib/isodoc/function/table.rb +0 -1
- data/lib/isodoc/function/to_word_html.rb +23 -13
- data/lib/isodoc/function/utils.rb +11 -5
- data/lib/isodoc/function/xref_gen.rb +2 -1
- data/lib/isodoc/function/xref_sect_gen.rb +24 -24
- data/lib/isodoc/headlesshtml_convert.rb +5 -0
- data/lib/isodoc/html_convert.rb +5 -0
- data/lib/isodoc/html_function/footnotes.rb +3 -3
- data/lib/isodoc/html_function/html.rb +15 -0
- data/lib/isodoc/html_function/postprocess.rb +6 -5
- data/lib/isodoc/metadata.rb +10 -3
- data/lib/isodoc/metadata_date.rb +19 -7
- data/lib/isodoc/pdf_convert.rb +5 -0
- data/lib/isodoc/version.rb +1 -1
- data/lib/isodoc/word_convert.rb +5 -0
- data/lib/isodoc/word_function/body.rb +0 -4
- data/lib/isodoc/word_function/footnotes.rb +3 -3
- data/lib/isodoc/word_function/postprocess.rb +13 -2
- data/lib/isodoc/xslfo_convert.rb +5 -0
- data/spec/assets/i18n.yaml +4 -1
- data/spec/isodoc/blocks_spec.rb +59 -8
- data/spec/isodoc/cleanup_spec.rb +317 -25
- data/spec/isodoc/footnotes_spec.rb +20 -5
- data/spec/isodoc/i18n_spec.rb +12 -12
- data/spec/isodoc/inline_spec.rb +118 -5
- data/spec/isodoc/metadata_spec.rb +8 -3
- data/spec/isodoc/postproc_spec.rb +34 -12
- data/spec/isodoc/ref_spec.rb +120 -51
- data/spec/isodoc/section_spec.rb +236 -207
- data/spec/isodoc/table_spec.rb +24 -24
- data/spec/isodoc/terms_spec.rb +50 -6
- data/spec/isodoc/xref_spec.rb +53 -26
- metadata +5 -4
data/spec/isodoc/ref_spec.rb
CHANGED
|
@@ -19,7 +19,7 @@ RSpec.describe IsoDoc do
|
|
|
19
19
|
<eref bibitemid="zip_ffs"/>
|
|
20
20
|
</p>
|
|
21
21
|
</foreword></preface>
|
|
22
|
-
<bibliography><references id="_normative_references" obligation="informative"><title>Normative References</title>
|
|
22
|
+
<bibliography><references id="_normative_references" obligation="informative" normative="true"><title>Normative References</title>
|
|
23
23
|
<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>
|
|
24
24
|
<bibitem id="ISO712" type="standard">
|
|
25
25
|
<title format="text/plain">Cereals or cereal products</title>
|
|
@@ -69,7 +69,7 @@ RSpec.describe IsoDoc do
|
|
|
69
69
|
<bibitem id="zip_ffs"><formattedref format="application/x-isodoc+xml">Title 5</formattedref><docidentifier type="metanorma">[5]</docidentifier></bibitem>
|
|
70
70
|
|
|
71
71
|
|
|
72
|
-
</references><references id="_bibliography" obligation="informative">
|
|
72
|
+
</references><references id="_bibliography" obligation="informative" normative="false">
|
|
73
73
|
<title>Bibliography</title>
|
|
74
74
|
<bibitem id="ISBN" type="ISBN">
|
|
75
75
|
<title format="text/plain">Chemicals for analytical laboratory use</title>
|
|
@@ -125,55 +125,124 @@ RSpec.describe IsoDoc do
|
|
|
125
125
|
</iso-standard>
|
|
126
126
|
INPUT
|
|
127
127
|
#{HTML_HDR}
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
</
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
128
|
+
<br/>
|
|
129
|
+
<div>
|
|
130
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
131
|
+
<p id='_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f'>
|
|
132
|
+
<a href='#ISO712'>[110]</a>
|
|
133
|
+
<a href='#ISBN'>[1]</a>
|
|
134
|
+
<a href='#ISSN'>[2]</a>
|
|
135
|
+
<a href='#ISO16634'>ISO 16634:-- (all parts)</a>
|
|
136
|
+
<a href='#ref1'>ICC 167</a>
|
|
137
|
+
<a href='#ref10'>[10]</a>
|
|
138
|
+
<a href='#ref12'>Citn</a>
|
|
139
|
+
<a href='#zip_ffs'>[5]</a>
|
|
140
|
+
</p>
|
|
141
|
+
</div>
|
|
142
|
+
<p class='zzSTDTitle1'/>
|
|
143
|
+
<div>
|
|
144
|
+
<h1>1.  Normative references</h1>
|
|
145
|
+
<p>
|
|
146
|
+
The following documents are referred to in the text in such a way that
|
|
147
|
+
some or all of their content constitutes requirements of this
|
|
148
|
+
document. For dated references, only the edition cited applies. For
|
|
149
|
+
undated references, the latest edition of the referenced document
|
|
150
|
+
(including any amendments) applies.
|
|
151
|
+
</p>
|
|
152
|
+
<p id='ISO712' class='NormRef'>
|
|
153
|
+
[110], ISO 712,
|
|
154
|
+
<i>Cereals and cereal products</i>
|
|
155
|
+
</p>
|
|
156
|
+
<p id='ISO16634' class='NormRef'>
|
|
157
|
+
ISO 16634:-- (all parts)
|
|
158
|
+
<a class='FootnoteRef' href='#fn:1'>
|
|
159
|
+
<sup>1</sup>
|
|
160
|
+
</a>
|
|
161
|
+
,
|
|
162
|
+
<i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i>
|
|
163
|
+
</p>
|
|
164
|
+
<p id='ISO20483' class='NormRef'>
|
|
165
|
+
ISO 20483:2013-2014,
|
|
166
|
+
<i>Cereals and pulses</i>
|
|
167
|
+
</p>
|
|
168
|
+
<p id='ref1' class='NormRef'>
|
|
169
|
+
ICC 167,
|
|
170
|
+
<span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
|
|
171
|
+
.
|
|
172
|
+
<i>
|
|
173
|
+
Determination of the protein content in cereal and cereal products
|
|
174
|
+
for food and animal feeding stuffs according to the Dumas combustion
|
|
175
|
+
method
|
|
176
|
+
</i>
|
|
177
|
+
(see
|
|
178
|
+
<a href='http://www.icc.or.at'>http://www.icc.or.at</a>
|
|
179
|
+
)
|
|
180
|
+
</p>
|
|
181
|
+
<div id='' class='Note'>
|
|
182
|
+
<p>
|
|
183
|
+
<span class='note_label'>NOTE</span>
|
|
184
|
+
  This is an annotation of ISO 20483:2013-2014
|
|
185
|
+
</p>
|
|
186
|
+
</div>
|
|
187
|
+
<p id='zip_ffs' class='NormRef'>[5], Title 5</p>
|
|
188
|
+
</div>
|
|
189
|
+
<br/>
|
|
190
|
+
<div>
|
|
191
|
+
<h1 class='Section3'>Bibliography</h1>
|
|
192
|
+
<p id='ISBN' class='Biblio'>
|
|
193
|
+
[1] 
|
|
194
|
+
<i>Chemicals for analytical laboratory use</i>
|
|
195
|
+
</p>
|
|
196
|
+
<p id='ISSN' class='Biblio'>
|
|
197
|
+
[2] 
|
|
198
|
+
<i>Instruments for analytical laboratory use</i>
|
|
199
|
+
</p>
|
|
200
|
+
<div id='' class='Note'>
|
|
201
|
+
<p>
|
|
202
|
+
<span class='note_label'>NOTE</span>
|
|
203
|
+
  This is an annotation of document ISSN.
|
|
204
|
+
</p>
|
|
205
|
+
</div>
|
|
206
|
+
<div id='' class='Note'>
|
|
207
|
+
<p>
|
|
208
|
+
<span class='note_label'>NOTE</span>
|
|
209
|
+
  This is another annotation of document ISSN.
|
|
210
|
+
</p>
|
|
211
|
+
</div>
|
|
212
|
+
<p id='ISO3696' class='Biblio'>
|
|
213
|
+
[3]  ISO 3696,
|
|
214
|
+
<i>Water for analytical laboratory use</i>
|
|
215
|
+
</p>
|
|
216
|
+
<p id='ref10' class='Biblio'>
|
|
217
|
+
[10] 
|
|
218
|
+
<span style='font-variant:small-caps;'>Standard No I.C.C 167</span>
|
|
219
|
+
.
|
|
220
|
+
<i>
|
|
221
|
+
Determination of the protein content in cereal and cereal products
|
|
222
|
+
for food and animal feeding stuffs according to the Dumas combustion
|
|
223
|
+
method
|
|
224
|
+
</i>
|
|
225
|
+
(see
|
|
226
|
+
<a href='http://www.icc.or.at'>http://www.icc.or.at</a>
|
|
227
|
+
)
|
|
228
|
+
</p>
|
|
229
|
+
<p id='ref11' class='Biblio'>
|
|
230
|
+
[5]  IETF RFC 10,
|
|
231
|
+
<i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i>
|
|
232
|
+
</p>
|
|
233
|
+
<p id='ref12' class='Biblio'>
|
|
234
|
+
[6]  Citn, IETF RFC 20, CitationWorks. 2019.
|
|
235
|
+
<i>How to cite a reference</i>
|
|
236
|
+
.
|
|
237
|
+
</p>
|
|
238
|
+
</div>
|
|
239
|
+
<aside id='fn:1' class='footnote'>
|
|
240
|
+
<p>Under preparation. (Stage at the time of publication ISO/DIS 16634)</p>
|
|
241
|
+
</aside>
|
|
242
|
+
</div>
|
|
243
|
+
</body>
|
|
244
|
+
</html>
|
|
245
|
+
|
|
177
246
|
OUTPUT
|
|
178
247
|
end
|
|
179
248
|
|
data/spec/isodoc/section_spec.rb
CHANGED
|
@@ -70,6 +70,8 @@ RSpec.describe IsoDoc do
|
|
|
70
70
|
<title>Acknowledgements</title>
|
|
71
71
|
</acknowledgements>
|
|
72
72
|
</preface><sections>
|
|
73
|
+
<note id="NN1"><p>Initial note</p></note>
|
|
74
|
+
<admonition id="NN2" type="warning"><p>Initial admonition</p></admonition>
|
|
73
75
|
<clause id="D" obligation="normative">
|
|
74
76
|
<title>Scope</title>
|
|
75
77
|
<p id="E">Text</p>
|
|
@@ -112,16 +114,16 @@ RSpec.describe IsoDoc do
|
|
|
112
114
|
<clause id="Q1" inline-header="false" obligation="normative">
|
|
113
115
|
<title>Annex A.1a</title>
|
|
114
116
|
</clause>
|
|
115
|
-
<references id="Q2"><title>Annex Bibliography</title></references>
|
|
117
|
+
<references id="Q2" normative="false"><title>Annex Bibliography</title></references>
|
|
116
118
|
</clause>
|
|
117
119
|
</annex>
|
|
118
120
|
<annex id="P1" inline-header="false" obligation="normative">
|
|
119
121
|
</annex>
|
|
120
|
-
<bibliography><references id="R" obligation="informative">
|
|
122
|
+
<bibliography><references id="R" obligation="informative" normative="true">
|
|
121
123
|
<title>Normative References</title>
|
|
122
124
|
</references><clause id="S" obligation="informative">
|
|
123
125
|
<title>Bibliography</title>
|
|
124
|
-
<references id="T" obligation="informative">
|
|
126
|
+
<references id="T" obligation="informative" normative="false">
|
|
125
127
|
<title>Bibliography Subsection</title>
|
|
126
128
|
</references>
|
|
127
129
|
</clause>
|
|
@@ -181,6 +183,16 @@ RSpec.describe IsoDoc do
|
|
|
181
183
|
<h1 class='IntroTitle'>Acknowledgements</h1>
|
|
182
184
|
</div>
|
|
183
185
|
<p class="zzSTDTitle1"/>
|
|
186
|
+
<div id='NN1' class='Note'>
|
|
187
|
+
<p>
|
|
188
|
+
<span class='note_label'>NOTE</span>
|
|
189
|
+
  Initial note
|
|
190
|
+
</p>
|
|
191
|
+
</div>
|
|
192
|
+
<div id='NN2' class='Admonition'>
|
|
193
|
+
<p class='AdmonitionTitle' style='text-align:center;'>WARNING</p>
|
|
194
|
+
<p>Initial admonition</p>
|
|
195
|
+
</div>
|
|
184
196
|
<div id="D">
|
|
185
197
|
<h1>1.  Scope</h1>
|
|
186
198
|
<p id="E">Text</p>
|
|
@@ -188,7 +200,7 @@ RSpec.describe IsoDoc do
|
|
|
188
200
|
<div>
|
|
189
201
|
<h1>2.  Normative references</h1>
|
|
190
202
|
</div>
|
|
191
|
-
<div id="H"><h1>3.  Terms,
|
|
203
|
+
<div id="H"><h1>3.  Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
|
192
204
|
<div id="I">
|
|
193
205
|
<h2>3.1.  Normal Terms</h2>
|
|
194
206
|
<p class="TermNum" id="J">3.1.1.</p>
|
|
@@ -342,11 +354,11 @@ OUTPUT
|
|
|
342
354
|
</annex>
|
|
343
355
|
<annex id="P1" inline-header="false" obligation="normative">
|
|
344
356
|
</annex>
|
|
345
|
-
<bibliography><references id="R" obligation="informative">
|
|
357
|
+
<bibliography><references id="R" obligation="informative" normative="true">
|
|
346
358
|
<title>Normative References</title>
|
|
347
359
|
</references><clause id="S" obligation="informative">
|
|
348
360
|
<title>Bibliography</title>
|
|
349
|
-
<references id="T" obligation="informative">
|
|
361
|
+
<references id="T" obligation="informative" normative="false">
|
|
350
362
|
<title>Bibliography Subsection</title>
|
|
351
363
|
</references>
|
|
352
364
|
</clause>
|
|
@@ -429,7 +441,7 @@ OUTPUT
|
|
|
429
441
|
<div>
|
|
430
442
|
<h1>2.<span style="mso-tab-count:1">  </span>Normative references</h1>
|
|
431
443
|
</div>
|
|
432
|
-
<div id="H"><h1>3.<span style="mso-tab-count:1">  </span>Terms,
|
|
444
|
+
<div id="H"><h1>3.<span style="mso-tab-count:1">  </span>Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
|
433
445
|
<div id="I">
|
|
434
446
|
<h2>3.1.<span style="mso-tab-count:1">  </span>Normal Terms</h2>
|
|
435
447
|
<p class="TermNum" id="J">3.1.1.</p>
|
|
@@ -579,210 +591,225 @@ OUTPUT
|
|
|
579
591
|
<clause id="Q1" inline-header="false" obligation="normative">
|
|
580
592
|
<title>Annex A.1a<fn reference="17"><p>A</p></fn></title>
|
|
581
593
|
</clause>
|
|
582
|
-
<references id="Q2"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
|
|
594
|
+
<references id="Q2" normative="false"><title>Annex Bibliography<fn reference="18"><p>A</p></fn></title></references>
|
|
583
595
|
</clause>
|
|
584
|
-
</annex><bibliography><references id="R" obligation="informative">
|
|
596
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
|
585
597
|
<title>Normative References<fn reference="19"><p>A</p></fn></title>
|
|
586
598
|
</references><clause id="S" obligation="informative">
|
|
587
599
|
<title>Bibliography<fn reference="20"><p>A</p></fn></title>
|
|
588
|
-
<references id="T" obligation="informative">
|
|
600
|
+
<references id="T" obligation="informative" normative="false">
|
|
589
601
|
<title>Bibliography Subsection<fn reference="21"><p>A</p></fn></title>
|
|
590
602
|
</references>
|
|
591
603
|
</clause>
|
|
592
604
|
</bibliography>
|
|
593
605
|
</iso-standard>
|
|
594
606
|
INPUT
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
|
|
740
|
-
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
756
|
-
|
|
757
|
-
|
|
758
|
-
|
|
759
|
-
|
|
760
|
-
|
|
761
|
-
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
765
|
-
|
|
766
|
-
|
|
767
|
-
|
|
768
|
-
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
775
|
-
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
</
|
|
607
|
+
<html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
|
|
608
|
+
<head/>
|
|
609
|
+
<body lang='en'>
|
|
610
|
+
<div class='title-section'>
|
|
611
|
+
<p> </p>
|
|
612
|
+
</div>
|
|
613
|
+
<br/>
|
|
614
|
+
<div class='prefatory-section'>
|
|
615
|
+
<p> </p>
|
|
616
|
+
</div>
|
|
617
|
+
<br/>
|
|
618
|
+
<div class='main-section'>
|
|
619
|
+
<div class='authority'>
|
|
620
|
+
<div class='boilerplate-copyright'>
|
|
621
|
+
<div>
|
|
622
|
+
<h1>
|
|
623
|
+
Copyright
|
|
624
|
+
<a class='FootnoteRef' href='#fn:1'>
|
|
625
|
+
<sup>1</sup>
|
|
626
|
+
</a>
|
|
627
|
+
</h1>
|
|
628
|
+
</div>
|
|
629
|
+
</div>
|
|
630
|
+
<div class='boilerplate-license'>
|
|
631
|
+
<div>
|
|
632
|
+
<h1>
|
|
633
|
+
License
|
|
634
|
+
<a class='FootnoteRef' href='#fn:2'>
|
|
635
|
+
<sup>2</sup>
|
|
636
|
+
</a>
|
|
637
|
+
</h1>
|
|
638
|
+
</div>
|
|
639
|
+
</div>
|
|
640
|
+
<div class='boilerplate-legal'>
|
|
641
|
+
<div>
|
|
642
|
+
<h1>
|
|
643
|
+
Legal
|
|
644
|
+
<a class='FootnoteRef' href='#fn:3'>
|
|
645
|
+
<sup>3</sup>
|
|
646
|
+
</a>
|
|
647
|
+
</h1>
|
|
648
|
+
</div>
|
|
649
|
+
</div>
|
|
650
|
+
<div class='boilerplate-feedback'>
|
|
651
|
+
<div>
|
|
652
|
+
<h1>
|
|
653
|
+
Feedback
|
|
654
|
+
<a class='FootnoteRef' href='#fn:4'>
|
|
655
|
+
<sup>4</sup>
|
|
656
|
+
</a>
|
|
657
|
+
</h1>
|
|
658
|
+
</div>
|
|
659
|
+
</div>
|
|
660
|
+
</div>
|
|
661
|
+
<br/>
|
|
662
|
+
<div>
|
|
663
|
+
<h1 class='AbstractTitle'>Abstract</h1>
|
|
664
|
+
</div>
|
|
665
|
+
<br/>
|
|
666
|
+
<div>
|
|
667
|
+
<h1 class='ForewordTitle'>Foreword</h1>
|
|
668
|
+
<p id='A'>This is a preamble</p>
|
|
669
|
+
</div>
|
|
670
|
+
<br/>
|
|
671
|
+
<div class='Section3' id='B'>
|
|
672
|
+
<h1 class='IntroTitle'>Introduction</h1>
|
|
673
|
+
<div id='C'>
|
|
674
|
+
<h2>
|
|
675
|
+
Introduction Subsection
|
|
676
|
+
<a class='FootnoteRef' href='#fn:8'>
|
|
677
|
+
<sup>8</sup>
|
|
678
|
+
</a>
|
|
679
|
+
</h2>
|
|
680
|
+
</div>
|
|
681
|
+
</div>
|
|
682
|
+
<p class='zzSTDTitle1'/>
|
|
683
|
+
<div>
|
|
684
|
+
<h1>1.  Normative references</h1>
|
|
685
|
+
</div>
|
|
686
|
+
<div id='H'>
|
|
687
|
+
<h1>
|
|
688
|
+
2.  Terms, Definitions, Symbols and Abbreviated Terms
|
|
689
|
+
<a class='FootnoteRef' href='#fn:10'>
|
|
690
|
+
<sup>10</sup>
|
|
691
|
+
</a>
|
|
692
|
+
</h1>
|
|
693
|
+
<div id='I'>
|
|
694
|
+
<h2>
|
|
695
|
+
2.1.  Normal Terms
|
|
696
|
+
<a class='FootnoteRef' href='#fn:11'>
|
|
697
|
+
<sup>11</sup>
|
|
698
|
+
</a>
|
|
699
|
+
</h2>
|
|
700
|
+
<p class='TermNum' id='J'>2.1.1.</p>
|
|
701
|
+
<p class='Terms' style='text-align:left;'>Term2</p>
|
|
702
|
+
</div>
|
|
703
|
+
<div id='K'>
|
|
704
|
+
<h2>
|
|
705
|
+
2.2.  Definitions
|
|
706
|
+
<a class='FootnoteRef' href='#fn:12'>
|
|
707
|
+
<sup>12</sup>
|
|
708
|
+
</a>
|
|
709
|
+
</h2>
|
|
710
|
+
<dl>
|
|
711
|
+
<dt>
|
|
712
|
+
<p>Symbol</p>
|
|
713
|
+
</dt>
|
|
714
|
+
<dd>Definition</dd>
|
|
715
|
+
</dl>
|
|
716
|
+
</div>
|
|
717
|
+
</div>
|
|
718
|
+
<div id='L' class='Symbols'>
|
|
719
|
+
<h1>3.  Symbols and abbreviated terms</h1>
|
|
720
|
+
<dl>
|
|
721
|
+
<dt>
|
|
722
|
+
<p>Symbol</p>
|
|
723
|
+
</dt>
|
|
724
|
+
<dd>Definition</dd>
|
|
725
|
+
</dl>
|
|
726
|
+
</div>
|
|
727
|
+
<div id='D'>
|
|
728
|
+
<h1>
|
|
729
|
+
4.  Scope
|
|
730
|
+
<a class='FootnoteRef' href='#fn:9'>
|
|
731
|
+
<sup>9</sup>
|
|
732
|
+
</a>
|
|
733
|
+
</h1>
|
|
734
|
+
<p id='E'>Text</p>
|
|
735
|
+
</div>
|
|
736
|
+
<div id='M'>
|
|
737
|
+
<h1>
|
|
738
|
+
5.  Clause 4
|
|
739
|
+
<a class='FootnoteRef' href='#fn:13'>
|
|
740
|
+
<sup>13</sup>
|
|
741
|
+
</a>
|
|
742
|
+
</h1>
|
|
743
|
+
<div id='N'>
|
|
744
|
+
<h2>
|
|
745
|
+
5.1.  Introduction
|
|
746
|
+
<a class='FootnoteRef' href='#fn:1'>
|
|
747
|
+
<sup>1</sup>
|
|
748
|
+
</a>
|
|
749
|
+
</h2>
|
|
750
|
+
</div>
|
|
751
|
+
<div id='O'>
|
|
752
|
+
<h2>
|
|
753
|
+
5.2.  Clause 4.2
|
|
754
|
+
<a class='FootnoteRef' href='#fn:14'>
|
|
755
|
+
<sup>14</sup>
|
|
756
|
+
</a>
|
|
757
|
+
</h2>
|
|
758
|
+
</div>
|
|
759
|
+
<div id='O1'>
|
|
760
|
+
<h2>5.3.  </h2>
|
|
761
|
+
</div>
|
|
762
|
+
</div>
|
|
763
|
+
<br/>
|
|
764
|
+
<div id='P' class='Section3'>
|
|
765
|
+
<h1 class='Annex'>
|
|
766
|
+
<b>Annex A</b>
|
|
767
|
+
<br/>
|
|
768
|
+
(normative)
|
|
769
|
+
<br/>
|
|
770
|
+
<br/>
|
|
771
|
+
<b>
|
|
772
|
+
Annex
|
|
773
|
+
<a class='FootnoteRef' href='#fn:15'>
|
|
774
|
+
<sup>15</sup>
|
|
775
|
+
</a>
|
|
776
|
+
</b>
|
|
777
|
+
</h1>
|
|
778
|
+
<div id='Q'>
|
|
779
|
+
<h2>
|
|
780
|
+
A.1.  Annex A.1
|
|
781
|
+
<a class='FootnoteRef' href='#fn:16'>
|
|
782
|
+
<sup>16</sup>
|
|
783
|
+
</a>
|
|
784
|
+
</h2>
|
|
785
|
+
<div id='Q1'>
|
|
786
|
+
<h3>
|
|
787
|
+
A.1.1.  Annex A.1a
|
|
788
|
+
<a class='FootnoteRef' href='#fn:17'>
|
|
789
|
+
<sup>17</sup>
|
|
790
|
+
</a>
|
|
791
|
+
</h3>
|
|
792
|
+
</div>
|
|
793
|
+
<div>
|
|
794
|
+
<h3>
|
|
795
|
+
A.1.2.  Annex Bibliography
|
|
796
|
+
<a class='FootnoteRef' href='#fn:18'>
|
|
797
|
+
<sup>18</sup>
|
|
798
|
+
</a>
|
|
799
|
+
</h3>
|
|
800
|
+
</div>
|
|
801
|
+
</div>
|
|
802
|
+
</div>
|
|
803
|
+
<br/>
|
|
804
|
+
<div>
|
|
805
|
+
<h1 class='Section3'>Bibliography</h1>
|
|
806
|
+
<div>
|
|
807
|
+
<h2 class='Section3'>Bibliography SubsectionA</h2>
|
|
808
|
+
</div>
|
|
809
|
+
</div>
|
|
810
|
+
</div>
|
|
811
|
+
</body>
|
|
812
|
+
</html>
|
|
786
813
|
OUTPUT
|
|
787
814
|
end
|
|
788
815
|
|
|
@@ -840,11 +867,11 @@ OUTPUT
|
|
|
840
867
|
<title>Annex A.1a</title>
|
|
841
868
|
</clause>
|
|
842
869
|
</clause>
|
|
843
|
-
</annex><bibliography><references id="R" obligation="informative">
|
|
870
|
+
</annex><bibliography><references id="R" obligation="informative" normative="true">
|
|
844
871
|
<title>Normative References</title>
|
|
845
872
|
</references><clause id="S" obligation="informative">
|
|
846
873
|
<title>Bibliography</title>
|
|
847
|
-
<references id="T" obligation="informative">
|
|
874
|
+
<references id="T" obligation="informative" normative="false">
|
|
848
875
|
<title>Bibliography Subsection</title>
|
|
849
876
|
</references>
|
|
850
877
|
</clause>
|
|
@@ -872,7 +899,7 @@ OUTPUT
|
|
|
872
899
|
<div>
|
|
873
900
|
<h1>Normative references</h1>
|
|
874
901
|
</div>
|
|
875
|
-
<div id="H"><h1>Terms,
|
|
902
|
+
<div id="H"><h1>Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
|
876
903
|
<div id="I"><h2>Normal Terms</h2>
|
|
877
904
|
|
|
878
905
|
<p class="TermNum" id="J">3.1.1.</p>
|
|
@@ -964,7 +991,7 @@ OUTPUT
|
|
|
964
991
|
INPUT
|
|
965
992
|
#{HTML_HDR}
|
|
966
993
|
<p class="zzSTDTitle1"/>
|
|
967
|
-
<div id="H"><h1>1.  Terms and
|
|
994
|
+
<div id="H"><h1>1.  Terms, Definitions, Symbols and Abbreviated Terms</h1>
|
|
968
995
|
<p class="TermNum" id="J">1.1.</p>
|
|
969
996
|
<p class="Terms" style="text-align:left;">Term2</p>
|
|
970
997
|
</div>
|
|
@@ -984,6 +1011,7 @@ OUTPUT
|
|
|
984
1011
|
</clause>
|
|
985
1012
|
<clause id="O" inline-header="true" obligation="normative">
|
|
986
1013
|
<title>Clause 4.2</title>
|
|
1014
|
+
<p>ABC</p>
|
|
987
1015
|
</clause></clause>
|
|
988
1016
|
|
|
989
1017
|
</sections>
|
|
@@ -997,7 +1025,8 @@ OUTPUT
|
|
|
997
1025
|
<h2>1.1.  Introduction</h2>
|
|
998
1026
|
</div>
|
|
999
1027
|
<div id="O">
|
|
1000
|
-
<span class="zzMoveToFollowing"><b>1.2.  Clause 4.2 </b></span>
|
|
1028
|
+
<span class="zzMoveToFollowing"><b>1.2.  Clause 4.2  </b></span>
|
|
1029
|
+
<p>ABC</p>
|
|
1001
1030
|
</div>
|
|
1002
1031
|
</div>
|
|
1003
1032
|
</div>
|
|
@@ -1028,7 +1057,7 @@ OUTPUT
|
|
|
1028
1057
|
<h2>Introduction</h2>
|
|
1029
1058
|
</div>
|
|
1030
1059
|
<div id="O">
|
|
1031
|
-
<span class="zzMoveToFollowing"><b>Clause 4.2 </b></span>
|
|
1060
|
+
<span class="zzMoveToFollowing"><b>Clause 4.2  </b></span>
|
|
1032
1061
|
</div>
|
|
1033
1062
|
</div>
|
|
1034
1063
|
</div>
|