metanorma-ogc 1.5.5 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69beab43aeb2bcb9aab11ca5567eba0c6cae2232f5258871911c2ff9fd7bedc2
-  data.tar.gz: b5cbea960accc69c1970f98023f3417311d6ec06b1675ea0f426ca7af0eee374
+  metadata.gz: 5e8614f0756871df71fbe86d5a3bf7ce5fc6ebd76f9764a803be35cf6ec38bdb
+  data.tar.gz: c8f3de3643c38786188ebc3f618624b733d50cb85d2c254600010bd141241068
 SHA512:
-  metadata.gz: 89c25bf2553b91594d1284fa13ed0ef7a814b7ad03fa57a5ecd6a456d043d5e567a7f3b4c1cfc522d9052de0f306bb4651de2ad67c1af76ba13e6e3166abf1f3
-  data.tar.gz: 5a741f7927bf22d91cdfc63e8ae7bd7bfe2d5617d4de0722110736e65d35f2556c9e296518531bc94cb54f0f97b543a5ab78b9b7e3928a7bcbb84817deeebb46
+  metadata.gz: d5dd85084c3420d9b4d27e097784ba6f1b636288f412cc14edc83dedc7f185a4ae03d057eea0424d64db23157da5e8e563130f2a01dc85929228617bcf23b710
+  data.tar.gz: a1f2ca81d35514c361a6f49cfaf4459e723371354dcf928672371725677b29ecb1a52db91eeefe2d30410aee162448ba947d676f2dd2fd52fe2443f15d9b52a5

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/base_convert.rb

@@ -28,7 +28,7 @@ module IsoDoc
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
           term_cleanup_merge_termnum(d)
-          term_cleanup_merge_admitted(d)
+          # term_cleanup_merge_admitted(d)
         end
         docxml
       end

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/html_ogc_titlepage.html

@@ -35,6 +35,12 @@
   -->
 
   <div class="authors">
+    {% if contributors %}
+    {% for contributor in contributors %}
+    <span>{{ contributor }} <span class="roletag">Contributor</span></span>
+    {% endfor %}
+    {% endif %}
+
     {% if editors %}
     {% for editor in editors %}
     <span>{{ editor }} <span class="roletag">Editor</span></span>

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

@@ -514,55 +514,60 @@ 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;
+  font-size: 100%; }
+
 @media screen and (min-width: 768px) {
   nav {
     position: fixed;
@@ -624,7 +629,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 +738,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,12 @@ dl {
   }
 }
 
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 100%;
+}
+
 nav {
   @include sidebarNav(#f1f8ff, 323px, 45px);
 
@@ -112,7 +118,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 +179,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;

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

@@ -813,8 +813,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/ogc/html/ogc.scss

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

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

@@ -733,8 +733,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/ogc/html/ogc_wp.scss

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

data/lib/isodoc/ogc/html/word_ogc_titlepage.html

@@ -30,9 +30,14 @@ style='mso-no-proof:yes;font-size:10.0pt'>Version: {{ edition }}</span></span></
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
 style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></span></p>
 
+{% if contributors %}
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
+                                                                  style='mso-no-proof:yes;font-size:10.0pt'>Contributor{% if contributors.size > 1 %}s{% endif %}: {{ contributors | join: ", " }}</span></span></p>
+{% endif %}
+
 {% if editors %}
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</span></span></p>
+                                                                  style='mso-no-proof:yes;font-size:10.0pt'>Editor{% if editors.size > 1 %}s{% endif %}: {{ editors | join: ", " }}</span></span></p>
 {% endif %}
 
 <p class="MsoNormal" align="center" style='text-align:center;line-height:18.0pt;margin-bottom:0.0pt'><b

data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html

@@ -50,9 +50,14 @@ style='mso-no-proof:yes;font-size:10.0pt'>Version: {{ edition }}</span></p>
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
 style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></p>
 
+{% if contributors %}
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
+                                                                  style='mso-no-proof:yes;font-size:10.0pt'>Contributor{% if contributors.size > 1 %}s{% endif %}: {{ contributors | join: ", " }}</span></span></p>
+{% endif %}
+
 {% if editors %}
 <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB"
-style='mso-no-proof:yes;font-size:10.0pt'>Editor: {{ editors | join: ", " }}</span></p>
+                                                                  style='mso-no-proof:yes;font-size:10.0pt'>Editor{% if editors.size > 1 %}s{% endif %}: {{ editors | join: ", " }}</span></span></p>
 {% endif %}
 
 <div style="margin-top:1.0cm;">

data/lib/isodoc/ogc/metadata.rb

@@ -63,6 +63,9 @@ module IsoDoc
         editors = isoxml.xpath(ns("//bibdata/contributor"\
                                   "[role/@type = 'editor']/person"))
         set(:editors, extract_person_names(editors))
+        contributors = isoxml.xpath(ns("//bibdata/contributor"\
+                                  "[role/@type = 'contributor']/person"))
+        set(:contributors, extract_person_names(contributors))
         agency(isoxml)
       end