metanorma-iec 1.2.8 → 1.2.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +7 -5
- data/lib/asciidoctor/iec/basicdoc.rng +52 -3
- data/lib/asciidoctor/iec/converter.rb +25 -1
- data/lib/asciidoctor/iec/front.rb +35 -58
- data/lib/asciidoctor/iec/iec.rng +81 -1
- data/lib/asciidoctor/iec/iec_intro_en.xml +110 -56
- data/lib/asciidoctor/iec/iec_intro_fr.xml +78 -22
- data/lib/asciidoctor/iec/isodoc.rng +51 -3
- data/lib/asciidoctor/iec/isostandard.rng +27 -10
- data/lib/isodoc/iec/base_convert.rb +2 -2
- data/lib/isodoc/iec/html/html_iec_intro.html +1 -1
- data/lib/isodoc/iec/html/htmlstyle.css +5 -5
- data/lib/isodoc/iec/html/htmlstyle.scss +4 -4
- data/lib/isodoc/iec/html/isodoc.css +79 -79
- data/lib/isodoc/iec/html/isodoc.scss +79 -79
- data/lib/isodoc/iec/html/word_iec_intro.html +1 -1
- data/lib/isodoc/iec/html/wordstyle.css +120 -120
- data/lib/isodoc/iec/html/wordstyle.scss +120 -120
- data/lib/isodoc/iec/html_convert.rb +10 -2
- data/lib/isodoc/iec/i18n-en.yaml +17 -0
- data/lib/isodoc/iec/i18n-fr.yaml +18 -0
- data/lib/isodoc/iec/iec.international-standard.xsl +914 -398
- data/lib/isodoc/iec/metadata.rb +33 -0
- data/lib/isodoc/iec/presentation_xml_convert.rb +12 -0
- data/lib/isodoc/iec/word_convert.rb +12 -2
- data/lib/metanorma/iec/processor.rb +11 -8
- data/lib/metanorma/iec/version.rb +1 -1
- data/metanorma-iec.gemspec +2 -3
- data/spec/asciidoctor-iec/base_spec.rb +444 -10
- data/spec/asciidoctor-iec/blocks_spec.rb +25 -21
- data/spec/asciidoctor-iec/cleanup_spec.rb +99 -14
- data/spec/asciidoctor-iec/iev_spec.rb +15 -6
- data/spec/asciidoctor-iec/inline_spec.rb +11 -7
- data/spec/asciidoctor-iec/lists_spec.rb +13 -9
- data/spec/asciidoctor-iec/section_spec.rb +9 -5
- data/spec/asciidoctor-iec/validate_spec.rb +16 -1
- data/spec/isodoc/i18n_spec.rb +30 -0
- data/spec/isodoc/iso_spec.rb +4 -4
- data/spec/isodoc/metadata_spec.rb +23 -1
- data/spec/metanorma/processor_spec.rb +1 -1
- data/spec/spec_helper.rb +20 -31
- metadata +5 -19
@@ -1,29 +1,36 @@
|
|
1
1
|
<boilerplate>
|
2
2
|
<copyright-statement>
|
3
3
|
<clause>
|
4
|
+
{% if unpublished %}
|
5
|
+
<p><strong>Copyright © {{ docyear }} International Electrotechnical Commission, IEC.</strong>
|
6
|
+
All rights reserved. It is permitted to download this electronic file, to make a copy and to
|
7
|
+
print out the content for the sole purpose of preparing National Committee positions. You
|
8
|
+
may not copy or "mirror" the file or printed version of the document, or any part of it,
|
9
|
+
for any other purpose without permission in writing from IEC.
|
10
|
+
{% else %}
|
4
11
|
<p id="boilerplate-year">
|
5
|
-
|
12
|
+
© {{ agency }} {{ docyear }}, Publié en Suisse
|
6
13
|
</p>
|
7
14
|
|
8
15
|
<p id="boilerplate-message">
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
at the address below or IEC's member body in the country of the requester.
|
16
|
+
Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
|
17
|
+
peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
|
18
|
+
ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
|
19
|
+
autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’IEC à
|
20
|
+
l’adresse ci-après ou au comité membre de l’IEC dans le pays du demandeur.
|
15
21
|
</p>
|
16
22
|
|
17
23
|
<p id="boilerplate-name">IEC Central Office</p>
|
18
24
|
|
19
25
|
<p id="boilerplate-address" align="left">
|
20
|
-
3, rue de Varemb
|
26
|
+
3, rue de Varembé<br/>
|
21
27
|
CH-1211 Geneva 20, Switzerland<br/>
|
22
|
-
Tel
|
23
|
-
Fax
|
28
|
+
Tel.  + 41 22 919 02 11<br/>
|
29
|
+
Fax  + 41 22 919 03 00<br/>
|
24
30
|
info@iec.ch<br/>
|
25
31
|
www.iec.ch
|
26
32
|
</p>
|
33
|
+
{% endif %}
|
27
34
|
</clause>
|
28
35
|
</copyright-statement>
|
29
36
|
<legal-statement>
|
@@ -43,19 +50,68 @@ at the address below or IEC's member body in the country of the requester.
|
|
43
50
|
</legal-statement>
|
44
51
|
{% if unpublished %}
|
45
52
|
<license-statement>
|
53
|
+
<clause>
|
54
|
+
{% if stage_int < 40 %}
|
55
|
+
<p>This document is still under study and subject to change. It should not be used for reference purposes.</p>
|
56
|
+
until published as such.</p>
|
57
|
+
{% endif %}
|
58
|
+
{% if stage_int >= 40 %}
|
59
|
+
<p>This document is a draft distributed for approval. It may not be referred to as an International Standard
|
60
|
+
until published as such.</p>
|
61
|
+
{% endif %}
|
62
|
+
{% if stage_int >= 50 %}
|
63
|
+
<p>In addition to their evaluation as being acceptable for industrial, technological, commercial and user
|
64
|
+
purposes, Final Draft International Standards may on occasion have to be considered in the light of their
|
65
|
+
potential to become standards to which reference may be made in national regulations.</p>
|
66
|
+
{% endif %}
|
67
|
+
<p>Recipients of this document are invited to submit, with their comments, notification of any relevant
|
68
|
+
patent rights of which they are aware and to provide supporting documentation.</p>
|
69
|
+
</clause>
|
70
|
+
</license-statement>
|
71
|
+
{% endif %}
|
72
|
+
<feedback-statement>
|
73
|
+
{% if unpublished %}
|
74
|
+
<clause id="boilerplate-cenelec-attention">
|
75
|
+
<title>Attention IEC-CENELEC parallel voting</title>
|
76
|
+
<p>The attention of IEC National Committees, members of CENELEC, is drawn to the fact that this
|
77
|
+
{% if stage_int >= 30 and stage_int < 40 %}Committee Draft{% endif %}
|
78
|
+
{% if stage_int >= 40 and stage_int < 50 %}Committee Draft For Vote{% endif %}
|
79
|
+
{% if stage_int >= 50 and stage_int < 60 %}Final Draft International Standard{% endif %}
|
80
|
+
({{ stageabbr }})
|
81
|
+
is submitted for parallel voting.</p>
|
82
|
+
<p>The CENELEC members are invited to vote through the CENELEC voting system.</p>
|
83
|
+
</clause>
|
84
|
+
{% else %}
|
85
|
+
<clause>
|
86
|
+
<title>A propos de l'IEC</title>
|
87
|
+
<p>La Commission Electrotechnique Internationale (IEC) est la première organisation mondiale qui élabore et publie des Normes internationales pour tout ce qui a trait à l'électricité, à l'électronique et aux technologies apparentées.</p>
|
88
|
+
</clause>
|
89
|
+
<clause>
|
90
|
+
<title>A propos des publications IEC</title>
|
91
|
+
<p>Le contenu technique des publications IEC est constamment revu. Veuillez vous assurer que vous possédez l’édition la plus récente, un corrigendum ou amendement peut avoir été publié.</p>
|
92
|
+
</clause>
|
93
|
+
<clause>
|
46
94
|
<clause>
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
<p>
|
55
|
-
|
56
|
-
|
57
|
-
|
95
|
+
<title>Catalogue IEC - <link target="https://webstore.iec.ch/catalogue">webstore.iec.ch/catalogue</link></title>
|
96
|
+
<p>Application autonome pour consulter tous les renseignements bibliographiques sur les Normes internationales, Spécifications techniques, Rapports techniques et autres documents de l'IEC. Disponible pour PC, Mac OS, tablettes Android et iPad.</p>
|
97
|
+
</clause>
|
98
|
+
<clause><title>Recherche de publications IEC - <link target="https://www.iec.ch/searchpub">www.iec.ch/searchpub</link></title>
|
99
|
+
<p>La recherche avancée permet de trouver des publications IEC en utilisant différents critères (numéro de référence, texte, comité d’études,...). Elle donne aussi des informations sur les projets et les publications remplacées ou retirées.</p>
|
100
|
+
</clause>
|
101
|
+
<clause><title>IEC Just Published - <link target="https://webstore.iec.ch/justpublished">webstore.iec.ch/justpublished</link></title>
|
102
|
+
<p>Restez informé sur les nouvelles publications IEC. Just Published détaille les nouvelles publications parues. Disponible en ligne et aussi une fois par mois par email.</p>
|
103
|
+
</clause>
|
104
|
+
<clause><title>Electropedia - <link target="http://www.electropedia.org">www.electropedia.org</link></title>
|
105
|
+
<p>Le premier dictionnaire en ligne de termes électroniques et électriques. Il contient plus de 30 000 termes et définitions en anglais et en français, ainsi que les termes équivalents dans 14 langues additionnelles. Egalement appelé Vocabulaire Electrotechnique International (IEV) en ligne.</p>
|
106
|
+
</clause>
|
107
|
+
<clause><title>Glossaire IEC - <link target="http://std.iec.ch/glossary">std.iec.ch/glossary</link></title>
|
108
|
+
<p>Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.</p>
|
109
|
+
</clause>
|
110
|
+
<clause><title>Service Clients - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
|
111
|
+
<p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
|
112
|
+
</clause>
|
58
113
|
</clause>
|
59
|
-
</license-statement>
|
60
114
|
{% endif %}
|
115
|
+
</feedback-statement>
|
61
116
|
</boilerplate>
|
117
|
+
|
@@ -55,6 +55,13 @@
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
56
56
|
</data>
|
57
57
|
</attribute>
|
58
|
+
<optional>
|
59
|
+
<attribute name="to">
|
60
|
+
<data type="string">
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
62
|
+
</data>
|
63
|
+
</attribute>
|
64
|
+
</optional>
|
58
65
|
<optional>
|
59
66
|
<attribute name="type">
|
60
67
|
<ref name="ReferenceFormat"/>
|
@@ -246,6 +253,12 @@
|
|
246
253
|
<data type="boolean"/>
|
247
254
|
</attribute>
|
248
255
|
</optional>
|
256
|
+
<optional>
|
257
|
+
<attribute name="width"/>
|
258
|
+
</optional>
|
259
|
+
<optional>
|
260
|
+
<ref name="colgroup"/>
|
261
|
+
</optional>
|
249
262
|
<optional>
|
250
263
|
<ref name="tname"/>
|
251
264
|
</optional>
|
@@ -764,6 +777,21 @@
|
|
764
777
|
</define>
|
765
778
|
</include>
|
766
779
|
<!-- end overrides -->
|
780
|
+
<define name="colgroup">
|
781
|
+
<element name="colgroup">
|
782
|
+
<oneOrMore>
|
783
|
+
<ref name="col"/>
|
784
|
+
</oneOrMore>
|
785
|
+
</element>
|
786
|
+
</define>
|
787
|
+
<define name="col">
|
788
|
+
<element name="col">
|
789
|
+
<attribute name="width"/>
|
790
|
+
</element>
|
791
|
+
</define>
|
792
|
+
<define name="BibItemType" combine="choice">
|
793
|
+
<value>internal</value>
|
794
|
+
</define>
|
767
795
|
<define name="TextElement" combine="choice">
|
768
796
|
<ref name="concept"/>
|
769
797
|
</define>
|
@@ -814,6 +842,9 @@
|
|
814
842
|
<data type="boolean"/>
|
815
843
|
</attribute>
|
816
844
|
</optional>
|
845
|
+
<optional>
|
846
|
+
<attribute name="number"/>
|
847
|
+
</optional>
|
817
848
|
<optional>
|
818
849
|
<attribute name="obligation">
|
819
850
|
<choice>
|
@@ -869,9 +900,11 @@
|
|
869
900
|
<element name="code">
|
870
901
|
<text/>
|
871
902
|
</element>
|
872
|
-
<
|
873
|
-
<text
|
874
|
-
|
903
|
+
<optional>
|
904
|
+
<element name="text">
|
905
|
+
<text/>
|
906
|
+
</element>
|
907
|
+
</optional>
|
875
908
|
</element>
|
876
909
|
</define>
|
877
910
|
<define name="standard-document">
|
@@ -1041,6 +1074,9 @@
|
|
1041
1074
|
</choice>
|
1042
1075
|
</attribute>
|
1043
1076
|
</optional>
|
1077
|
+
<optional>
|
1078
|
+
<attribute name="number"/>
|
1079
|
+
</optional>
|
1044
1080
|
<optional>
|
1045
1081
|
<attribute name="type"/>
|
1046
1082
|
</optional>
|
@@ -1094,6 +1130,9 @@
|
|
1094
1130
|
<optional>
|
1095
1131
|
<attribute name="type"/>
|
1096
1132
|
</optional>
|
1133
|
+
<optional>
|
1134
|
+
<attribute name="number"/>
|
1135
|
+
</optional>
|
1097
1136
|
<optional>
|
1098
1137
|
<ref name="section-title"/>
|
1099
1138
|
</optional>
|
@@ -1196,6 +1235,9 @@
|
|
1196
1235
|
<optional>
|
1197
1236
|
<attribute name="type"/>
|
1198
1237
|
</optional>
|
1238
|
+
<optional>
|
1239
|
+
<attribute name="number"/>
|
1240
|
+
</optional>
|
1199
1241
|
<optional>
|
1200
1242
|
<attribute name="obligation">
|
1201
1243
|
<choice>
|
@@ -1524,6 +1566,7 @@
|
|
1524
1566
|
<value>add</value>
|
1525
1567
|
<value>modify</value>
|
1526
1568
|
<value>delete</value>
|
1569
|
+
<value>replace</value>
|
1527
1570
|
</choice>
|
1528
1571
|
</attribute>
|
1529
1572
|
<optional>
|
@@ -1554,6 +1597,11 @@
|
|
1554
1597
|
</optional>
|
1555
1598
|
<optional>
|
1556
1599
|
<element name="newcontent">
|
1600
|
+
<optional>
|
1601
|
+
<attribute name="id">
|
1602
|
+
<data type="ID"/>
|
1603
|
+
</attribute>
|
1604
|
+
</optional>
|
1557
1605
|
<zeroOrMore>
|
1558
1606
|
<ref name="BasicBlock"/>
|
1559
1607
|
</zeroOrMore>
|
@@ -38,6 +38,9 @@
|
|
38
38
|
</define>
|
39
39
|
<define name="BibDataExtensionType">
|
40
40
|
<ref name="doctype"/>
|
41
|
+
<optional>
|
42
|
+
<ref name="horizontal"/>
|
43
|
+
</optional>
|
41
44
|
<ref name="editorialgroup"/>
|
42
45
|
<zeroOrMore>
|
43
46
|
<ref name="ics"/>
|
@@ -137,22 +140,28 @@
|
|
137
140
|
</choice>
|
138
141
|
</attribute>
|
139
142
|
</optional>
|
143
|
+
<optional>
|
144
|
+
<attribute name="type"/>
|
145
|
+
</optional>
|
140
146
|
<optional>
|
141
147
|
<ref name="section-title"/>
|
142
148
|
</optional>
|
143
|
-
<
|
144
|
-
<
|
145
|
-
<
|
146
|
-
<
|
147
|
-
|
148
|
-
|
149
|
-
<
|
150
|
-
|
151
|
-
|
149
|
+
<group>
|
150
|
+
<choice>
|
151
|
+
<group>
|
152
|
+
<oneOrMore>
|
153
|
+
<ref name="BasicBlock"/>
|
154
|
+
</oneOrMore>
|
155
|
+
<zeroOrMore>
|
156
|
+
<ref name="note"/>
|
157
|
+
</zeroOrMore>
|
158
|
+
</group>
|
159
|
+
<ref name="amend"/>
|
160
|
+
</choice>
|
152
161
|
<oneOrMore>
|
153
162
|
<ref name="clause-subsection"/>
|
154
163
|
</oneOrMore>
|
155
|
-
</
|
164
|
+
</group>
|
156
165
|
</define>
|
157
166
|
<define name="term">
|
158
167
|
<element name="term">
|
@@ -379,6 +388,9 @@
|
|
379
388
|
<data type="anyURI"/>
|
380
389
|
</attribute>
|
381
390
|
</optional>
|
391
|
+
<optional>
|
392
|
+
<ref name="colgroup"/>
|
393
|
+
</optional>
|
382
394
|
<optional>
|
383
395
|
<ref name="tname"/>
|
384
396
|
</optional>
|
@@ -429,6 +441,11 @@
|
|
429
441
|
<ref name="bibliography"/>
|
430
442
|
</element>
|
431
443
|
</define>
|
444
|
+
<define name="horizontal">
|
445
|
+
<element name="horizontal">
|
446
|
+
<data type="boolean"/>
|
447
|
+
</element>
|
448
|
+
</define>
|
432
449
|
<define name="documentnumber">
|
433
450
|
<element name="project-number">
|
434
451
|
<optional>
|
@@ -13,7 +13,7 @@ module IsoDoc
|
|
13
13
|
b = isoxml.at(ns("//boilerplate/legal-statement"))
|
14
14
|
page_break(out)
|
15
15
|
iec_orgname(out)
|
16
|
-
middle_title(out)
|
16
|
+
middle_title(isoxml, out)
|
17
17
|
out.div **attr_code(id: f ? f["id"] : "") do |s|
|
18
18
|
s.h1(**{ class: "ForewordTitle" }) { |h1| h1 << @i18n.foreword }
|
19
19
|
@meta.get[:doctype] == "Amendment" or
|
@@ -30,7 +30,7 @@ module IsoDoc
|
|
30
30
|
out.p(**{ class: "zzSTDTitle1" }) { |p| p << " " }
|
31
31
|
end
|
32
32
|
|
33
|
-
def middle_title(out)
|
33
|
+
def middle_title(_isoxml, out)
|
34
34
|
title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
|
35
35
|
@meta.get[:doctitleintro] and
|
36
36
|
title1 = "#{@meta.get[:doctitleintro]} — #{title1}"
|
@@ -768,12 +768,12 @@ p.NormRef {
|
|
768
768
|
pre,
|
769
769
|
.pseudocode {
|
770
770
|
background-color: #f5faff;
|
771
|
-
font-size:
|
771
|
+
font-size: {{monospacefontsize}};
|
772
772
|
line-height: 1.6em;
|
773
773
|
padding: 1.5em;
|
774
774
|
margin: 2em 0 1em 0;
|
775
775
|
overflow: auto;
|
776
|
-
font-size:
|
776
|
+
font-size: {{monospacefontsize}}; }
|
777
777
|
.figure .SourceTitle,
|
778
778
|
pre .SourceTitle,
|
779
779
|
.pseudocode .SourceTitle {
|
@@ -890,14 +890,14 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
|
|
890
890
|
font-size: 0.8em; }
|
891
891
|
|
892
892
|
.footnote {
|
893
|
-
font-size:
|
893
|
+
font-size: {{footnotefontsize}}; }
|
894
894
|
|
895
895
|
sup a {
|
896
896
|
vertical-align: super;
|
897
897
|
font-size: 0.8em; }
|
898
898
|
|
899
899
|
#footnote_box {
|
900
|
-
font-size:
|
900
|
+
font-size: {{footnotefontsize}};
|
901
901
|
background: white;
|
902
902
|
padding: 0 10px;
|
903
903
|
margin: 10px;
|
@@ -910,7 +910,7 @@ ol.footnotes-list, aside.footnote {
|
|
910
910
|
margin-left: 1em; }
|
911
911
|
|
912
912
|
ol.footnotes-list li, aside.footnote {
|
913
|
-
font-size:
|
913
|
+
font-size: {{footnotefontsize}};
|
914
914
|
vertical-align: top;
|
915
915
|
list-style: decimal;
|
916
916
|
margin-bottom: 1em; }
|
@@ -517,7 +517,7 @@ p.NormRef {
|
|
517
517
|
pre,
|
518
518
|
.pseudocode {
|
519
519
|
@include pseudocodeBlock(#f5faff);
|
520
|
-
font-size:
|
520
|
+
font-size: $monospacefontsize;
|
521
521
|
}
|
522
522
|
|
523
523
|
pre {
|
@@ -618,7 +618,7 @@ a.footnote-number, a.TableFootnoteRef, span.TableFootnoteRef {
|
|
618
618
|
}
|
619
619
|
|
620
620
|
.footnote {
|
621
|
-
font-size:
|
621
|
+
font-size: $footnotefontsize;
|
622
622
|
}
|
623
623
|
|
624
624
|
sup a {
|
@@ -626,7 +626,7 @@ sup a {
|
|
626
626
|
font-size: 0.8em;
|
627
627
|
}
|
628
628
|
#footnote_box {
|
629
|
-
font-size:
|
629
|
+
font-size: $footnotefontsize;
|
630
630
|
background: white;
|
631
631
|
padding: 0 10px;
|
632
632
|
margin: 10px;
|
@@ -642,7 +642,7 @@ ol.footnotes-list, aside.footnote {
|
|
642
642
|
}
|
643
643
|
|
644
644
|
ol.footnotes-list li, aside.footnote {
|
645
|
-
font-size:
|
645
|
+
font-size: $footnotefontsize;
|
646
646
|
vertical-align: top;
|
647
647
|
list-style:decimal;
|
648
648
|
margin-bottom: 1em;
|
@@ -10,9 +10,9 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode {
|
|
10
10
|
text-align: left;
|
11
11
|
mso-pagination: widow-orphan;
|
12
12
|
layout-grid-mode: char;
|
13
|
-
font-size:
|
14
|
-
mso-bidi-font-size:
|
15
|
-
font-family:
|
13
|
+
font-size: {{monospacefontsize}};
|
14
|
+
mso-bidi-font-size: {{normalfontsize}};
|
15
|
+
font-family: {{monospacefont}};
|
16
16
|
mso-fareast-font-family: "Times New Roman";
|
17
17
|
mso-bidi-font-family: Arial;
|
18
18
|
letter-spacing: -.1pt;
|
@@ -31,9 +31,9 @@ p.pseudocode, li.pseudocode, div.pseudocode {
|
|
31
31
|
text-align: left;
|
32
32
|
mso-pagination: widow-orphan;
|
33
33
|
layout-grid-mode: char;
|
34
|
-
font-size:
|
35
|
-
mso-bidi-font-size:
|
36
|
-
font-family:
|
34
|
+
font-size: {{normalfontsize}};
|
35
|
+
mso-bidi-font-size: {{normalfontsize}};
|
36
|
+
font-family: {{bodyfont}};
|
37
37
|
mso-fareast-font-family: "Times New Roman";
|
38
38
|
mso-bidi-font-family: Arial;
|
39
39
|
letter-spacing: -.1pt;
|
@@ -54,9 +54,9 @@ p.CODE-TableCell, li.CODE-TableCell, div.CODE-TableCell, pre.CODE-TableCell {
|
|
54
54
|
text-align: left;
|
55
55
|
mso-pagination: widow-orphan;
|
56
56
|
layout-grid-mode: char;
|
57
|
-
font-size:
|
58
|
-
mso-bidi-font-size:
|
59
|
-
font-family:
|
57
|
+
font-size: {{smallerfontsize}};
|
58
|
+
mso-bidi-font-size: {{normalfontsize}};
|
59
|
+
font-family: {{monospacefontsize}};
|
60
60
|
mso-fareast-font-family: "Times New Roman";
|
61
61
|
mso-bidi-font-family: Arial;
|
62
62
|
letter-spacing: -.1pt;
|
@@ -71,7 +71,7 @@ p.Biblio, li.Biblio, div.Biblio {
|
|
71
71
|
mso-style-parent: Normal;
|
72
72
|
margin-top: 5.0pt;
|
73
73
|
margin-right: 0cm;
|
74
|
-
margin-bottom:
|
74
|
+
margin-bottom: {{normalfontsize}};
|
75
75
|
margin-left: 34.0pt;
|
76
76
|
text-align: justify;
|
77
77
|
text-indent: -34.0pt;
|
@@ -80,8 +80,8 @@ p.Biblio, li.Biblio, div.Biblio {
|
|
80
80
|
/* mso-list:l6 level1 lfo20; */
|
81
81
|
tab-stops: list 34.0pt;
|
82
82
|
layout-grid-mode: char;
|
83
|
-
font-size:
|
84
|
-
font-family:
|
83
|
+
font-size: {{normalfontsize}};
|
84
|
+
font-family: {{bodyfont}};
|
85
85
|
mso-fareast-font-family: "Times New Roman";
|
86
86
|
letter-spacing: .4pt;
|
87
87
|
mso-ansi-language: EN-GB;
|
@@ -93,7 +93,7 @@ p.NormRef, li.NormRef, div.NormRef {
|
|
93
93
|
mso-style-parent: Normal;
|
94
94
|
margin-top: 5.0pt;
|
95
95
|
margin-right: 0cm;
|
96
|
-
margin-bottom:
|
96
|
+
margin-bottom: {{normalfontsize}};
|
97
97
|
margin-left: 0pt;
|
98
98
|
text-align: justify;
|
99
99
|
mso-pagination: widow-orphan;
|
@@ -101,8 +101,8 @@ p.NormRef, li.NormRef, div.NormRef {
|
|
101
101
|
/* mso-list:l6 level1 lfo20; */
|
102
102
|
tab-stops: list 34.0pt;
|
103
103
|
layout-grid-mode: char;
|
104
|
-
font-size:
|
105
|
-
font-family:
|
104
|
+
font-size: {{normalfontsize}};
|
105
|
+
font-family: {{bodyfont}};
|
106
106
|
mso-fareast-font-family: "Times New Roman";
|
107
107
|
letter-spacing: .4pt;
|
108
108
|
mso-ansi-language: EN-GB;
|
@@ -115,13 +115,13 @@ p.FigureTitle {
|
|
115
115
|
mso-style-next: Normal;
|
116
116
|
margin-top: 5.0pt;
|
117
117
|
margin-right: 0cm;
|
118
|
-
margin-bottom:
|
118
|
+
margin-bottom: {{normalfontsize}};
|
119
119
|
margin-left: 0cm;
|
120
120
|
text-align: center;
|
121
121
|
mso-pagination: widow-orphan;
|
122
122
|
layout-grid-mode: char;
|
123
|
-
font-size:
|
124
|
-
font-family:
|
123
|
+
font-size: {{normalfontsize}};
|
124
|
+
font-family: {{headerfont}};
|
125
125
|
mso-fareast-font-family: "Times New Roman";
|
126
126
|
letter-spacing: .4pt;
|
127
127
|
mso-ansi-language: EN-GB;
|
@@ -134,13 +134,13 @@ p.AdmonitionTitle, p.RecommendationTitle {
|
|
134
134
|
mso-style-next: Normal;
|
135
135
|
margin-top: 5.0pt;
|
136
136
|
margin-right: 0cm;
|
137
|
-
margin-bottom:
|
137
|
+
margin-bottom: {{normalfontsize}};
|
138
138
|
margin-left: 0cm;
|
139
139
|
text-align: center;
|
140
140
|
mso-pagination: widow-orphan;
|
141
141
|
layout-grid-mode: char;
|
142
|
-
font-size:
|
143
|
-
font-family:
|
142
|
+
font-size: {{normalfontsize}};
|
143
|
+
font-family: {{headerfont}};
|
144
144
|
mso-fareast-font-family: "Times New Roman";
|
145
145
|
letter-spacing: .4pt;
|
146
146
|
mso-ansi-language: EN-GB;
|
@@ -153,13 +153,13 @@ p.SourceTitle {
|
|
153
153
|
mso-style-next: Normal;
|
154
154
|
margin-top: 5.0pt;
|
155
155
|
margin-right: 0cm;
|
156
|
-
margin-bottom:
|
156
|
+
margin-bottom: {{normalfontsize}};
|
157
157
|
margin-left: 0cm;
|
158
158
|
text-align: center;
|
159
159
|
mso-pagination: widow-orphan;
|
160
160
|
layout-grid-mode: char;
|
161
|
-
font-size:
|
162
|
-
font-family:
|
161
|
+
font-size: {{normalfontsize}};
|
162
|
+
font-family: {{headerfont}};
|
163
163
|
mso-fareast-font-family: "Times New Roman";
|
164
164
|
letter-spacing: .4pt;
|
165
165
|
mso-ansi-language: EN-GB;
|
@@ -174,14 +174,14 @@ p.TableTitle {
|
|
174
174
|
mso-style-next: Normal;
|
175
175
|
margin-top: 5.0pt;
|
176
176
|
margin-right: 0cm;
|
177
|
-
margin-bottom:
|
177
|
+
margin-bottom: {{normalfontsize}};
|
178
178
|
margin-left: 0cm;
|
179
179
|
text-align: center;
|
180
180
|
mso-pagination: widow-orphan;
|
181
181
|
page-break-after: avoid;
|
182
182
|
layout-grid-mode: char;
|
183
|
-
font-size:
|
184
|
-
font-family:
|
183
|
+
font-size: {{normalfontsize}};
|
184
|
+
font-family: {{headerfont}};
|
185
185
|
mso-fareast-font-family: "Times New Roman";
|
186
186
|
letter-spacing: .4pt;
|
187
187
|
mso-ansi-language: EN-GB;
|
@@ -200,8 +200,8 @@ p.Note, div.Note, li.Note {
|
|
200
200
|
text-align: justify;
|
201
201
|
mso-pagination: widow-orphan;
|
202
202
|
layout-grid-mode: char;
|
203
|
-
font-size:
|
204
|
-
font-family:
|
203
|
+
font-size: {{smallerfontsize}};
|
204
|
+
font-family: {{bodyfont}};
|
205
205
|
mso-fareast-font-family: "Times New Roman";
|
206
206
|
letter-spacing: .4pt;
|
207
207
|
mso-ansi-language: EN-GB;
|
@@ -220,8 +220,8 @@ p.TableFootnote, div.TableFootnote, li.TableFootnote {
|
|
220
220
|
mso-pagination: widow-orphan;
|
221
221
|
tab-stops: 14.2pt;
|
222
222
|
layout-grid-mode: char;
|
223
|
-
font-size:
|
224
|
-
font-family:
|
223
|
+
font-size: {{smallerfontsize}};
|
224
|
+
font-family: {{bodyfont}};
|
225
225
|
mso-fareast-font-family: "Times New Roman";
|
226
226
|
letter-spacing: .4pt;
|
227
227
|
mso-ansi-language: EN-GB;
|
@@ -236,7 +236,7 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle {
|
|
236
236
|
mso-style-next: Normal;
|
237
237
|
margin-top: 0cm;
|
238
238
|
margin-right: 0cm;
|
239
|
-
margin-bottom:
|
239
|
+
margin-bottom: {{normalfontsize}};
|
240
240
|
margin-left: 0cm;
|
241
241
|
text-align: center;
|
242
242
|
text-indent: 0pt;
|
@@ -246,8 +246,8 @@ p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle {
|
|
246
246
|
mso-hyphenate: none;
|
247
247
|
layout-grid-mode: char;
|
248
248
|
font-size: 12.0pt;
|
249
|
-
mso-bidi-font-size:
|
250
|
-
font-family:
|
249
|
+
mso-bidi-font-size: {{normalfontsize}};
|
250
|
+
font-family: {{headerfont}};
|
251
251
|
mso-fareast-font-family: "Times New Roman";
|
252
252
|
letter-spacing: .4pt;
|
253
253
|
mso-ansi-language: EN-GB;
|
@@ -262,7 +262,7 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle {
|
|
262
262
|
mso-style-next: Normal;
|
263
263
|
margin-top: 0cm;
|
264
264
|
margin-right: 0cm;
|
265
|
-
margin-bottom:
|
265
|
+
margin-bottom: {{normalfontsize}};
|
266
266
|
margin-left: 0cm;
|
267
267
|
text-align: center;
|
268
268
|
text-indent: 0pt;
|
@@ -272,8 +272,8 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle {
|
|
272
272
|
mso-hyphenate: none;
|
273
273
|
layout-grid-mode: char;
|
274
274
|
font-size: 12.0pt;
|
275
|
-
mso-bidi-font-size:
|
276
|
-
font-family:
|
275
|
+
mso-bidi-font-size: {{normalfontsize}};
|
276
|
+
font-family: {{headerfont}};
|
277
277
|
mso-fareast-font-family: "Times New Roman";
|
278
278
|
letter-spacing: .4pt;
|
279
279
|
mso-ansi-language: EN-GB;
|
@@ -286,7 +286,7 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
286
286
|
mso-style-next: Normal;
|
287
287
|
margin-top: 0cm;
|
288
288
|
margin-right: 0cm;
|
289
|
-
margin-bottom:
|
289
|
+
margin-bottom: {{normalfontsize}};
|
290
290
|
margin-left: 0cm;
|
291
291
|
text-align: center;
|
292
292
|
text-indent: 0pt;
|
@@ -295,8 +295,8 @@ p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
|
|
295
295
|
mso-hyphenate: none;
|
296
296
|
layout-grid-mode: char;
|
297
297
|
font-size: 12.0pt;
|
298
|
-
mso-bidi-font-size:
|
299
|
-
font-family:
|
298
|
+
mso-bidi-font-size: {{normalfontsize}};
|
299
|
+
font-family: {{headerfont}};
|
300
300
|
mso-fareast-font-family: "Times New Roman";
|
301
301
|
letter-spacing: .4pt;
|
302
302
|
mso-ansi-language: EN-GB;
|
@@ -318,8 +318,8 @@ p.Terms, li.Terms, div.Terms {
|
|
318
318
|
mso-pagination: widow-orphan;
|
319
319
|
page-break-after: avoid;
|
320
320
|
layout-grid-mode: char;
|
321
|
-
font-size:
|
322
|
-
font-family:
|
321
|
+
font-size: {{normalfontsize}};
|
322
|
+
font-family: {{bodyfont}};
|
323
323
|
mso-fareast-font-family: "Times New Roman";
|
324
324
|
letter-spacing: .4pt;
|
325
325
|
mso-ansi-language: EN-GB;
|
@@ -346,8 +346,8 @@ p.AltTerms, li.AltTerms, div.AltTerms {
|
|
346
346
|
mso-pagination: widow-orphan;
|
347
347
|
page-break-after: avoid;
|
348
348
|
layout-grid-mode: char;
|
349
|
-
font-size:
|
350
|
-
font-family:
|
349
|
+
font-size: {{normalfontsize}};
|
350
|
+
font-family: {{bodyfont}};
|
351
351
|
mso-fareast-font-family: "Times New Roman";
|
352
352
|
letter-spacing: .4pt;
|
353
353
|
mso-ansi-language: EN-GB;
|
@@ -368,8 +368,8 @@ p.DeprecatedTerms, li.DeprecatedTerms, div.DeprecatedTerms {
|
|
368
368
|
text-align: justify;
|
369
369
|
mso-pagination: widow-orphan;
|
370
370
|
layout-grid-mode: char;
|
371
|
-
font-size:
|
372
|
-
font-family:
|
371
|
+
font-size: {{smallerfontsize}};
|
372
|
+
font-family: {{bodyfont}};
|
373
373
|
mso-fareast-font-family: "Times New Roman";
|
374
374
|
letter-spacing: .4pt;
|
375
375
|
mso-ansi-language: EN-GB;
|
@@ -396,8 +396,8 @@ p.TermNum, li.TermNum, div.TermNum {
|
|
396
396
|
mso-hyphenate: none;
|
397
397
|
tab-stops: list 31.2pt;
|
398
398
|
layout-grid-mode: char;
|
399
|
-
font-size:
|
400
|
-
font-family:
|
399
|
+
font-size: {{normalfontsize}};
|
400
|
+
font-family: {{headerfont}};
|
401
401
|
mso-fareast-font-family: "Times New Roman";
|
402
402
|
letter-spacing: .4pt;
|
403
403
|
mso-ansi-language: EN-GB;
|
@@ -464,7 +464,7 @@ p.zzSTDTitle1, li.zzSTDTitle1, div.zzSTDTitle1 {
|
|
464
464
|
mso-pagination: widow-orphan;
|
465
465
|
layout-grid-mode: char;
|
466
466
|
font-size: 12.0pt;
|
467
|
-
font-family:
|
467
|
+
font-family: {{headerfont}};
|
468
468
|
mso-fareast-font-family: "Times New Roman";
|
469
469
|
letter-spacing: .4pt;
|
470
470
|
mso-ansi-language: EN-GB;
|
@@ -483,7 +483,7 @@ p.zzSTDTitle2, li.zzSTDTitle2, div.zzSTDTitle2 {
|
|
483
483
|
mso-pagination: widow-orphan;
|
484
484
|
layout-grid-mode: char;
|
485
485
|
font-size: 12.0pt;
|
486
|
-
font-family:
|
486
|
+
font-family: {{headerfont}};
|
487
487
|
mso-fareast-font-family: "Times New Roman";
|
488
488
|
letter-spacing: .4pt;
|
489
489
|
mso-ansi-language: EN-GB;
|
@@ -503,8 +503,8 @@ p.TABLE-col-heading, li.TABLE-col-heading, div.TABLE-col-heading {
|
|
503
503
|
mso-pagination: widow-orphan;
|
504
504
|
page-break-after: avoid;
|
505
505
|
layout-grid-mode: char;
|
506
|
-
font-size:
|
507
|
-
font-family:
|
506
|
+
font-size: {{smallerfontsize}};
|
507
|
+
font-family: {{headerfont}};
|
508
508
|
mso-fareast-font-family: "Times New Roman";
|
509
509
|
letter-spacing: .4pt;
|
510
510
|
mso-ansi-language: EN-GB;
|
@@ -523,9 +523,9 @@ p.TABLE-cell, li.TABLE-cell, div.TABLE-cell {
|
|
523
523
|
text-align: left;
|
524
524
|
mso-pagination: widow-orphan;
|
525
525
|
layout-grid-mode: char;
|
526
|
-
font-size:
|
527
|
-
mso-bidi-font-size:
|
528
|
-
font-family:
|
526
|
+
font-size: {{smallerfontsize}};
|
527
|
+
mso-bidi-font-size: {{normalfontsize}};
|
528
|
+
font-family: {{bodyfont}};
|
529
529
|
mso-fareast-font-family: "Times New Roman";
|
530
530
|
letter-spacing: .4pt;
|
531
531
|
mso-ansi-language: EN-GB;
|
@@ -542,7 +542,7 @@ p.Quote, li.Quote, div.Quote {
|
|
542
542
|
line-height: 12.0pt;
|
543
543
|
mso-pagination: widow-orphan;
|
544
544
|
tab-stops: 20.15pt;
|
545
|
-
font-size:
|
545
|
+
font-size: {{normalfontsize}};
|
546
546
|
font-family: {{bodyfont}};
|
547
547
|
mso-fareast-font-family: {{bodyfont}};
|
548
548
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -554,7 +554,7 @@ p.QuoteAttribution {
|
|
554
554
|
p.Admonition, li.Admonition, div.Admonition {
|
555
555
|
mso-style-priority: 99;
|
556
556
|
mso-pagination: widow-orphan;
|
557
|
-
font-size:
|
557
|
+
font-size: {{normalfontsize}};
|
558
558
|
font-family: {{bodyfont}};
|
559
559
|
mso-ascii-font-family: {{bodyfont}};
|
560
560
|
mso-ascii-theme-font: minor-latin;
|
@@ -577,16 +577,16 @@ p.formula, li.formula, div.formula {
|
|
577
577
|
mso-style-unhide: no;
|
578
578
|
mso-style-qformat: yes;
|
579
579
|
mso-style-next: Normal;
|
580
|
-
margin-top:
|
580
|
+
margin-top: {{normalfontsize}};
|
581
581
|
margin-right: 0cm;
|
582
|
-
margin-bottom:
|
582
|
+
margin-bottom: {{normalfontsize}};
|
583
583
|
margin-left: 0cm;
|
584
584
|
text-align: justify;
|
585
585
|
mso-pagination: widow-orphan;
|
586
586
|
tab-stops: center 8.0cm right 16.0cm;
|
587
587
|
layout-grid-mode: char;
|
588
|
-
font-size:
|
589
|
-
font-family:
|
588
|
+
font-size: {{normalfontsize}};
|
589
|
+
font-family: {{bodyfont}};
|
590
590
|
mso-fareast-font-family: "Times New Roman";
|
591
591
|
letter-spacing: .4pt;
|
592
592
|
mso-ansi-language: EN-GB;
|
@@ -607,8 +607,8 @@ p.FOREWORD, li.FOREWORD, div.FOREWORD {
|
|
607
607
|
mso-pagination: widow-orphan;
|
608
608
|
tab-stops: 14.2pt;
|
609
609
|
layout-grid-mode: char;
|
610
|
-
font-size:
|
611
|
-
font-family:
|
610
|
+
font-size: {{smallerfontsize}};
|
611
|
+
font-family: {{bodyfont}};
|
612
612
|
mso-fareast-font-family: "Times New Roman";
|
613
613
|
letter-spacing: .4pt;
|
614
614
|
mso-ansi-language: EN-GB;
|
@@ -652,7 +652,7 @@ table.MsoISOTable, table.MsoISOTableBig {
|
|
652
652
|
mso-yfti-tbllook: 480;
|
653
653
|
mso-border-insideh: .75pt solid windowtext;
|
654
654
|
mso-border-insidev: .75pt solid windowtext;
|
655
|
-
font-size:
|
655
|
+
font-size: {{normalfontsize}};
|
656
656
|
font-family: {{bodyfont}}; }
|
657
657
|
|
658
658
|
table.MsoISOTable th, table.MsoISOTableBig th {
|
@@ -666,7 +666,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
666
666
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
667
667
|
|
668
668
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
669
|
-
font-size:
|
669
|
+
font-size: {{normalfontsize}}; }
|
670
670
|
|
671
671
|
table.MsoTableGrid {
|
672
672
|
mso-style-name: "Table Grid";
|
@@ -682,7 +682,7 @@ table.MsoTableGrid {
|
|
682
682
|
mso-para-margin: 0cm;
|
683
683
|
mso-para-margin-bottom: .0001pt;
|
684
684
|
mso-pagination: widow-orphan;
|
685
|
-
font-size:
|
685
|
+
font-size: {{normalfontsize}};
|
686
686
|
font-family: {{bodyfont}}; }
|
687
687
|
|
688
688
|
body {
|
@@ -716,7 +716,7 @@ div.coverpage_warning {
|
|
716
716
|
|
717
717
|
.coverpage_warning {
|
718
718
|
color: #485094;
|
719
|
-
font-size:
|
719
|
+
font-size: {{normalfontsize}}; }
|
720
720
|
|
721
721
|
.coverpage {
|
722
722
|
text-align: center;
|
@@ -799,16 +799,16 @@ a.TableFootnoteRef, span.TableFootnoteRef {
|
|
799
799
|
vertical-align: super; }
|
800
800
|
|
801
801
|
aside {
|
802
|
-
font-size:
|
802
|
+
font-size: {{footnotefontsize}}; }
|
803
803
|
|
804
804
|
/*
|
805
805
|
div.example {
|
806
806
|
border:solid black .25pt;
|
807
807
|
mso-border-alt:solid black .25pt;
|
808
808
|
padding:10pt;
|
809
|
-
mso-padding-alt
|
809
|
+
mso-padding-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
|
810
810
|
margin:10pt;
|
811
|
-
mso-margin-alt
|
811
|
+
mso-margin-alt:$normalfontsize 10.0pt 10.0pt 10.0pt;
|
812
812
|
}
|
813
813
|
*/
|
814
814
|
/*
|
@@ -820,28 +820,28 @@ div.example {
|
|
820
820
|
p.example, li.example, div.example, td.example {
|
821
821
|
mso-pagination: none;
|
822
822
|
tab-stops: 70.9pt;
|
823
|
-
font-size:
|
823
|
+
font-size: {{normalfontsize}};
|
824
824
|
font-family: {{bodyfont}}; }
|
825
825
|
|
826
826
|
td.example p.MsoListParagraph {
|
827
|
-
font-size:
|
827
|
+
font-size: {{normalfontsize}}; }
|
828
828
|
|
829
829
|
div.example p.MsoListParagraph {
|
830
|
-
font-size:
|
830
|
+
font-size: {{normalfontsize}}; }
|
831
831
|
|
832
832
|
div.Note p.MsoListParagraph {
|
833
|
-
font-size:
|
833
|
+
font-size: {{smallerfontsize}};
|
834
834
|
margin-left: 1.0cm; }
|
835
835
|
|
836
836
|
div.Note span.stem {
|
837
|
-
font-size:
|
837
|
+
font-size: {{smallerfontsize}}; }
|
838
838
|
|
839
839
|
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
840
|
-
font-size:
|
840
|
+
font-size: {{smallerfontsize}};
|
841
841
|
margin-left: 1.0cm; }
|
842
842
|
|
843
843
|
div.Note table.dl {
|
844
|
-
font-size:
|
844
|
+
font-size: {{smallerfontsize}};
|
845
845
|
margin-left: 1.0cm; }
|
846
846
|
|
847
847
|
div.example, td.example {
|
@@ -849,9 +849,9 @@ div.example, td.example {
|
|
849
849
|
margin-bottom: 12.0pt; }
|
850
850
|
|
851
851
|
span.example_label, td.example_label {
|
852
|
-
font-size:
|
852
|
+
font-size: {{normalfontsize}};
|
853
853
|
font-family: {{bodyfont}}; }
|
854
854
|
|
855
855
|
span.note_label, td.note_label {
|
856
|
-
font-size:
|
856
|
+
font-size: {{smallerfontsize}};
|
857
857
|
font-family: {{bodyfont}}; }
|