metanorma-itu 1.4.2 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (40) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -32
  3. data/.gitignore +3 -0
  4. data/bin/console +1 -1
  5. data/lib/isodoc/itu/cleanup.rb +1 -1
  6. data/lib/isodoc/itu/html/_coverpage.css +9 -0
  7. data/lib/isodoc/itu/html/htmlstyle.css +31 -13
  8. data/lib/isodoc/itu/html/htmlstyle.scss +7 -7
  9. data/lib/isodoc/itu/html/itu.css +0 -1
  10. data/lib/isodoc/itu/html/itu.scss +0 -1
  11. data/lib/isodoc/itu/html/scripts.html +0 -1
  12. data/lib/isodoc/itu/html/wordstyle.css +30 -18
  13. data/lib/isodoc/itu/html/wordstyle.scss +30 -18
  14. data/lib/isodoc/itu/itu.implementers-guide.xsl +504 -262
  15. data/lib/isodoc/itu/itu.in-force.xsl +504 -262
  16. data/lib/isodoc/itu/itu.recommendation-annex.xsl +504 -262
  17. data/lib/isodoc/itu/itu.recommendation-supplement.xsl +504 -262
  18. data/lib/isodoc/itu/itu.recommendation.xsl +504 -262
  19. data/lib/isodoc/itu/itu.resolution.xsl +504 -262
  20. data/lib/isodoc/itu/itu.service-publication.xsl +504 -262
  21. data/lib/isodoc/itu/itu.technical-paper.xsl +504 -262
  22. data/lib/isodoc/itu/itu.technical-report.xsl +504 -262
  23. data/lib/isodoc/itu/ref.rb +2 -2
  24. data/lib/{asciidoctor → metanorma}/itu/basicdoc.rng +0 -0
  25. data/lib/{asciidoctor → metanorma}/itu/biblio.rng +0 -0
  26. data/lib/{asciidoctor → metanorma}/itu/boilerplate.xml +0 -0
  27. data/lib/{asciidoctor → metanorma}/itu/cleanup.rb +1 -1
  28. data/lib/{asciidoctor → metanorma}/itu/converter.rb +6 -9
  29. data/lib/{asciidoctor → metanorma}/itu/front.rb +2 -2
  30. data/lib/{asciidoctor → metanorma}/itu/front_id.rb +1 -1
  31. data/lib/{asciidoctor → metanorma}/itu/isodoc.rng +90 -18
  32. data/lib/{asciidoctor → metanorma}/itu/itu.rng +1 -0
  33. data/lib/{asciidoctor → metanorma}/itu/reqt.rng +0 -0
  34. data/lib/{asciidoctor → metanorma}/itu/validate.rb +2 -2
  35. data/lib/metanorma/itu/version.rb +1 -1
  36. data/lib/metanorma/itu.rb +1 -0
  37. data/lib/metanorma-itu.rb +0 -1
  38. data/metanorma-itu.gemspec +2 -2
  39. metadata +21 -22
  40. data/lib/asciidoctor/itu.rb +0 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 884443bd7f066d1f36f6619d27f1c18ccea67e94f7630c1683c316d1f6147a34
4
- data.tar.gz: 8e6338fa60555339dcf8d1201d899ce9d12dfba028f928e3d9cf3f981560bb80
3
+ metadata.gz: 3fdddaec3384534927a88d4a07598884be02c732c4c22ebb4f48a25d1ba25e26
4
+ data.tar.gz: e2f5b1459929f5e8a1db46fa2a38ab0bfee5c582a7c9fd5c482fb28bb7de9f56
5
5
  SHA512:
