metanorma-itu 1.4.3 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae257da364e6e0e56b29c4da7d8a403812f5fd07ab0e8e5e538e0ff4ddcee57b
-  data.tar.gz: d20a7c7aa06a781127d74bec94efa03a08cb77e1ab190b6afe31a7401ea3a960
+  metadata.gz: 5edf39d184a64b3dea930821b40da7c92071b6a41194d5faac3f8e6f75167528
+  data.tar.gz: f0501d3013f6b7f1b4d6b3b0d191084b2a653111d8fb7cdc8ac7821910a0f147
 SHA512:
-  metadata.gz: d8b5d6a0cd4300502e68e1527d833d30bd6fef92d5a9bf5d3829d00942e93fdb06bd9bdb64d55e01dcb65f5b982a29c8c8283b52966f9abb7e7f8f3ac57b039c
-  data.tar.gz: 4d9f70319c6e95b856c3df39f414dfe32b68e5149a6bc1982b95e86aff68bbbbc73a6eec34f0882786b756ef17b8d21a2dbeb403d9882239231ba7b32858151e
+  metadata.gz: 1e0fe821463e07e9db98a9d2cf8179135b92dd825999af71f4585ddeaf3370cdd478cf3b7a54b18175f016082bd7f1f95ec455432e73c2f88cdd268ff7c1d9d1
+  data.tar.gz: dac3cf8c61853963698b124fc6a909c62b44f08156a5be3bfa750d65ef6aaee411a51584f53c9e6e3abb0d2ecef1ae2bd52201fb6f8b278d10826483c70f19c9

data/.github/workflows/rake.yml

@@ -9,35 +9,7 @@ on:
   pull_request:
 
 jobs:
-  rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+  notify:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -4,3 +4,6 @@
 coverage/
 
 .rubocop-https--*
+
+/Gemfile.devel
+/Gemfile.lock

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "asciidoctor/csand"
+require "metanorma/itu"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/isodoc/itu/base_convert.rb

@@ -53,6 +53,7 @@ module IsoDoc
       end
 
       def annex_name(annex, name, div)
+        preceding_floating_titles(name, div)
         r_a = @meta.get[:doctype_original] == "recommendation-annex"
         div.h1 **{ class: r_a ? "RecommendationAnnex" : "Annex" } do |t|
           name&.children&.each { |c2| parse(c2, t) }

data/lib/isodoc/itu/html/_coverpage.css

@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -79,6 +85,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {

data/lib/isodoc/itu/html/htmlstyle.css

@@ -68,6 +68,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -79,6 +85,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -305,6 +314,12 @@ code *, pre *, tt *, kbd *, samp * {
   font-family: {{monospacefont}} !important;
   font-variant-ligatures: none; }
 
+p code, dt code, li code, label code, legend code, caption code, th code, td code,
+p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
+p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
+p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
+  font-size: {{monospacefontsize}}; }
+
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
   display: block; }
@@ -316,6 +331,9 @@ table {
 h1, h2, h3, h4, h5, h6 {
   font-family: {{headerfont}}; }
 
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: {{headerfont}}; }
+
 blockquote, q {
   quotes: none; }
   blockquote:before, blockquote:after, q:before, q:after {
@@ -660,57 +678,61 @@ nav #toc {
     nav #toc {
       padding: 0 1.5em;
       overflow: visible; } }
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: {{bodyfont}};
   font-weight: 400; }
-  #toc ul {
+  #toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul {
     margin: 0;
     padding: 0;
     list-style: none; }
-    #toc ul li a {
+    #toc ul li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul li a {
       padding: 5px 10px; }
-    #toc ul a {
+    #toc ul a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a {
       color: #141115;
       text-decoration: none;
       display: block; }
-      #toc ul a:hover {
+      #toc ul a:hover, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
         box-shadow: none;
         color: white; }
-  #toc .h2 {
+  #toc .h2, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
     padding-left: 30px; }
-  #toc .h3 {
+  #toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
     padding-left: 50px; }
-  #toc .toc-active, #toc li:hover {
+  #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 {
     background: #da1d52;
     box-shadow: inset -5px 0px 10px -5px #da1d52 !important; }
-    #toc .toc-active a, #toc li:hover a {
+    #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 {
       color: white; }
   @media print {
-    #toc .toc-active, #toc li:hover {
+    #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 {
       background: white;
       box-shadow: none !important; }
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #141115; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
-  #toc .h1 {
+  #toc .h1, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h1 {
     text-transform: uppercase; }
-  #toc li a {
+  #toc li a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
     font-size: {{normalfontsize}}; }
