metanorma-un 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89413090ed747b554d765b2c2670f943aab27e38f9b1db11c6adc6433932d31
-  data.tar.gz: 5a2b19fda5a3ed32ab7231ca27fae981d5b315287b4d9cd17a9d272b8e604dd1
+  metadata.gz: 84ac6004180fc5b55f02c08ce72d19b4b2e0de5f5b406f4c6796fe5595edeee6
+  data.tar.gz: 0d742071c23c5455cca3ddcd9a13dcdcf45ad781478dfad4a4297510697e5f70
 SHA512:
-  metadata.gz: 4dfc69a0efb1d8a48b6b479bcbdcb70ef22e5c733a0e6edfe210a66033af618de7daf596182957b53f0ab0be0187c5b7ad2abb8261258ea0609bf9d79cbba139
-  data.tar.gz: 61f54df3a3d6b56718f887c81d0c3fca978e25fcffbbfc41d9a4b3f9e99cd86a7f86f483cdda80701bf7db16714cd49d7b90db8d732ce5f77e55ac09e9202fa6
+  metadata.gz: e0d3b23e08336a19b8000792d0facbb9e7311f77ef014e5931503027b5dd9e54fa84e6135c4e38535a8bc0a75d476f5b8ac95443cda73b1e9c4cb19a3d5b3571
+  data.tar.gz: 88d72ed256d4c45d0c1873c42423fcc6449a99b0a3efa8d842f9d33fcf63dc823a102fac228b4c3fb9a82f737e20cd3befeb6a43e59c7b13884a4c7f301216b6

data/lib/asciidoctor/un/converter.rb

@@ -5,10 +5,6 @@ require_relative "validate"
 
 module Asciidoctor
   module UN
-
-    # A {Converter} implementation that generates RSD output, and a document
-    # schema encapsulation of the document for validation
-    #
     class Converter < Standoc::Converter
       XML_ROOT_TAG = "un-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/un".freeze
@@ -49,14 +45,20 @@ module Asciidoctor
         end
       end
 
+      def asciidoc_sub(text)
+        Asciidoctor::Standoc::Utils::asciidoc_sub(text)
+      end
+
       def title(node, xml)
         ["en"].each do |lang|
-          xml.title **{ type: "main", language: lang, format: "text/plain" } do |t|
-            t << (Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title")) || node.title)
+          xml.title **{ type: "main", language: lang,
+                        format: "text/plain" } do |t|
+            t << (asciidoc_sub(node.attr("title")) || node.title)
           end
           node.attr("subtitle") and
-            xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
-            t << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("subtitle"))
+            xml.title **{ type: "subtitle", language: lang,
+                          format: "text/plain" } do |t|
+            t << asciidoc_sub(node.attr("subtitle"))
           end
         end
       end
@@ -64,7 +66,8 @@ module Asciidoctor
       def metadata_id(node, xml)
         dn = node.attr("docnumber")
         if docstatus = node.attr("status")
-          abbr = IsoDoc::UN::Metadata.new("en", "Latn", {}).stage_abbr(docstatus)
+          abbr = IsoDoc::UN::Metadata.new("en", "Latn", @i18n)
+            .stage_abbr(docstatus)
           dn = "#{dn}(#{abbr})" unless abbr.empty?
         end
         xml.docidentifier { |i| i << dn }
@@ -92,17 +95,26 @@ module Asciidoctor
         xml.session do |session|
           session.number node.attr("session") if node.attr("session")
           session.date node.attr("session-date") if node.attr("session-date")
-          node&.attr("item-number")&.split(/,[ ]*/)&.each { |i| session.item_number i }
-          node&.attr("item-name")&.split(/,[ ]*/)&.each { |i| session.item_name i }
-          node&.attr("subitem-name")&.split(/,[ ]*/)&.each { |i| session.subitem_name i }
-          session.collaborator node.attr("collaborator") if node.attr("collaborator")
+          node&.attr("item-number")&.split(/,[ ]*/)&.each do |i|
+            session.item_number i
+          end
+          node&.attr("item-name")&.split(/,[ ]*/)&.each do |i|
+            session.item_name i
+          end
+          node&.attr("subitem-name")&.split(/,[ ]*/)&.each do |i|
+            session.subitem_name i
+          end
+          node.attr("collaborator") and
+            session.collaborator node.attr("collaborator")
           session.id node.attr("agenda-id") if node.attr("agenda-id")
