metanorma-iho 0.4.5 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0847c09cfdfde2e17055709884e36114585df1c82e72ca972959da5537b915
-  data.tar.gz: 61017f76453d1a730328e274a5f6b150c0761c69340cbd92244b2ce1fc01efba
+  metadata.gz: ee0ce9c8c2bd6d95f99e1a81307f83751cea7086046359bf0c98c4567ba3c8e3
+  data.tar.gz: 0addeac4155072d4eed975211ad8ed40a3da6f3a6ff8f97c35f53be9422392ea
 SHA512:
-  metadata.gz: e4be9b3b344e0ea3c98bf779a1880770a97a5099c56857ecce0d2f55b05ad34d67288b092b71d10a25d520da7b6777bb41d648bb1fba6e2451ca34d15a66d34d
-  data.tar.gz: d67e94e5dc7b1460503b60da913339dd59e46b709917e97af3daa064b67ef21c586333f8860b36fcb15e2301a960bf44f86340c87c0effbe0c0a8685085fa37d
+  metadata.gz: 576967ae59fddeeadde1f4b18ecc7ac78f0fc32c3535920cd84164846534666a55e3104f0ba42d1f6a2a11c61ee379f22d1d7c71913974f5bbe9b870201219cf
+  data.tar.gz: d3842b851ccc0f122b2b5cb0b631078a611d87a836d722bedfa0d46b7bd226b8adc95c126221c728964f7e12e768948e47257476634d49ee3a704cab09c5e408

data/.github/workflows/rake.yml

@@ -10,34 +10,6 @@ on:
 
 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@master
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - uses: metanorma/metanorma-build-scripts/plantuml-setup-action@master
-
-      - 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 }}"}'
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -1 +1,12 @@
 .rubocop-https--*
+
+/.rspec_status
+/Gemfile.devel
+/Gemfile.lock
+/coverage/
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test_*_htmlimages/

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "asciidoctor/rsd"
+require "metanorma/iho"
 
 # 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/iho/base_convert.rb

@@ -27,7 +27,7 @@ module IsoDoc
           xml.span do |s|
             node&.children&.each { |x| parse(x, s) }
           end
-        end.join("")
+        end.join
       end
 
       def multiplenames_and(names)
@@ -56,13 +56,15 @@ module IsoDoc
       def inline_bibitem_ref_code(bib)
         id = bib.at(ns("./docidentifier[not(@type = 'DOI' or "\
                        "@type = 'metanorma' or @type = 'ISSN' or "\
-                       "@type = 'ISBN' or @type = 'rfc-anchor')]"))
-        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma')]"))
-        return [nil, id, nil] if id
+                       "@type = 'ISBN' or @type = 'rfc-anchor' or "\
+                       "@type = 'metanorma-ordinal')]"))
+        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
+                         "@type = 'metanorma-ordinal')]"))
+        return [nil, id, nil, nil] if id
 
         id = Nokogiri::XML::Node.new("docidentifier", bib.document)
         id << "(NO ID)"
-        [nil, id, nil]
+        [nil, id, nil, nil]
       end
 
       def extract_edition(bib)
@@ -101,9 +103,9 @@ module IsoDoc
         c = p.at(ns("./completename")) and return c.text
         s = p&.at(ns("./surname"))&.text or return
         i = p.xpath(ns("./initial")) and
-          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join("")
+          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
         i.empty? and f = p.xpath(ns("./forename")) and
-          front = f.map { |e| e.text[0].upcase }.join("")
+          front = f.map { |e| e.text[0].upcase }.join
         front ? "#{s} #{front}" : s
       end
 
@@ -117,10 +119,10 @@ module IsoDoc
           ftitle&.children&.each { |n| parse(n, out) }
         else
           id = render_identifier(inline_bibitem_ref_code(bib))
-          out << id[1] if id[1]
+          out << id[:sdo] if id[:sdo]
           ed = extract_edition(bib) if iho?(bib)
           out << " edition #{ed}" if ed
-          out << ": " if id[1] || ed
+          out << ": " if id[:sdo] || ed
           iso_title(bib)&.children&.each { |n| parse(n, out) }
           out << ", "
           author = extract_author(bib)

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

@@ -248,51 +248,56 @@ body {
 main {
   margin: 0 3em 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: #05164d;
       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: #05164d; }
-  #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: #fedc5b;
     box-shadow: inset -5px 0px 10px -5px #fedc5b !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: #05164d; }
   @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: #05164d; }
-    #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 a {
+  #toc .toc-active a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a {
     color: #05164d; }
-  #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: #05164d; }
 
+#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;
@@ -377,7 +382,7 @@ main {
     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/iho/html/htmlstyle.scss

@@ -18,7 +18,7 @@ main {
   margin: 0 3em 0 6em;
 }
 
-#toc {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6)  {
   @include toc(#05164d, #fedc5b, #05164d);
   @include sidebarToc();
 
@@ -38,6 +38,12 @@ main {
   }
 }
 
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+   margin-top: 0;
+   margin-bottom: 0;
+   font-size: 100%;
+ }
+
 nav {
   @include sidebarNav(#f7f7f7, 323px, 45px);
 }
@@ -72,7 +78,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/iho/html/iho.css

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

data/lib/isodoc/iho/html/iho.scss

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