metanorma-un 0.6.8 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aebf3c6706cfb9ddeb3383122c3024ce95df446858775f8054c293a9906c02cc
-  data.tar.gz: 0d6826ce4771d8d6b5d235308026177ce41888a8dfc21349bd2b3a0aeb227a7e
+  metadata.gz: 81239633565c9e41ab2e2dd7ac8e30b6d17306628a0038c88d400ae4d97a16cd
+  data.tar.gz: 5b83a51cdc3f1dc81692e8721e9a3443fb025fb9cd39ea3cd33c8904ab2a2db4
 SHA512:
-  metadata.gz: 25c47d32f0deeddaad8160e391f5c421c6cfffc555cbaa0239682c75a3c798ea484e154ffe11d9a5696e32bbc16ab587eaec2b1bfc6ab27af470fae824481f35
-  data.tar.gz: d5ecc5209fee4731f50317763bff7d327bf794032ae3bef01fdddedc23ab40b6dc20a9ab281d4d86126103578a880ca8b25d8b6c6e869860e950eaa81a6f2295
+  metadata.gz: a8b00137085f9cb9b4d4821475b10b36df50d3d90b8e1d1f4bc3dd4d50f346af5f9701b49c8e4f46a7eba212e4965ac7b8ec9b47086e638e7053390dff08c466
+  data.tar.gz: 79b6c46e6d568f014e238731e2add2ad696a0a2ae538a9d797a557eb66a7729964e24eb8ddb393da2a4663c73a794f7b795b0930cf7a0abca9ae76c52deaf4fb

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/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

data/lib/asciidoctor/un/isodoc.rng

@@ -32,6 +32,18 @@
         <ref name="DocumentType"/>
       </element>
     </define>
+    <define name="section-title">
+      <element name="title">
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+      <zeroOrMore>
+        <element name="variant-title">
+          <ref name="TypedTitleString"/>
+        </element>
+      </zeroOrMore>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -158,15 +170,17 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <attribute name="type">
-          <choice>
-            <value>roman</value>
-            <value>alphabet</value>
-            <value>arabic</value>
-            <value>roman_upper</value>
-            <value>alphabet_upper</value>
-          </choice>
-        </attribute>
+        <optional>
+          <attribute name="type">
+            <choice>
+              <value>roman</value>
+              <value>alphabet</value>
+              <value>arabic</value>
+              <value>roman_upper</value>
+              <value>alphabet_upper</value>
+            </choice>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -976,6 +990,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="linkmention">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="linkref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <element name="refterm">
           <zeroOrMore>
@@ -1012,6 +1036,7 @@
       <ref name="svgmap"/>
       <ref name="inputform"/>
       <ref name="toc"/>
+      <ref name="passthrough"/>
     </choice>
   </define>
   <define name="toc">
@@ -1019,6 +1044,14 @@
       <ref name="ul"/>
     </element>
   </define>
+  <define name="passthrough">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -1686,7 +1719,9 @@
       <zeroOrMore>
         <ref name="termgrammar"/>
       </zeroOrMore>
-      <ref name="definition"/>
+      <oneOrMore>
+        <ref name="termdefinition"/>
+      </oneOrMore>
       <zeroOrMore>
         <ref name="termnote"/>
       </zeroOrMore>
@@ -1749,7 +1784,7 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="definition">
+  <define name="termdefinition">
     <element name="definition">
       <oneOrMore>
         <choice>
@@ -1758,6 +1793,9 @@
           <ref name="formula"/>
         </choice>
       </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="termnote">

data/lib/asciidoctor/un/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/asciidoctor/un/validate.rb

@@ -13,11 +13,10 @@ module Asciidoctor
       def stage_validate(xmldoc)
         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")
+           published withdrawn).include? stage or
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised status")
       end
     end
   end
 end
-

data/lib/isodoc/un/html/htmlstyle.css

@@ -676,6 +676,12 @@ ul > li p:first-child {
 ul > li:first-child {
   margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 #toc-list ul {
   margin-bottom: 0.25em; }
 

data/lib/isodoc/un/html/htmlstyle.scss

@@ -394,6 +394,13 @@ ul>li:first-child {
   margin-top: 1em;
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 #toc-list ul {
   margin-bottom: 0.25em;
 }

data/lib/isodoc/un/i18n.rb

@@ -8,4 +8,3 @@ module IsoDoc
     end
   end
 end
-

data/lib/isodoc/un/init.rb

@@ -11,7 +11,7 @@ module IsoDoc
         @meta.set(:toc, @toc)
       end
 
-      def xref_init(lang, script, klass, labels, options)
+      def xref_init(lang, script, _klass, labels, options)
         html = HtmlConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
@@ -26,4 +26,3 @@ module IsoDoc
     end
   end
 end
-