metanorma-un 0.3.4 → 0.3.9

data/lib/asciidoctor/un/boilerplate.xml

@@ -30,7 +30,7 @@
 
       {% if tc == "United Nations Centre for Trade Facilitation and Electronic Business (UN/CEFACT)" %}
       <clause>
-        <title>#{tc}<br/>Simple, Transparent and Effective Processes for Global Commerce</title>
+        <title>{{tc}}<br/>Simple, Transparent and Effective Processes for Global Commerce</title>
         <p>UN/CEFACT's mission is to improve the ability of business, trade and administrative organizations, from developed, developing and transitional economies, to exchange products and relevant services effectively. Its principal focus is on facilitating national and international transactions, through the simplification and harmonization of processes, procedures and information flows, and so contribute to the growth of global commerce.</p>
         <p>Participation in UN/CEFACT is open to experts from United Nations Member States, Intergovernmental Organizations and Non-Governmental Organizations recognised by the United Nations Economic and Social Council (ECOSOC). Through this participation of government and business representatives from around the world, UN/CEFACT has developed a range of trade facilitation and e-business standards, recommendations and tools that are approved within a broad intergovernmental process and implemented globally.</p>
         <p align="center"><b>www.unece.org/cefact</b></p>

data/lib/asciidoctor/un/converter.rb

@@ -52,7 +52,7 @@ module Asciidoctor
       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"))