-          session.item_footnote node.attr("item-footnote") if node.attr("item-footnote")
+          node.attr("item-footnote") and
+            session.item_footnote node.attr("item-footnote")
         end
       end
 
       def metadata_language(node, xml)
-        languages = node&.attr("language")&.split(/,[ ]*/) || %w(ar ru en fr zh es)
+        languages = node&.attr("language")&.split(/,[ ]*/) ||
+          %w(ar ru en fr zh es)
         languages.each { |l| xml.language l }
       end
 
@@ -124,15 +136,19 @@ module Asciidoctor
 
       def makexml(node)
         @draft = node.attributes.has_key?("draft")
-        @no_number_subheadings = node.attributes.has_key?("do-not-number-subheadings")
+        @no_number_subheadings =
+          node.attributes.has_key?("do-not-number-subheadings")
         super
       end
 
       def doctype(node)
         d = node.attr("doctype")
-        unless %w{plenary recommendation addendum communication corrigendum reissue
-          agenda budgetary sec-gen-notes expert-report resolution plenary-attachment}.include? d
-          @log.add("Document Attributes", nil, "#{d} is not a legal document type: reverting to 'recommendation'")
+        unless %w{plenary recommendation addendum communication corrigendum 
+          reissue agenda budgetary sec-gen-notes expert-report resolution 
+          plenary-attachment}.include? d
+          @log.add(
+            "Document Attributes", nil,
+            "#{d} is not a legal document type: reverting to 'recommendation'")
           d = "recommendation"
         end
         d
@@ -141,9 +157,12 @@ module Asciidoctor
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
         presentation_xml_converter(node).convert(@filename + ".xml")
-        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
+        html_converter(node).convert(@filename + ".presentation.xml", 
+                                     nil, false, "#{@filename}.html")
+        doc_converter(node).convert(@filename + ".presentation.xml", 
+                                    nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+                                     nil, false, "#{@filename}.pdf")
       end
 
       def validate(doc)
@@ -217,10 +236,8 @@ module Asciidoctor
       end
 
       def admonition_attrs(node)
-        attr_code(super.merge(
-          "unnumbered": node.option?("unnumbered"),
-          "subsequence": node.attr("subsequence"),
-        ))
+        attr_code(super.merge("unnumbered": node.option?("unnumbered"),
+          "subsequence": node.attr("subsequence")))
       end
 
       def sectiontype_streamline(ret)

data/lib/asciidoctor/un/isodoc.rng

@@ -922,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1180,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>

data/lib/asciidoctor/un/validate.rb

@@ -14,7 +14,8 @@ module Asciidoctor
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(proposal working-draft committee-draft draft-standard final-draft
         published withdrawn).include? stage or
-        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
+        @log.add("Document Attributes", nil, 
+                 "#{stage} is not a recognised status")
       end
     end
   end

data/lib/isodoc/un/base_convert.rb

@@ -1,52 +1,12 @@
-require_relative "metadata"
-require_relative "xref"
 require "fileutils"
 
 module IsoDoc
   module UN
     module BaseConvert
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
-        @meta.set(:toc, @toc)
-      end
-
-def xref_init(lang, script, klass, labels, options)
-        @xrefs = Xref.new(lang, script, klass, labels, options)
-      end
-
-      def annex_name(annex, name, div)
-        div.h1 **{ class: "Annex" } do |t|
-          t << "#{@xrefs.anchor(annex['id'], :label)}"
-          t.br
-          t.b do |b|
-            name&.children&.each { |c2| parse(c2, b) }
-          end
-        end
-      end
-
-      def i18n_init(lang, script)
-        super
-        @admonition_lbl = "Box"
-        @abstract_lbl = "Summary"
-      end
-
-      def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
-      end
-
       def middle_clause
         "//clause[parent::sections]"
       end
 
