metanorma-ogc 2.5.14 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a42aacc8919672ff6672fba3620817651a5e0e7b6d13dbac7d9d51a7a34bc0
-  data.tar.gz: a781bdab6a4550bc6d04f0a3cde51775d6755f680f2d9a22b4dfe65d9e8e5933
+  metadata.gz: 27c6878e7287b08cb973284d9b5f753f1f5aac697dc983a128c495649b38660d
+  data.tar.gz: 9ed25beb811a9f4a24b08e479581063160a6af5081c9e539043d9a6254b1da33
 SHA512:
-  metadata.gz: e309309936b82e9e266346b7c630f845a9e77269724a31e20e1e29fc5b7ec2aa3a0d906664a67d34398ade90168276d1b66979aad8c46664b39a71a19b0bf868
-  data.tar.gz: 358c573ed7cd006c1fc6a25a1b94ea13b47f43a4ba78fb80f934c12c0dd45bab470e9c55d0c699e6d589a69f104b0944b04c17b85a723603d305f4c36014b814
+  metadata.gz: 5bb9297e2ea6b848a8f604c6896a280fb6b4f8f81f34ea5b509a9a128fccd3a5552a2c47f3df19b5cd7283fb467558163fd2406843925e3b5fadc8c03898155c
+  data.tar.gz: 81bd653915b2c7f9b70c5748b302aae9074f0d329ffc6894bbc306f1750c48bc696afce2f4c42aa7810472ad40aa408f94fc3b644fa9a8f5d263830de004277d

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

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #3D9970; }
 
@@ -1037,7 +1077,7 @@ p.AltTerms {
   font-size: 24px;
   margin-top: 1em; }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
   color: #00335b;
   background-color: #CFE2F3;
   font-size: 70%;

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

@@ -401,7 +401,7 @@ p.AltTerms {
   margin-top: 1em;
 }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
     color: #00335b;
     background-color: #CFE2F3;
     font-size: 70%;

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

@@ -856,6 +856,6 @@ div.warning p {
 span.hi {
   background-color: yellow; }
 
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
   color: #00335b;
   background-color: #CFE2F3; }

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

@@ -814,7 +814,7 @@ padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 span.hi {
   background-color: yellow;
 }
-span.AdmittedLabel {
+span.AdmittedLabel, span.DeprecatedLabel {
     color: #00335b;
     background-color: #CFE2F3;
 }

data/lib/isodoc/ogc/html_convert.rb

@@ -41,8 +41,13 @@ module IsoDoc
 
       def admonition_class(node)
         case node["type"]
-        when "important" then "Admonition.Important"
-        when "warning" then "Admonition.Warning"
+        when "important" then "Admonition Important"
+        when "warning" then "Admonition Warning"
+        when "caution" then "Admonition Caution"
+        when "todo" then "Admonition Todo"
+        when "editor" then "Admonition Editor"
+        when "tip" then "Admonition Tip"
+        when "safety-precaution" then "Admonition Safety-Precaution"
         else "Admonition"
         end
       end
@@ -135,6 +140,18 @@ module IsoDoc
         html
       end
 
+      # to pass on to imported _coverpage.scss
+      def scss_fontheader(is_html_css)
+        super + <<~SCSS
+          $color_text : #{@meta.get[:"presentation_metadata_color-text"].first};
+          $color_background_page : #{@meta.get[:"presentation_metadata_color-background-page"].first};
+          $color_background_definition_term : #{@meta.get[:"presentation_metadata_color-background-definition-term"].first};
+          $color_background_definition_description : #{@meta.get[:"presentation_metadata_color-background-definition-description"].first};
+          $color_secondary_shade_1 : #{@meta.get[:"presentation_metadata_color-secondary-shade-1"].first};
+          $color_background : #f6f8fa;
+        SCSS
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/ogc/i18n-en.yaml

@@ -20,17 +20,23 @@ toc_recommendations: List of Recommendations
 table_of_figures: Table of Figures
 security_empty: No security considerations have been made for this document.
 internal_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the following additional terms and definitions apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the following additional terms and definitions apply.
 external_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the terms and definitions given in % additionally apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the terms and definitions given in % additionally apply.
 internal_external_terms_boilerplate: |
-  <p>This document uses the terms defined in <link target="https://portal.ogc.org/public_ogc/directives/directives.php">OGC Policy Directive 49</link>, which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.</p>
-  <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
-  <p>For the purposes of this document, the terms and definitions given in % and the following additionally apply.</p>
+  This document uses the terms defined in https://portal.ogc.org/public_ogc/directives/directives.php[OGC Policy Directive 49], which is based on the ISO/IEC Directives, Part 2, Rules for the structure and drafting of International Standards. In particular, the word “shall” (not “must”) is the verb form used to indicate a requirement to be strictly followed to conform to this document and OGC documents do not use the equivalent phrases in the ISO/IEC Directives, Part 2.
+
+  This document also uses terms defined in the OGC Standard for Modular specifications (https://portal.opengeospatial.org/files/?artifact_id=34762[OGC 08-131r3]), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.
+
+  For the purposes of this document, the terms and definitions given in % and the following additionally apply.
 term_defined_in: "(%)"
 submission_date: Submission Date
 approval_date: Approval Date

data/lib/isodoc/ogc/metadata.rb

@@ -157,6 +157,17 @@ module IsoDoc
         end
         set(:logo_word, old ? get[:logo_old] : get[:logo_new])
       end
+
+      def presentation(xml, _out)
+        super
+        @metadata.each do |k, v|
+          /^presentation_metadata_color_/.match?(k) or next
+          v.is_a?(Array) or next
+          m = /^rgb\((\d+),\s*(\d+),\s*(\d+)\s*\)/.match(Array(v).first)
+          @metadata[k] =
+            sprintf("#%02x%02x%02x", m[1].to_i, m[2].to_i, m[3].to_i)
+        end
+      end
     end
   end
 end