metanorma-iec 1.4.5 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cd54ae113583e981d0db28b08ed00eb92f1b07a79d395c1d907860270889b59
-  data.tar.gz: bb89fee2a134f6affa9a94d21da24a9ef2c827bb5a5ea03991d405325fe101b0
+  metadata.gz: 4912b4a758eeb2ef870ccbf98c3b23701c63c691abaceab22220fde852ef53b0
+  data.tar.gz: 8904c263d8eaae36cb1ed8e463bdbe4d16aa8c114b740e27d19272b3bfb3251f
 SHA512:
-  metadata.gz: 1b3b33b44d4f1434415774b9ceccdff08a48ce8983aee4e7717e5a217fb47bfbfa77b447d70dd4a4530e5fd0e36e9158ebc18ff9ff58a07d4e3a7d80aee82219
-  data.tar.gz: 4aa8430cb7caa4450916cf7a677612c937183e62a77b938787f4baf76e4d63fa4de0630283bc761cdd30063aca1df8472a8e5098bc9b453121f9eec75038c684
+  metadata.gz: 8bbcea1b3012449f0c7b12b7c3031233cb87ee6f7c393e52dfa30d08b4792d8d9665c53ffb4481c827301b9db2b9cffa994bb837b4493ebd393e32d08366876c
+  data.tar.gz: 39849f14f5501bebb447d0188466a2eef1f2337a0f9fe376aba4b66cc1ca11dbccd2a35f884ac1f3066076eb2b3fcef5c951c67677cec7e4ebc0e6f8bc7213b5

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,17 @@
 coverage/
 
 .rubocop-https--*
+
+/Gemfile.devel
+/Gemfile.lock
+/spec/assets/iso.doc
+/spec/assets/iso.html
+/spec/assets/iso.pdf
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test.sts.xml
+/test.xml
+/test_alt.html

data/Gemfile

@@ -7,3 +7,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "reline", "~> 0.2.8.pre.11"
+
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
+end

data/lib/isodoc/iec/base_convert.rb

@@ -48,7 +48,7 @@ module IsoDoc
         out.p(**{ class: "zzSTDTitle1" }) { |p| p << "&nbsp;" }
       end
 
-      def middle_title_parts(out)
+      def middle_title_parts(_out)
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
           title1 = "#{@meta.get[:doctitleintro]} &mdash; #{title1}"
@@ -79,7 +79,8 @@ module IsoDoc
 
         page_break(out)
         out.div **attr_code(id: node["id"]) do |div|
-          out.p(**{ class: "zzSTDTitle2" }) do |p|
+          depth = clause_title_depth(node, nil)
+          out.send "h#{depth}", **{ class: "zzSTDTitle2" } do |p|
             p.b do |b|
               node&.at(ns("./title"))&.children&.each { |c2| parse(c2, b) }
             end

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

@@ -331,7 +331,7 @@ p.zzSTDTitle1 {
   font-size: 1.5em;
   text-transform: uppercase; }
 
-p.zzSTDTitle2 {
+.zzSTDTitle2 {
   font-weight: 700;
   font-size: 1.5em; }
 
@@ -426,52 +426,58 @@ p.TermNum {
   #toggle {
     display: none; } }
 
-#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: black;
       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: black; }
-  #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: black;
     box-shadow: inset -5px 0px 10px -5px black !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: black; }
   @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: black; }
-    #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 {
     box-shadow: 0px 1px 0px 0px black !important;
     color: black;
     background: none; }
-  #toc ul a:hover {
+  #toc ul a:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) ul a:hover {
     box-shadow: none;
     color: black; }
 
+#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 {
     line-height: 1.2em; }
@@ -485,7 +491,7 @@ p.TermNum {
     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; } }
 

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

@@ -133,7 +133,7 @@ p.zzSTDTitle1 {
     text-transform: uppercase;
 }
 
-p.zzSTDTitle2 {
+.zzSTDTitle2 {
     font-weight: 700;
     font-size: 1.5em;
 }
@@ -205,7 +205,7 @@ nav {
     @include sidebarNavToggle(black, #f5faff)
 }
 
-#toc {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
     @include toc(black, black, black);
     @include sidebarToc();
 
@@ -224,6 +224,12 @@ nav {
     }
 }
 
+#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 {
         line-height: 1.2em;
@@ -247,7 +253,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;
     }

data/lib/isodoc/iec/html/isodoc.css

@@ -831,8 +831,7 @@ div.example p.MsoListParagraph {
   font-size: {{normalfontsize}}; }
 
 div.Note p.MsoListParagraph {
-  font-size: {{smallerfontsize}};
-  margin-left: 1.0cm; }
+  font-size: {{smallerfontsize}}; }
 
 div.Note span.stem {
   font-size: {{smallerfontsize}}; }

data/lib/isodoc/iec/html/isodoc.scss

@@ -817,7 +817,6 @@ div.example p.MsoListParagraph {
 
 div.Note p.MsoListParagraph {
   font-size: $smallerfontsize;
-  margin-left: 1.0cm;
 }
 
 div.Note span.stem {

data/lib/isodoc/iec/html_convert.rb

@@ -38,7 +38,8 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        auth = docxml.at("//div[@id = 'boilerplate-feedback' or @class = 'boilerplate-feedback']")
+        auth = docxml.at("//div[@id = 'boilerplate-feedback' or "\
+                         "@class = 'boilerplate-feedback']")
         auth&.remove
         super
       end

data/lib/isodoc/iec/i18n-fr.yaml

@@ -18,7 +18,7 @@ term_def_boilerplate: |
         <link target="http://www.iso.org/obp"/></p> </li>
       </ul>
 doctype_dict:
-  international-standard: Norme international
+  international-standard: Norme internationale
   technical-specification: Spécification technique
   technical-report: Rapport technique
   publicly-available-specification: Spécification disponible publiquement