metanorma-ogc 1.4.0 → 1.4.3.1

data/lib/isodoc/ogc/biblio.rb

@@ -1,31 +1,31 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def std_bibitem_entry(list, b, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+      def std_bibitem_entry(list, bib, ordinal, biblio)
+        list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
           prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
-          standard_citation(ref, b)
+          standard_citation(ref, bib)
         end
       end
 
-      def nonstd_bibitem(list, b, ordinal, bibliography)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
-          id = bibitem_ref_code(b)
+      def nonstd_bibitem(list, bib, ordinal, bibliography)
+        list.p **attr_code(iso_bibitem_entry_attrs(bib, bibliography)) do |r|
+          id = bibitem_ref_code(bib)
           identifier = render_identifier(id)
           identifier[1] = nil
           if bibliography
             ref_entry_code(r, ordinal, identifier, id)
           end
-          reference_format(b, r)
+          reference_format(bib, r)
         end
       end
 
-      def reference_format(b, r)
-        if ftitle = b.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, r) }
+      def reference_format(bib, ref)
+        if ftitle = bib.at(ns("./formattedref"))
+          ftitle&.children&.each { |n| parse(n, ref) }
         else
           # eventually will be full LNCS reference
-          standard_citation(r, b)
+          standard_citation(ref, bib)
         end
       end
 
@@ -34,97 +34,101 @@ module IsoDoc
       end
 
       def multiplenames_and(names)
-        return "" if names.length == 0
+        return "" if names.empty?
         return names[0] if names.length == 1
         return "#{names[0]} and #{names[1]}" if names.length == 2
+
         names[0..-2].join(", ") + " and #{names[-1]}"
       end
 
-      def nodes_to_span(n)
+      def nodes_to_span(node)
         noko do |xml|
           xml.span do |s|
-            n&.children&.each { |x| parse(x, s) }
+            node&.children&.each { |x| parse(x, s) }
           end
-        end.join("")
+        end.join
       end
 
-      def extract_publisher(b)
-        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
+      def extract_publisher(bib)
         abbrs = []
         names = []
-        c&.each do |c1|
+        bib.xpath(ns("./contributor[role/@type = 'publisher']"\
+                     "[organization]"))&.each do |c1|
           n = c1.at(ns("./organization/name")) or next
           abbrs << (c1.at(ns("./organization/abbreviation")) || n)
           names << nodes_to_span(n)
         end
         return [nil, nil] if names.empty?
-        return [multiplenames_and(names), (abbrs.map { |x| x.text }).join("/")]
+
+        [multiplenames_and(names), abbrs.map(&:text).join("/")]
       end
 
-      def extract_author(b)
-        c = b.xpath(ns("./contributor[role/@type = 'author']"))
-        c = b.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
+      def extract_author(bib)
+        c = bib.xpath(ns("./contributor[role/@type = 'author']"))
+        c = bib.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
         return nil if c.empty?
+
         c.map do |c1|
           c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
         end.reject { |e| e.nil? || e.empty? }.join(", ")
       end
 
-      def extract_person_name(b)
-        p = b.at(ns("./person/name")) or return
+      def extract_person_name(bib)
+        p = bib.at(ns("./person/name")) or return
         c = p.at(ns("./completename")) and return c.text
         s = p&.at(ns("./surname"))&.text or return
         i = p.xpath(ns("./initial")) and
-          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join("")
+          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
         i.empty? and f = p.xpath(ns("./forename")) and
-          front = f.map { |e| e.text[0].upcase }.join("")
+          front = f.map { |e| e.text[0].upcase }.join
         front ? "#{s} #{front}" : s
       end
 
-
       def date_render(date)
         return nil if date.nil?
+
         on = date&.at(ns("./on"))&.text
         from = date&.at(ns("./from"))&.text
         to = date&.at(ns("./to"))&.text
         return on if on && !on.empty?
         return "#{from}&ndash;#{to}" if from && !from.empty?
+
         nil
       end
 
-      def extract_year(b)
-        d = b.at(ns("./date[@type = 'published']")) ||
-          b.at(ns("./date[@type = 'issued']")) ||
-          b.at(ns("./date[@type = 'circulated']")) ||
-          b.at(ns("./date"))
+      def extract_year(bib)
+        d = bib.at(ns("./date[@type = 'published']")) ||
+          bib.at(ns("./date[@type = 'issued']")) ||
+          bib.at(ns("./date[@type = 'circulated']")) ||
+          bib.at(ns("./date"))
         date_render(d)
       end
 
