metanorma-mpfa 0.7.4 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1856ecde5c7f52e4b8287bb3540ab3aebf463c08b80d90cf39b65f8fa3628d6
-  data.tar.gz: a185cb883f506cf8a609a836e3192643dcaf5e7ccaabe96b458709fc68e59fc0
+  metadata.gz: 2651688661f171667344c98cc00f9e3ffe9e5b68c4291b1fde54d1b719d7601d
+  data.tar.gz: 74aa78d7d70a2110580c6c3670fd1b5df9f01092395083fd5a6fb3a0fc8c0661
 SHA512:
-  metadata.gz: c79d6153c881b5e9c7328c2ab44b4405492b48388b756fafe8ae359001873f2fed8d4059f25cd5b06b630465e80f50f447ecdec1742474067a804dfcadbe1975
-  data.tar.gz: 7edd6a6ce865b9bb0e993953e9606a16ae666d2c3eb656267183c75a14348a943cf7b6cffee5f9b98f7ffc46ad1c0db36cfc6c8c78cbcf0f47d5ca08a962a73f
+  metadata.gz: 8ce9e81eda544f3ccc445f95edc5d317ef09eb55f8b8ea057ee49b7455294feb7461bd43866a91fbbeb53d947b57f372a85e8c841ca88dd021e3e09fb43ca7f7
+  data.tar.gz: 47d3d0f7879c9696f5706c3d7202d65dc1c2d26ed1aad754981d9e7e90082e369043af616cf8836a878033741f6481aa6c9c5a52ed33af09eb0b30faf5ba8c68

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

@@ -1,3 +1,8 @@
 .DS_Store
 
 .rubocop-https--*
+
+/.rspec_status
+/Gemfile.devel
+/Gemfile.lock
+/coverage/

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "asciidoctor/rsd"
+require "metanorma-mpfa"
 
 # 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/mpfa/html/htmlstyle.css

@@ -75,6 +75,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; }
@@ -86,6 +92,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 {
@@ -241,56 +250,62 @@ body {
   body main {
     margin: 0 0 0 6em; }
 
-#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: #301907;
       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: #301907; }
-  #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: #301907;
     box-shadow: inset -5px 0px 10px -5px #301907 !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: #301907; }
   @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: #301907; }
-    #toc li:hover a {
+    #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
       color: black; } }
   @media screen and (max-width: 768px) {
-    #toc {
+    #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
   #toc .toc-active,
-  #toc li:hover {
+  #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: none;
     box-shadow: none !important;
     border-bottom: solid 1px #301907 !important; }
-  #toc li:hover a {
+  #toc li:hover a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover a {
     color: black; }
-  #toc li a {
+  #toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
     text-transform: uppercase; }
-  #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 > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 100%; }
+
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -378,7 +393,7 @@ strong {
     display: none; }
   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; }
   #toggle {
@@ -566,13 +581,13 @@ p.document-stage {
 /*
     3.1 Titles
 */
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: {{headerfont}};
   color: #301907;
   font-weight: 300;
   margin-top: 2em; }
 