-      def admonition_name_parse(node, div, name)
-        div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
-          lbl = @xrefs.anchor(node['id'], :label)
-          lbl.nil? or p << l10n("#{@admonition_lbl} #{lbl}")
-          name and !lbl.nil? and p << "&nbsp;&mdash; "
-          name and name.children.each { |n| parse(n, div) }
-        end
-      end
-
       def admonition_parse(node, out)
         name = node.at(ns("./name"))
         out.div **admonition_attrs(node) do |t|
@@ -57,13 +17,10 @@ def xref_init(lang, script, klass, labels, options)
         end
       end
 
-      def inline_header_title(out, node, c1)
+      def inline_header_title(out, node, title)
         out.span **{ class: "zzMoveToFollowing" } do |s|
-          if lbl = @xrefs.anchor(node['id'], :label)
-            s << "#{lbl}. " unless @suppressheadingnumbers
-            insert_tab(s, 1)
-          end
-          c1&.children&.each { |c2| parse(c2, s) }
+          title&.children&.each { |c2| parse(c2, s) }
+          clausedelimspace(out) if /\S/.match(title&.text)
         end
       end
 
@@ -73,18 +30,6 @@ def xref_init(lang, script, klass, labels, options)
         return true if docxml&.at(ns("//bibdata/ext/session/*"))
         false
       end
-
-       def note_label(node)
-         n = @xrefs.get[node["id"]]
-      lbl = case node["type"]
-            when "source" then "Source"
-            when "abbreviation" then "Abbreviations"
-            else
-              @note_lbl
-            end
-      return "#{lbl}:" # if n.nil? || n[:label].nil? || n[:label].empty?
-      #l10n("#{lbl} #{n[:label]}:")
-    end
     end
   end
 end

data/lib/isodoc/un/html_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -48,8 +49,10 @@ module IsoDoc
 
       def make_body(xml, docxml)
         plenary = is_plenary?(docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        if plenary && @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
+        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72",
+                      "xml:lang": "EN-US", class: "container" }
+        if plenary &&
+            @htmlcoverpage == html_doc_path("html_unece_titlepage.html")
           @htmlcoverpage = html_doc_path("html_unece_plenary_titlepage.html")
         end
         xml.body **body_attr do |body|
@@ -80,26 +83,11 @@ module IsoDoc
         bibliography isoxml, out
       end
 
-      def clause_parse_title(node, div, c1, out)
-        if node["inline-header"] == "true"
-          inline_header_title(out, node, c1)
-        else
-          div.send "h#{@xrefs.anchor(node['id'], :level, false) || '1'}" do |h|
-            lbl = @xrefs.anchor(node['id'], :label, false)
-            h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            insert_tab(h, 1) if lbl && !@suppressheadingnumbers
-            c1&.children&.each { |c2| parse(c2, h) }
-          end
-        end
-      end
-
       def introduction(isoxml, out)
         f = isoxml.at(ns("//introduction")) || return
         page_break(out)
         out.div **{ class: "Section3", id: f["id"] } do |div|
-          div.h1(**{ class: "IntroTitle" }) do |h1|
-            h1 << @introduction_lbl
-          end
+          clause_name(nil, f.at(ns("./title")), div, { class: "IntroTitle" })
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -110,14 +98,14 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "ForewordTitle" }) do |h1|
-            h1 << @foreword_lbl
-          end
+          clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
+                    class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

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

@@ -0,0 +1,2 @@
+admonition: Box
+abstract: Summary

data/lib/isodoc/un/i18n.rb

@@ -0,0 +1,11 @@
+module IsoDoc
+  module UN
+    class I18n < IsoDoc::I18n
+      def load_yaml1(lang, script)
+        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+        super.merge(y)
+      end
+    end
+  end
+end
+

data/lib/isodoc/un/init.rb

