metanorma-unece 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07f87e086397434004ac02295c0831da0583e8f6f8ff485206c0d4deaaa1a46
-  data.tar.gz: c186fbf4c55bc0d60a7bc5238de13a979d1694b51876459f28b4f8d5f513544f
+  metadata.gz: 1884c00a1f3cdb5626d42140dbaf0cc1eba0b94a0b55326fcb61299d748670a5
+  data.tar.gz: 206c2ff4bd76b1737832bd33d5faefeca07fbaa9e3aeb2ee0da9cdda344c0aef
 SHA512:
-  metadata.gz: ce40c58219498fce0223818014ffe4c942dbd4747a7967585ba7de42f445ad051eae28b650311913dd4f753aa38148745fb069dab621f78411626064631cafd5
-  data.tar.gz: 6d824abd450b6f1d4a0061a674fdbaceee7910a44e23397f9aecfc0fe09040b42051db18e69ebde6bb30f80b8d4e288bf8924371cf6f4843ee8774679760598a
+  metadata.gz: 0b4bced04b985dbe955927b45a46e0d552a7f4197b8346868e44f058ea04773c3bed8ab504f313ed54a5906253a07ec16cbd13e873dfbf47b0ce70281fc2918c
+  data.tar.gz: cb3a319050a40edc80909a93eff0d3a7f59aac5e1d94e7f5e0e24381ef13e717486e3d3d45a77befdf987c9434ccbcfadcc47d522fe33681aefb654e5a88a961

data/lib/asciidoctor/unece/converter.rb

@@ -59,7 +59,13 @@ module Asciidoctor
       end
 
       def metadata_id(node, xml)
-        xml.docidentifier { |i| i << node.attr("docnumber") }
+        dn = node.attr("docnumber")
+        if docstatus = node.attr("status")
+          abbr = IsoDoc::Unece::Metadata.new("en", "Latn", {}).status_abbr(docstatus)
+          dn = "#{dn}(#{abbr})" unless abbr.empty?
+        end
+        xml.docidentifier { |i| i << dn }
+        xml.docnumber { |i| i << node.attr("docnumber") }
       end
 
       def metadata_copyright(node, xml)
@@ -146,13 +152,6 @@ module Asciidoctor
         end
       end
 
-      def sections_cleanup(x)
-        super
-        x.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
-      end
-
       def style(n, t)
         return
       end
@@ -228,21 +227,6 @@ module Asciidoctor
         abstract_parse(attrs, xml, node) && return if node.attr("style") == "abstract"
         super
       end
-
-      def abstract_parse(attrs, xml, node)
-        xml.abstract **attr_code(attrs) do |xml_section|
-          xml_section << node.content
-        end
-      end
-
-      def make_preface(x, s)
-        super
-        if x.at("//abstract")
-          preface = s.at("//preface") || s.add_previous_sibling("<preface/>").first
-          abstract = x.at("//abstract").remove
-          preface.prepend_child abstract.remove
-        end
-      end
     end
   end
 end

data/lib/isodoc/unece/html/html_unece_titlepage.html

@@ -18,9 +18,8 @@
 
   <div class="coverpage-doc-identity">
     <div class="doc-number">
-      <span class="docnumber">{{ docnumber }}</span>
-      <span class="docnumber-separator">:</span>
-      <span class="docyear">{{ docyear }} {{ draftinfo }}</span>
+      <span class="docnumber">{{ formatted_docnumber }}</span>
+      <span class="docyear">{{ draftinfo }}</span>
     </div>
 
     <div class="coverpage-title">

data/lib/isodoc/unece/html_convert.rb

@@ -125,7 +125,7 @@ module IsoDoc
           div.send "h#{get_anchors[node['id']][:level]}" do |h|
             lbl = get_anchors[node['id']][:label]
             h << "#{lbl}. " if lbl && !@suppressheadingnumbers
-            insert_tab(h, 1)
+            insert_tab(h, 1) if lbl && !@suppressheadingnumbers
             c1&.children&.each { |c2| parse(c2, h) }
           end
         end
