metanorma-iho 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb1d1f60faf44b8588778468d67ab66d77fd558474b98e39d76a22f2e0a676d
-  data.tar.gz: 6623c86cc70970450bc8f07c01523e1c365dbc065d0db954ea36a391d1521c80
+  metadata.gz: 220adb84380d83295f89f7657a7311c2242c0b36ca7ad3cf8f87badc7a53d9a9
+  data.tar.gz: b5d713d761cc297c8cb434912eb1ebb3b8ee541036f05679341c62d94141ec45
 SHA512:
-  metadata.gz: f06bebea95255d6239531f171e86cb95837fb6c69fe91eb25915ca15b87faa245cbddb4a9283e1a65cbc3b1f87230494ff3edf680d58cbad587f1339740e873a
-  data.tar.gz: c7b4085bf8a18ef1e28740f1dd70d79d7ef6980bb9a1033e11f8be5761db9cf46c987e8fe4a1c308dda7b79bcee980320ec87efd9816c45e56ab63fa5553f74d
+  metadata.gz: 1046417d144ae07ced41c663572cc23f4b95526b61d0a59f5f8525b3b4e38906e70c2737cc54de5488f556e2e58f878008792f82352485875829662b1372bbb3
+  data.tar.gz: 7f1a7d1208ace1b629eb26214ac2938f8e1bc45b1c6897b4cdac08d67182d609d5c5ee06d7ed9cbd259aa007a7eaf43856f1c606068fa969734375715db991db

data/.github/workflows/ubuntu.yml

@@ -39,7 +39,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
+          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/iho/basicdoc.rng

@@ -402,6 +402,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +439,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -998,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/iho/converter.rb

@@ -67,14 +67,22 @@ module Asciidoctor
 
       def metadata_committee1(node, xml)
         xml.editorialgroup do |a|
-          a.committee node.attr("committee")
-          a.workgroup node.attr("workgroup")
+          a.committee do |n|
+            n.abbreviation node.attr("committee").upcase
+          end
+          a.workgroup do |n|
+            n.abbreviation node.attr("workgroup").upcase
+          end
         end
         i = 2
         while node.attr("workgroup_#{i}") do
           xml.editorialgroup do |a|
-            a.committee node.attr("committee_#{i}")
-            a.workgroup node.attr("workgroup_#{i}")
+            a.committee do |n|
+              n.abbreviation node.attr("committee_#{i}").upcase
+            end
+            a.workgroup do |n|
+              n.abbreviation node.attr("workgroup_#{i}").upcase
+            end
           end
           i += 1
         end

data/lib/asciidoctor/iho/iho.rng

@@ -23,8 +23,13 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <ref name="committee"/>
-        <ref name="workgroup"/>
+        <oneOrMore>
+          <choice>
+            <ref name="committee"/>
+            <ref name="workgroup"/>
+            <ref name="commission"/>
+          </choice>
+        </oneOrMore>
       </element>
     </define>
     <define name="BibDataExtensionType">
@@ -94,16 +99,35 @@
   </include>
   <define name="committee">
     <element name="committee">
-      <choice>
-        <value>hssc</value>
-        <value>ircc</value>
-      </choice>
+      <ref name="IHO_Group"/>
     </element>
   </define>
   <define name="workgroup">
     <element name="workgroup">
+      <ref name="IHO_Group"/>
+    </element>
+  </define>
+  <define name="commission">
+    <element name="commission">
+      <ref name="IHO_Group"/>
+    </element>
+  </define>
+  <define name="IHO_Group">
+    <optional>
+      <element name="name">
+        <text/>
+      </element>
+    </optional>
+    <element name="abbreviation">
       <text/>
     </element>
+    <optional>
+      <choice>
+        <ref name="committee"/>
+        <ref name="workgroup"/>
+        <ref name="commission"/>
+      </choice>
+    </optional>
   </define>
   <define name="annex-appendix">
     <element name="appendix">
@@ -124,6 +148,13 @@
   </define>
   <define name="iho-standard">
     <element name="iho-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/asciidoctor/iho/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1049,14 +1085,17 @@
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1453,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1507,4 +1541,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/isodoc/iho/base_convert.rb

@@ -12,9 +12,129 @@ module IsoDoc
 
       def info(isoxml, out)
         @meta.series isoxml, out
-        @meta.commentperiod isoxml, out
         super
       end
+
+      def std_bibitem_entry(list, b, ordinal, biblio)
+        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+          prefix_bracketed_ref(ref, "[#{ordinal}]")
+          standard_citation(ref, b)
+        end
+      end
+
+      def nodes_to_span(n)
+        noko do |xml|
+          xml.span do |s|
+            n&.children&.each { |x| parse(x, s) }
+          end
+        end.join("")
+      end
+
+      def multiplenames_and(names)
+        return "" if names.length == 0
+        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 extract_publisher(b)
+        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
+        abbrs = []
+        names = []
+        c&.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("/")]
+      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')]"))
+        return [nil, id, nil] if id
+        id = Nokogiri::XML::Node.new("docidentifier", b.document)
+        id << "(NO ID)"
+        [nil, id, nil]
+      end
+
+      def extract_edition(b)
+        b&.at(ns("./edition"))&.text
+      end
+
+      def extract_uri(b)
+        b.at(ns("./uri"))
+      end
+
+      def omit_docid_prefix(prefix)
+        return true if prefix == "IHO"
+        super
+      end
+
+      def render_identifier(id)
+        if !id[1].nil? and id[1]["type"] == "IHO"
+          id[1].children = id[1].text.sub(/^IHO /, "")
+        end
+        super
+      end
+
+      def extract_publisher(b)
+        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
+        abbrs = []
+        names = []
+        c&.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("/")]
+      end
+
+      def extract_author(b)
+        c = b.xpath(ns("./contributor[role/@type = 'author']"))
+        c = b.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
+        return extract_publisher(b)[0] 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
+        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("")
+        i.empty? and f = p.xpath(ns("./forename")) and
+          front = f.map { |e| e.text[0].upcase }.join("")
+        front ? "#{s} #{front}" : s
+      end
+
+      def is_iho?(b)
+        extract_publisher(b)[1] == "IHO"
+      end
+
+      # [{number}] {docID} edition {edition}: {title}, {author/organization}
+      def standard_citation(out, b)
+        if ftitle = b.at(ns("./formattedref"))
+          ftitle&.children&.each { |n| parse(n, out) }
+        else
+          id = render_identifier(inline_bibitem_ref_code(b))
+          out << id[1] if id[1]
+          ed = extract_edition(b) if is_iho?(b)
+          out << " edition #{ed}" if ed
+          out << ": " if id[1] || ed
+          iso_title(b)&.children&.each { |n| parse(n, out) }
+          out << ", "
+          author = extract_author(b)
+          out << author
+          u = extract_uri(b)
+          out << " (<a href='#{u.text}'>#{u.text}</a>)" if u
+        end
+      end
     end
   end
 end