metanorma-ogc 1.5.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69beab43aeb2bcb9aab11ca5567eba0c6cae2232f5258871911c2ff9fd7bedc2
-  data.tar.gz: b5cbea960accc69c1970f98023f3417311d6ec06b1675ea0f426ca7af0eee374
+  metadata.gz: a2ea72db3debb8356d5047e7ab611b33e467d1393d0f9e1164100f56c8988bfb
+  data.tar.gz: 4cc91744a555f596fc9ac2bf56f54d0f18ee5d762b3de027338af3fd7b65d820
 SHA512:
-  metadata.gz: 89c25bf2553b91594d1284fa13ed0ef7a814b7ad03fa57a5ecd6a456d043d5e567a7f3b4c1cfc522d9052de0f306bb4651de2ad67c1af76ba13e6e3166abf1f3
-  data.tar.gz: 5a741f7927bf22d91cdfc63e8ae7bd7bfe2d5617d4de0722110736e65d35f2556c9e296518531bc94cb54f0f97b543a5ab78b9b7e3928a7bcbb84817deeebb46
+  metadata.gz: 135588fdcec82c7eb91b3c6851b87c70ca8ee40a8c3d06240ed909dedaf9a11a85150e2b8c96e227eec9b0df5e97e0d148f2d2caeba5f28ab14879cae0c32da2
+  data.tar.gz: 063c4282b5ec0881a83bc820a7e9966fa7ae73feb7ef15ef92f139df340b5a09dbe057586a9d8624e1a36bbc7426e5e589d282d43246fc7b58f9794182f37aea

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,14 @@
 .DS_Store
 
 .rubocop-https--*
+
+/.rspec_status
+/Gemfile.devel
+/Gemfile.lock
+/coverage/
+/test.doc
+/test.err
+/test.html
+/test.pdf
+/test.presentation.xml
+/test_*_htmlimages/

data/Gemfile

@@ -10,5 +10,3 @@ if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
-gem "metanorma-cli"
-gem "reline", "~> 0.2.8.pre.11"

data/lib/isodoc/ogc/biblio.rb

@@ -12,7 +12,7 @@ module IsoDoc
         list.p **attr_code(iso_bibitem_entry_attrs(bib, bibliography)) do |r|
           id = bibitem_ref_code(bib)
           identifier = render_identifier(id)
-          identifier[1] = nil
+          identifier[:sdo] = nil
           if bibliography
             ref_entry_code(r, ordinal, identifier, id)
           end
@@ -124,7 +124,7 @@ module IsoDoc
           u = extract_uri(bib)
           out << "#{author || pub_abbrev}: " if author || pub_abbrev
           id = render_identifier(inline_bibitem_ref_code(bib))
-          out << id[1] if id[1]
+          out << id[:sdo] if id[:sdo]
           out << " (Draft)" if ogc_draft_ref?(bib)
           out << ", "
           out.i do |i|
@@ -143,13 +143,14 @@ 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
+                       "or @type = 'ISBN' 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
     end
   end

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

@@ -514,55 +514,59 @@ dl {
   dl pre {
     overflow-x: scroll; }
 
-#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: #00335b;
     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: #00335b;
   box-shadow: inset -5px 0px 10px -5px #00335b !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: #00335b; }
-  #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 {
   font-size: 14px; }
 
-#toc li:before {
+#toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
   content: " ";
   display: none; }
 
-#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 {
   font-weight: 600; }
 
-#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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0; }
+
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -624,7 +628,7 @@ dl {
 @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; } }
 
@@ -733,7 +737,8 @@ p {
   margin-top: 1em;
   margin-bottom: 1em; }
 
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   color: #00335b;
   font-weight: 400;
   margin-top: 1.6em;

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

@@ -64,7 +64,7 @@ dl {
   }
 }
 
-#toc {
+#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   @include toc($colorLink: #00335b, $colorLinkActiveBg: #00335b, $colorLinkActiveFg: white);
 
   li a {
@@ -86,6 +86,11 @@ dl {
   }
 }
 
+#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 nav {
   @include sidebarNav(#f1f8ff, 323px, 45px);
 
@@ -112,7 +117,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;
   }
@@ -173,7 +178,8 @@ p {
   margin-bottom: 1em;
 }
 
-h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
   color: #00335b;
   font-weight: 400;
   margin-top: 1.6em;