metanorma-ogc 1.5.2 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1eb36cd9acf77e8aa250a285572951349e07d00f78c574538a514bdae30ffc3
-  data.tar.gz: 9777f0f9a6bbe8204f20449024c2644a0956932bf8b1bf5c2722b809debabfcc
+  metadata.gz: 69beab43aeb2bcb9aab11ca5567eba0c6cae2232f5258871911c2ff9fd7bedc2
+  data.tar.gz: b5cbea960accc69c1970f98023f3417311d6ec06b1675ea0f426ca7af0eee374
 SHA512:
-  metadata.gz: a76271bb1ff825eb70caf9c0858b5b70a5f0fc13d07c7cd2713a3670923a9b4550e743b9a61541fc1fda17bfb2a4e8e9011a2b859b0a7d61c8ec9fde5ac67d4a
-  data.tar.gz: 3a3ea1f65f90decc18daa92d6958ecb5f4ad8ff61ab6dda324639209516e8b79d90ef1d5eb5e561ca0089b3a603d6c1c18cf4db8139c3daa12f79587c814941c
+  metadata.gz: 89c25bf2553b91594d1284fa13ed0ef7a814b7ad03fa57a5ecd6a456d043d5e567a7f3b4c1cfc522d9052de0f306bb4651de2ad67c1af76ba13e6e3166abf1f3
+  data.tar.gz: 5a741f7927bf22d91cdfc63e8ae7bd7bfe2d5617d4de0722110736e65d35f2556c9e296518531bc94cb54f0f97b543a5ab78b9b7e3928a7bcbb84817deeebb46

data/Gemfile

@@ -9,3 +9,6 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gem "metanorma-cli"
+gem "reline", "~> 0.2.8.pre.11"

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)
@@ -49,6 +58,9 @@ module Asciidoctor
         super
         a = xmldoc.at("//bibdata/status/stage")
         a.text == "published" and a.children = "approved"
+        doctype = xmldoc.at("//bibdata/ext/doctype")
+        doctype.text == "technical-paper" and
+          doctype.children = "white-paper"
       end
 
       def section_names_terms_cleanup(xml)
@@ -162,17 +174,31 @@ module Asciidoctor
         xmldoc.xpath(REQRECPER).each do |r|
           next unless r["type"]
 
-          r["type"] = case r["type"]
-                      when "requirement", "recommendation", "permission"
-                        "general"
-                      when "requirements_class" then "class"
-                      when "conformance_test" then "verification"
-                      when "conformance_class" then "conformanceclass"
-                      when "abstract_test" then "abstracttest"
-                      else r["type"]
-                      end
+          requirement_type1(r)
         end
       end
+
+      def requirement_type1(reqt)
+        reqt["type"] = case reqt["type"]
+                       when "requirement", "recommendation", "permission"
+                         "general"
+                       when "requirements_class" then "class"
+                       when "conformance_test" then "verification"
+                       when "conformance_class" then "conformanceclass"
+                       when "abstract_test" then "abstracttest"
+                       else reqt["type"]
+                       end
+      end
+
+      def normref_cleanup(xmldoc)
+        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = "\
+                       "'Normative references']]")
+        r2 = xmldoc.at("//references[title[text() = 'References']]")
+        if r1 && r2
+          r2["normative"] = false
+        end
+        super
+      end
     end
   end
 end

data/lib/asciidoctor/ogc/converter.rb

@@ -31,7 +31,7 @@ module Asciidoctor
                   change-request-supporting-document community-practice
                   community-standard discussion-paper engineering-report
                   reference-model release-notes standard user-guide white-paper
-                  test-suite}.include? d
+                  technical-paper test-suite}.include? d
           @warned_doctype or
             @log.add("Document Attributes", nil,
                      "'#{d}' is not a legal document type: reverting to 'standard'")
@@ -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>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,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 +2088,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 +2101,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 +2119,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

@@ -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; }
 
@@ -718,32 +733,32 @@ 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 {
@@ -863,9 +878,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 +894,9 @@ p.AltTerms {
 
 span.AdmittedLabel {
   color: #00335b;
-  background-color: #CFE2F3; }
+  background-color: #CFE2F3;
+  font-size: 70%;
+  vertical-align: top; }
 
 /* Links, selection */
 a, a:visited {
@@ -1079,18 +1098,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,
@@ -172,14 +173,14 @@ 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 +190,7 @@ h1 {
   }
 }
 
-h2 {
+h2, .h2 {
   margin-top: 1.3em;
   font-size: 1.7em;
   font-weight: 300;
@@ -199,13 +200,13 @@ h2 {
   }
 }
 
-h3 {
+h3, .h3 {
   margin-top: 1.3em;
   font-size: 1.5em;
   font-weight: 100;
 }
 
-h4 {
+h4, .h4 {
   font-size: 1.4em;
 }
 
@@ -355,9 +356,12 @@ p.TableTitle {
 
 /* Terms */
 
+.TermNum {
+  font-weight: 300;
+}
+
 .TermNum, .Terms, .AltTerms {
   color: #00335b;
-  font-weight: 300;
   font-family: $headerfont;
 }
 
@@ -373,6 +377,8 @@ p.AltTerms {
 span.AdmittedLabel {
     color: #00335b;
     background-color: #CFE2F3;
+    font-size: 70%;
+    vertical-align: top;
 }
 
 
@@ -550,12 +556,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;
 
@@ -565,11 +571,11 @@ a.anchorjs-link {
     }
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

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>