metanorma-ogc 1.5.1 → 1.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4063833ca53f3e93cf63f8ac3a5d8a82b6ffdfd63f5241e443c5f917685fcaff
-  data.tar.gz: f4fce3ab129c5de35104728ce908b4b57c4de46eaf69d600dbe2daa778e4d2df
+  metadata.gz: 237dae6888c593bf44ad5b0d1f7ab5f6911f9ad32adf109bbd609594cffb8088
+  data.tar.gz: 0376a84dded3cc7f7f261f8233b7f3bcf0866b6869d78f7c42666a77bf30b64e
 SHA512:
-  metadata.gz: c0449f36aaadb5ad9ecf5c534b92b385259147fdd94962e01923ad80a3f4e49f6f0b85f4fe0f1637b46eedc0af9f434eb9a3905170044a618e839f406fa473cf
-  data.tar.gz: 141846935988beca18f4180ad4a0acd0912fa56bbab0b8ea81f70f3f97dd20bb90b47e666741025814b4283bfa2b5aaa496a93c415c8769960169078f12e97f9
+  metadata.gz: 6f9b4f21f1c69bbb87f73727a6c77a09399afd1745b7fc9b10efff2b4b0245beba920f428eba17adec3aa1825b942f73258d8027b03ead7b6e89c91acf9335a4
+  data.tar.gz: 5de27f6083e45917d32d11de6256c34449a1c23a3905d52cb7e300b3ae004d0ab4ae27c5f9cd939db47fc3964325e7a617a76340fe268d301729f7712fe431d5

data/Gemfile

@@ -9,3 +9,5 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gem "metanorma-cli"

data/lib/asciidoctor/ogc/boilerplate.xml

@@ -5,7 +5,7 @@
 
       <p align="center">Copyright
         © {{ docyear }} Open Geospatial Consortium<br/>
-        To obtain additional rights of use, visit 
+        To obtain additional rights of use, visit
         <link target="http://www.ogc.org/legal/">http://www.ogc.org/legal/</link></p>
     </clause>
     <clause>
@@ -113,7 +113,7 @@
     <clause>
       <title>Notice</title>
       <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
-     
+
       <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
     </clause>
 
@@ -151,7 +151,7 @@
   <feedback-statement>
     {% if doctype == "Standard" %}
     <clause id="boilerplate-standard-feedback">
-      <p>Suggested additions, changes and comments on this standard are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://portal.opengeospatial.org/public_ogc/change_request.php">http://portal.opengeospatial.org/public_ogc/change_request.php</link></p>
+      <p>Suggested additions, changes and comments on this document are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://portal.opengeospatial.org/public_ogc/change_request.php">http://portal.opengeospatial.org/public_ogc/change_request.php</link></p>
     </clause>
     {% endif %}
   </feedback-statement>

data/lib/asciidoctor/ogc/cleanup.rb

@@ -10,6 +10,7 @@ module Asciidoctor
 
       def make_preface(xml, sect)
         super
+        insert_execsummary(xml, sect)
         insert_security(xml, sect)
         insert_submitters(xml, sect)
       end
@@ -18,6 +19,14 @@ module Asciidoctor
         %(id="_#{UUIDTools::UUID.random_create}")
       end
 
+      def insert_execsummary(xml, sect)
+        summ = xml&.at("//clause[@type = 'executivesummary']")&.remove or
+          return
+        preface = sect.at("//preface") ||
+          sect.add_previous_sibling("<preface/>").first
+        preface.add_child summ
+      end
+
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)

data/lib/asciidoctor/ogc/converter.rb

@@ -75,8 +75,10 @@ module Asciidoctor
         case node&.attr("heading")&.downcase || node.title.downcase
         when "submitters" then return submitters_parse(attrs, xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
-        when "security considerations" then attrs =
-                                              attrs.merge(type: "security")
+        when "security considerations"
+          attrs = attrs.merge(type: "security")
+        when "executive summary"
+          attrs = attrs.merge(type: "executivesummary")
         end
         super
       end
@@ -143,7 +145,7 @@ module Asciidoctor
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
 
-        IsoDoc::Ogc::PdfConvert.new(html_extract_attributes(node))
+        IsoDoc::Ogc::PdfConvert.new(pdf_extract_attributes(node))
       end
 
       def doc_converter(node)

data/lib/asciidoctor/ogc/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1946,7 +1977,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1987,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2014,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2050,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2063,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2084,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2097,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2115,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>

data/lib/asciidoctor/ogc/validate.rb

@@ -57,8 +57,20 @@ module Asciidoctor
         end
       end
 
+      def execsummary_validate(xmldoc)
+        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        sect = xmldoc&.at("//clause[@type = 'executivesummary']")
+        doctype == "engineering-report" && sect.nil? and
+          @log.add("Style", nil,
+                   "Executive Summary required for Engineering Reports!")
+        doctype != "engineering-report" && !sect.nil? and
+          @log.add("Style", nil,
+                   "Executive Summary only allowed for Engineering Reports!")
+      end
+
       def section_validate(doc)
         preface_sequence_validate(doc.root)
+        execsummary_validate(doc.root)
         sections_sequence_validate(doc.root)
         super
       end

data/lib/isodoc/ogc/base_convert.rb

@@ -138,7 +138,8 @@ module IsoDoc
         return super unless (node["class"] == "steps") ||
           node.at(".//ancestor::xmlns:ol[@class = 'steps']")
 
-        ol_style(:arabic)
+        idx = node.xpath("./ancestor-or-self::xmlns:ol[@class = 'steps']").size
+        ol_style(%i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5])
       end
     end
   end

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