-h1 {
+h1, .h1 {
   color: #301907;
   font-size: 1.6em;
   /* margin-top: 5em; */
@@ -582,7 +597,7 @@ h1 {
   border-bottom: solid 5px #FD8924;
   font-weight: 800; }
 
-h1#content {
+h1#content, #content.h1 {
   margin-top: 0em;
   margin-left: -2em; }
 
@@ -600,11 +615,11 @@ h2.containerhdr {
   font-style: italic;
   padding: 45px 15px 15px 50px; }
 
-h2 {
+h2, .h2 {
   font-size: 1.5em;
   font-weight: 400; }
 
-h3 {
+h3, .h3 {
   font-size: 1.1em;
   font-weight: 100; }
 
@@ -875,7 +890,7 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h2 p {
+h2 p, .h2 p {
   display: inline; }
 
 /*
@@ -1050,7 +1065,7 @@ h2 p {
     filter: invert(100%); }
   .coverpage-title {
     border-left: 0.5em solid #888; }
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
   .note, .figure, pre, .pseudocode, table {
@@ -1068,15 +1083,15 @@ h2 p {
     margin-top: -5px; }
   .container {
     padding-left: 0; }
-  h1.content {
+  h1.content, .h1.content {
     margin-top: 2em;
     line-height: 2.5em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .Note {
     background-color: #fff495;
@@ -1116,10 +1131,10 @@ h2 p {
     padding-left: 0; }
   main {
     margin-left: 1em; }
-  h1 {
+  h1, .h1 {
     margin-left: 0;
     padding-left: 0; }
-  h1#content {
+  h1#content, #content.h1 {
     margin-left: 1em; } }
 
 /* Tablet Styles */
@@ -1141,10 +1156,10 @@ h2 p {
     padding-left: 0; }
   main {
     margin-left: 2em; }
-  h1 {
+  h1, .h1 {
     margin-left: 0em;
     padding-left: 0; }
-  h1#content {
+  h1#content, #content.h1 {
     margin-left: 1em; } }
 
 @media screen and (max-width: 768px) {
@@ -1154,9 +1169,9 @@ h2 p {
     display: none; } }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .main-section h1 {
+  .main-section h1, .main-section .h1 {
     margin-left: 14px; }
-  .main-section h2, h3, h4, ol, ul, p, .ms-table-wrap {
+  .main-section h2, .main-section .h2, h3, h4, .h3, .h4, ol, ul, p, .ms-table-wrap {
     margin-left: 75px; }
   .main-section li p {
     margin-left: 5px; }

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

@@ -21,7 +21,7 @@ body {
   }
 }
 
-#toc {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   @include toc(#301907, #301907, #301907);
   @include sidebarToc();
 
@@ -48,6 +48,13 @@ body {
   }
 }
 
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+   font-size: 100%;
+ }
+
+
 nav {
   @include sidebarNav(#f7f7f7, 328px, 15px);
 }
@@ -87,7 +94,7 @@ strong {
       margin-top: 1em;
   }
 
-  ul#toc-list {
+  ul#toc-list, ul#toc-list > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding:0;
       margin:0;
   }
@@ -228,14 +235,14 @@ p.document-stage {
     3.1 Titles
 */
 
-h1,h2,h3,h4,h5,h6 {
+h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6 {
   font-family: $headerfont;
   color: #301907;
   font-weight: 300;
   margin-top: 2em;
 }
 
-h1 {
+h1,.h1 {
   color: #301907;
   font-size: 1.6em;
   /* margin-top: 5em; */
@@ -246,7 +253,7 @@ h1 {
   font-weight: 800;
 }
 
-h1#content {
+h1#content,.h1#content {
   margin-top: 0em;
   margin-left: -2em;
 }
@@ -267,12 +274,12 @@ h2.containerhdr {
   padding: 45px 15px 15px 50px;
 }
 
-h2 {
+h2,.h2 {
   font-size: 1.5em;
   font-weight: 400;
 }
 
-h3 {
+h3,.h3 {
   font-size: 1.1em;
   font-weight: 100;
 }
@@ -534,7 +541,7 @@ p {
   margin-bottom: 1em;
 }
 
-h2 p {
+h2 p, .h2 p {
   display: inline;
 }
 
@@ -755,7 +762,7 @@ padding: 0 2em 0 5em; }
     border-left: 0.5em solid #888;
   }
 
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
@@ -787,21 +794,21 @@ padding: 0 2em 0 5em; }
     padding-left: 0;
   }
 
-  h1.content {
+  h1.content, .h1.content {
     margin-top: 2em;
     line-height: 2.5em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 
@@ -870,12 +877,12 @@ padding: 0 2em 0 5em; }
     margin-left: 1em;
   }
 
-  h1 {
+  h1, .h1 {
     margin-left: 0;
     padding-left: 0;
   }
 
-  h1#content {
+  h1#content, .h1#content {
     margin-left: 1em;
   }
 }
@@ -913,12 +920,12 @@ padding: 0 2em 0 5em; }
     margin-left: 2em;
   }
 
-  h1 {
+  h1, .h1 {
     margin-left: 0em;
     padding-left: 0;
   }
 
-  h1#content {
+  h1#content, .h1#content {
     margin-left: 1em;
   }
 }
@@ -936,8 +943,8 @@ padding: 0 2em 0 5em; }
 }
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-  .main-section h1 {margin-left:14px;}
-  .main-section h2, h3, h4, ol, ul, p, .ms-table-wrap {margin-left:75px;}
+  .main-section h1, .main-section .h1 {margin-left:14px;}
+  .main-section h2, .main-section .h2, h3, h4, .h3, .h4, ol, ul, p, .ms-table-wrap {margin-left:75px;}
   .main-section li p {margin-left:5px;}
   .main-section li {margin-left:25px;}
 }

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

@@ -370,7 +370,7 @@ span.blackgraphtx {
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -385,8 +385,6 @@ h1 {
   line-height: 13.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   tab-stops: 20.0pt list 21.6pt left 28.0pt;
   font-size: 13.0pt;
@@ -399,6 +397,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.Annex {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -457,7 +459,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;
@@ -473,8 +475,6 @@ h2 {
   line-height: 12.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 27.0pt 35.0pt;
   font-size: 12.0pt;
@@ -486,7 +486,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;
@@ -502,8 +506,6 @@ h3 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: list 36.0pt left 44.0pt;
   font-size: 11.0pt;
@@ -514,7 +516,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;
@@ -530,8 +536,6 @@ h4 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt 57.0pt 68.0pt;
   font-size: 11.0pt;
@@ -542,7 +546,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;
@@ -558,8 +566,6 @@ h5 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 54.0pt;
   font-size: 11.0pt;
@@ -570,7 +576,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;
@@ -586,8 +596,6 @@ h6 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 6;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   tab-stops: 51.05pt list 72.0pt;
   font-size: 11.0pt;
@@ -598,6 +606,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;