metanorma-ogc 1.5.4.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237dae6888c593bf44ad5b0d1f7ab5f6911f9ad32adf109bbd609594cffb8088
-  data.tar.gz: 0376a84dded3cc7f7f261f8233b7f3bcf0866b6869d78f7c42666a77bf30b64e
+  metadata.gz: 44ee1a340ca37855ff816bf3165f9a3c621a49b6cf84c066c1da4c5e59ccddfc
+  data.tar.gz: 91717d247b8885191960133aad5ed66a922bd4fc24380d851025b933acce9205
 SHA512:
-  metadata.gz: 6f9b4f21f1c69bbb87f73727a6c77a09399afd1745b7fc9b10efff2b4b0245beba920f428eba17adec3aa1825b942f73258d8027b03ead7b6e89c91acf9335a4
-  data.tar.gz: 5de27f6083e45917d32d11de6256c34449a1c23a3905d52cb7e300b3ae004d0ab4ae27c5f9cd939db47fc3964325e7a617a76340fe268d301729f7712fe431d5
+  metadata.gz: d59fdeee4090b4b49224172713ed75482c99bc8fdf06bb2580637d92122228ef7fe8278352f202cd3efcba6a6cce8e9f31916ef0b6e89799e20e4191e7222fde
+  data.tar.gz: eb7235d7c53b998ca950074562df5e3192972b1628c939b658abf06548db9047339e8c8418d6576cd43e04be8605370fcb849ce3f39a8c5225501f334b9ed949

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,4 +10,3 @@ if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
 
-gem "metanorma-cli"

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

@@ -68,6 +68,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; }
@@ -79,6 +85,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 {
@@ -151,6 +160,12 @@ a.FootnoteRef + a.FootnoteRef:before {
 #white-paper {
   border-bottom: solid 3px #39CCCC; }
 
+#technical-paper-band {
+  background-color: #39CCCC; }
+
+#technical-paper {
+  border-bottom: solid 3px #39CCCC; }
+
 #engineering-report-band {
   background-color: #39CCCC; }
 
@@ -499,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;
@@ -609,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; } }
 
@@ -718,32 +738,33 @@ 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 {
   color: #00335b;
   font-weight: 400;
   margin-top: 1.6em;
   margin-bottom: 0.3em; }
 
-h1 {
+h1, .h1 {
   font-size: 1.8em;
   text-transform: uppercase;
   margin-top: 2em; }
-  h1 #content {
+  h1 #content, .h1 #content {
     margin-top: 2em; }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.7em;
   font-weight: 300; }
-  h2 p {
+  h2 p, .h2 p {
     display: inline; }
 
-h3 {
+h3, .h3 {
   margin-top: 1.3em;
   font-size: 1.5em;
   font-weight: 100; }
 
-h4 {
+h4, .h4 {
   font-size: 1.4em; }
 
 .contact-info {
@@ -1083,18 +1104,18 @@ a.anchorjs-link:hover {
   margin: 2cm 1cm; }
 
 @media print {
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em; }
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5; }
-    h1.content {
+    h1.content, .h1.content {
       margin-top: 2em;
       line-height: 2.5em; }
-  h2 {
+  h2, .h2 {
     font-size: 1.2em; }
-  h3 {
+  h3, .h3 {
     font-size: 1em; }
   .prefatory-section {
     page-break-before: always; }

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

@@ -6,6 +6,7 @@ $doctype-colors-list: (
   best-practice: #39CCCC,
   discussion-paper: #39CCCC,
   white-paper: #39CCCC,
+  technical-paper: #39CCCC,
   engineering-report: #39CCCC,
 
   release-notes: #FFDC00,
@@ -63,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 {
@@ -85,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);
 
@@ -111,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;
   }
@@ -172,14 +179,15 @@ p {
   margin-bottom: 1em;
 }
 
-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;
   margin-bottom: 0.3em;
 }
 
-h1 {
+h1, .h1 {
   font-size: 1.8em;
   text-transform: uppercase;
   margin-top: 2em;
@@ -189,7 +197,7 @@ h1 {
   }
 }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.7em;
   font-weight: 300;
@@ -199,13 +207,13 @@ h2 {
   }
 }
 
-h3 {
+h3, .h3 {
   margin-top: 1.3em;
   font-size: 1.5em;
   font-weight: 100;
 }
 
-h4 {
+h4, .h4 {
   font-size: 1.4em;
 }
 
@@ -555,12 +563,12 @@ a.anchorjs-link {
 }
 
 @media print {
-  h1, h2, h3, h4 {
+  h1, h2, h3, h4, .h1, .h2, .h3, .h4 {
     page-break-after: avoid;
     margin-top: 1.2em;
   }
 
-  h1 {
+  h1, .h1 {
     font-size: 1.5em;
     line-height: 1.5;
 
@@ -570,11 +578,11 @@ a.anchorjs-link {
     }
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

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/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: 0.7cm;
   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: 1.0cm;
   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: 1.3cm;
   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: 1.6cm;
   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: 1.9cm;
   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: 2.2cm;
   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;