-      def extract_city(b)
-        b.at(ns("./place"))
+      def extract_city(bib)
+        bib.at(ns("./place"))
       end
 
-      def extract_uri(b)
-        b.at(ns("./uri"))
+      def extract_uri(bib)
+        bib.at(ns("./uri"))
       end
 
       # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
-      def standard_citation(out, b)
-        if ftitle = b.at(ns("./formattedref"))
+      def standard_citation(out, bib)
+        if ftitle = bib.at(ns("./formattedref"))
           ftitle&.children&.each { |n| parse(n, out) }
         else
-          pub, pub_abbrev = extract_publisher(b)
-          author = extract_author(b)
-          c = extract_city(b)
-          y = extract_year(b)
-          u = extract_uri(b)
+          pub, pub_abbrev = extract_publisher(bib)
+          author = extract_author(bib)
+          c = extract_city(bib)
+          y = extract_year(bib)
+          u = extract_uri(bib)
           out << "#{author || pub_abbrev}: " if author || pub_abbrev
-          id = render_identifier(inline_bibitem_ref_code(b))
+          id = render_identifier(inline_bibitem_ref_code(bib))
           out << id[1] if id[1]
-          out << " (Draft)" if ogc_draft_ref?(b)
+          out << " (Draft)" if ogc_draft_ref?(bib)
           out << ", "
           out.i do |i|
-            iso_title(b)&.children&.each { |n| parse(n, i) }
+            iso_title(bib)&.children&.each { |n| parse(n, i) }
           end
           out << ". "
           out << pub if pub
@@ -136,12 +140,14 @@ module IsoDoc
         end
       end
 
-      def inline_bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                     "or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"))
-        id ||= b.at(ns("./docidentifier[not(@type = 'metanorma')]"))
+      def inline_bibitem_ref_code(bib)
+        id = bib.at(ns("./docidentifier[not(@type = 'DOI' "\
+                       "or @type = 'metanorma' or @type = 'ISSN' "\
+                       "or @type = 'ISBN' or @type = 'rfc-anchor')]"))
+        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma')]"))
         return [nil, id, nil] if id
-        id = Nokogiri::XML::Node.new("docidentifier", b.document)
+
+        id = Nokogiri::XML::Node.new("docidentifier", bib.document)
         id << "(NO ID)"
         [nil, id, nil]
       end

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

@@ -784,6 +784,12 @@ ul > li {
   ul > li:first-child {
     margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 span.keyword {
   font-weight: 600; }
 
@@ -865,6 +871,10 @@ p.AltTerms {
   font-size: 24px;
   margin-top: 1em; }
 
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }
+
 /* Links, selection */
 a, a:visited {
   text-decoration: none;

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

@@ -273,6 +273,13 @@ ul {
   }
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 
 span.keyword {
   font-weight: 600;
@@ -363,6 +370,11 @@ p.AltTerms {
   margin-top: 1em;
 }
 
+span.AdmittedLabel {
+    color: #00335b;
+    background-color: #CFE2F3;
+}
+
 
 /* Links, selection */
 

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

@@ -851,3 +851,7 @@ div.warning p {
 
 span.hi {
   background-color: yellow; }
+
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }

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

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

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

@@ -1,15 +1,31 @@
+admitted: ADMITTED
 foreword: Preface
 submitters: Submitters
-recommendationtest: Recommendation Test
-requirementtest: Requirement Test
-permissiontest: Permission Test
-recommendationclass: Recommendation Class
-requirementclass: Requirement Class
-permissionclass: Permission Class
-abstracttest: Abstract Test
-conformanceclass: Conformance Class
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
 example: Example
 security_empty: No security considerations have been made for this %.
+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>
+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>
+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>
+term_defined_in: "(%)"
 stage_dict:
   swg-draft: Candidate SWG Draft
   oab-review: Candidate OAB Review Draft

data/lib/isodoc/ogc/metadata.rb

@@ -96,7 +96,7 @@ module IsoDoc
         if t = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
           set(:doctype, type_capitalise(t))
           set(:doctype_abbr, doctype_abbr(t))
-          if st = isoxml&.at(ns("//bibdata/ext/docsubtype"))&.text
+          if st = isoxml&.at(ns("//bibdata/ext/subdoctype"))&.text
             set(:docsubtype, type_capitalise(st))
             set(:docsubtype_abbr, docsubtype_abbr(st, t))
           end