6
- metadata.gz: '0582f0b0770409d595b19e0976f2438b6fff7084b02220d35ac0e29936ba2c2fe98682810b21b502c029a5a6defdcb6e0d4a3f00142174c07ec44df5e2bd5db6'
7
- data.tar.gz: f3e40a05f45bcf0f1a87a920210188c1700950aa676a78c7f08c31fa1c0cce04282a2ed47a9f64506528220893bf9d39c484e2f43a3f3a263b63cef4619d0085
6
+ metadata.gz: 5e8eb91dcc35be210a9f55eaa7e256d1a5c31785341e3749667eca9a0c6a97e1c2f2c7a283711520f476377ad2db75d791acf4f43da567833f65c8cb53c74d32
7
+ data.tar.gz: 4471f53be6a4fd4167e70b6670a68b9b67cef8e3421075e049bd871acc443b4ade5cb3766dc0904c5980caa5f157fc3a258b095fd3e22f910b945fdefc89f2b3
data/.github/workflows/rake.yml CHANGED
@@ -9,35 +9,7 @@ on:
9
9
  pull_request:
10
10
 
11
11
  jobs:
12
- rake:
13
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
14
- runs-on: ${{ matrix.os }}
15
- continue-on-error: ${{ matrix.experimental }}
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
@@ -4,3 +4,6 @@
4
4
  coverage/
5
5
 
6
6
  .rubocop-https--*
7
+
8
+ /Gemfile.devel
9
+ /Gemfile.lock
data/bin/console CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  require "bundler/setup"
4
- require "asciidoctor/csand"
4
+ require "metanorma/itu"
5
5
 
6
6
  # You can add fixtures and/or initialization code here to make experimenting
7
7
  # with your gem easier. You can also use a different console, if you like.
data/lib/isodoc/itu/cleanup.rb CHANGED
@@ -33,7 +33,7 @@ module IsoDoc
33
33
 
34
34
  def term_cleanup2(docxml)
35
35
  docxml.xpath("//p[@class = 'TermNum']").each do |d|
36
- d1 = d.next_element and d1.name == "p" or next
36
+ (d1 = d.next_element and d1.name == "p") or next
37
37
  d1.children.each { |e| e.parent = d }
38
38
  d1.remove
39
39
  end
data/lib/isodoc/itu/html/_coverpage.css CHANGED
@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
68
68
  font-family: {{monospacefont}} !important;
69
69
  font-variant-ligatures: none; }
70
70
 
71
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
72
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
73
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
74
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
75
+ font-size: {{monospacefontsize}}; }
76
+
71
77
  article, aside, details, figcaption, figure,
72
78
  footer, header, hgroup, menu, nav, section {
73
79
  display: block; }
@@ -79,6 +85,9 @@ table {
79
85
  h1, h2, h3, h4, h5, h6 {
80
86
  font-family: {{headerfont}}; }
81
87
 
88
+ .h1, .h2, .h3, .h4, .h5, .h6 {
89
+ font-family: {{headerfont}}; }
90
+
82
91
  blockquote, q {
83
92
  quotes: none; }
84
93
  blockquote:before, blockquote:after, q:before, q:after {
data/lib/isodoc/itu/html/htmlstyle.css CHANGED
@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
68
68
  font-family: {{monospacefont}} !important;
69
69
  font-variant-ligatures: none; }
70
70
 
71
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
72
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
73
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
74
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
75
+ font-size: {{monospacefontsize}}; }
76
+
71
77
  article, aside, details, figcaption, figure,
72
78
  footer, header, hgroup, menu, nav, section {
73
79
  display: block; }
