metanorma-ogc 2.2.4 → 2.2.6

data/lib/isodoc/ogc/pdf_convert.rb

@@ -13,10 +13,11 @@ module IsoDoc
 
       def pdf_stylesheet(docxml)
         doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
-        doctype = "other" unless %w(abstract-specification-topic best-practice
-        change-request-supporting-document community-practice community-standard 
-        discussion-paper engineering-report policy reference-model release-notes 
-        standard user-guide test-suite white-paper).include? doctype
+        %w(abstract-specification-topic best-practice draft-standard
+           change-request-supporting-document community-practice
+           community-standard discussion-paper engineering-report policy
+           reference-model release-notes standard user-guide test-suite
+           white-paper).include? doctype or doctype = "other"
         "ogc.#{doctype}.xsl"
       end
     end

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -12,7 +12,7 @@ module IsoDoc
       end
 
       def insert_preface_sections(doc)
-        preface_insert(doc.at(ns("//preface/clause"\
+        preface_insert(doc.at(ns("//preface/clause" \
                                  "[@type = 'executivesummary']")),
                        doc.at(ns("//preface/abstract")), doc)
         preface_insert(doc.at(ns("//preface//submitters")),
@@ -109,7 +109,7 @@ module IsoDoc
 
       def clause(docxml)
         super
-        docxml.xpath(ns("//foreword | //preface/abstract | "\
+        docxml.xpath(ns("//foreword | //preface/abstract | " \
                         "//submitters | //introduction | //acknowledgements"))
           .each do |f|
           clause1(f)
@@ -146,7 +146,7 @@ module IsoDoc
 
       def rename_stage(stage, doctype, _bib)
         stage&.text == "approved" &&
-          !%w(standard abstract-specification-topic
+          !%w(standard abstract-specification-topic draft-standard
               community-standard).include?(doctype&.text) and
           stage.children = "published"
       end
@@ -170,7 +170,7 @@ module IsoDoc
         while elem&.next_element&.name == "termsource"
           elem << "; #{elem.next_element.remove.children.to_xml}"
         end
-        elem.children = l10n("[<strong>#{@i18n.source}:</strong> "\
+        elem.children = l10n("[<strong>#{@i18n.source}:</strong> " \
                              "#{elem.children.to_xml.strip}]")
       end
 
@@ -199,7 +199,7 @@ module IsoDoc
         i = display_order_at(docxml, "//clause[@type = 'scope']", i)
         i = display_order_at(docxml, "//clause[@type = 'conformance']", i)
         i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-        i = display_order_at(docxml, "//sections/terms | "\
+        i = display_order_at(docxml, "//sections/terms | " \
                                      "//sections/clause[descendant::terms]", i)
         i = display_order_at(docxml, "//sections/definitions", i)
         i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)

data/lib/isodoc/ogc/xref.rb

@@ -6,17 +6,17 @@ module IsoDoc
     class Xref < IsoDoc::Xref
       def initial_anchor_names(doc)
         if @parse_settings.empty? || @parse_settings[:clauses]
-        preface_anchor_names(doc)
-        n = Counter.new
-        n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-        n = section_names(doc.at(ns("//clause[@type = 'conformance']")), n, 1)
-        n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-        n = section_names(
-          doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
-          n, 1
-        )
-        n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-        clause_names(doc, n)
+          preface_anchor_names(doc)
+          n = Counter.new
+          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
+          n = section_names(doc.at(ns("//clause[@type = 'conformance']")), n, 1)
+          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
+          n = section_names(
+            doc.at(ns("//sections/terms | //sections/clause[descendant::terms]")),
+            n, 1
+          )
+          n = section_names(doc.at(ns("//sections/definitions")), n, 1)
+          clause_names(doc, n)
         end
       end
 
@@ -29,23 +29,23 @@ module IsoDoc
          "//introduction"].each do |path|
           preface_names_numbered(doc.at(ns(path)))
         end
-        doc.xpath(ns("//preface/clause[not(@type = 'keywords' or "\
-                     "@type = 'submitting_orgs' or @type = 'security' or "\
+        doc.xpath(ns("//preface/clause[not(@type = 'keywords' or " \
+                     "@type = 'submitting_orgs' or @type = 'security' or " \
                      "@type = 'executivesummary')]"))
           .each { |c| preface_names_numbered(c) }
         preface_names_numbered(doc.at(ns("//acknowledgements")))
         sequential_asset_names(
-          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+          doc.xpath(ns("//preface/abstract | //foreword | //introduction | " \
                        "//submitters | //acknowledgements | //preface/clause")),
         )
       end
 
       def middle_section_asset_names(doc)
         middle_sections =
-          "//clause[@type = 'scope' or @type = 'conformance'] | //foreword | "\
-          "//introduction | //preface/abstract | //submitters | "\
-          "//acknowledgements | //preface/clause | "\
-          " #{@klass.norm_ref_xpath} | //sections/terms | "\
+          "//clause[@type = 'scope' or @type = 'conformance'] | //foreword | " \
+          "//introduction | //preface/abstract | //submitters | " \
+          "//acknowledgements | //preface/clause | " \
+          "#{@klass.norm_ref_xpath} | //sections/terms | " \
           "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(doc.xpath(ns(middle_sections)))
       end
@@ -57,7 +57,7 @@ module IsoDoc
         pref = preface_number(@prefacenum, 1)
         @anchors[clause["id"]] =
           { label: pref,
-            level: 1, xref: preface_clause_name(clause), type: "clause" }
+            level: 1, xref: clause_title(clause), type: "clause" }
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names_numbered1(c, "#{pref}.#{preface_number(i + 1, 2)}", 2)
         end

data/lib/metanorma/ogc/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -1125,26 +1120,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>

data/lib/metanorma/ogc/biblio-standoc.rng

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <!--
+    Add-ons to biblio.rnc for standoc model: defines the extension point BibDataExtensionType
+    of relaton
+    
+    Specialisations as for biblio.rnc. Extension point can be redefined completely for a flavour of standoc
+    (SDO); but other elements in Bibdata can only be extended (more specialised vocabularies for Bibdata)
+  -->
+  <include href="biblio.rng">
+    <define name="BibData">
+      <ref name="BibliographicItem"/>
+      <optional>
+        <ref name="ext"/>
+      </optional>
+    </define>
+  </include>
+  <define name="ext">
+    <element name="ext">
+      <ref name="BibDataExtensionType"/>
+    </element>
+  </define>
+  <define name="BibDataExtensionType">
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
+    <ref name="doctype"/>
+    <optional>
+      <ref name="docsubtype"/>
+    </optional>
+    <optional>
+      <ref name="editorialgroup"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="ics"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="structuredidentifier"/>
+    </zeroOrMore>
+  </define>
+  <define name="doctype">
+    <element name="doctype">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="DocumentType">
+    <value>document</value>
+  </define>
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
+  <define name="editorialgroup">
+    <element name="editorialgroup">
+      <oneOrMore>
+        <ref name="technical-committee"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="technical-committee">
+    <element name="technical-committee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="IsoWorkgroup">
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
+    <text/>
+  </define>
+  <define name="ics">
+    <element name="ics">
+      <element name="code">
+        <text/>
+      </element>
+      <optional>
+        <element name="text">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="structuredidentifier">
+    <element name="structuredidentifier">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <oneOrMore>
+        <element name="agency">
+          <text/>
+        </element>
+      </oneOrMore>
+      <optional>
+        <element name="class">
+          <text/>
+        </element>
+      </optional>
+      <element name="docnumber">
+        <text/>
+      </element>
+      <optional>
+        <element name="partnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="edition">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="version">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementtype">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="supplementnumber">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="language">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="year">
+          <text/>
+        </element>
+      </optional>
+    </element>
+  </define>
+</grammar>

data/lib/metanorma/ogc/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -170,27 +171,30 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <value>adapter</value>
+          <value>translator</value>
+          <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
+        </choice>
+      </attribute>
       <zeroOrMore>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -512,6 +516,17 @@
   </define>
   <define name="localityStack">
     <element name="localityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="locality"/>
       </zeroOrMore>
@@ -524,6 +539,17 @@
   </define>
   <define name="sourceLocalityStack">
     <element name="sourceLocalityStack">
+      <optional>
+        <attribute name="connective">
+          <choice>
+            <value>and</value>
+            <value>or</value>
+            <value>from</value>
+            <value>to</value>
+            <value/>
+          </choice>
+        </attribute>
+      </optional>
       <zeroOrMore>
         <ref name="sourceLocality"/>
       </zeroOrMore>
@@ -626,6 +652,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -720,6 +749,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>

data/lib/metanorma/ogc/cleanup.rb

@@ -30,12 +30,12 @@ module Metanorma
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)
-          .include?(sect&.at("//bibdata/ext/doctype")&.text)
+          .include?(sect.at("//bibdata/ext/doctype")&.text)
         preface = sect.at("//preface") ||
           sect.add_previous_sibling("<preface/>").first
-        sect = xml&.at("//clause[@type = 'security']")&.remove ||
-          "<clause type='security' #{add_id}>"\
-          "<title>Security considerations</title>"\
+        sect = xml.at("//clause[@type = 'security']")&.remove ||
+          "<clause type='security' #{add_id}>" \
+          "<title>Security considerations</title>" \
           "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
         preface.add_child sect
       end
@@ -68,19 +68,19 @@ module Metanorma
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n&.abbrev)
         replace_title(xml, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
-        replace_title(xml, "//sections//terms#{SYMnoABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMnoABBR} | " \
                            "//sections//clause[.//terms]#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//sections//terms#{ABBRnoSYM} | "\
+        replace_title(xml, "//sections//terms#{ABBRnoSYM} | " \
                            "//sections//clause[.//terms]#{ABBRnoSYM}",
                       @i18n&.termsdefabbrev, true)
-        replace_title(xml, "//sections//terms#{SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMABBR} | " \
                            "//sections//clause[.//terms]#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms#{NO_SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{NO_SYMABBR} | " \
                            "//sections//clause[.//terms]#{NO_SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms[not(.//definitions)] | "\
+        replace_title(xml, "//sections//terms[not(.//definitions)] | " \
                            "//sections//clause[.//terms][not(.//definitions)]",
                       @i18n&.termsdef, true)
       end
@@ -101,7 +101,7 @@ module Metanorma
       end
 
       def normref_cleanup(xmldoc)
-        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = "\
+        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = " \
                        "'Normative references']]")
         r2 = xmldoc.at("//references[title[text() = 'References']]")
         if r1 && r2
@@ -118,7 +118,7 @@ module Metanorma
           r["obligation"] = "normative" unless r["obligation"]
         end
         xml.xpath(::Metanorma::Standoc::Utils::SUBCLAUSE_XPATH).each do |r|
-          o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
+          o = r.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
 
@@ -145,12 +145,12 @@ module Metanorma
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
+      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or " \
                  "@type = 'ISBN'".freeze
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'OGC']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial " \
                            "Consortium']")
         return 2 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
 
@@ -173,7 +173,7 @@ module Metanorma
         num = if ids[:num].nil? then ids[:abbrid]
               else sprintf("%09d", ids[:num].to_i)
               end
-        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: "\
+        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: " \
           "#{sprintf('%09d', ids[:partid])} :: #{ids[:id]} :: #{title}"
       end
 

data/lib/metanorma/ogc/converter.rb

@@ -42,7 +42,7 @@ module Metanorma
                   change-request-supporting-document community-practice
                   community-standard discussion-paper engineering-report
                   reference-model release-notes standard user-guide white-paper
-                  technical-paper test-suite}.include? d
+                  technical-paper test-suite draft-standard}.include? d
           @warned_doctype or
             @log.add("Document Attributes", nil,
                      "'#{d}' is not a legal document type: reverting to 'standard'")
@@ -83,7 +83,7 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
-        case node&.attr("heading")&.downcase || node.title.downcase
+        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"

data/lib/metanorma/ogc/front.rb

@@ -85,16 +85,20 @@ module Metanorma
         return unless node.attr("committee")
 
         xml.editorialgroup do |a|
-          a.committee(node.attr("committee") || "technical")
-          node.attr("subcommittee") and
-            a.subcommittee(node.attr("subcommittee"),
+          metadata_committee1(node, a)
+        end
+      end
+
+      def metadata_committee1(node, xml)
+        xml.committee(node.attr("committee") || "technical")
+        node.attr("subcommittee") and
+          xml.subcommittee(node.attr("subcommittee"),
                            **attr_code(type: node.attr("subcommittee-type"),
                                        number: node.attr("subcommittee-number")))
-          (node.attr("workgroup") || node.attr("workinggroup")) and
-            a.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
+        (node.attr("workgroup") || node.attr("workinggroup")) and
+          xml.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
                         **attr_code(type: node.attr("workgroup-type"),
                                     number: node.attr("workgroup-number")))
-        end
       end
 
       def externalid(node)
@@ -170,7 +174,7 @@ module Metanorma
                     conceptual-model-and-implementation encoding extension
                     implementation profile profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "implementation"
           end
@@ -178,7 +182,7 @@ module Metanorma
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "general"
           end