metanorma-un 0.6.9 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bebff59ec3ff854c555b92c957234f6741e6bf178b8b88f849a9a1984eee4bf0
-  data.tar.gz: e1c6234c1e97e715eb0162a12af1671aa095bec3ea184641c09e0ed27e80bfb9
+  metadata.gz: b7090558cbfbf23662a7b4c3d74d37e8f36f6ed5e9fd2533f4a60727b649103b
+  data.tar.gz: a66d7b14762d4d72ba18f136b5d21f6c9630e248bee55a4b77ba6ed609b55ee1
 SHA512:
-  metadata.gz: 9845dc890c962b26f7f28a73cd8acddc2631b2656f9cbd66ff23715b7b5077087838f7948c23b770c6006f001f49c71097fde08def137e725437fa3ca9f73bb1
-  data.tar.gz: c80f23d647165a1c4ad89bc7f7efed18f4c484ccbf495a9ef0a4a3a53bde0d68c241cb877c6ee093995987b90effeaab8ab3d7029c23aaea71a670bac2fb2d50
+  metadata.gz: 5489ca83efa7a1c79205c2ece2e831176280ba0ee916147ca0d8e5f35c34adb863a5ac6115e375c2462036c6baae47861dda1d359d70048ac4a934d74525fe9b
+  data.tar.gz: 25ddfbdf217fef36a89c60690b9f5592e30980fbcb9f505ceada556b7817dbe9813b4b0b773bf9cbdbfaf3c9e69913600925b81ce01a8744b9109c02b7e80cc3

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/Rakefile

@@ -1,8 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/asciidoctor/un/basicdoc.rng

@@ -624,6 +624,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +637,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +647,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +833,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +848,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +864,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/lib/asciidoctor/un/converter.rb

@@ -17,13 +17,14 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
+                      **attr_code(type: node.attr("committee-type"))
           i = 2
-          while node.attr("committee_#{i}") do
+          while node.attr("committee_#{i}")
             a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
+                        **attr_code(type: node.attr("committee-type_#{i}"))
             i += 1
           end
         end
@@ -66,13 +67,13 @@ 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 do |i|
+          node&.attr("item-number")&.split(/, */)&.each do |i|
             session.item_number i
           end
-          node&.attr("item-name")&.split(/,[ ]*/)&.each do |i|
+          node&.attr("item-name")&.split(/, */)&.each do |i|
             session.item_name i
           end
-          node&.attr("subitem-name")&.split(/,[ ]*/)&.each do |i|
+          node&.attr("subitem-name")&.split(/, */)&.each do |i|
             session.subitem_name i
           end
           node.attr("collaborator") and
@@ -84,13 +85,13 @@ module Asciidoctor
       end
 
       def metadata_language(node, xml)
-        languages = node&.attr("language")&.split(/,[ ]*/) ||
+        languages = node&.attr("language")&.split(/, */) ||
           %w(ar ru en fr zh es)
         languages.each { |l| xml.language l }
       end
 
       def metadata_submission_language(node, xml)
-        languages = node&.attr("submissionlanguage")&.split(/,[ ]*/) || []
+        languages = node&.attr("submissionlanguage")&.split(/, */) || []
         languages.each { |l| xml.submissionlanguage l }
       end
 
@@ -101,7 +102,7 @@ module Asciidoctor
         metadata_submission_language(node, xml)
       end
 
-      def title_validate(root)
+      def title_validate(_root)
         nil
       end
 
@@ -114,12 +115,11 @@ module Asciidoctor
 
       def doctype(node)
         d = super
-        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
@@ -128,11 +128,11 @@ 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", 
+        html_converter(node).convert(@filename + ".presentation.xml",
                                      nil, false, "#{@filename}.html")
-        doc_converter(node).convert(@filename + ".presentation.xml", 
+        doc_converter(node).convert(@filename + ".presentation.xml",
                                     nil, false, "#{@filename}.doc")
-        pdf_converter(node)&.convert(@filename + ".presentation.xml", 
+        pdf_converter(node)&.convert(@filename + ".presentation.xml",
                                      nil, false, "#{@filename}.pdf")
       end
 
@@ -142,8 +142,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "un.rng"))
       end
 
-      def style(n, t)
-        return
+      def style(_node, _text)
+        nil
       end
 
       def html_extract_attributes(node)
@@ -168,6 +168,7 @@ module Asciidoctor
 
       def pdf_converter(node)
         return nil if node.attr("no-pdf")
+
         IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
       end
 
@@ -196,25 +197,24 @@ module Asciidoctor
         xmldoc.xpath("//clause/p | //annex/p").each do |p|
           cl = Nokogiri::XML::Node.new("clause", xmldoc)
           cl["id"] = p["id"]
-          cl["inline-header"]="true" 
-          p["id"] = "_" + UUIDTools::UUID.random_create
+          cl["inline-header"] = "true"
+          p["id"] = "_#{UUIDTools::UUID.random_create}"
           p.replace(cl)
           p.parent = cl
-          while n = cl.next_element and !%w(p clause).include? n.name
+          while (n = cl.next_element) && !%w(p clause).include?(n.name)
             n.parent = cl
           end
         end
       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)
         case ret
-        when "foreword" then "donotrecognise-foreword"
-        when "introduction" then "donotrecognise-foreword"
+        when "foreword", "introduction" then "donotrecognise-foreword"
         else
           super
         end