metanorma-ogc 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1eb36cd9acf77e8aa250a285572951349e07d00f78c574538a514bdae30ffc3
-  data.tar.gz: 9777f0f9a6bbe8204f20449024c2644a0956932bf8b1bf5c2722b809debabfcc
+  metadata.gz: b5bb1ae7e71ccb9893d37252f166f957986676100103a0923a916e305d952c03
+  data.tar.gz: 3ed27b1075d8dc53266349d70c809427b0c548708a9b6fe4018d8b4666d17f5c
 SHA512:
-  metadata.gz: a76271bb1ff825eb70caf9c0858b5b70a5f0fc13d07c7cd2713a3670923a9b4550e743b9a61541fc1fda17bfb2a4e8e9011a2b859b0a7d61c8ec9fde5ac67d4a
-  data.tar.gz: 3a3ea1f65f90decc18daa92d6958ecb5f4ad8ff61ab6dda324639209516e8b79d90ef1d5eb5e561ca0089b3a603d6c1c18cf4db8139c3daa12f79587c814941c
+  metadata.gz: 63c9dc50ccc0094aa55ddf0313c9a5d1274330537d7af307fb5118dc122352d3ecf5f928dcf6f6a6fb686cee588d013eb656fbf1725e67ca6d17dc776428dc88
+  data.tar.gz: 73e2d1c0a868d9be6e8320504ffab6062368b95d2af4241e16f4d686e0f4e5bb0d78115a90d1bd3b86d09bc10d50d5ad40380801ac1f2d4ab6d2244bf56cdc94

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

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>
@@ -1814,9 +1814,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1877,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 +1963,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1973,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2000,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2036,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2049,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 +2070,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 +2083,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 +2101,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_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/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