-  #toc li:hover a {
+  #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
     background: none;
     box-shadow: none; }
-  #toc li:before {
+  #toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
     content: " ";
     display: none; }
   @media print {
-    #toc .toc-active a {
+    #toc .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
       color: #4D7EA5; }
-    #toc .toc-active, #toc li:hover {
+    #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 {
       background: white;
       box-shadow: none !important; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 #toc-list ul {
   margin-bottom: 0.25em; }
 
@@ -771,7 +793,7 @@ nav #toc {
 @media screen and (min-width: 768px) {
   h1.toc-contents {
     margin-top: 1em; }
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0; } }
 
@@ -907,27 +929,27 @@ svg {
   font-style: italic; }
 
 /* Headings */
-h1, h2, h3, h4, h5, h6, .h1Annex {
+h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 400;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
 @media print {
-  h1, h2, h3, h4, .h1Annex {
+  h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; } }
 
-h1, .h1Annex {
+h1, .h1Annex, p.h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em; }
-  h1#content, #content.h1Annex {
+  h1#content, #content.h1Annex, p#content.h1 {
     margin-top: 2em; }
   @media print {
-    h1, .h1Annex {
+    h1, .h1Annex, p.h1 {
       font-size: 1.5em;
       line-height: 1.5; }
-      h1.content, .h1Annex.content {
+      h1.content, .h1Annex.content, p.h1.content {
         margin-top: 2em;
         line-height: 2.5em; } }
 p.supertitle {
@@ -941,21 +963,21 @@ p.supertitle {
       p.supertitle.content {
         margin-top: 2em;
         line-height: 2.5em; } }
-h2 {
+h2, .h2 {
   margin-top: 1.7em;
   font-size: 1.5em; }
-  h2 p {
+  h2 p, .h2 p {
     display: inline; }
   @media print {
-    h2 {
+    h2, .h2 {
       font-size: 1.2em; } }
-h3 {
+h3, .h3 {
   margin-top: 1.5em;
   font-size: 1.4em; }
   @media print {
-    h3 {
+    h3, .h3 {
       font-size: 1em; } }
-h4 {
+h4, .h4 {
   font-size: 1.2em; }
 
 /* Terms */

data/lib/isodoc/itu/html/htmlstyle.scss

@@ -52,7 +52,7 @@ nav {
   }
 }
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   font-family: $bodyfont;
   font-weight: 400;
 
@@ -92,6 +92,12 @@ nav {
   }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+ }
+
+
 #toc-list {
   ul {
     margin-bottom: 0.25em;
@@ -136,7 +142,7 @@ nav {
       margin-top: 1em;
   }
 
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     padding: 0;
     margin: 0;
   }
@@ -215,20 +221,20 @@ svg {
 
 /* Headings */
 
-h1, h2, h3, h4, h5, h6, .h1Annex {
+h1, h2, h3, h4, h5, h6, .h1Annex, p.h1, .h2, .h3, .h4, .h5, .h6 {
   font-weight: 400;
   margin-top: 1.6em;
   margin-bottom: 0.3em;
 }
 
-h1, h2, h3, h4, .h1Annex {
+h1, h2, h3, h4, .h1Annex, p.h1, .h2, .h3, .h4 {
   @media print {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
 }
 
-h1, .h1Annex {
+h1, .h1Annex, p.h1 {
   font-size: 1.4em;
   text-transform: uppercase;
   margin-top: 2em;
@@ -265,7 +271,7 @@ p.supertitle {
 
 }
 
-h2 {
+h2, .h2 {
   margin-top: 1.7em;
   font-size: 1.5em;
 
@@ -278,7 +284,7 @@ h2 {
   }
 }
 
-h3 {
+h3, .h3 {
   margin-top: 1.5em;
   font-size: 1.4em;
 
@@ -287,7 +293,7 @@ h3 {
   }
 }
 
-h4 {
+h4, .h4 {
   font-size: 1.2em;
 }
 

data/lib/isodoc/itu/html/scripts.html

@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>

data/lib/isodoc/itu/html/wordstyle.css

@@ -462,7 +462,7 @@ div.pseudocode, p.pseudocode, li.pseudocode {
   text-align: left;
   font-size: 10pt; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -477,14 +477,12 @@ h1 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 1;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
   punctuation-wrap: simple;
   text-autospace: none;
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10.0pt;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   font-family: {{headerfont}};
   mso-fareast-font-family: {{headerfont}};
@@ -498,6 +496,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 p.supertitle {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -648,7 +650,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h2 {
+h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -664,8 +666,6 @@ h2 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   punctuation-wrap: simple;
@@ -680,7 +680,11 @@ h2 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h3 {
+h2 {
+  mso-outline-level: 2;
+  mso-list: l1 level2 lfo6; }
+
+h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -696,8 +700,6 @@ h3 {
   text-indent: -39.7pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: 39.7pt 59.55pt 79.4pt 99.25pt;
   font-size: {{normalfontsize}};
@@ -710,7 +712,11 @@ h3 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h4 {
+h3 {
+  mso-outline-level: 3;
+  mso-list: l1 level3 lfo6; }
+
+h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -726,8 +732,6 @@ h4 {
   text-indent: -51.05pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
@@ -743,7 +747,11 @@ h4 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h5 {
+h4 {
+  mso-outline-level: 4;
+  mso-list: l1 level4 lfo6; }
+
+h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -759,8 +767,6 @@ h5 {
   text-indent: -51.05pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 59.55pt 79.4pt 99.25pt;
   mso-layout-grid-align: none;
@@ -776,7 +782,11 @@ h5 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h6 {
+h5 {
+  mso-outline-level: 5;
+  mso-list: l1 level5 lfo6; }
+
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -792,14 +802,12 @@ h6 {
   text-indent: -79.4pt;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 6;
   tab-stops: 79.4pt 99.25pt;
   mso-layout-grid-align: none;
   punctuation-wrap: simple;
   text-autospace: none;
   font-size: {{normalfontsize}};
   mso-bidi-font-size: 10.0pt;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   font-family: {{headerfont}};
   color: black;
@@ -809,6 +817,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
   mso-style-unhide: no;
   mso-style-qformat: yes;

data/lib/isodoc/itu/html/wordstyle.scss

@@ -430,7 +430,7 @@ div.pseudocode, p.pseudocode, li.pseudocode
         font-size:10pt;}
 
 
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -445,14 +445,12 @@ h1
 	text-indent:-39.7pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:1;
 	tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
 	mso-layout-grid-align:none;
 	punctuation-wrap:simple;
 	text-autospace:none;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
@@ -465,6 +463,10 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1 {
+	mso-outline-level:1;
+	mso-list:l1 level1 lfo6;
+}
 p.supertitle
         {mso-style-priority:1;
         mso-style-unhide:no;
@@ -612,7 +614,7 @@ h1.Annex {
         mso-ansi-language:EN-GB;
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
-h2
+h2, .h2
 	{mso-style-priority:2;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -628,8 +630,6 @@ h2
 	text-indent:-39.7pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:2;
-	mso-list:l1 level2 lfo6;
 	mso-hyphenate:none;
 	tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
 	punctuation-wrap:simple;
@@ -643,7 +643,11 @@ h2
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h3
+h2 {
+	mso-outline-level:2;
+	mso-list:l1 level2 lfo6;
+}
+h3, .h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -659,8 +663,6 @@ h3
 	text-indent:-39.7pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:3;
-	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:39.7pt 59.55pt 79.4pt 99.25pt;
 	font-size:$normalfontsize;
@@ -672,7 +674,11 @@ h3
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h4
+h3 {
+	mso-outline-level:3;
+	mso-list:l1 level3 lfo6;
+}
+h4, .h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -688,8 +694,6 @@ h4
 	text-indent:-51.05pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:4;
-	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 59.55pt 79.4pt 99.25pt;
 	mso-layout-grid-align:none;
@@ -704,7 +708,11 @@ h4
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h5
+h4 {
+	mso-outline-level:4;
+	mso-list:l1 level4 lfo6;
+}
+h5, .h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -720,8 +728,6 @@ h5
 	text-indent:-51.05pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:5;
-	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:51.05pt 59.55pt 79.4pt 99.25pt;
 	mso-layout-grid-align:none;
@@ -736,7 +742,11 @@ h5
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h6
+h5 {
+	mso-outline-level:5;
+	mso-list:l1 level5 lfo6;
+}
+h6, .h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -752,14 +762,12 @@ h6
 	text-indent:-79.4pt;
 	mso-pagination:widow-orphan lines-together;
 	page-break-after:avoid;
-	mso-outline-level:6;
 	tab-stops:79.4pt 99.25pt;
 	mso-layout-grid-align:none;
 	punctuation-wrap:simple;
 	text-autospace:none;
 	font-size:$normalfontsize;
 	mso-bidi-font-size:10.0pt;
-	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	font-family:$headerfont;
         color:black;
@@ -768,6 +776,10 @@ h6
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h6 {
+	mso-outline-level:6;
+	mso-list:l1 level6 lfo6;
+}
 p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;