metanorma-iho 0.4.3 → 0.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +3 -31
- data/.gitignore +11 -0
- data/bin/console +1 -1
- data/lib/isodoc/iho/base_convert.rb +11 -9
- data/lib/isodoc/iho/html/htmlstyle.css +43 -28
- data/lib/isodoc/iho/html/htmlstyle.scss +20 -13
- data/lib/isodoc/iho/html/scripts.html +0 -1
- data/lib/isodoc/iho/html/wordstyle.css +30 -18
- data/lib/isodoc/iho/html/wordstyle.scss +30 -18
- data/lib/isodoc/iho/iho.specification.xsl +1607 -1328
- data/lib/isodoc/iho/iho.standard.xsl +1607 -1328
- data/lib/{asciidoctor → metanorma}/iho/basicdoc.rng +0 -0
- data/lib/{asciidoctor → metanorma}/iho/biblio.rng +0 -0
- data/lib/{asciidoctor → metanorma}/iho/boilerplate.xml +0 -0
- data/lib/{asciidoctor → metanorma}/iho/converter.rb +5 -5
- data/lib/{asciidoctor → metanorma}/iho/iho.rng +0 -0
- data/lib/{asciidoctor → metanorma}/iho/isodoc.rng +49 -2
- data/lib/{asciidoctor → metanorma}/iho/reqt.rng +0 -0
- data/lib/metanorma/iho/version.rb +1 -1
- data/lib/metanorma-iho.rb +1 -1
- data/metanorma-iho.gemspec +1 -1
- data/metanorma.yml +1 -1
- metadata +12 -13
- data/lib/asciidoctor/iho.rb +0 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4612e6f0572641c8bb7d4cd0fea31d29f08f22a2a91769f6672de6bf5f3b9537
|
|
4
|
+
data.tar.gz: 521bdd5d699fa4366321944b71e58eef8d99b84aa32939b34170d0c601645f15
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fbe8526f702770249d451bad836eb969a395ec48807f503de3f3bb6ee50d151f6d5e5960813574ec96038249f9d1d792b626e3c6fa4763e94e2553d88ba19f97
|
|
7
|
+
data.tar.gz: 482dba99416e23f4e93ecab8a96a107a4577f3897cf1f1df6460277baf0cdd340f6108169a8de6cbfb35aeb36bfed450bcb2eb172bd9443299269399d088e666
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -10,34 +10,6 @@ on:
|
|
|
10
10
|
|
|
11
11
|
jobs:
|
|
12
12
|
rake:
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
strategy:
|
|
17
|
-
fail-fast: false
|
|
18
|
-
matrix:
|
|
19
|
-
ruby: [ '3.0', '2.7', '2.6', '2.5' ]
|
|
20
|
-
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
|
21
|
-
experimental: [ false ]
|
|
22
|
-
steps:
|
|
23
|
-
- uses: actions/checkout@master
|
|
24
|
-
|
|
25
|
-
- uses: ruby/setup-ruby@v1
|
|
26
|
-
with:
|
|
27
|
-
ruby-version: ${{ matrix.ruby }}
|
|
28
|
-
bundler-cache: true
|
|
29
|
-
|
|
30
|
-
- uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
|
|
31
|
-
|
|
32
|
-
- run: bundle exec rake
|
|
33
|
-
|
|
34
|
-
tests-passed:
|
|
35
|
-
needs: rake
|
|
36
|
-
runs-on: ubuntu-latest
|
|
37
|
-
steps:
|
|
38
|
-
- uses: peter-evans/repository-dispatch@v1
|
|
39
|
-
with:
|
|
40
|
-
token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
|
41
|
-
repository: ${{ github.repository }}
|
|
42
|
-
event-type: tests-passed
|
|
43
|
-
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
|
|
13
|
+
uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
|
|
14
|
+
secrets:
|
|
15
|
+
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
data/.gitignore
CHANGED
data/bin/console
CHANGED
|
@@ -27,7 +27,7 @@ module IsoDoc
|
|
|
27
27
|
xml.span do |s|
|
|
28
28
|
node&.children&.each { |x| parse(x, s) }
|
|
29
29
|
end
|
|
30
|
-
end.join
|
|
30
|
+
end.join
|
|
31
31
|
end
|
|
32
32
|
|
|
33
33
|
def multiplenames_and(names)
|
|
@@ -56,13 +56,15 @@ module IsoDoc
|
|
|
56
56
|
def inline_bibitem_ref_code(bib)
|
|
57
57
|
id = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
|
|
58
58
|
"@type = 'metanorma' or @type = 'ISSN' or "\
|
|
59
|
-
"@type = 'ISBN' or @type = 'rfc-anchor'
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
"@type = 'ISBN' or @type = 'rfc-anchor' or "\
|
|
60
|
+
"@type = 'metanorma-ordinal')]"))
|
|
61
|
+
id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
|
|
62
|
+
"@type = 'metanorma-ordinal')]"))
|
|
63
|
+
return [nil, id, nil, nil] if id
|
|
62
64
|
|
|
63
65
|
id = Nokogiri::XML::Node.new("docidentifier", bib.document)
|
|
64
66
|
id << "(NO ID)"
|
|
65
|
-
[nil, id, nil]
|
|
67
|
+
[nil, id, nil, nil]
|
|
66
68
|
end
|
|
67
69
|
|
|
68
70
|
def extract_edition(bib)
|
|
@@ -101,9 +103,9 @@ module IsoDoc
|
|
|
101
103
|
c = p.at(ns("./completename")) and return c.text
|
|
102
104
|
s = p&.at(ns("./surname"))&.text or return
|
|
103
105
|
i = p.xpath(ns("./initial")) and
|
|
104
|
-
front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
|
|
106
|
+
front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
|
|
105
107
|
i.empty? and f = p.xpath(ns("./forename")) and
|
|
106
|
-
front = f.map { |e| e.text[0].upcase }.join
|
|
108
|
+
front = f.map { |e| e.text[0].upcase }.join
|
|
107
109
|
front ? "#{s} #{front}" : s
|
|
108
110
|
end
|
|
109
111
|
|
|
@@ -117,10 +119,10 @@ module IsoDoc
|
|
|
117
119
|
ftitle&.children&.each { |n| parse(n, out) }
|
|
118
120
|
else
|
|
119
121
|
id = render_identifier(inline_bibitem_ref_code(bib))
|
|
120
|
-
out << id[
|
|
122
|
+
out << id[:sdo] if id[:sdo]
|
|
121
123
|
ed = extract_edition(bib) if iho?(bib)
|
|
122
124
|
out << " edition #{ed}" if ed
|
|
123
|
-
out << ": " if id[
|
|
125
|
+
out << ": " if id[:sdo] || ed
|
|
124
126
|
iso_title(bib)&.children&.each { |n| parse(n, out) }
|
|
125
127
|
out << ", "
|
|
126
128
|
author = extract_author(bib)
|
|
@@ -75,6 +75,12 @@ code *, pre *, tt *, kbd *, samp * {
|
|
|
75
75
|
font-family: {{monospacefont}} !important;
|
|
76
76
|
font-variant-ligatures: none; }
|
|
77
77
|
|
|
78
|
+
p code, dt code, li code, label code, legend code, caption code, th code, td code,
|
|
79
|
+
p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
|
|
80
|
+
p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
|
|
81
|
+
p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
|
|
82
|
+
font-size: {{monospacefontsize}}; }
|
|
83
|
+
|
|
78
84
|
article, aside, details, figcaption, figure,
|
|
79
85
|
footer, header, hgroup, menu, nav, section {
|
|
80
86
|
display: block; }
|
|
@@ -86,6 +92,9 @@ table {
|
|
|
86
92
|
h1, h2, h3, h4, h5, h6 {
|
|
87
93
|
font-family: {{headerfont}}; }
|
|
88
94
|
|
|
95
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
|
96
|
+
font-family: {{headerfont}}; }
|
|
97
|
+
|
|
89
98
|
blockquote, q {
|
|
90
99
|
quotes: none; }
|
|
91
100
|
blockquote:before, blockquote:after, q:before, q:after {
|
|
@@ -239,51 +248,55 @@ body {
|
|
|
239
248
|
main {
|
|
240
249
|
margin: 0 3em 0 6em; }
|
|
241
250
|
|
|
242
|
-
#toc {
|
|
251
|
+
#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
243
252
|
font-family: {{bodyfont}};
|
|
244
253
|
font-weight: 400; }
|
|
245
|
-
#toc ul {
|
|
254
|
+
#toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
|
|
246
255
|
margin: 0;
|
|
247
256
|
padding: 0;
|
|
248
257
|
list-style: none; }
|
|
249
|
-
#toc ul li a {
|
|
258
|
+
#toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
|
|
250
259
|
padding: 5px 10px; }
|
|
251
|
-
#toc ul a {
|
|
260
|
+
#toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
|
|
252
261
|
color: #05164d;
|
|
253
262
|
text-decoration: none;
|
|
254
263
|
display: block; }
|
|
255
|
-
#toc ul a:hover {
|
|
264
|
+
#toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
|
256
265
|
box-shadow: none;
|
|
257
266
|
color: #05164d; }
|
|
258
|
-
#toc .h2 {
|
|
267
|
+
#toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
|
|
259
268
|
padding-left: 30px; }
|
|
260
|
-
#toc .h3 {
|
|
269
|
+
#toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
|
|
261
270
|
padding-left: 50px; }
|
|
262
|
-
#toc .toc-active, #toc li:hover {
|
|
271
|
+
#toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
|
263
272
|
background: #fedc5b;
|
|
264
273
|
box-shadow: inset -5px 0px 10px -5px #fedc5b !important; }
|
|
265
|
-
#toc .toc-active a, #toc li:hover a {
|
|
274
|
+
#toc .toc-active a, #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
|
266
275
|
color: #05164d; }
|
|
267
276
|
@media print {
|
|
268
|
-
#toc .toc-active, #toc li:hover {
|
|
277
|
+
#toc .toc-active, #toc li:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
|
269
278
|
background: white;
|
|
270
279
|
box-shadow: none !important; }
|
|
271
|
-
#toc .toc-active a {
|
|
280
|
+
#toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
|
272
281
|
color: #05164d; }
|
|
273
|
-
#toc li:hover a {
|
|
282
|
+
#toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
|
274
283
|
color: black; } }
|
|
275
284
|
@media screen and (max-width: 768px) {
|
|
276
|
-
#toc {
|
|
285
|
+
#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
277
286
|
padding: 0 1.5em;
|
|
278
287
|
overflow: visible; } }
|
|
279
|
-
#toc .toc-active a {
|
|
288
|
+
#toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
|
280
289
|
color: #05164d; }
|
|
281
|
-
#toc li a {
|
|
290
|
+
#toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
|
|
282
291
|
text-transform: uppercase; }
|
|
283
|
-
#toc ul a:hover {
|
|
292
|
+
#toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
|
284
293
|
box-shadow: none;
|
|
285
294
|
color: #05164d; }
|
|
286
295
|
|
|
296
|
+
#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
297
|
+
margin-top: 0;
|
|
298
|
+
margin-bottom: 0; }
|
|
299
|
+
|
|
287
300
|
@media screen and (min-width: 768px) {
|
|
288
301
|
nav {
|
|
289
302
|
position: fixed;
|
|
@@ -368,7 +381,7 @@ main {
|
|
|
368
381
|
display: none; }
|
|
369
382
|
h1.toc-contents {
|
|
370
383
|
margin-top: 1em; }
|
|
371
|
-
ul#toc-list {
|
|
384
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
372
385
|
padding: 0;
|
|
373
386
|
margin: 0; } }
|
|
374
387
|
|
|
@@ -537,27 +550,28 @@ h2,
|
|
|
537
550
|
h3,
|
|
538
551
|
h4,
|
|
539
552
|
h5,
|
|
540
|
-
h6
|
|
553
|
+
h6,
|
|
554
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
|
541
555
|
font-family: {{headerfont}};
|
|
542
556
|
color: #05164D;
|
|
543
557
|
font-weight: 300;
|
|
544
558
|
margin-top: 1.6em;
|
|
545
559
|
margin-bottom: 0.3em; }
|
|
546
560
|
|
|
547
|
-
h1 {
|
|
561
|
+
h1, .h1 {
|
|
548
562
|
font-size: 1.6em;
|
|
549
563
|
text-transform: uppercase;
|
|
550
564
|
margin-top: 2em; }
|
|
551
565
|
|
|
552
|
-
h1#content {
|
|
566
|
+
h1#content, #content.h1 {
|
|
553
567
|
margin-top: 2em; }
|
|
554
568
|
|
|
555
|
-
h2 {
|
|
569
|
+
h2, .h2 {
|
|
556
570
|
margin-top: 1.3em;
|
|
557
571
|
font-size: 1.3em;
|
|
558
572
|
font-weight: 400; }
|
|
559
573
|
|
|
560
|
-
h3 {
|
|
574
|
+
h3, .h3 {
|
|
561
575
|
margin-top: 1.1em;
|
|
562
576
|
font-size: 1.1em;
|
|
563
577
|
font-weight: 100; }
|
|
@@ -842,7 +856,7 @@ p {
|
|
|
842
856
|
margin-top: 1em;
|
|
843
857
|
margin-bottom: 1em; }
|
|
844
858
|
|
|
845
|
-
h2 p {
|
|
859
|
+
h2 p, .h2 p {
|
|
846
860
|
display: inline; }
|
|
847
861
|
|
|
848
862
|
/*
|
|
@@ -975,7 +989,8 @@ To top button
|
|
|
975
989
|
h1,
|
|
976
990
|
h2,
|
|
977
991
|
h3,
|
|
978
|
-
h4
|
|
992
|
+
h4,
|
|
993
|
+
.h1, .h2, .h3, .h4 {
|
|
979
994
|
page-break-after: avoid;
|
|
980
995
|
margin-top: 1.2em; }
|
|
981
996
|
.note,
|
|
@@ -998,15 +1013,15 @@ To top button
|
|
|
998
1013
|
background-color: white; }
|
|
999
1014
|
.container {
|
|
1000
1015
|
padding-left: 0; }
|
|
1001
|
-
h1.content {
|
|
1016
|
+
h1.content, .h1.content {
|
|
1002
1017
|
margin-top: 2em;
|
|
1003
1018
|
line-height: 2.5em; }
|
|
1004
|
-
h1 {
|
|
1019
|
+
h1, .h1 {
|
|
1005
1020
|
font-size: 1.5em;
|
|
1006
1021
|
line-height: 1.5; }
|
|
1007
|
-
h2 {
|
|
1022
|
+
h2, .h2 {
|
|
1008
1023
|
font-size: 1.2em; }
|
|
1009
|
-
h3 {
|
|
1024
|
+
h3, .h3 {
|
|
1010
1025
|
font-size: 1em; }
|
|
1011
1026
|
.Note {
|
|
1012
1027
|
background-color: #fedc5b;
|
|
@@ -18,7 +18,7 @@ main {
|
|
|
18
18
|
margin: 0 3em 0 6em;
|
|
19
19
|
}
|
|
20
20
|
|
|
21
|
-
#toc {
|
|
21
|
+
#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
22
22
|
@include toc(#05164d, #fedc5b, #05164d);
|
|
23
23
|
@include sidebarToc();
|
|
24
24
|
|
|
@@ -38,6 +38,11 @@ main {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
+
#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
42
|
+
margin-top: 0;
|
|
43
|
+
margin-bottom: 0;
|
|
44
|
+
}
|
|
45
|
+
|
|
41
46
|
nav {
|
|
42
47
|
@include sidebarNav(#f7f7f7, 323px, 45px);
|
|
43
48
|
}
|
|
@@ -72,7 +77,7 @@ nav {
|
|
|
72
77
|
margin-top: 1em;
|
|
73
78
|
}
|
|
74
79
|
|
|
75
|
-
ul#toc-list {
|
|
80
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
76
81
|
padding: 0;
|
|
77
82
|
margin: 0;
|
|
78
83
|
}
|
|
@@ -203,7 +208,8 @@ h2,
|
|
|
203
208
|
h3,
|
|
204
209
|
h4,
|
|
205
210
|
h5,
|
|
206
|
-
h6
|
|
211
|
+
h6,
|
|
212
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
|
207
213
|
font-family: $headerfont;
|
|
208
214
|
color: #05164D;
|
|
209
215
|
font-weight: 300;
|
|
@@ -211,23 +217,23 @@ h6 {
|
|
|
211
217
|
margin-bottom: 0.3em;
|
|
212
218
|
}
|
|
213
219
|
|
|
214
|
-
h1 {
|
|
220
|
+
h1, .h1 {
|
|
215
221
|
font-size: 1.6em;
|
|
216
222
|
text-transform: uppercase;
|
|
217
223
|
margin-top: 2em;
|
|
218
224
|
}
|
|
219
225
|
|
|
220
|
-
h1#content {
|
|
226
|
+
h1#content, .h1#content {
|
|
221
227
|
margin-top: 2em;
|
|
222
228
|
}
|
|
223
229
|
|
|
224
|
-
h2 {
|
|
230
|
+
h2, .h2 {
|
|
225
231
|
margin-top: 1.3em;
|
|
226
232
|
font-size: 1.3em;
|
|
227
233
|
font-weight: 400;
|
|
228
234
|
}
|
|
229
235
|
|
|
230
|
-
h3 {
|
|
236
|
+
h3, .h3 {
|
|
231
237
|
margin-top: 1.1em;
|
|
232
238
|
font-size: 1.1em;
|
|
233
239
|
font-weight: 100;
|
|
@@ -503,7 +509,7 @@ p {
|
|
|
503
509
|
margin-bottom: 1em;
|
|
504
510
|
}
|
|
505
511
|
|
|
506
|
-
h2 p {
|
|
512
|
+
h2 p, .h2 p {
|
|
507
513
|
display: inline;
|
|
508
514
|
}
|
|
509
515
|
|
|
@@ -681,7 +687,8 @@ To top button
|
|
|
681
687
|
h1,
|
|
682
688
|
h2,
|
|
683
689
|
h3,
|
|
684
|
-
h4
|
|
690
|
+
h4,
|
|
691
|
+
.h1, .h2, .h3, .h4 {
|
|
685
692
|
page-break-after: avoid;
|
|
686
693
|
margin-top: 1.2em;
|
|
687
694
|
}
|
|
@@ -720,21 +727,21 @@ To top button
|
|
|
720
727
|
padding-left: 0;
|
|
721
728
|
}
|
|
722
729
|
|
|
723
|
-
h1.content {
|
|
730
|
+
h1.content, .h1.content {
|
|
724
731
|
margin-top: 2em;
|
|
725
732
|
line-height: 2.5em;
|
|
726
733
|
}
|
|
727
734
|
|
|
728
|
-
h1 {
|
|
735
|
+
h1, .h1 {
|
|
729
736
|
font-size: 1.5em;
|
|
730
737
|
line-height: 1.5;
|
|
731
738
|
}
|
|
732
739
|
|
|
733
|
-
h2 {
|
|
740
|
+
h2, .h2 {
|
|
734
741
|
font-size: 1.2em
|
|
735
742
|
}
|
|
736
743
|
|
|
737
|
-
h3 {
|
|
744
|
+
h3, .h3 {
|
|
738
745
|
font-size: 1em;
|
|
739
746
|
}
|
|
740
747
|
|
|
@@ -370,7 +370,7 @@ span.blackgraphtx {
|
|
|
370
370
|
div.figure, p.figure {
|
|
371
371
|
text-align: center; }
|
|
372
372
|
|
|
373
|
-
h1 {
|
|
373
|
+
h1, .h1 {
|
|
374
374
|
mso-style-priority: 1;
|
|
375
375
|
mso-style-unhide: no;
|
|
376
376
|
mso-style-qformat: yes;
|
|
@@ -385,8 +385,6 @@ h1 {
|
|
|
385
385
|
line-height: 13.5pt;
|
|
386
386
|
mso-pagination: widow-orphan;
|
|
387
387
|
page-break-after: avoid;
|
|
388
|
-
mso-outline-level: 1;
|
|
389
|
-
mso-list: l1 level1 lfo6;
|
|
390
388
|
mso-hyphenate: none;
|
|
391
389
|
tab-stops: 20.0pt list 21.6pt left 28.0pt;
|
|
392
390
|
font-size: 13.0pt;
|
|
@@ -399,6 +397,10 @@ h1 {
|
|
|
399
397
|
mso-fareast-language: JA;
|
|
400
398
|
mso-bidi-font-weight: normal; }
|
|
401
399
|
|
|
400
|
+
h1 {
|
|
401
|
+
mso-outline-level: 1;
|
|
402
|
+
mso-list: l1 level1 lfo6; }
|
|
403
|
+
|
|
402
404
|
h1.Annex {
|
|
403
405
|
mso-style-priority: 1;
|
|
404
406
|
mso-style-unhide: no;
|
|
@@ -456,7 +458,7 @@ h1.Annex {
|
|
|
456
458
|
mso-fareast-language: JA;
|
|
457
459
|
mso-bidi-font-weight: normal; }
|
|
458
460
|
|
|
459
|
-
h2 {
|
|
461
|
+
h2, .h2 {
|
|
460
462
|
mso-style-priority: 2;
|
|
461
463
|
mso-style-unhide: no;
|
|
462
464
|
mso-style-qformat: yes;
|
|
@@ -472,8 +474,6 @@ h2 {
|
|
|
472
474
|
line-height: 12.5pt;
|
|
473
475
|
mso-pagination: widow-orphan;
|
|
474
476
|
page-break-after: avoid;
|
|
475
|
-
mso-outline-level: 2;
|
|
476
|
-
mso-list: l1 level2 lfo6;
|
|
477
477
|
mso-hyphenate: none;
|
|
478
478
|
tab-stops: 27.0pt 35.0pt;
|
|
479
479
|
font-size: {{normalfontsize}};
|
|
@@ -485,7 +485,11 @@ h2 {
|
|
|
485
485
|
mso-fareast-language: JA;
|
|
486
486
|
mso-bidi-font-weight: normal; }
|
|
487
487
|
|
|
488
|
-
|
|
488
|
+
h2 {
|
|
489
|
+
mso-outline-level: 2;
|
|
490
|
+
mso-list: l1 level2 lfo6; }
|
|
491
|
+
|
|
492
|
+
h3, .h3 {
|
|
489
493
|
mso-style-priority: 3;
|
|
490
494
|
mso-style-unhide: no;
|
|
491
495
|
mso-style-qformat: yes;
|
|
@@ -501,8 +505,6 @@ h3 {
|
|
|
501
505
|
line-height: {{normalfontsize}};
|
|
502
506
|
mso-pagination: widow-orphan;
|
|
503
507
|
page-break-after: avoid;
|
|
504
|
-
mso-outline-level: 3;
|
|
505
|
-
mso-list: l1 level3 lfo6;
|
|
506
508
|
mso-hyphenate: none;
|
|
507
509
|
tab-stops: list 36.0pt left 44.0pt;
|
|
508
510
|
font-size: {{smallerfontsize}};
|
|
@@ -513,7 +515,11 @@ h3 {
|
|
|
513
515
|
mso-fareast-language: JA;
|
|
514
516
|
mso-bidi-font-weight: normal; }
|
|
515
517
|
|
|
516
|
-
|
|
518
|
+
h3 {
|
|
519
|
+
mso-outline-level: 3;
|
|
520
|
+
mso-list: l1 level3 lfo6; }
|
|
521
|
+
|
|
522
|
+
h4, .h4 {
|
|
517
523
|
mso-style-priority: 4;
|
|
518
524
|
mso-style-unhide: no;
|
|
519
525
|
mso-style-qformat: yes;
|
|
@@ -529,8 +535,6 @@ h4 {
|
|
|
529
535
|
line-height: {{normalfontsize}};
|
|
530
536
|
mso-pagination: widow-orphan;
|
|
531
537
|
page-break-after: avoid;
|
|
532
|
-
mso-outline-level: 4;
|
|
533
|
-
mso-list: l1 level4 lfo6;
|
|
534
538
|
mso-hyphenate: none;
|
|
535
539
|
tab-stops: 51.05pt 57.0pt 68.0pt;
|
|
536
540
|
font-size: {{smallerfontsize}};
|
|
@@ -541,7 +545,11 @@ h4 {
|
|
|
541
545
|
mso-fareast-language: JA;
|
|
542
546
|
mso-bidi-font-weight: normal; }
|
|
543
547
|
|
|
544
|
-
|
|
548
|
+
h4 {
|
|
549
|
+
mso-outline-level: 4;
|
|
550
|
+
mso-list: l1 level4 lfo6; }
|
|
551
|
+
|
|
552
|
+
h5, .h5 {
|
|
545
553
|
mso-style-priority: 5;
|
|
546
554
|
mso-style-unhide: no;
|
|
547
555
|
mso-style-qformat: yes;
|
|
@@ -557,8 +565,6 @@ h5 {
|
|
|
557
565
|
line-height: {{normalfontsize}};
|
|
558
566
|
mso-pagination: widow-orphan;
|
|
559
567
|
page-break-after: avoid;
|
|
560
|
-
mso-outline-level: 5;
|
|
561
|
-
mso-list: l1 level5 lfo6;
|
|
562
568
|
mso-hyphenate: none;
|
|
563
569
|
tab-stops: 51.05pt list 54.0pt;
|
|
564
570
|
font-size: {{smallerfontsize}};
|
|
@@ -569,7 +575,11 @@ h5 {
|
|
|
569
575
|
mso-fareast-language: JA;
|
|
570
576
|
mso-bidi-font-weight: normal; }
|
|
571
577
|
|
|
572
|
-
|
|
578
|
+
h5 {
|
|
579
|
+
mso-outline-level: 5;
|
|
580
|
+
mso-list: l1 level5 lfo6; }
|
|
581
|
+
|
|
582
|
+
h6, .h6 {
|
|
573
583
|
mso-style-priority: 6;
|
|
574
584
|
mso-style-unhide: no;
|
|
575
585
|
mso-style-qformat: yes;
|
|
@@ -585,8 +595,6 @@ h6 {
|
|
|
585
595
|
line-height: {{normalfontsize}};
|
|
586
596
|
mso-pagination: widow-orphan;
|
|
587
597
|
page-break-after: avoid;
|
|
588
|
-
mso-outline-level: 6;
|
|
589
|
-
mso-list: l1 level6 lfo6;
|
|
590
598
|
mso-hyphenate: none;
|
|
591
599
|
tab-stops: 51.05pt list 72.0pt;
|
|
592
600
|
font-size: {{smallerfontsize}};
|
|
@@ -597,6 +605,10 @@ h6 {
|
|
|
597
605
|
mso-fareast-language: JA;
|
|
598
606
|
mso-bidi-font-weight: normal; }
|
|
599
607
|
|
|
608
|
+
h6 {
|
|
609
|
+
mso-outline-level: 6;
|
|
610
|
+
mso-list: l1 level6 lfo6; }
|
|
611
|
+
|
|
600
612
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
601
613
|
mso-style-priority: 39;
|
|
602
614
|
mso-style-unhide: no;
|
|
@@ -340,7 +340,7 @@ div.figure, p.figure
|
|
|
340
340
|
|
|
341
341
|
|
|
342
342
|
|
|
343
|
-
h1
|
|
343
|
+
h1, .h1
|
|
344
344
|
{mso-style-priority:1;
|
|
345
345
|
mso-style-unhide:no;
|
|
346
346
|
mso-style-qformat:yes;
|
|
@@ -355,8 +355,6 @@ h1
|
|
|
355
355
|
line-height:13.5pt;
|
|
356
356
|
mso-pagination:widow-orphan;
|
|
357
357
|
page-break-after:avoid;
|
|
358
|
-
mso-outline-level:1;
|
|
359
|
-
mso-list:l1 level1 lfo6;
|
|
360
358
|
mso-hyphenate:none;
|
|
361
359
|
tab-stops:20.0pt list 21.6pt left 28.0pt;
|
|
362
360
|
font-size:13.0pt;
|
|
@@ -368,6 +366,10 @@ h1
|
|
|
368
366
|
mso-ansi-language:EN-GB;
|
|
369
367
|
mso-fareast-language:JA;
|
|
370
368
|
mso-bidi-font-weight:normal;}
|
|
369
|
+
h1 {
|
|
370
|
+
mso-outline-level:1;
|
|
371
|
+
mso-list:l1 level1 lfo6;
|
|
372
|
+
}
|
|
371
373
|
h1.Annex
|
|
372
374
|
{mso-style-priority:1;
|
|
373
375
|
mso-style-unhide:no;
|
|
@@ -423,7 +425,7 @@ h1.Annex
|
|
|
423
425
|
mso-ansi-language:EN-GB;
|
|
424
426
|
mso-fareast-language:JA;
|
|
425
427
|
mso-bidi-font-weight:normal;}
|
|
426
|
-
h2
|
|
428
|
+
h2, .h2
|
|
427
429
|
{mso-style-priority:2;
|
|
428
430
|
mso-style-unhide:no;
|
|
429
431
|
mso-style-qformat:yes;
|
|
@@ -439,8 +441,6 @@ h2
|
|
|
439
441
|
line-height:12.5pt;
|
|
440
442
|
mso-pagination:widow-orphan;
|
|
441
443
|
page-break-after:avoid;
|
|
442
|
-
mso-outline-level:2;
|
|
443
|
-
mso-list:l1 level2 lfo6;
|
|
444
444
|
mso-hyphenate:none;
|
|
445
445
|
tab-stops:27.0pt 35.0pt;
|
|
446
446
|
font-size:$normalfontsize;
|
|
@@ -451,7 +451,11 @@ h2
|
|
|
451
451
|
mso-ansi-language:EN-GB;
|
|
452
452
|
mso-fareast-language:JA;
|
|
453
453
|
mso-bidi-font-weight:normal;}
|
|
454
|
-
|
|
454
|
+
h2 {
|
|
455
|
+
mso-outline-level:2;
|
|
456
|
+
mso-list:l1 level2 lfo6;
|
|
457
|
+
}
|
|
458
|
+
h3, .h3
|
|
455
459
|
{mso-style-priority:3;
|
|
456
460
|
mso-style-unhide:no;
|
|
457
461
|
mso-style-qformat:yes;
|
|
@@ -467,8 +471,6 @@ h3
|
|
|
467
471
|
line-height:$normalfontsize;
|
|
468
472
|
mso-pagination:widow-orphan;
|
|
469
473
|
page-break-after:avoid;
|
|
470
|
-
mso-outline-level:3;
|
|
471
|
-
mso-list:l1 level3 lfo6;
|
|
472
474
|
mso-hyphenate:none;
|
|
473
475
|
tab-stops:list 36.0pt left 44.0pt;
|
|
474
476
|
font-size:$smallerfontsize;
|
|
@@ -478,7 +480,11 @@ h3
|
|
|
478
480
|
mso-ansi-language:EN-GB;
|
|
479
481
|
mso-fareast-language:JA;
|
|
480
482
|
mso-bidi-font-weight:normal;}
|
|
481
|
-
|
|
483
|
+
h3 {
|
|
484
|
+
mso-outline-level:3;
|
|
485
|
+
mso-list:l1 level3 lfo6;
|
|
486
|
+
}
|
|
487
|
+
h4, .h4
|
|
482
488
|
{mso-style-priority:4;
|
|
483
489
|
mso-style-unhide:no;
|
|
484
490
|
mso-style-qformat:yes;
|
|
@@ -494,8 +500,6 @@ h4
|
|
|
494
500
|
line-height:$normalfontsize;
|
|
495
501
|
mso-pagination:widow-orphan;
|
|
496
502
|
page-break-after:avoid;
|
|
497
|
-
mso-outline-level:4;
|
|
498
|
-
mso-list:l1 level4 lfo6;
|
|
499
503
|
mso-hyphenate:none;
|
|
500
504
|
tab-stops:51.05pt 57.0pt 68.0pt;
|
|
501
505
|
font-size:$smallerfontsize;
|
|
@@ -505,7 +509,11 @@ h4
|
|
|
505
509
|
mso-ansi-language:EN-GB;
|
|
506
510
|
mso-fareast-language:JA;
|
|
507
511
|
mso-bidi-font-weight:normal;}
|
|
508
|
-
|
|
512
|
+
h4 {
|
|
513
|
+
mso-outline-level:4;
|
|
514
|
+
mso-list:l1 level4 lfo6;
|
|
515
|
+
}
|
|
516
|
+
h5, .h5
|
|
509
517
|
{mso-style-priority:5;
|
|
510
518
|
mso-style-unhide:no;
|
|
511
519
|
mso-style-qformat:yes;
|
|
@@ -521,8 +529,6 @@ h5
|
|
|
521
529
|
line-height:$normalfontsize;
|
|
522
530
|
mso-pagination:widow-orphan;
|
|
523
531
|
page-break-after:avoid;
|
|
524
|
-
mso-outline-level:5;
|
|
525
|
-
mso-list:l1 level5 lfo6;
|
|
526
532
|
mso-hyphenate:none;
|
|
527
533
|
tab-stops:51.05pt list 54.0pt;
|
|
528
534
|
font-size:$smallerfontsize;
|
|
@@ -532,7 +538,11 @@ h5
|
|
|
532
538
|
mso-ansi-language:EN-GB;
|
|
533
539
|
mso-fareast-language:JA;
|
|
534
540
|
mso-bidi-font-weight:normal;}
|
|
535
|
-
|
|
541
|
+
h5 {
|
|
542
|
+
mso-outline-level:5;
|
|
543
|
+
mso-list:l1 level5 lfo6;
|
|
544
|
+
}
|
|
545
|
+
h6, .h6
|
|
536
546
|
{mso-style-priority:6;
|
|
537
547
|
mso-style-unhide:no;
|
|
538
548
|
mso-style-qformat:yes;
|
|
@@ -548,8 +558,6 @@ h6
|
|
|
548
558
|
line-height:$normalfontsize;
|
|
549
559
|
mso-pagination:widow-orphan;
|
|
550
560
|
page-break-after:avoid;
|
|
551
|
-
mso-outline-level:6;
|
|
552
|
-
mso-list:l1 level6 lfo6;
|
|
553
561
|
mso-hyphenate:none;
|
|
554
562
|
tab-stops:51.05pt list 72.0pt;
|
|
555
563
|
font-size:$smallerfontsize;
|
|
@@ -559,6 +567,10 @@ h6
|
|
|
559
567
|
mso-ansi-language:EN-GB;
|
|
560
568
|
mso-fareast-language:JA;
|
|
561
569
|
mso-bidi-font-weight:normal;}
|
|
570
|
+
h6 {
|
|
571
|
+
mso-outline-level:6;
|
|
572
|
+
mso-list:l1 level6 lfo6;
|
|
573
|
+
}
|
|
562
574
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
563
575
|
{mso-style-priority:39;
|
|
564
576
|
mso-style-unhide:no;
|