metanorma-un 0.7.4 → 0.8.2
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 +4 -32
- data/.gitignore +10 -0
- data/lib/isodoc/un/html/htmlstyle.css +49 -31
- data/lib/isodoc/un/html/htmlstyle.scss +23 -15
- data/lib/isodoc/un/html/wordstyle.css +30 -18
- data/lib/isodoc/un/html/wordstyle.scss +30 -18
- data/lib/isodoc/un/un.plenary-attachment.xsl +1495 -1182
- data/lib/isodoc/un/un.plenary.xsl +1495 -1182
- data/lib/isodoc/un/un.recommendation.xsl +1516 -1162
- data/lib/{asciidoctor → metanorma}/un/basicdoc.rng +0 -0
- data/lib/{asciidoctor → metanorma}/un/biblio.rng +2 -2
- data/lib/{asciidoctor → metanorma}/un/boilerplate.xml +0 -0
- data/lib/{asciidoctor → metanorma}/un/converter.rb +2 -2
- data/lib/{asciidoctor → metanorma}/un/isodoc.rng +104 -3
- data/lib/{asciidoctor → metanorma}/un/reqt.rng +0 -0
- data/lib/{asciidoctor → metanorma}/un/un.rng +6 -1
- data/lib/{asciidoctor → metanorma}/un/validate.rb +1 -1
- data/lib/metanorma/un/version.rb +1 -1
- data/lib/metanorma/un.rb +1 -0
- data/lib/metanorma-un.rb +0 -1
- data/metanorma-unece.gemspec +1 -1
- metadata +12 -13
- data/lib/asciidoctor/un.rb +0 -7
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8abeb01f4594d299582ed20410c2ecb1383ceeb8dde9c9169fba854555cf8842
|
|
4
|
+
data.tar.gz: 466da30ae66c596f026680172f42217bca3a1e6ed0669944ee5e82600838c6f9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 890b27b9dfab4c41db61c1bd1f09040530b42bfc15b923ef54b61c9571ec349361d92a30010bae6ee50d4203fdeadb8f830446b58828d3a4617b3ef71d8522f2
|
|
7
|
+
data.tar.gz: 8df3c9bf1f7d236cc62242d654f72ff92e5da1a27a1956f67bd261260be10d3afd6960a623dc6fcf170b43c0798867f37ab09a3fb6d470d61cc39fb1996a9c32
|
data/.github/workflows/rake.yml
CHANGED
|
@@ -9,35 +9,7 @@ on:
|
|
|
9
9
|
pull_request:
|
|
10
10
|
|
|
11
11
|
jobs:
|
|
12
|
-
|
|
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@v2
|
|
24
|
-
with:
|
|
25
|
-
submodules: true
|
|
26
|
-
|
|
27
|
-
- uses: ruby/setup-ruby@v1
|
|
28
|
-
with:
|
|
29
|
-
ruby-version: ${{ matrix.ruby }}
|
|
30
|
-
bundler-cache: true
|
|
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 }}"}'
|
|
12
|
+
notify:
|
|
13
|
+
uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
|
|
14
|
+
secrets:
|
|
15
|
+
pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
data/.gitignore
CHANGED
|
@@ -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 {
|
|
@@ -255,58 +264,65 @@ p {
|
|
|
255
264
|
/*
|
|
256
265
|
2. Responsive navigation layout
|
|
257
266
|
*/
|
|
258
|
-
#toc {
|
|
267
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
259
268
|
font-family: {{bodyfont}};
|
|
260
269
|
font-weight: 400; }
|
|
261
|
-
#toc ul {
|
|
270
|
+
#toc ul, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
|
|
262
271
|
margin: 0;
|
|
263
272
|
padding: 0;
|
|
264
273
|
list-style: none; }
|
|
265
|
-
#toc ul li a {
|
|
274
|
+
#toc ul li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
|
|
266
275
|
padding: 5px 10px; }
|
|
267
|
-
#toc ul a {
|
|
276
|
+
#toc ul a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
|
|
268
277
|
color: #333;
|
|
269
278
|
text-decoration: none;
|
|
270
279
|
display: block; }
|
|
271
|
-
#toc ul a:hover {
|
|
280
|
+
#toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
|
272
281
|
box-shadow: none;
|
|
273
282
|
color: #333; }
|
|
274
|
-
#toc .h2 {
|
|
283
|
+
#toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
|
|
275
284
|
padding-left: 30px; }
|
|
276
|
-
#toc .h3 {
|
|
285
|
+
#toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
|
|
277
286
|
padding-left: 50px; }
|
|
278
|
-
#toc .toc-active, #toc li:hover {
|
|
287
|
+
#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 {
|
|
279
288
|
background: #1661ad;
|
|
280
289
|
box-shadow: inset -5px 0px 10px -5px #1661ad !important; }
|
|
281
|
-
#toc .toc-active a, #toc li:hover a {
|
|
290
|
+
#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 {
|
|
282
291
|
color: #333; }
|
|
283
292
|
@media print {
|
|
284
|
-
#toc .toc-active, #toc li:hover {
|
|
293
|
+
#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 {
|
|
285
294
|
background: white;
|
|
286
295
|
box-shadow: none !important; }
|
|
287
|
-
#toc .toc-active a {
|
|
296
|
+
#toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
|
288
297
|
color: #333; }
|
|
289
|
-
#toc li:hover a {
|
|
298
|
+
#toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
|
290
299
|
color: black; } }
|
|
291
300
|
@media screen and (max-width: 768px) {
|
|
292
|
-
#toc {
|
|
301
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
293
302
|
padding: 0 1.5em;
|
|
294
303
|
overflow: visible; } }
|
|
295
|
-
#toc .toc-active a {
|
|
304
|
+
#toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
|
|
296
305
|
color: white; }
|
|
297
306
|
#toc .toc-active,
|
|
298
|
-
#toc li:hover
|
|
307
|
+
#toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active,
|
|
308
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
|
|
299
309
|
background: linear-gradient(280deg, #00ADEF, #5b92e5);
|
|
300
310
|
box-shadow: inset -5px 0px 10px -5px #00ADEF !important; }
|
|
301
311
|
#toc .toc-active a,
|
|
302
|
-
#toc li:hover a
|
|
312
|
+
#toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a,
|
|
313
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
|
|
303
314
|
color: white;
|
|
304
315
|
background: none;
|
|
305
316
|
box-shadow: none; }
|
|
306
|
-
#toc ul a:hover {
|
|
317
|
+
#toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
|
|
307
318
|
box-shadow: none;
|
|
308
319
|
color: white; }
|
|
309
320
|
|
|
321
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
322
|
+
margin-top: 0;
|
|
323
|
+
margin-bottom: 0;
|
|
324
|
+
font-size: 100%; }
|
|
325
|
+
|
|
310
326
|
@media screen and (min-width: 768px) {
|
|
311
327
|
nav {
|
|
312
328
|
position: fixed;
|
|
@@ -360,7 +376,7 @@ p {
|
|
|
360
376
|
display: none; }
|
|
361
377
|
h1.toc-contents {
|
|
362
378
|
margin-top: 1em; }
|
|
363
|
-
ul#toc-list {
|
|
379
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
364
380
|
margin: 0;
|
|
365
381
|
padding: 0; } }
|
|
366
382
|
|
|
@@ -558,7 +574,8 @@ h3,
|
|
|
558
574
|
h4,
|
|
559
575
|
h5,
|
|
560
576
|
h6,
|
|
561
|
-
.h2Annex
|
|
577
|
+
.h2Annex,
|
|
578
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
|
562
579
|
font-family: {{headerfont}};
|
|
563
580
|
color: #00ADEF;
|
|
564
581
|
font-weight: 700;
|
|
@@ -568,38 +585,38 @@ h6,
|
|
|
568
585
|
|
|
569
586
|
h1,
|
|
570
587
|
h2,
|
|
571
|
-
h3 {
|
|
588
|
+
h3, .h1, .h2, .h3 {
|
|
572
589
|
margin-top: 18px;
|
|
573
590
|
margin-bottom: 9px; }
|
|
574
591
|
|
|
575
|
-
h1 {
|
|
592
|
+
h1, .h1 {
|
|
576
593
|
font-size: 33px;
|
|
577
594
|
font-weight: 500;
|
|
578
595
|
margin: 0.67em 0;
|
|
579
596
|
letter-spacing: -0.02em;
|
|
580
597
|
color: #4D4D4D; }
|
|
581
598
|
|
|
582
|
-
h2 {
|
|
599
|
+
h2, .h2 {
|
|
583
600
|
font-size: 27px;
|
|
584
601
|
color: #4D4D4D; }
|
|
585
602
|
|
|
586
|
-
h3 {
|
|
603
|
+
h3, .h3 {
|
|
587
604
|
font-size: 24px;
|
|
588
605
|
margin-top: 26px;
|
|
589
606
|
color: #000; }
|
|
590
607
|
|
|
591
|
-
h4 {
|
|
608
|
+
h4, .h4 {
|
|
592
609
|
font-size: 18.2px;
|
|
593
610
|
margin-bottom: 2px;
|
|
594
611
|
color: #4D4D4D;
|
|
595
612
|
letter-spacing: 0.03em; }
|
|
596
613
|
|
|
597
|
-
h5 {
|
|
614
|
+
h5, .h5 {
|
|
598
615
|
font-size: 16.25px;
|
|
599
616
|
color: #000;
|
|
600
617
|
margin-bottom: 2px; }
|
|
601
618
|
|
|
602
|
-
h6 {
|
|
619
|
+
h6, .h6 {
|
|
603
620
|
font-size: 13px;
|
|
604
621
|
color: #4D4D4D;
|
|
605
622
|
letter-spacing: 0.05em; }
|
|
@@ -893,7 +910,7 @@ p {
|
|
|
893
910
|
margin-bottom: 1em;
|
|
894
911
|
margin-top: 1em; }
|
|
895
912
|
|
|
896
|
-
h2 p {
|
|
913
|
+
h2 p, .h2 p {
|
|
897
914
|
display: inline; }
|
|
898
915
|
|
|
899
916
|
/*
|
|
@@ -1057,7 +1074,8 @@ To top button
|
|
|
1057
1074
|
h1,
|
|
1058
1075
|
h2,
|
|
1059
1076
|
h3,
|
|
1060
|
-
h4
|
|
1077
|
+
h4,
|
|
1078
|
+
.h1, .h2, .h3, .h4 {
|
|
1061
1079
|
page-break-after: avoid;
|
|
1062
1080
|
margin-top: 1.2em; }
|
|
1063
1081
|
.note,
|
|
@@ -1089,12 +1107,12 @@ To top button
|
|
|
1089
1107
|
h1.content {
|
|
1090
1108
|
line-height: 2.5em;
|
|
1091
1109
|
margin-top: 2em; }
|
|
1092
|
-
h1 {
|
|
1110
|
+
h1, .h1 {
|
|
1093
1111
|
font-size: 1.5em;
|
|
1094
1112
|
line-height: 1.5; }
|
|
1095
|
-
h2 {
|
|
1113
|
+
h2, .h2 {
|
|
1096
1114
|
font-size: 1.2em; }
|
|
1097
|
-
h3 {
|
|
1115
|
+
h3, .h3 {
|
|
1098
1116
|
font-size: 1em; }
|
|
1099
1117
|
.Note {
|
|
1100
1118
|
background-color: #fff495;
|
|
@@ -74,7 +74,7 @@ p {
|
|
|
74
74
|
2. Responsive navigation layout
|
|
75
75
|
*/
|
|
76
76
|
|
|
77
|
-
#toc {
|
|
77
|
+
#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
78
78
|
@include toc($un-text, $un-toc, $un-text);
|
|
79
79
|
@include sidebarToc();
|
|
80
80
|
|
|
@@ -102,6 +102,12 @@ p {
|
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
+
#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
106
|
+
margin-top: 0;
|
|
107
|
+
margin-bottom: 0;
|
|
108
|
+
font-size: 100%;
|
|
109
|
+
}
|
|
110
|
+
|
|
105
111
|
nav {
|
|
106
112
|
@include sidebarNav(#f2f2f2, 323px, 45px);
|
|
107
113
|
}
|
|
@@ -123,7 +129,7 @@ nav {
|
|
|
123
129
|
margin-top: 1em;
|
|
124
130
|
}
|
|
125
131
|
|
|
126
|
-
ul#toc-list {
|
|
132
|
+
ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
|
|
127
133
|
margin: 0;
|
|
128
134
|
padding: 0;
|
|
129
135
|
}
|
|
@@ -268,7 +274,8 @@ h3,
|
|
|
268
274
|
h4,
|
|
269
275
|
h5,
|
|
270
276
|
h6,
|
|
271
|
-
.h2Annex
|
|
277
|
+
.h2Annex,
|
|
278
|
+
.h1, .h2, .h3, .h4, .h5, .h6 {
|
|
272
279
|
font-family: $headerfont;
|
|
273
280
|
color: $un-blue;
|
|
274
281
|
font-weight: 700;
|
|
@@ -279,12 +286,12 @@ h6,
|
|
|
279
286
|
|
|
280
287
|
h1,
|
|
281
288
|
h2,
|
|
282
|
-
h3 {
|
|
289
|
+
h3, .h1, .h2, .h3 {
|
|
283
290
|
margin-top: 18px;
|
|
284
291
|
margin-bottom: 9px;
|
|
285
292
|
}
|
|
286
293
|
|
|
287
|
-
h1 {
|
|
294
|
+
h1, .h1 {
|
|
288
295
|
font-size: 33px;
|
|
289
296
|
font-weight: 500;
|
|
290
297
|
margin: 0.67em 0;
|
|
@@ -293,31 +300,31 @@ h1 {
|
|
|
293
300
|
}
|
|
294
301
|
|
|
295
302
|
|
|
296
|
-
h2 {
|
|
303
|
+
h2, .h2 {
|
|
297
304
|
font-size: 27px;
|
|
298
305
|
color: $un-label;
|
|
299
306
|
}
|
|
300
307
|
|
|
301
|
-
h3 {
|
|
308
|
+
h3, .h3 {
|
|
302
309
|
font-size: 24px;
|
|
303
310
|
margin-top: 26px;
|
|
304
311
|
color: $un-black;
|
|
305
312
|
}
|
|
306
313
|
|
|
307
|
-
h4 {
|
|
314
|
+
h4, .h4 {
|
|
308
315
|
font-size: 18.2px;
|
|
309
316
|
margin-bottom: 2px;
|
|
310
317
|
color: $un-label;
|
|
311
318
|
letter-spacing: 0.03em;
|
|
312
319
|
}
|
|
313
320
|
|
|
314
|
-
h5 {
|
|
321
|
+
h5, .h5 {
|
|
315
322
|
font-size: 16.25px;
|
|
316
323
|
color: $un-black;
|
|
317
324
|
margin-bottom: 2px;
|
|
318
325
|
}
|
|
319
326
|
|
|
320
|
-
h6 {
|
|
327
|
+
h6, .h6 {
|
|
321
328
|
font-size: 13px;
|
|
322
329
|
color: $un-label;
|
|
323
330
|
letter-spacing: 0.05em;
|
|
@@ -607,7 +614,7 @@ p {
|
|
|
607
614
|
margin-top: 1em;
|
|
608
615
|
}
|
|
609
616
|
|
|
610
|
-
h2 p {
|
|
617
|
+
h2 p, .h2 p {
|
|
611
618
|
display: inline;
|
|
612
619
|
}
|
|
613
620
|
|
|
@@ -791,7 +798,8 @@ To top button
|
|
|
791
798
|
h1,
|
|
792
799
|
h2,
|
|
793
800
|
h3,
|
|
794
|
-
h4
|
|
801
|
+
h4,
|
|
802
|
+
.h1, .h2, .h3, .h4 {
|
|
795
803
|
page-break-after: avoid;
|
|
796
804
|
margin-top: 1.2em;
|
|
797
805
|
}
|
|
@@ -847,16 +855,16 @@ To top button
|
|
|
847
855
|
margin-top: 2em;
|
|
848
856
|
}
|
|
849
857
|
|
|
850
|
-
h1 {
|
|
858
|
+
h1, .h1 {
|
|
851
859
|
font-size: 1.5em;
|
|
852
860
|
line-height: 1.5;
|
|
853
861
|
}
|
|
854
862
|
|
|
855
|
-
h2 {
|
|
863
|
+
h2, .h2 {
|
|
856
864
|
font-size: 1.2em;
|
|
857
865
|
}
|
|
858
866
|
|
|
859
|
-
h3 {
|
|
867
|
+
h3, .h3 {
|
|
860
868
|
font-size: 1em;
|
|
861
869
|
}
|
|
862
870
|
|
|
@@ -366,7 +366,7 @@ span.blackgraphtx {
|
|
|
366
366
|
div.figure, p.figure {
|
|
367
367
|
text-align: center; }
|
|
368
368
|
|
|
369
|
-
h1 {
|
|
369
|
+
h1, .h1 {
|
|
370
370
|
mso-style-priority: 1;
|
|
371
371
|
mso-style-unhide: no;
|
|
372
372
|
mso-style-qformat: yes;
|
|
@@ -381,8 +381,6 @@ h1 {
|
|
|
381
381
|
line-height: 13.5pt;
|
|
382
382
|
mso-pagination: widow-orphan;
|
|
383
383
|
page-break-after: avoid;
|
|
384
|
-
mso-outline-level: 1;
|
|
385
|
-
mso-list: l1 level1 lfo6;
|
|
386
384
|
mso-hyphenate: none;
|
|
387
385
|
tab-stops: 20.0pt list 21.6pt left 28.0pt;
|
|
388
386
|
font-size: 13.0pt;
|
|
@@ -394,6 +392,10 @@ h1 {
|
|
|
394
392
|
mso-fareast-language: JA;
|
|
395
393
|
mso-bidi-font-weight: normal; }
|
|
396
394
|
|
|
395
|
+
h1 {
|
|
396
|
+
mso-outline-level: 1;
|
|
397
|
+
mso-list: l1 level1 lfo6; }
|
|
398
|
+
|
|
397
399
|
h1.Annex {
|
|
398
400
|
mso-style-priority: 1;
|
|
399
401
|
mso-style-unhide: no;
|
|
@@ -450,7 +452,7 @@ h1.Annex {
|
|
|
450
452
|
mso-fareast-language: JA;
|
|
451
453
|
mso-bidi-font-weight: normal; }
|
|
452
454
|
|
|
453
|
-
h2 {
|
|
455
|
+
h2, .h2 {
|
|
454
456
|
mso-style-priority: 2;
|
|
455
457
|
mso-style-unhide: no;
|
|
456
458
|
mso-style-qformat: yes;
|
|
@@ -465,8 +467,6 @@ h2 {
|
|
|
465
467
|
line-height: 12.5pt;
|
|
466
468
|
mso-pagination: widow-orphan;
|
|
467
469
|
page-break-after: avoid;
|
|
468
|
-
mso-outline-level: 2;
|
|
469
|
-
mso-list: l1 level2 lfo6;
|
|
470
470
|
mso-hyphenate: none;
|
|
471
471
|
tab-stops: 27.0pt 35.0pt;
|
|
472
472
|
font-size: 12.0pt;
|
|
@@ -477,7 +477,11 @@ h2 {
|
|
|
477
477
|
mso-fareast-language: JA;
|
|
478
478
|
mso-bidi-font-weight: normal; }
|
|
479
479
|
|
|
480
|
-
|
|
480
|
+
h2 {
|
|
481
|
+
mso-outline-level: 2;
|
|
482
|
+
mso-list: l1 level2 lfo6; }
|
|
483
|
+
|
|
484
|
+
h3, .h3 {
|
|
481
485
|
mso-style-priority: 3;
|
|
482
486
|
mso-style-unhide: no;
|
|
483
487
|
mso-style-qformat: yes;
|
|
@@ -493,8 +497,6 @@ h3 {
|
|
|
493
497
|
line-height: 12.0pt;
|
|
494
498
|
mso-pagination: widow-orphan;
|
|
495
499
|
page-break-after: avoid;
|
|
496
|
-
mso-outline-level: 3;
|
|
497
|
-
mso-list: l1 level3 lfo6;
|
|
498
500
|
mso-hyphenate: none;
|
|
499
501
|
tab-stops: list 27.0pt left 44.0pt;
|
|
500
502
|
font-size: 11.0pt;
|
|
@@ -504,7 +506,11 @@ h3 {
|
|
|
504
506
|
mso-fareast-language: JA;
|
|
505
507
|
mso-bidi-font-weight: normal; }
|
|
506
508
|
|
|
507
|
-
|
|
509
|
+
h3 {
|
|
510
|
+
mso-outline-level: 3;
|
|
511
|
+
mso-list: l1 level3 lfo6; }
|
|
512
|
+
|
|
513
|
+
h4, .h4 {
|
|
508
514
|
mso-style-priority: 4;
|
|
509
515
|
mso-style-unhide: no;
|
|
510
516
|
mso-style-qformat: yes;
|
|
@@ -520,8 +526,6 @@ h4 {
|
|
|
520
526
|
line-height: 12.0pt;
|
|
521
527
|
mso-pagination: widow-orphan;
|
|
522
528
|
page-break-after: avoid;
|
|
523
|
-
mso-outline-level: 4;
|
|
524
|
-
mso-list: l1 level4 lfo6;
|
|
525
529
|
mso-hyphenate: none;
|
|
526
530
|
tab-stops: 51.05pt 57.0pt 68.0pt;
|
|
527
531
|
font-size: 11.0pt;
|
|
@@ -531,7 +535,11 @@ h4 {
|
|
|
531
535
|
mso-fareast-language: JA;
|
|
532
536
|
mso-bidi-font-weight: normal; }
|
|
533
537
|
|
|
534
|
-
|
|
538
|
+
h4 {
|
|
539
|
+
mso-outline-level: 4;
|
|
540
|
+
mso-list: l1 level4 lfo6; }
|
|
541
|
+
|
|
542
|
+
h5, .h5 {
|
|
535
543
|
mso-style-priority: 5;
|
|
536
544
|
mso-style-unhide: no;
|
|
537
545
|
mso-style-qformat: yes;
|
|
@@ -547,8 +555,6 @@ h5 {
|
|
|
547
555
|
line-height: 12.0pt;
|
|
548
556
|
mso-pagination: widow-orphan;
|
|
549
557
|
page-break-after: avoid;
|
|
550
|
-
mso-outline-level: 5;
|
|
551
|
-
mso-list: l1 level5 lfo6;
|
|
552
558
|
mso-hyphenate: none;
|
|
553
559
|
tab-stops: 51.05pt list 54.0pt;
|
|
554
560
|
font-size: 11.0pt;
|
|
@@ -558,7 +564,11 @@ h5 {
|
|
|
558
564
|
mso-fareast-language: JA;
|
|
559
565
|
mso-bidi-font-weight: normal; }
|
|
560
566
|
|
|
561
|
-
|
|
567
|
+
h5 {
|
|
568
|
+
mso-outline-level: 5;
|
|
569
|
+
mso-list: l1 level5 lfo6; }
|
|
570
|
+
|
|
571
|
+
h6, .h6 {
|
|
562
572
|
mso-style-priority: 6;
|
|
563
573
|
mso-style-unhide: no;
|
|
564
574
|
mso-style-qformat: yes;
|
|
@@ -574,8 +584,6 @@ h6 {
|
|
|
574
584
|
line-height: 12.0pt;
|
|
575
585
|
mso-pagination: widow-orphan;
|
|
576
586
|
page-break-after: avoid;
|
|
577
|
-
mso-outline-level: 6;
|
|
578
|
-
mso-list: l1 level6 lfo6;
|
|
579
587
|
mso-hyphenate: none;
|
|
580
588
|
tab-stops: 51.05pt list 72.0pt;
|
|
581
589
|
font-size: 11.0pt;
|
|
@@ -585,6 +593,10 @@ h6 {
|
|
|
585
593
|
mso-fareast-language: JA;
|
|
586
594
|
mso-bidi-font-weight: normal; }
|
|
587
595
|
|
|
596
|
+
h6 {
|
|
597
|
+
mso-outline-level: 6;
|
|
598
|
+
mso-list: l1 level6 lfo6; }
|
|
599
|
+
|
|
588
600
|
p.MsoToc1, li.MsoToc1, div.MsoToc1 {
|
|
589
601
|
mso-style-priority: 39;
|
|
590
602
|
mso-style-unhide: no;
|
|
@@ -335,7 +335,7 @@ div.figure, p.figure
|
|
|
335
335
|
{text-align: center;}
|
|
336
336
|
|
|
337
337
|
|
|
338
|
-
h1
|
|
338
|
+
h1, .h1
|
|
339
339
|
{mso-style-priority:1;
|
|
340
340
|
mso-style-unhide:no;
|
|
341
341
|
mso-style-qformat:yes;
|
|
@@ -350,8 +350,6 @@ h1
|
|
|
350
350
|
line-height:13.5pt;
|
|
351
351
|
mso-pagination:widow-orphan;
|
|
352
352
|
page-break-after:avoid;
|
|
353
|
-
mso-outline-level:1;
|
|
354
|
-
mso-list:l1 level1 lfo6;
|
|
355
353
|
mso-hyphenate:none;
|
|
356
354
|
tab-stops:20.0pt list 21.6pt left 28.0pt;
|
|
357
355
|
font-size:13.0pt;
|
|
@@ -362,6 +360,10 @@ h1
|
|
|
362
360
|
mso-ansi-language:EN-GB;
|
|
363
361
|
mso-fareast-language:JA;
|
|
364
362
|
mso-bidi-font-weight:normal;}
|
|
363
|
+
h1 {
|
|
364
|
+
mso-outline-level:1;
|
|
365
|
+
mso-list:l1 level1 lfo6;
|
|
366
|
+
}
|
|
365
367
|
h1.Annex
|
|
366
368
|
{mso-style-priority:1;
|
|
367
369
|
mso-style-unhide:no;
|
|
@@ -416,7 +418,7 @@ h1.Annex
|
|
|
416
418
|
mso-ansi-language:EN-GB;
|
|
417
419
|
mso-fareast-language:JA;
|
|
418
420
|
mso-bidi-font-weight:normal;}
|
|
419
|
-
h2
|
|
421
|
+
h2, .h2
|
|
420
422
|
{mso-style-priority:2;
|
|
421
423
|
mso-style-unhide:no;
|
|
422
424
|
mso-style-qformat:yes;
|
|
@@ -431,8 +433,6 @@ h2
|
|
|
431
433
|
line-height:12.5pt;
|
|
432
434
|
mso-pagination:widow-orphan;
|
|
433
435
|
page-break-after:avoid;
|
|
434
|
-
mso-outline-level:2;
|
|
435
|
-
mso-list:l1 level2 lfo6;
|
|
436
436
|
mso-hyphenate:none;
|
|
437
437
|
tab-stops:27.0pt 35.0pt;
|
|
438
438
|
font-size:12.0pt;
|
|
@@ -442,7 +442,11 @@ h2
|
|
|
442
442
|
mso-ansi-language:EN-GB;
|
|
443
443
|
mso-fareast-language:JA;
|
|
444
444
|
mso-bidi-font-weight:normal;}
|
|
445
|
-
|
|
445
|
+
h2 {
|
|
446
|
+
mso-outline-level:2;
|
|
447
|
+
mso-list:l1 level2 lfo6;
|
|
448
|
+
}
|
|
449
|
+
h3, .h3
|
|
446
450
|
{mso-style-priority:3;
|
|
447
451
|
mso-style-unhide:no;
|
|
448
452
|
mso-style-qformat:yes;
|
|
@@ -458,8 +462,6 @@ h3
|
|
|
458
462
|
line-height:12.0pt;
|
|
459
463
|
mso-pagination:widow-orphan;
|
|
460
464
|
page-break-after:avoid;
|
|
461
|
-
mso-outline-level:3;
|
|
462
|
-
mso-list:l1 level3 lfo6;
|
|
463
465
|
mso-hyphenate:none;
|
|
464
466
|
tab-stops:list 27.0pt left 44.0pt;
|
|
465
467
|
font-size:11.0pt;
|
|
@@ -468,7 +470,11 @@ h3
|
|
|
468
470
|
mso-ansi-language:EN-GB;
|
|
469
471
|
mso-fareast-language:JA;
|
|
470
472
|
mso-bidi-font-weight:normal;}
|
|
471
|
-
|
|
473
|
+
h3 {
|
|
474
|
+
mso-outline-level:3;
|
|
475
|
+
mso-list:l1 level3 lfo6;
|
|
476
|
+
}
|
|
477
|
+
h4, .h4
|
|
472
478
|
{mso-style-priority:4;
|
|
473
479
|
mso-style-unhide:no;
|
|
474
480
|
mso-style-qformat:yes;
|
|
@@ -484,8 +490,6 @@ h4
|
|
|
484
490
|
line-height:12.0pt;
|
|
485
491
|
mso-pagination:widow-orphan;
|
|
486
492
|
page-break-after:avoid;
|
|
487
|
-
mso-outline-level:4;
|
|
488
|
-
mso-list:l1 level4 lfo6;
|
|
489
493
|
mso-hyphenate:none;
|
|
490
494
|
tab-stops:51.05pt 57.0pt 68.0pt;
|
|
491
495
|
font-size:11.0pt;
|
|
@@ -494,7 +498,11 @@ h4
|
|
|
494
498
|
mso-ansi-language:EN-GB;
|
|
495
499
|
mso-fareast-language:JA;
|
|
496
500
|
mso-bidi-font-weight:normal;}
|
|
497
|
-
|
|
501
|
+
h4 {
|
|
502
|
+
mso-outline-level:4;
|
|
503
|
+
mso-list:l1 level4 lfo6;
|
|
504
|
+
}
|
|
505
|
+
h5, .h5
|
|
498
506
|
{mso-style-priority:5;
|
|
499
507
|
mso-style-unhide:no;
|
|
500
508
|
mso-style-qformat:yes;
|
|
@@ -510,8 +518,6 @@ h5
|
|
|
510
518
|
line-height:12.0pt;
|
|
511
519
|
mso-pagination:widow-orphan;
|
|
512
520
|
page-break-after:avoid;
|
|
513
|
-
mso-outline-level:5;
|
|
514
|
-
mso-list:l1 level5 lfo6;
|
|
515
521
|
mso-hyphenate:none;
|
|
516
522
|
tab-stops:51.05pt list 54.0pt;
|
|
517
523
|
font-size:11.0pt;
|
|
@@ -520,7 +526,11 @@ h5
|
|
|
520
526
|
mso-ansi-language:EN-GB;
|
|
521
527
|
mso-fareast-language:JA;
|
|
522
528
|
mso-bidi-font-weight:normal;}
|
|
523
|
-
|
|
529
|
+
h5 {
|
|
530
|
+
mso-outline-level:5;
|
|
531
|
+
mso-list:l1 level5 lfo6;
|
|
532
|
+
}
|
|
533
|
+
h6, .h6
|
|
524
534
|
{mso-style-priority:6;
|
|
525
535
|
mso-style-unhide:no;
|
|
526
536
|
mso-style-qformat:yes;
|
|
@@ -536,8 +546,6 @@ h6
|
|
|
536
546
|
line-height:12.0pt;
|
|
537
547
|
mso-pagination:widow-orphan;
|
|
538
548
|
page-break-after:avoid;
|
|
539
|
-
mso-outline-level:6;
|
|
540
|
-
mso-list:l1 level6 lfo6;
|
|
541
549
|
mso-hyphenate:none;
|
|
542
550
|
tab-stops:51.05pt list 72.0pt;
|
|
543
551
|
font-size:11.0pt;
|
|
@@ -546,6 +554,10 @@ h6
|
|
|
546
554
|
mso-ansi-language:EN-GB;
|
|
547
555
|
mso-fareast-language:JA;
|
|
548
556
|
mso-bidi-font-weight:normal;}
|
|
557
|
+
h6 {
|
|
558
|
+
mso-outline-level:6;
|
|
559
|
+
mso-list:l1 level6 lfo6;
|
|
560
|
+
}
|
|
549
561
|
p.MsoToc1, li.MsoToc1, div.MsoToc1
|
|
550
562
|
{mso-style-priority:39;
|
|
551
563
|
mso-style-unhide:no;
|