+            t << (Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title")) || node.title)
           end
           node.attr("subtitle") and
             xml.title **{ type: "subtitle", language: lang, format: "text/plain" } do |t|
@@ -124,6 +124,7 @@ module Asciidoctor
 
       def makexml(node)
         @draft = node.attributes.has_key?("draft")
+        @no_number_subheadings = node.attributes.has_key?("do-not-number-subheadings")
         super
       end
 
@@ -147,9 +148,9 @@ module Asciidoctor
           File.open(filename, "w") { |f| f.write(ret) }
           html_converter(node).convert filename unless node.attr("nodoc")
           word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
+          pdf_converter(node)&.convert filename unless node.attr("nodoc")
         end
-        @log.write(@filename + ".err") unless @novalid
+        @log.write(@localdir + @filename + ".err") unless @novalid
         @files_to_delete.each { |f| FileUtils.rm f }
         ret
       end
@@ -181,17 +182,32 @@ module Asciidoctor
       end
 
       def pdf_converter(node)
+        return nil if node.attr("no-pdf")
         IsoDoc::UN::PdfConvert.new(doc_extract_attributes(node))
       end
 
       def sections_cleanup(xmldoc)
         super
+        no_number_subheadings(xmldoc) if @no_number_subheadings
+        para_to_clause(xmldoc)
+      end
+
+      def no_number_subheadings(xmldoc)
+        xmldoc.xpath("//sections/clause | "\
+                     "//sections/definitions | //annex").each do |s|
+          s.xpath(".//clause | .//definitions").each do |c|
+            c["unnumbered"] = true
+          end
+        end
+      end
+
+      def para_to_clause(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(plenary agenda budgetary).include?(doctype) or
-          para_to_clause(xmldoc)
+          para_to_clause1(xmldoc)
       end
 
-      def para_to_clause(xmldoc)
+      def para_to_clause1(xmldoc)
         xmldoc.xpath("//clause/p | //annex/p").each do |p|
           cl = Nokogiri::XML::Node.new("clause", xmldoc)
           cl["id"] = p["id"]

data/lib/asciidoctor/un/isodoc.rng

@@ -101,9 +101,7 @@
         <ref name="structuredidentifier"/>
       </zeroOrMore>
     </define>
-    <define name="TitleType">
-      <text/>
-    </define>
+    <!-- TitleType = text -->
     <define name="sections">
       <element name="sections">
         <oneOrMore>
@@ -131,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -307,6 +308,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -913,7 +929,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -921,6 +940,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/asciidoctor/un/un.rng

@@ -107,7 +107,9 @@
       <zeroOrMore>
         <ref name="submissionlanguage"/>
       </zeroOrMore>
-      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="editorialgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -136,6 +138,109 @@
         <ref name="Basic-Section"/>
       </element>
     </define>
+    <define name="Clause-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <group>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <zeroOrMore>
+          <choice>
+            <ref name="clause-subsection"/>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+          </choice>
+        </zeroOrMore>
+      </group>
+    </define>
+    <define name="Annex-Section">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="inline-header">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="obligation">
+          <choice>
+            <value>normative</value>
+            <value>informative</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name="section-title"/>
+      </optional>
+      <group>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <zeroOrMore>
+          <choice>
+            <ref name="annex-subsection"/>
+            <ref name="terms"/>
+            <ref name="definitions"/>
+            <ref name="references"/>
+          </choice>
+        </zeroOrMore>
+      </group>
+    </define>
   </include>
   <define name="session">
     <element name="session">
@@ -221,6 +326,7 @@
         <value>general</value>
         <value>limited</value>
         <value>restricted</value>
+        <value>provisional</value>
       </choice>
     </element>
   </define>

data/lib/isodoc/un/base_convert.rb

@@ -1,6 +1,6 @@
 require_relative "metadata"
+require_relative "xref"
 require "fileutils"
-require "roman-numerals"
 
 module IsoDoc
   module UN
@@ -30,175 +30,6 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
-      MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
-
-      def initial_anchor_names(d)
-        preface_names(d.at(ns("//preface/abstract")))
-        preface_names(d.at(ns("//foreword")))
-        preface_names(d.at(ns("//introduction")))
-        d.xpath(ns("//preface/clause")).each do |c| 
-          preface_names(c)
-        end
-        preface_names(d.at(ns("//acknowledgements")))
-        sequential_asset_names(
-          d.xpath(ns("//preface/abstract | //foreword | //introduction | "\
-                     "//preface/clause | //acknowledgements")))
-        middle_section_asset_names(d)
-        clause_names(d, 0)
-        termnote_anchor_names(d)
-        termexample_anchor_names(d)
-      end
-
-      def clause_names(docxml, sect_num)
-        q = "//clause[parent::sections]"
-        @paranumber = 0
-        docxml.xpath(ns(q)).each_with_index do |c, i|
-          section_names(c, (i + sect_num), 1)
-        end
-      end
-
-      def levelnumber(num, lvl)
-        case lvl % 3
-        when 1 then RomanNumerals.to_roman(num)
-        when 2 then ("A".ord + num - 1).chr
-        when 0 then num.to_s
-        end
-      end
-
-      def annex_levelnum(num, lvl)
-        case lvl % 3
-        when 0 then RomanNumerals.to_roman(num)
-        when 1 then ("A".ord + num - 1).chr
-        when 2 then num.to_s
-        end
-      end
-
-      NONTERMINAL =
-        "./clause | ./term  | ./terms | ./definitions | ./references".freeze
-
-      def leaf_section?(clause)
-        !clause.at(ns(NONTERMINAL)) &&
-          !%w(definitions annex terms).include?(clause.name) &&
-          clause.at(ns("./p | ./bibitem"))
-      end
-
-      def label_leaf_section(clause, lvl)
-        @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: "paragraph #{@paranumber}", 
-                                  level: lvl, type: "paragraph" }
-      end
-
-      def label_annex_leaf_section(clause, num, lvl)
-        @paranumber += 1
-        @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: "paragraph #{num}.#{@paranumber}", 
-                                  level: lvl, type: "paragraph" }
-      end
-
-      def section_names(clause, num, lvl)
-        return num if clause.nil?
-        leaf_section?(clause) and label_leaf_section(clause, lvl) and return
-        num = num + 1
-        lbl = levelnumber(num, 1)
-        @anchors[clause["id"]] = { label: lbl, level: lvl, type: "clause",
-                                   xref: l10n("#{@clause_lbl} #{lbl}") }
-        i = 1
-        clause.xpath(ns(NONTERMINAL)).each do |c|
-          section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
-          i += 1 if !leaf_section?(c)
-        end
-        num
-      end
-
-      def section_names1(clause, num, level)
-        leaf_section?(clause) and label_leaf_section(clause, level) and return
-        /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] = { label: leafnum, level: level, type: "clause",
-                                   xref: l10n("#{@clause_lbl} #{num}") }
-        i = 1
-        clause.xpath(ns(NONTERMINAL)).each do |c|
-          section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
-          i += 1 if !leaf_section?(c)
-        end
-      end
-
-      def annex_name_lbl(clause, num)
-        l10n("<b>#{@annex_lbl} #{num}</b>")
-      end
-
-      def annex_names(clause, num)
-        hierarchical_asset_names(clause, num)
-        leaf_section?(clause) and
-          label_annex_leaf_section(clause, num, 1) and return
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                   type: "clause",
-                                   xref: "#{@annex_lbl} #{num}", level: 1 }
-        i = 1
-        clause.xpath(ns("./clause")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnum(i, 2)}", 2)
-          i += 1 if !leaf_section?(c)
-        end
-      end
-
-      def annex_names1(clause, num, level)
-        leaf_section?(clause) and
-          label_annex_leaf_section(clause, num, level) and return
-        /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] = { label: leafnum, xref: "#{@annex_lbl} #{num}",
-                                   level: level, type: "clause" }
-        i = 1
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          annex_names1(c, "#{num}.#{annex_levelnum(i, level + 1)}", level + 1)
-          i += 1 if !leaf_section?(c)
-        end
-      end
-
-      def back_anchor_names(docxml)
-        docxml.xpath(ns("//annex")).each_with_index do |c, i|
-          @paranumber = 0
-          annex_names(c, RomanNumerals.to_roman(i + 1))
-        end
-        docxml.xpath(ns("//bibliography/clause |"\
-                        "//bibliography/references")).each do |b|
-          preface_names(b)
-        end
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
-
-      def sequential_admonition_names(clause)
-        i = 0
-        clause.xpath(ns(".//admonition")).each do |t|
-          i += 1 unless t["unnumbered"]
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] = anchor_struct(i.to_s, nil, @admonition_lbl,
-                                            "box", t["unnumbered"])
-        end
-      end
-
-      def hierarchical_admonition_names(clause, num)
-        i = 0
-        clause.xpath(ns(".//admonition")).each do |t|
-          i += 1 unless t["unnumbered"]
-          next if t["id"].nil? || t["id"].empty?
-          @anchors[t["id"]] =
-            anchor_struct("#{num}.#{i}", nil, @admonition_lbl, "box",
-                          t["unnumbered"])
-        end
-      end
-
-      def sequential_asset_names(clause)
-        super
-        sequential_admonition_names(clause)
-      end
-
-      def hierarchical_asset_names(clause, num)
-        super
-        hierarchical_admonition_names(clause, num)
-      end
-
       def admonition_name_parse(node, div, name)
         div.p **{ class: "AdmonitionTitle", style: "text-align:center;" } do |p|
           lbl = anchor(node['id'], :label)