metanorma-ogc 2.3.3 → 2.3.5

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -203,13 +203,13 @@ module IsoDoc
         display_order_xpath(docxml, "//indexsect", i)
       end
 
-      def norm_ref_entry_code(_ordinal, _idents, _ids, _standard, _datefn)
+      def norm_ref_entry_code(_ordinal, _idents, _ids, _standard, _datefn, _bib)
         ""
       end
 
       # if ids is just a number, only use that ([1] Non-Standard)
       # else, use both ordinal, as prefix, and ids
-      def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn)
+      def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn, _bib)
         standard and return "[#{ordinal}]<tab/>"
         ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
         prefix_bracketed_ref("#{ret}#{datefn}")

data/lib/isodoc/ogc/sections.rb

@@ -3,7 +3,7 @@ module IsoDoc
     module BaseConvert
       def intro_clause(elem, out)
         out.div **{ class: "Section3", id: elem["id"] } do |div|
-          clause_name(nil, elem&.at(ns("./title")), div, class: "IntroTitle")
+          clause_name(elem, elem&.at(ns("./title")), div, class: "IntroTitle")
           elem.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
       end
@@ -48,7 +48,7 @@ module IsoDoc
         f = isoxml.at(ns("//preface/abstract")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, f&.at(ns("./title")), s, class: "AbstractTitle")
+          clause_name(f, f&.at(ns("./title")), s, class: "AbstractTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -57,7 +57,7 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, f&.at(ns("./title")), s, class: "ForewordTitle")
+          clause_name(f, f&.at(ns("./title")), s, class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -70,7 +70,7 @@ module IsoDoc
       def conformance(isoxml, out, num)
         f = isoxml.at(ns("//clause[@type = 'conformance']")) or return num
         out.div **attr_code(id: f["id"]) do |div|
-          clause_name(nil, f&.at(ns("./title")), div, nil)
+          clause_name(f, f&.at(ns("./title")), div, nil)
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
         num

data/lib/metanorma/ogc/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/lib/metanorma/ogc/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">

data/lib/metanorma/ogc/front.rb

@@ -16,7 +16,7 @@ module Metanorma
         csv_split(HTMLEntities.new
           .decode(node.attr("submitting-organizations")), ";")&.each do |org|
           xml.contributor do |c|
-            c.role **{ type: "author" }
+            c.role type: "author"
             c.organization do |a|
               a.name org
             end
@@ -39,12 +39,12 @@ module Metanorma
       def personal_role(node, contrib, suffix)
         type = node.attr("role#{suffix}")&.downcase || "editor"
         if type == "contributor"
-          contrib.role **{ type: "author" } do |r|
+          contrib.role type: "author" do |r|
             r.description do |d|
               d << type
             end
           end
-        else contrib.role **{ type: type }
+        else contrib.role type: type
         end
       end
 
@@ -52,7 +52,7 @@ module Metanorma
         return unless node.attr("editor")
 
         xml.contributor do |c|
-          c.role **{ type: "editor" }
+          c.role type: "editor"
           c.person do |p|
             p.name do |n|
               n.completename node.attr("editor")
@@ -114,14 +114,13 @@ module Metanorma
       end
 
       def metadata_id(node, xml)
-        e = externalid(node) and xml.docidentifier e, **{ type: "ogc-external" }
+        e = externalid(node) and xml.docidentifier e, type: "ogc-external"
         node.attr("referenceurlid") and
-          xml.docidentifier externalurl(node), **{ type: "ogc-external" }
+          xml.docidentifier externalurl(node), type: "ogc-external"
         docnumber = node.attr("docnumber") || node.attr("docreference")
-        if docnumber
-          xml.docidentifier docnumber, **{ type: "ogc-internal" }
-          xml.docnumber docnumber
-        end
+        id = node.attr("docidentifier") || docnumber
+        xml.docidentifier id, type: "ogc-internal"
+        docnumber and xml.docnumber docnumber
       end
 
       def externalurl(node)
@@ -153,7 +152,7 @@ module Metanorma
 
       def ogc_date(node, xml, ogcname, metanormaname)
         if node.attr(ogcname)
-          xml.date **{ type: metanormaname } do |d|
+          xml.date type: metanormaname do |d|
             d.on node.attr(ogcname)
           end
         end