metanorma-ogc 2.0.1 → 2.0.2

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -35,8 +35,7 @@ module IsoDoc
       def insert_security(docxml)
         s = docxml&.at(ns("//preface/clause[@type = 'security']"))&.remove or
           return
-        if a = submit_orgs_append_pt(docxml)
-          a.next = s
+        if a = submit_orgs_append_pt(docxml) then a.next = s
         else
           preface_init_insert_pt(docxml)&.children&.first
             &.add_previous_sibling(s)
@@ -46,8 +45,7 @@ module IsoDoc
       def insert_executivesummary(docxml)
         s = docxml&.at(ns("//preface/clause[@type = 'executivesummary']"))
           &.remove or return
-        if a = docxml.at(ns("//preface/abstract"))
-          a.next = s
+        if a = docxml.at(ns("//preface/abstract")) then a.next = s
         else
           preface_init_insert_pt(docxml)&.children&.first
             &.add_previous_sibling(s)
@@ -56,9 +54,7 @@ module IsoDoc
 
       def insert_submitting_orgs(docxml)
         orgs = docxml.xpath(ns(submittingorgs_path))
-          .each_with_object([]) do |org, m|
-          m << org.text
-        end
+          .each_with_object([]) { |org, m| m << org.text }
         return if orgs.empty?
 
         if a = submit_orgs_append_pt(docxml)
@@ -146,9 +142,8 @@ module IsoDoc
 
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
+        t = elem.at(ns("./title")) and
           t.children = "<strong>#{t.children.to_xml}</strong>"
-        end
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
@@ -188,6 +183,14 @@ module IsoDoc
         end
       end
 
+      def bibdata(docxml)
+        docxml.xpath(ns("//bibdata/contributor[@type = 'author']")).each do |a|
+          a.at(ns("./description"))&.text == "contributor" and
+            a["type"] = "contributor"
+        end
+        super
+      end
+
       def bibdata_i18n(bib)
         doctype = bib&.at(ns("./ext/doctype"))
         rename_stage(bib&.at(ns("./status/stage")), doctype, bib)
@@ -197,19 +200,17 @@ module IsoDoc
       end
 
       def rename_stage(stage, doctype, _bib)
-        if stage&.text == "approved" &&
-            !%w(standard abstract-specification-topic
-                community-standard).include?(doctype&.text)
+        stage&.text == "approved" &&
+          !%w(standard abstract-specification-topic
+              community-standard).include?(doctype&.text) and
           stage.children = "published"
-        end
       end
 
       def rename_doctype(doctype, date)
         return unless doctype&.text == "white-paper" && date
 
-        if Date.iso8601(date.text) >= Date.iso8601("2021-12-16")
+        Date.iso8601(date.text) >= Date.iso8601("2021-12-16") and
           doctype.children = "technical-paper"
-        end
       end
 
       def ol(docxml)

data/lib/metanorma/ogc/biblio.rng

@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>

data/lib/metanorma/ogc/front.rb

@@ -36,6 +36,18 @@ module Metanorma
         end
       end
 
+      def personal_role(node, contrib, suffix)
+        type = node.attr("role#{suffix}")&.downcase || "editor"
+        if type == "contributor"
+          contrib.role **{ type: "author" } do |r|
+            r.description do |d|
+              d << type
+            end
+          end
+        else contrib.role **{ type: type }
+        end
+      end
+
       def ogc_editor(node, xml)
         return unless node.attr("editor")
 
@@ -51,7 +63,7 @@ module Metanorma
 
       def personal_author1(node, xml, suffix)
         xml.contributor do |c|
-          c.role **{ type: node&.attr("role#{suffix}")&.downcase || "editor" }
+          personal_role(node, c, suffix)
           c.person do |p|
             p.name do |n|
               if node.attr("fullname#{suffix}")

data/lib/metanorma/ogc/isodoc.rng

@@ -32,6 +32,43 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="index">
+      <element name="index">
+        <optional>
+          <attribute name="to">
+            <data type="IDREF"/>
+          </attribute>
+        </optional>
+        <element name="primary">
+          <oneOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </oneOrMore>
+        </element>
+        <optional>
+          <element name="secondary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+        <optional>
+          <element name="tertiary">
+            <oneOrMore>
+              <choice>
+                <ref name="PureTextElement"/>
+                <ref name="stem"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+    </define>
     <define name="bibitem">
       <element name="bibitem">
         <attribute name="id">
@@ -1027,6 +1064,26 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="sub">
+      <element name="sub">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sup">
+      <element name="sup">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="pagebreak">
       <element name="pagebreak">
         <optional>
@@ -2216,7 +2273,18 @@
           <ref name="MultilingualRenderingType"/>
         </attribute>
       </optional>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="figure"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termsource">

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.1".freeze
+    VERSION = "2.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639