@@ -0,0 +1,29 @@
+require "isodoc"
+require_relative "metadata"
+require_relative "xref"
+require_relative "i18n"
+
+module IsoDoc
+  module UN
+    module Init
+      def metadata_init(lang, script, labels)
+        @meta = Metadata.new(lang, script, labels)
+        @meta.set(:toc, @toc)
+      end
+
+      def xref_init(lang, script, klass, labels, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, labels, options)
+      end
+
+      def i18n_init(lang, script, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+      end
+
+      def fileloc(loc)
+        File.join(File.dirname(__FILE__), loc)
+      end
+    end
+  end
+end
+

data/lib/isodoc/un/metadata.rb

@@ -13,12 +13,14 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en' and @type='main']"))&.text
+        main = isoxml&.at(ns("//bibdata/title"\
+                             "[@language='en' and @type='main']"))&.text
         set(:doctitle, main)
       end
 
       def subtitle(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en' and @type='subtitle']"))&.text
+        main = isoxml&.at(ns("//bibdata/title"\
+                             "[@language='en' and @type='subtitle']"))&.text
         set(:docsubtitle, main)
       end
 
@@ -36,8 +38,10 @@ module IsoDoc
         set(:tc, tc.text) if tc
         set(:distribution, isoxml&.at(ns("//bibdata/ext/distribution"))&.text)
         lgs = extract_languages(isoxml.xpath(ns("//bibdata/language")))
-        lgs = [] if lgs.sort == %w(English French Arabic Chinese Russian Spanish).sort
-        slgs = extract_languages(isoxml.xpath(ns("//bibdata/ext/submissionlanguage")))
+        lgs.sort == %w(English French Arabic Chinese Russian Spanish).sort and
+          lgs = []
+        slgs = extract_languages(isoxml.xpath(ns("//bibdata/ext/"\
+                                                 "submissionlanguage")))
         lgs = [] if slgs.size == 1
         set(:doclanguage, lgs) unless lgs.empty?
         set(:submissionlanguage, slgs) unless slgs.empty?
@@ -52,25 +56,32 @@ module IsoDoc
       end
 
       def session(isoxml, _out)
-        set(:session_number, isoxml&.at(ns("//bibdata/ext/session/number"))&.text&.to_i&.
-            localize&.to_rbnf_s("SpelloutRules", "spellout-ordinal")&.capitalize)
+        set(:session_number, isoxml&.at(ns("//bibdata/ext/session/number"))&.
+            text&.to_i&.localize&.
+            to_rbnf_s("SpelloutRules", "spellout-ordinal")&.capitalize)
         set(:session_date, isoxml&.at(ns("//bibdata/ext/session/date"))&.text)
-        set(:session_collaborator, isoxml&.at(ns("//bibdata/ext/session/collaborator"))&.text)
+        set(:session_collaborator,
+            isoxml&.at(ns("//bibdata/ext/session/collaborator"))&.text)
         sid = isoxml&.at(ns("//bibdata/ext/session/id"))&.text
         set(:session_id, sid)
         set(:session_id_head, sid&.sub(%r{/.*$}, ""))
         set(:session_id_tail, sid&.sub(%r{^[^/]+}, ""))
-        set(:item_footnote, isoxml&.at(ns("//bibdata/ext/session/item-footnote"))&.text)
-        set(:session_itemnumber, multival(isoxml, "//bibdata/ext/session/item-number"))
-        set(:session_itemname, multival(isoxml, "//bibdata/ext/session/item-name"))
-        set(:session_subitemname, multival(isoxml, "//bibdata/ext/session/subitem-name"))
+        set(:item_footnote, 
+            isoxml&.at(ns("//bibdata/ext/session/item-footnote"))&.text)
+        set(:session_itemnumber, 
+            multival(isoxml, "//bibdata/ext/session/item-number"))
+        set(:session_itemname, 
+            multival(isoxml, "//bibdata/ext/session/item-name"))
+        set(:session_subitemname, 
+            multival(isoxml, "//bibdata/ext/session/subitem-name"))
       end
 
       def docid(isoxml, _out)
         dn = isoxml.at(ns("//bibdata/docidentifier"))&.text
         set(:docnumber, dn)
         type = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
-        set(:formatted_docnumber, type == "recommendation" ? "UN/CEFACT Recommendation #{dn}" : dn)
+        set(:formatted_docnumber, type == "recommendation" ?
+            "UN/CEFACT Recommendation #{dn}" : dn)
       end
 
       def stage_abbr(status)