metanorma-ogc 1.5.4.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 237dae6888c593bf44ad5b0d1f7ab5f6911f9ad32adf109bbd609594cffb8088
-  data.tar.gz: 0376a84dded3cc7f7f261f8233b7f3bcf0866b6869d78f7c42666a77bf30b64e
+  metadata.gz: 69beab43aeb2bcb9aab11ca5567eba0c6cae2232f5258871911c2ff9fd7bedc2
+  data.tar.gz: b5cbea960accc69c1970f98023f3417311d6ec06b1675ea0f426ca7af0eee374
 SHA512:
-  metadata.gz: 6f9b4f21f1c69bbb87f73727a6c77a09399afd1745b7fc9b10efff2b4b0245beba920f428eba17adec3aa1825b942f73258d8027b03ead7b6e89c91acf9335a4
-  data.tar.gz: 5de27f6083e45917d32d11de6256c34449a1c23a3905d52cb7e300b3ae004d0ab4ae27c5f9cd939db47fc3964325e7a617a76340fe268d301729f7712fe431d5
+  metadata.gz: 89c25bf2553b91594d1284fa13ed0ef7a814b7ad03fa57a5ecd6a456d043d5e567a7f3b4c1cfc522d9052de0f306bb4651de2ad67c1af76ba13e6e3166abf1f3
+  data.tar.gz: 5a741f7927bf22d91cdfc63e8ae7bd7bfe2d5617d4de0722110736e65d35f2556c9e296518531bc94cb54f0f97b543a5ab78b9b7e3928a7bcbb84817deeebb46

data/Gemfile

@@ -11,3 +11,4 @@ if File.exist? "Gemfile.devel"
 end
 
 gem "metanorma-cli"
+gem "reline", "~> 0.2.8.pre.11"

data/lib/asciidoctor/ogc/cleanup.rb

@@ -58,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)
@@ -171,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'")

data/lib/asciidoctor/ogc/isodoc.rng

@@ -1973,7 +1973,11 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
@@ -1987,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammar-info">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>

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 {
@@ -1083,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;
 }
 
@@ -555,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;
 
@@ -570,11 +571,11 @@ a.anchorjs-link {
     }
   }
 
