metanorma-ogc 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ea72db3debb8356d5047e7ab611b33e467d1393d0f9e1164100f56c8988bfb
-  data.tar.gz: 4cc91744a555f596fc9ac2bf56f54d0f18ee5d762b3de027338af3fd7b65d820
+  metadata.gz: 8f96712a836ecd61ea5c7c706335c5f5ee895c819a3b65905a0f88b42ad63991
+  data.tar.gz: a177b6bdfbf926afd1946f9891f8ae11f7763595cf73716d7e8457648e5b1d8a
 SHA512:
-  metadata.gz: 135588fdcec82c7eb91b3c6851b87c70ca8ee40a8c3d06240ed909dedaf9a11a85150e2b8c96e227eec9b0df5e97e0d148f2d2caeba5f28ab14879cae0c32da2
-  data.tar.gz: 063c4282b5ec0881a83bc820a7e9966fa7ae73feb7ef15ef92f139df340b5a09dbe057586a9d8624e1a36bbc7426e5e589d282d43246fc7b58f9794182f37aea
+  metadata.gz: 4465fc5ab6f9b7994c01db9c7f61f94e7c699c1120bd073e455a42947eb1c62e52ad9f7676f7a9eddbff1b1c11b6f460b19fd41761729176488ba6a22da3f477
+  data.tar.gz: 9e4661b7d45f62b8bcf704ce5ede43462ce05aa3cfc5a5c3b0516480e95794b8c70ae61517bf3a1f73a8fe895f35c6929b790653670d2d73cceb5b82263035d8

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
@@ -129,7 +129,8 @@ module IsoDoc
       end
 
       def para_class(node)
-        return node["class"] if node["class"]
+        return node["class"] if node["class"] &&
+          node["class"] != "RecommendationLabel"
 
         super
       end
@@ -139,7 +140,8 @@ module IsoDoc
           node.at(".//ancestor::xmlns:ol[@class = 'steps']")
 
         idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
-        ol_style(%i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5])
+        styles = %i(arabic alphabet roman alphabet_upper roman_upper)
+        ol_style(styles[(idx - 1) % 5])
       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,58 +514,59 @@ dl {
   dl pre {
     overflow-x: scroll; }
 
-#toc ul, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
+#toc .h2, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h2 {
   padding-left: 30px; }
 
-#toc .h3, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
+#toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
   padding-left: 50px; }
 
-#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 {
+#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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active a, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
+#toc li a, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li a {
   font-size: 14px; }
 
-#toc li:before, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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 > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) 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) {
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   margin-top: 0;
-  margin-bottom: 0; }
+  margin-bottom: 0;
+  font-size: 100%; }
 
 @media screen and (min-width: 768px) {
   nav {

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

@@ -64,7 +64,7 @@ dl {
   }
 }
 
-#toc, #toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+#toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   @include toc($colorLink: #00335b, $colorLinkActiveBg: #00335b, $colorLinkActiveFg: white);
 
   li a {
@@ -86,9 +86,10 @@ dl {
   }
 }
 
-#toc > ul > :is(.h1, .h2, .h3, .h4, .h5, .h6) {
+#toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
   margin-top: 0;
   margin-bottom: 0;
+  font-size: 100%;
 }
 
 nav {

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