metanorma-un 0.4.3 → 0.5.4

data/lib/asciidoctor/un/un.rng

@@ -340,6 +340,13 @@
   </define>
   <define name="un-standard">
     <element name="un-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

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/unece.css

@@ -679,7 +679,7 @@ div.WordSection2 {
 div.WordSection3 {
   page: WordSection3; }
 
-table.MsoISOTable {
+table.MsoISOTable, table.MsoISOTableBig {
   mso-style-name: "Table ISO";
   mso-tstyle-rowband-size: 0;
   mso-tstyle-colband-size: 0;
@@ -701,15 +701,15 @@ table.MsoISOTable {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }
 
-table.MsoISOTable th {
+table.MsoISOTable th, table.MsoISOTableBig th {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable p {
+table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: 10.0pt; }
 
-table.MsoISOTable td {
+table.MsoISOTable td, table.MsoISOTableBig td {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
@@ -799,8 +799,20 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt; }
 
 div.Note p.MsoListParagraph {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
+div.Note span.stem {
   font-size: 10.0pt; }
 
+div.Note p.Sourcecode, div.Note pre.Sourcecode {
+  font-size: 8.0pt;
+  margin-left: 1.0cm; }
+
+div.Note table.dl {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
 span.note_label, span.example_label, td.example_label, td.note_label {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }

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

@@ -662,7 +662,7 @@ div.WordSection2
       }
 div.WordSection3
 	{page:WordSection3;}
-table.MsoISOTable
+table.MsoISOTable, table.MsoISOTableBig
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
 	mso-tstyle-colband-size:0;
@@ -683,13 +683,13 @@ table.MsoISOTable
         margin-bottom:12pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable th
+table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p
+table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:10.0pt; }
-table.MsoISOTable td
+table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
@@ -778,6 +778,20 @@ div.example p.MsoListParagraph {
 
 div.Note p.MsoListParagraph {
   font-size: 10.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note span.stem {
+  font-size: 10.0pt; }
+
+div.Note p.Sourcecode, div.Note pre.Sourcecode  {
+  font-size: 8.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note table.dl  {
+  font-size: 10.0pt;
+  margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label

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|
@@ -62,6 +65,7 @@ module IsoDoc
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
           boilerplate docxml, div3
+          preface_block docxml, div3
           abstract docxml, div3
           foreword docxml, div3
           introduction docxml, div3
@@ -80,26 +84,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 +99,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)

data/lib/isodoc/un/presentation_xml_convert.rb

@@ -1,9 +1,52 @@
-require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
   module UN
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def initialize(options)
+        super
+        @toc = options[:toc]
+      end
+
+      def note1(f)
+        return if f.parent.name == "bibitem"
+        n = @xrefs.get[f["id"]]
+        lbl = case f["type"]
+              when "source" then "Source"
+              when "abbreviation" then "Abbreviations"
+              else
+                @i18n.note
+              end
+        prefix_name(f, "", lbl, "name")
+      end
+
+      def conversions(docxml)
+        super
+        admonition docxml
+      end
+
+      def admonition(docxml)
+        docxml.xpath(ns("//admonition")).each do |f|
+          admonition1(f)
+        end
+      end
+
+      def admonition1(f)
+        n = @xrefs.anchor(f['id'], :label) or return
+        lbl = l10n("#{@i18n.admonition} #{n}")
+        prefix_name(f, "&nbsp;&mdash; ", lbl, "name")
+      end
+
+      def annex1(f)
+        lbl = @xrefs.anchor(f['id'], :label)
+        if t = f.at(ns("./title"))
+          t.children = "<strong>#{t.children.to_xml}</strong>"
+        end
+        prefix_name(f, "<br/>", lbl, "title")
+      end
+
+      include Init
     end
   end
 end