@@ -79,6 +85,9 @@ table {
79
85
  h1, h2, h3, h4, h5, h6 {
80
86
  font-family: {{headerfont}}; }
81
87
 
88
+ .h1, .h2, .h3, .h4, .h5, .h6 {
89
+ font-family: {{headerfont}}; }
90
+
82
91
  blockquote, q {
83
92
  quotes: none; }
84
93
  blockquote:before, blockquote:after, q:before, q:after {
@@ -305,6 +314,12 @@ code *, pre *, tt *, kbd *, samp * {
305
314
  font-family: {{monospacefont}} !important;
306
315
  font-variant-ligatures: none; }
307
316
 
317
+ p code, dt code, li code, label code, legend code, caption code, th code, td code,
318
+ p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
319
+ p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
320
+ p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
321
+ font-size: {{monospacefontsize}}; }
322
+
308
323
  article, aside, details, figcaption, figure,
309
324
  footer, header, hgroup, menu, nav, section {
310
325
  display: block; }
@@ -316,6 +331,9 @@ table {
316
331
  h1, h2, h3, h4, h5, h6 {
317
332
  font-family: {{headerfont}}; }
318
333
 
334
+ .h1, .h2, .h3, .h4, .h5, .h6 {
335
+ font-family: {{headerfont}}; }
336
+
319
337
  blockquote, q {
320
338
  quotes: none; }
321
339
  blockquote:before, blockquote:after, q:before, q:after {
@@ -907,27 +925,27 @@ svg {
907
925
  font-style: italic; }
908
926
 
909
927
  /* Headings */
910
- h1, h2, h3, h4, h5, h6, .h1Annex {
928
+ h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
911
929
  font-weight: 400;
912
930
  margin-top: 1.6em;
913
931
  margin-bottom: 0.3em; }
914
932
 
915
933
  @media print {
916
- h1, h2, h3, h4, .h1Annex {
934
+ h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
917
935
  page-break-after: avoid;
918
936
  margin-top: 1.2em; } }
919
937
 
920
- h1, .h1Annex {
938
+ h1, .h1Annex, p.h1 {
921
939
  font-size: 1.4em;
922
940
  text-transform: uppercase;
923
941
  margin-top: 2em; }
924
- h1#content, #content.h1Annex {
942
+ h1#content, #content.h1Annex, p#content.h1 {
925
943
  margin-top: 2em; }
926
944
  @media print {
927
- h1, .h1Annex {
945
+ h1, .h1Annex, p.h1 {
928
946
  font-size: 1.5em;
929
947
  line-height: 1.5; }
930
- h1.content, .h1Annex.content {
948
+ h1.content, .h1Annex.content, p.h1.content {
931
949
  margin-top: 2em;
932
950
  line-height: 2.5em; } }
933
951
  p.supertitle {
@@ -941,25 +959,25 @@ p.supertitle {
941
959
  p.supertitle.content {
942
960
  margin-top: 2em;
943
961
  line-height: 2.5em; } }
944
- h2 {
962
+ h2, .h2 {
945
963
  margin-top: 1.7em;
946
964
  font-size: 1.5em; }
947
- h2 p {
965
+ h2 p, .h2 p {
948
966
  display: inline; }
949
967
  @media print {
950
- h2 {
968
+ h2, .h2 {
951
969
  font-size: 1.2em; } }
952
- h3 {
970
+ h3, .h3 {
953
971
  margin-top: 1.5em;
954
972
  font-size: 1.4em; }
955
973
  @media print {
956
- h3 {
974
+ h3, .h3 {
957
975
  font-size: 1em; } }
958
- h4 {
976
+ h4, .h4 {
959
977
  font-size: 1.2em; }
960
978
 
961
979
  /* Terms */
962
- .TermNum, .Terms, .AltTerms {
980
+ .TermNum {
963
981
  font-weight: 400; }
964
982
 
965
983
  h2.TermNum {
data/lib/isodoc/itu/html/htmlstyle.scss CHANGED
@@ -215,20 +215,20 @@ svg {
215
215
 
216
216
  /* Headings */
217
217
 
218
- h1, h2, h3, h4, h5, h6, .h1Annex {
218
+ h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
219
219
  font-weight: 400;
220
220
  margin-top: 1.6em;
221
221
  margin-bottom: 0.3em;
222
222
  }
223
223
 
224
- h1, h2, h3, h4, .h1Annex {
224
+ h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
225
225
  @media print {
226
226
  page-break-after: avoid;
227
227
  margin-top: 1.2em;
228
228
  }
229
229
  }
230
230
 
231
- h1, .h1Annex {
231
+ h1, .h1Annex, p.h1 {
232
232
  font-size: 1.4em;
233
233
  text-transform: uppercase;
234
234
  margin-top: 2em;
@@ -265,7 +265,7 @@ p.supertitle {
265
265
 
266
266
  }
267
267
 
268
- h2 {
268
+ h2, .h2 {
269
269
  margin-top: 1.7em;
270
270
  font-size: 1.5em;
271
271
 
@@ -278,7 +278,7 @@ h2 {
278
278
  }
279
279
  }
280
280
 
281
- h3 {
281
+ h3, .h3 {
282
282
  margin-top: 1.5em;
283
283
  font-size: 1.4em;
284
284
 
@@ -287,14 +287,14 @@ h3 {
287
287
  }
288
288
  }
289
289
 
290
- h4 {
290
+ h4, .h4 {
291
291
  font-size: 1.2em;
292
292
  }
293
293
 
294
294
 
295
295
  /* Terms */
296
296
 
297
- .TermNum, .Terms, .AltTerms {
297
+ .TermNum {
298
298
  font-weight: 400;
299
299
  }
300
300
 
data/lib/isodoc/itu/html/itu.css CHANGED
@@ -445,7 +445,6 @@ p.Terms, li.Terms, div.Terms {
445
445
  mso-fareast-font-family: {{headerfont}};
446
446
  mso-bidi-font-family: {{headerfont}};
447
447
  mso-ansi-language: EN-GB;
448
- font-weight: bold;
449
448
  mso-bidi-font-weight: normal; }
450
449
 
451
450
  p.AltTerms, li.AltTerms, div.AltTerms {
data/lib/isodoc/itu/html/itu.scss CHANGED
@@ -427,7 +427,6 @@ p.Terms, li.Terms, div.Terms
427
427
  mso-fareast-font-family:$headerfont;
428
428
  mso-bidi-font-family:$headerfont;
429
429
  mso-ansi-language:EN-GB;
430
- font-weight:bold;
431
430
  mso-bidi-font-weight:normal;}
432
431
  p.AltTerms, li.AltTerms, div.AltTerms
433
432
  {mso-style-name:"AltTerm\(s\)";
data/lib/isodoc/itu/html/scripts.html CHANGED
@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
17
17
  else {
18
18
  $('nav').show();
19
19
  $('nav').animate({ 'left': '0px' }, 'slow');
20
- $('.container').animate({ 'padding-left': '360px' }, 'slow');
21
20
  }
22
21
  });
23
22
  </script>
data/lib/isodoc/itu/html/wordstyle.css CHANGED
@@ -462,7 +462,7 @@ div.pseudocode, p.pseudocode, li.pseudocode {
462
462
  text-align: left;
463
463
  font-size: 10pt; }
464
464
 
465
- h1 {
465
+ h1, .h1 {
466
466
  mso-style-priority: 1;
467
467
  mso-style-unhide: no;
468
468
  mso-style-qformat: yes;
@@ -477,14 +477,12 @@ h1 {
477
477
  text-indent: -39.7pt;
478
478
  mso-pagination: widow-orphan lines-together;
479
479
  page-break-after: avoid;
480
- mso-outline-level: 1;
481
480
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
482
481
  mso-layout-grid-align: none;
483
482
  punctuation-wrap: simple;
484
483
  text-autospace: none;
485
484
  font-size: {{normalfontsize}};
486
485
  mso-bidi-font-size: 10.0pt;
487
- mso-list: l1 level1 lfo6;
488
486
  mso-hyphenate: none;
489
487
  font-family: {{headerfont}};
490
488
  mso-fareast-font-family: {{headerfont}};
@@ -498,6 +496,10 @@ h1 {
498
496
  mso-fareast-language: JA;
499
497
  mso-bidi-font-weight: normal; }
500
498
 
499
+ h1 {
500
+ mso-outline-level: 1;
501
+ mso-list: l1 level1 lfo6; }
502
+
501
503
  p.supertitle {
502
504
  mso-style-priority: 1;
503
505
  mso-style-unhide: no;
@@ -648,7 +650,7 @@ h1.Annex {
648
650
  mso-fareast-language: JA;
649
651
  mso-bidi-font-weight: normal; }
650
652
 
651
- h2 {
653
+ h2, .h2 {
652
654
  mso-style-priority: 2;
653
655
  mso-style-unhide: no;
654
656
  mso-style-qformat: yes;
@@ -664,8 +666,6 @@ h2 {
664
666
  text-indent: -39.7pt;
665
667
  mso-pagination: widow-orphan lines-together;
666
668
  page-break-after: avoid;
667
- mso-outline-level: 2;
668
- mso-list: l1 level2 lfo6;
669
669
  mso-hyphenate: none;
670
670
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
671
671
  punctuation-wrap: simple;
@@ -680,7 +680,11 @@ h2 {
680
680
  mso-fareast-language: JA;
681
681
  mso-bidi-font-weight: normal; }
682
682
 
683
- h3 {
683
+ h2 {
684
+ mso-outline-level: 2;
685
+ mso-list: l1 level2 lfo6; }
686
+
687
+ h3, .h3 {
684
688
  mso-style-priority: 3;
685
689
  mso-style-unhide: no;
686
690
  mso-style-qformat: yes;
@@ -696,8 +700,6 @@ h3 {
696
700
  text-indent: -39.7pt;
697
701
  mso-pagination: widow-orphan lines-together;
698
702
  page-break-after: avoid;
699
- mso-outline-level: 3;
700
- mso-list: l1 level3 lfo6;
701
703
  mso-hyphenate: none;
702
704
  tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
703
705
  font-size: {{normalfontsize}};
@@ -710,7 +712,11 @@ h3 {
710
712
  mso-fareast-language: JA;
711
713
  mso-bidi-font-weight: normal; }
712
714
 
713
- h4 {
715
+ h3 {
716
+ mso-outline-level: 3;
717
+ mso-list: l1 level3 lfo6; }
718
+
719
+ h4, .h4 {
714
720
  mso-style-priority: 4;
715
721
  mso-style-unhide: no;
716
722
  mso-style-qformat: yes;
@@ -726,8 +732,6 @@ h4 {
726
732
  text-indent: -51.05pt;
727
733
  mso-pagination: widow-orphan lines-together;
728
734
  page-break-after: avoid;
729
- mso-outline-level: 4;
730
- mso-list: l1 level4 lfo6;
731
735
  mso-hyphenate: none;
732
736
  tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
733
737
  mso-layout-grid-align: none;
@@ -743,7 +747,11 @@ h4 {
743
747
  mso-fareast-language: JA;
744
748
  mso-bidi-font-weight: normal; }
745
749
 
746
- h5 {
750
+ h4 {
751
+ mso-outline-level: 4;
752
+ mso-list: l1 level4 lfo6; }
753
+
754
+ h5, .h5 {
747
755
  mso-style-priority: 5;
748
756
  mso-style-unhide: no;
749
757
  mso-style-qformat: yes;
@@ -759,8 +767,6 @@ h5 {
759
767
  text-indent: -51.05pt;
760
768
  mso-pagination: widow-orphan lines-together;
761
769
  page-break-after: avoid;
762
- mso-outline-level: 5;
763
- mso-list: l1 level5 lfo6;
764
770
  mso-hyphenate: none;
765
771
  tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
766
772
  mso-layout-grid-align: none;
@@ -776,7 +782,11 @@ h5 {
776
782
  mso-fareast-language: JA;
777
783
  mso-bidi-font-weight: normal; }
778
784
 
779
- h6 {
785
+ h5 {
786
+ mso-outline-level: 5;
787
+ mso-list: l1 level5 lfo6; }
788
+
789
+ h6, .h6 {
780
790
  mso-style-priority: 6;
781
791
  mso-style-unhide: no;
782
792
  mso-style-qformat: yes;
@@ -792,14 +802,12 @@ h6 {
792
802
  text-indent: -79.4pt;
793
803
  mso-pagination: widow-orphan lines-together;
794
804
  page-break-after: avoid;
795
- mso-outline-level: 6;
796
805
  tab-stops: 79.4pt 99.25pt;
797
806
  mso-layout-grid-align: none;
798
807
  punctuation-wrap: simple;
799
808
  text-autospace: none;
800
809
  font-size: {{normalfontsize}};
801
810
  mso-bidi-font-size: 10.0pt;
802
- mso-list: l1 level6 lfo6;
803
811
  mso-hyphenate: none;
804
812
  font-family: {{headerfont}};
805
813
  color: black;
@@ -809,6 +817,10 @@ h6 {
809
817
  mso-fareast-language: JA;
810
818
  mso-bidi-font-weight: normal; }
811
819
 
820
+ h6 {
821
+ mso-outline-level: 6;
822
+ mso-list: l1 level6 lfo6; }
823
+
812
824
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
813
825
  mso-style-unhide: no;
814
826
  mso-style-qformat: yes;
data/lib/isodoc/itu/html/wordstyle.scss CHANGED
@@ -430,7 +430,7 @@ div.pseudocode, p.pseudocode, li.pseudocode
430
430
  font-size:10pt;}
431
431
 
432
432
 
433
- h1
433
+ h1, .h1
434
434
  {mso-style-priority:1;
435
435
  mso-style-unhide:no;
436
436
  mso-style-qformat:yes;
@@ -445,14 +445,12 @@ h1
445
445
  text-indent:-39.7pt;
446
446
  mso-pagination:widow-orphan lines-together;
447
447
  page-break-after:avoid;
448
- mso-outline-level:1;
449
448
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
450
449
  mso-layout-grid-align:none;
451
450
  punctuation-wrap:simple;
452
451
  text-autospace:none;
453
452
  font-size:$normalfontsize;
454
453
  mso-bidi-font-size:10.0pt;
455
- mso-list:l1 level1 lfo6;
456
454
  mso-hyphenate:none;
457
455
  font-family:$headerfont;
458
456
  mso-fareast-font-family:$headerfont;
@@ -465,6 +463,10 @@ h1
465
463
  mso-ansi-language:EN-GB;
466
464
  mso-fareast-language:JA;
467
465
  mso-bidi-font-weight:normal;}
466
+ h1 {
467
+ mso-outline-level:1;
468
+ mso-list:l1 level1 lfo6;
469
+ }
468
470
  p.supertitle
469
471
  {mso-style-priority:1;
470
472
  mso-style-unhide:no;
@@ -612,7 +614,7 @@ h1.Annex {
612
614
  mso-ansi-language:EN-GB;
613
615
  mso-fareast-language:JA;
614
616
  mso-bidi-font-weight:normal;}
615
- h2
617
+ h2, .h2
616
618
  {mso-style-priority:2;
617
619
  mso-style-unhide:no;
618
620
  mso-style-qformat:yes;
@@ -628,8 +630,6 @@ h2
628
630
  text-indent:-39.7pt;
629
631
  mso-pagination:widow-orphan lines-together;
630
632
  page-break-after:avoid;
631
- mso-outline-level:2;
632
- mso-list:l1 level2 lfo6;
633
633
  mso-hyphenate:none;
634
634
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
635
635
  punctuation-wrap:simple;
@@ -643,7 +643,11 @@ h2
643
643
  mso-ansi-language:EN-GB;
644
644
  mso-fareast-language:JA;
645
645
  mso-bidi-font-weight:normal;}
646
- h3
646
+ h2 {
647
+ mso-outline-level:2;
648
+ mso-list:l1 level2 lfo6;
649
+ }
650
+ h3, .h3
647
651
  {mso-style-priority:3;
648
652
  mso-style-unhide:no;
649
653
  mso-style-qformat:yes;
@@ -659,8 +663,6 @@ h3
659
663
  text-indent:-39.7pt;
660
664
  mso-pagination:widow-orphan lines-together;
661
665
  page-break-after:avoid;
662
- mso-outline-level:3;
663
- mso-list:l1 level3 lfo6;
664
666
  mso-hyphenate:none;
665
667
  tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
666
668
  font-size:$normalfontsize;
@@ -672,7 +674,11 @@ h3
672
674
  mso-ansi-language:EN-GB;
673
675
  mso-fareast-language:JA;
674
676
  mso-bidi-font-weight:normal;}
675
- h4
677
+ h3 {
678
+ mso-outline-level:3;
679
+ mso-list:l1 level3 lfo6;
680
+ }
681
+ h4, .h4
676
682
  {mso-style-priority:4;
677
683
  mso-style-unhide:no;
678
684
  mso-style-qformat:yes;
@@ -688,8 +694,6 @@ h4
688
694
  text-indent:-51.05pt;
689
695
  mso-pagination:widow-orphan lines-together;
690
696
  page-break-after:avoid;
691
- mso-outline-level:4;
692
- mso-list:l1 level4 lfo6;
693
697
  mso-hyphenate:none;
694
698
  tab-stops:51.05pt 59.55pt 79.4pt 99.25pt;
695
699
  mso-layout-grid-align:none;
@@ -704,7 +708,11 @@ h4
704
708
  mso-ansi-language:EN-GB;
705
709
  mso-fareast-language:JA;
706
710
  mso-bidi-font-weight:normal;}
707
- h5
711
+ h4 {
712
+ mso-outline-level:4;
713
+ mso-list:l1 level4 lfo6;
714
+ }
715
+ h5, .h5
708
716
  {mso-style-priority:5;
709
717
  mso-style-unhide:no;
710
718
  mso-style-qformat:yes;
@@ -720,8 +728,6 @@ h5
720
728
  text-indent:-51.05pt;
721
729
  mso-pagination:widow-orphan lines-together;
722
730
  page-break-after:avoid;
723
- mso-outline-level:5;
724
- mso-list:l1 level5 lfo6;
725
731
  mso-hyphenate:none;
726
732
  tab-stops:51.05pt 59.55pt 79.4pt 99.25pt;
727
733
  mso-layout-grid-align:none;
@@ -736,7 +742,11 @@ h5
736
742
  mso-ansi-language:EN-GB;
737
743
  mso-fareast-language:JA;
738
744
  mso-bidi-font-weight:normal;}
739
- h6
745
+ h5 {
746
+ mso-outline-level:5;
747
+ mso-list:l1 level5 lfo6;
748
+ }
749
+ h6, .h6
740
750
  {mso-style-priority:6;
741
751
  mso-style-unhide:no;
742
752
  mso-style-qformat:yes;
@@ -752,14 +762,12 @@ h6
752
762
  text-indent:-79.4pt;
753
763
  mso-pagination:widow-orphan lines-together;
754
764
  page-break-after:avoid;
755
- mso-outline-level:6;
756
765
  tab-stops:79.4pt 99.25pt;
757
766
  mso-layout-grid-align:none;
758
767
  punctuation-wrap:simple;
759
768
  text-autospace:none;
760
769
  font-size:$normalfontsize;
761
770
  mso-bidi-font-size:10.0pt;
762
- mso-list:l1 level6 lfo6;
763
771
  mso-hyphenate:none;
764
772
  font-family:$headerfont;
765
773
  color:black;
@@ -768,6 +776,10 @@ h6
768
776
  mso-ansi-language:EN-GB;
769
777
  mso-fareast-language:JA;
770
778
  mso-bidi-font-weight:normal;}
779
+ h6 {
780
+ mso-outline-level:6;
781
+ mso-list:l1 level6 lfo6;
782
+ }
771
783
  p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
772
784
  {mso-style-unhide:no;
773
785
  mso-style-qformat:yes;