@@ -863,9 +863,11 @@ p.TableTitle {
   font-weight: 400; }
 
 /* Terms */
+.TermNum {
+  font-weight: 300; }
+
 .TermNum, .Terms, .AltTerms {
   color: #00335b;
-  font-weight: 300;
   font-family: {{headerfont}}; }
 
 h2.TermNum {
@@ -877,7 +879,9 @@ p.AltTerms {
 
 span.AdmittedLabel {
   color: #00335b;
-  background-color: #CFE2F3; }
+  background-color: #CFE2F3;
+  font-size: 70%;
+  vertical-align: top; }
 
 /* Links, selection */
 a, a:visited {

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

@@ -355,9 +355,12 @@ p.TableTitle {
 
 /* Terms */
 
+.TermNum {
+  font-weight: 300;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: #00335b;
-  font-weight: 300;
   font-family: $headerfont;
 }
 
@@ -373,6 +376,8 @@ p.AltTerms {
 span.AdmittedLabel {
     color: #00335b;
     background-color: #CFE2F3;
+    font-size: 70%;
+    vertical-align: top;
 }
 
 

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

@@ -309,7 +309,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: {{headerfont}};
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

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

@@ -296,7 +296,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";

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

@@ -263,7 +263,6 @@ p.Terms, li.Terms, div.Terms {
   mso-fareast-font-family: {{headerfont}};
   mso-bidi-font-family: {{headerfont}};
   mso-ansi-language: EN-GB;
-  font-weight: bold;
   mso-bidi-font-weight: normal; }
 
 p.AltTerms, li.AltTerms, div.AltTerms {

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

@@ -256,7 +256,6 @@ p.Terms, li.Terms, div.Terms
         mso-fareast-font-family:$headerfont;
         mso-bidi-font-family:$headerfont;
         mso-ansi-language:EN-GB;
-        font-weight:bold;
         mso-bidi-font-weight:normal;}
 p.AltTerms, li.AltTerms, div.AltTerms
         {mso-style-name:"AltTerm\(s\)";

data/lib/isodoc/ogc/html/scripts.html

@@ -17,7 +17,6 @@ $('#toggle').on('click', function(){
     else {
         $('nav').show();
         $('nav').animate({ 'left': '0px' }, 'slow');
-        $('.container').animate({ 'padding-left': '360px' }, 'slow');
     }
 });
 </script>

data/lib/isodoc/ogc/html_convert.rb

@@ -67,6 +67,7 @@ module IsoDoc
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
+          executivesummary docxml, div3
           keywords docxml, div3
           foreword docxml, div3
           introduction docxml, div3

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

@@ -10,21 +10,19 @@ permissionclass: Permissions class
 abstracttest: Abstract test
 conformanceclass: Conformance class
 example: Example
-security_empty: No security considerations have been made for this %.
+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 standard 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>
+  <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>
 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 standard 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>
+  <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>
 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 standard 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>
+  <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>
 term_defined_in: "(%)"
 stage_dict:
   draft: Draft

data/lib/isodoc/ogc/metadata.rb

@@ -130,8 +130,12 @@ module IsoDoc
       def bibdate(isoxml, _out)
         super
         d = docdate(isoxml)
-        old = d.nil? || d.empty? ||
-          DateTime.iso8601("2021-11-08") > DateTime.parse(d.text)
+        begin
+          old = d.nil? || d.empty? ||
+            DateTime.iso8601("2021-11-08") > DateTime.parse(d.text)
+        rescue StandardError
+          old = false
+        end
         set(:logo_word, old ? get[:logo_old] : get[:logo_new])
       end
     end