-  h2 {
+  h2, .h2 {
     font-size: 1.2em
   }
 
-  h3 {
+  h3, .h3 {
     font-size: 1em;
   }
 

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

@@ -370,7 +370,7 @@ span.blackgraphtx {
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -385,8 +385,6 @@ h1 {
   line-height: 13.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   mso-hyphenate: none;
   tab-stops: 0.7cm;
   font-size: 13.0pt;
@@ -399,6 +397,10 @@ h1 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 h1.Annex {
   mso-style-priority: 1;
   mso-style-unhide: no;
@@ -457,7 +459,7 @@ h1.Annex {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h2 {
+h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -473,8 +475,6 @@ h2 {
   line-height: 12.5pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 2;
-  mso-list: l1 level2 lfo6;
   mso-hyphenate: none;
   tab-stops: 1.0cm;
   font-size: 12.0pt;
@@ -486,7 +486,11 @@ h2 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h3 {
+h2 {
+  mso-outline-level: 2;
+  mso-list: l1 level2 lfo6; }
+
+h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -502,8 +506,6 @@ h3 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 3;
-  mso-list: l1 level3 lfo6;
   mso-hyphenate: none;
   tab-stops: 1.3cm;
   font-size: 11.0pt;
@@ -514,7 +516,11 @@ h3 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h4 {
+h3 {
+  mso-outline-level: 3;
+  mso-list: l1 level3 lfo6; }
+
+h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -530,8 +536,6 @@ h4 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 4;
-  mso-list: l1 level4 lfo6;
   mso-hyphenate: none;
   tab-stops: 1.6cm;
   font-size: 11.0pt;
@@ -542,7 +546,11 @@ h4 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h5 {
+h4 {
+  mso-outline-level: 4;
+  mso-list: l1 level4 lfo6; }
+
+h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -558,8 +566,6 @@ h5 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 5;
-  mso-list: l1 level5 lfo6;
   mso-hyphenate: none;
   tab-stops: 1.9cm;
   font-size: 11.0pt;
@@ -570,7 +576,11 @@ h5 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
-h6 {
+h5 {
+  mso-outline-level: 5;
+  mso-list: l1 level5 lfo6; }
+
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -586,8 +596,6 @@ h6 {
   line-height: 12.0pt;
   mso-pagination: widow-orphan;
   page-break-after: avoid;
-  mso-outline-level: 6;
-  mso-list: l1 level6 lfo6;
   mso-hyphenate: none;
   tab-stops: 2.2cm;
   font-size: 11.0pt;
@@ -598,6 +606,10 @@ h6 {
   mso-fareast-language: JA;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6;
+  mso-list: l1 level6 lfo6; }
+
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;

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

@@ -339,7 +339,7 @@ div.figure, p.figure
         {text-align: center;}
 
 
-h1
+h1, .h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -354,8 +354,6 @@ h1
 	line-height:13.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:1;
-	mso-list:l1 level1 lfo6;
 	mso-hyphenate:none;
 	tab-stops:0.7cm;
 	font-size:13.0pt;
@@ -367,6 +365,10 @@ h1
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h1 {
+	mso-outline-level:1;
+	mso-list:l1 level1 lfo6;
+}
 h1.Annex
 	{mso-style-priority:1;
 	mso-style-unhide:no;
@@ -423,7 +425,7 @@ h1.Annex
         mso-ansi-language:EN-GB;
         mso-fareast-language:JA;
         mso-bidi-font-weight:normal;}
-h2
+h2, .h2
 	{mso-style-priority:2;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -439,8 +441,6 @@ h2
 	line-height:12.5pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:2;
-	mso-list:l1 level2 lfo6;
 	mso-hyphenate:none;
 	tab-stops:1.0cm;
 	font-size:12.0pt;
@@ -451,7 +451,11 @@ h2
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h3
+h2 {
+	mso-outline-level:2;
+	mso-list:l1 level2 lfo6;
+}
+h3, .h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -467,8 +471,6 @@ h3
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:3;
-	mso-list:l1 level3 lfo6;
 	mso-hyphenate:none;
 	tab-stops:1.3cm;
 	font-size:11.0pt;
@@ -478,7 +480,11 @@ h3
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h4
+h3 {
+	mso-outline-level:3;
+	mso-list:l1 level3 lfo6;
+}
+h4, .h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -494,8 +500,6 @@ h4
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:4;
-	mso-list:l1 level4 lfo6;
 	mso-hyphenate:none;
 	tab-stops:1.6cm;
 	font-size:11.0pt;
@@ -505,7 +509,11 @@ h4
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h5
+h4 {
+	mso-outline-level:4;
+	mso-list:l1 level4 lfo6;
+}
+h5, .h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -521,8 +529,6 @@ h5
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:5;
-	mso-list:l1 level5 lfo6;
 	mso-hyphenate:none;
 	tab-stops:1.9cm;
 	font-size:11.0pt;
@@ -532,7 +538,11 @@ h5
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
-h6
+h5 {
+	mso-outline-level:5;
+	mso-list:l1 level5 lfo6;
+}
+h6, .h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
@@ -548,8 +558,6 @@ h6
 	line-height:12.0pt;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
-	mso-outline-level:6;
-	mso-list:l1 level6 lfo6;
 	mso-hyphenate:none;
 	tab-stops:2.2cm;
 	font-size:11.0pt;
@@ -559,6 +567,10 @@ h6
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
+h6 {
+	mso-outline-level:6;
+	mso-list:l1 level6 lfo6;
+}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;

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

@@ -467,7 +467,7 @@ span.blackgraphtx {
 div.figure, p.figure {
   text-align: center; }
 
-h1 {
+h1, .h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -481,8 +481,6 @@ h1 {
   mso-add-space: auto;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 1;
-  mso-list: l1 level1 lfo6;
   tab-stops: 0.7cm;
   border: none;
   mso-border-bottom-alt: solid #152B4D 2.25pt;
@@ -506,6 +504,10 @@ h1 {
   mso-fareast-language: EN-US;
   font-weight: normal; }
 
+h1 {
+  mso-outline-level: 1;
+  mso-list: l1 level1 lfo6; }
+
 /*
 h1.Annex
 	{mso-style-priority:1;
@@ -537,7 +539,7 @@ h1.Annex
 	mso-fareast-language:JA;
 	mso-bidi-font-weight:normal;}
 */
-.h2Annex, h2 {
+.h2Annex, h2, .h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -567,7 +569,7 @@ h1.Annex
 h2 {
   mso-list: l1 level2 lfo6; }
 
-h3 {
+h3, .h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -582,7 +584,6 @@ h3 {
   line-height: 107%;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 3;
   tab-stops: 1.3cm;
   font-size: 12.0pt;
   font-family: {{headerfont}};
@@ -594,7 +595,10 @@ h3 {
   font-weight: bold;
   mso-bidi-font-weight: normal; }
 
-h4 {
+h3 {
+  mso-outline-level: 3; }
+
+h4, .h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -610,7 +614,6 @@ h4 {
   tab-stops: 1.6cm;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 4;
   font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   color: #1F4E79;
@@ -621,7 +624,10 @@ h4 {
   font-weight: normal;
   font-style: italic; }
 
-h5 {
+h4 {
+  mso-outline-level: 4; }
+
+h5, .h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -637,7 +643,6 @@ h5 {
   tab-stops: 1.9cm;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 5;
   font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   color: #1F4E79;
@@ -647,7 +652,10 @@ h5 {
   mso-fareast-language: EN-US;
   font-weight: normal; }
 
-h6 {
+h5 {
+  mso-outline-level: 5; }
+
+h6, .h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
@@ -663,7 +671,6 @@ h6 {
   tab-stops: 2.2cm;
   mso-pagination: widow-orphan lines-together;
   page-break-after: avoid;
-  mso-outline-level: 6;
   font-size: {{normalfontsize}};
   font-family: {{headerfont}};
   mso-fareast-font-family: "MS Gothic";
@@ -678,6 +685,9 @@ h6 {
   font-weight: bold;
   mso-bidi-font-weight: normal; }
 
+h6 {
+  mso-outline-level: 6; }
+
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;