@@ -165,41 +165,16 @@ module IsoDoc
         end
       end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        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 cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
       MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
 
       def initial_anchor_names(d)
@@ -281,6 +256,7 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
+        hierarchical_asset_names(clause, num)
         unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
           annex_leaf_section(clause, num, 1) and return
         end
@@ -291,7 +267,6 @@ module IsoDoc
           annex_names1(c, "#{num}.#{annex_levelnumber(i, 2)}", 2)
           i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
         end
-        hierarchical_asset_names(clause, num)
       end
 
       def annex_names1(clause, num, level)
@@ -376,15 +351,6 @@ module IsoDoc
           s << "#{title} "
         end
       end
-
-      def abstract(isoxml, out)
-        f = isoxml.at(ns("//abstract")) || return
-        page_break(out)
-        out.div **attr_code(id: f["id"]) do |s|
-          s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << "Summary" }
-          f.elements.each { |e| parse(e, s) unless e.name == "title" }
-        end
-      end
     end
   end
 end

data/lib/isodoc/unece/metadata.rb

@@ -34,17 +34,10 @@ module IsoDoc
       end
 
       def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        docstatus = isoxml.at(ns("//bibdata/status"))
-        dn = docnumber&.text
-        if docstatus
-          set(:status, status_print(docstatus.text))
-          abbr = status_abbr(docstatus.text)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
+        dn = isoxml.at(ns("//bibdata/docidentifier"))&.text
         set(:docnumber, dn)
         type = isoxml&.at(ns("//bibdata/@type"))&.value
-        set(:formatted_docnumber, type == "recommendation" ? "Recommendation No. #{dn}" : dn)
+        set(:formatted_docnumber, type == "recommendation" ? "UN/CEFACT Recommendation #{dn}" : dn)
       end
 
       def status_print(status)

data/lib/isodoc/unece/word_convert.rb

@@ -131,7 +131,7 @@ module IsoDoc
         intro = docxml.at("//p[@class = 'IntroTitle']/..")
         abstract = docxml.at("//p[@class = 'AbstractTitle']/..")
         abstract.parent = (abstractbox || preface_container) if abstract
-        abstractbox and abstract.xpath("./br").each do |a|
+        abstractbox and abstract&.xpath("./br")&.each do |a|
           a.remove if /page-break-before:always/.match(a["style"])
         end
         docxml&.at("//p[@class = 'AbstractTitle']")&.remove if abstractbox
@@ -159,41 +159,16 @@ module IsoDoc
         end
       end
 
-      def pre_parse(node, out)
-        out.pre node.text # content.gsub(/</, "&lt;").gsub(/>/, "&gt;")
-      end
-
-      def term_defs_boilerplate(div, source, term, preface)
-        if source.empty? && term.nil?
-          div << @no_terms_boilerplate
-        else
-          div << term_defs_boilerplate_cont(source, term)
-        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 cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child("&nbsp;")
-          h2.add_child(d.remove)
-        end
-        docxml
-      end
-
       MIDDLE_CLAUSE = "//clause[parent::sections]".freeze
 
       def initial_anchor_names(d)
@@ -275,6 +250,7 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
+        hierarchical_asset_names(clause, num)
         unless clause.at(ns("./clause | ./term  | ./terms | ./definitions"))
           annex_leaf_section(clause, num, 1) and return
         end
@@ -285,7 +261,6 @@ module IsoDoc
           annex_names1(c, "#{num}.#{annex_levelnumber(i, 2)}", 2)
           i += 1 if c.at(ns("./clause | ./term  | ./terms | ./definitions"))
         end
-        hierarchical_asset_names(clause, num)
       end
 
       def annex_names1(clause, num, level)
@@ -375,7 +350,7 @@ module IsoDoc
         f = isoxml.at(ns("//abstract")) || return
         out.div **attr_code(id: f["id"]) do |s|
           page_break(out)
-          s.p(**{ class: "AbstractTitle" }) { |h1| h1 << "Summary" }
+          s.p(**{ class: "AbstractTitle" }) { |h1| h1 << @abstract_lbl }
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end

data/lib/metanorma/unece/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Unece
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-unece
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor