metanorma-un 0.4.1 → 0.5.2

data/lib/isodoc/un/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require_relative "init"
 require "isodoc"
 
 module IsoDoc
@@ -15,8 +16,10 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Times New Roman",serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Times New Roman",serif'),
+          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+                     '"Times New Roman",serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                       '"Times New Roman",serif'),
           monospacefont: '"Courier New",monospace'
         }
       end
@@ -47,7 +50,8 @@ module IsoDoc
 
       def make_body(xml, docxml)
         plenary = is_plenary?(docxml)
-        if plenary && @wordcoverpage == html_doc_path("word_unece_titlepage.html")
+        if plenary &&
+            @wordcoverpage == html_doc_path("word_unece_titlepage.html")
           @wordcoverpage = html_doc_path("word_unece_plenary_titlepage.html")
         end
         @wordintropage = nil if plenary && !@toc
@@ -63,6 +67,7 @@ module IsoDoc
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2
           boilerplate docxml, div2
+          preface_block docxml, div2
           abstract docxml, div2
           foreword docxml, div2
           introduction docxml, div2
@@ -94,27 +99,12 @@ module IsoDoc
         end_line(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)
-            if lbl && !@suppressheadingnumbers
-              h << "#{lbl}. "
-              insert_tab(h, 1)
-            end
-            c1&.children&.each { |c2| parse(c2, h) }
-          end
-        end
-      end
-
       def introduction(isoxml, out)
         f = isoxml.at(ns("//introduction")) || return
         out.div **{ class: "Section3", id: f["id"] } do |div|
           page_break(out)
           div.p(**{ class: "IntroTitle" }) do |h1|
-            h1 << @introduction_lbl
+            f&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
           end
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
@@ -127,7 +117,7 @@ module IsoDoc
         out.div **attr_code(id: f["id"]) do |s|
           page_break(out)
           s.p(**{ class: "ForewordTitle" }) do |h1|
-            h1 << @foreword_lbl
+            f&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
           end
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
@@ -135,7 +125,8 @@ module IsoDoc
 
       def word_preface(docxml)
         super
-        preface_container = docxml.at("//div[@id = 'preface_container']") # recommendation
+        preface_container =
+          docxml.at("//div[@id = 'preface_container']") # recommendation
         abstractbox = docxml.at("//div[@id = 'abstractbox']") # plenary
         foreword = docxml.at("//p[@class = 'ForewordTitle']/..")
         intro = docxml.at("//p[@class = 'IntroTitle']/..")
@@ -163,18 +154,22 @@ 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 << @abstract_lbl }
+          s.p(**{ class: "AbstractTitle" }) do |h1|
+            f&.at(ns("./title"))&.children&.each { |n| parse(n, h1) }
+          end
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
 
       def authority_cleanup(docxml)
         super
-        a = docxml.at("//div[@id = 'boilerplate-ECEhdr']") and a["class"] = "boilerplate-ECEhdr"
+        a = docxml.at("//div[@id = 'boilerplate-ECEhdr']") and
+          a["class"] = "boilerplate-ECEhdr"
         docxml&.at("//div[@class = 'authority']")&.remove
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/un/xref.rb

@@ -76,9 +76,8 @@ module IsoDoc
                                    xref: l10n("#{@labels['clause']} #{lbl}") }
         i = 1
         clause.xpath(ns(NONTERMINAL)).each do |c|
-          next if c["unnumbered"] == "true"
           section_names1(c, "#{lbl}.#{levelnumber(i, lvl + 1)}", lvl + 1)
-          i += 1 if !leaf_section?(c)
+          i += 1 if !leaf_section?(c) && c["unnumbered"] != "true"
         end
         num
       end
@@ -86,18 +85,18 @@ module IsoDoc
       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("#{@labels['clause']} #{num}") }
+        clause["unnumbered"] == "true" or
+          @anchors[clause["id"]] = { label: leafnum, level: level, type: "clause",
+                                     xref: l10n("#{@labels['clause']} #{num}") }
         i = 1
         clause.xpath(ns(NONTERMINAL)).each do |c|
-          next if c["unnumbered"] == "true"
           section_names1(c, "#{num}.#{levelnumber(i, level + 1)}", level + 1)
-          i += 1 if !leaf_section?(c)
+          i += 1 if !leaf_section?(c) && c["unnumbered"] != "true"
         end
       end
 
       def annex_name_lbl(clause, num)
-        l10n("<b>#{@labels['annex']} #{num}</b>")
+        l10n("<strong>#{@labels['annex']} #{num}</strong>")
       end
 
       SUBCLAUSES =
@@ -128,7 +127,7 @@ module IsoDoc
           label_annex_leaf_section(clause, num, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
         @anchors[clause["id"]] = { label: leafnum, xref: "#{@labels['annex']} #{num}",
-                                                              level: level, type: "clause" }
+                                   level: level, type: "clause" }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|
           next if c["unnumbered"] == "true"

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.4.1"
+    VERSION = "0.5.2"
   end
 end

data/metanorma-unece.gemspec

@@ -26,16 +26,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "ruby-jing"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "iso-639"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
-  spec.add_dependency "isodoc", "~> 1.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.1'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -273,15 +259,21 @@ files:
 - lib/isodoc/un/html/html_unece_intro.html
 - lib/isodoc/un/html/html_unece_plenary_titlepage.html
 - lib/isodoc/un/html/html_unece_titlepage.html
+- lib/isodoc/un/html/htmlstyle.css
 - lib/isodoc/un/html/htmlstyle.scss
 - lib/isodoc/un/html/logo.jpg
 - lib/isodoc/un/html/scripts.html
+- lib/isodoc/un/html/unece.css
 - lib/isodoc/un/html/unece.scss
 - lib/isodoc/un/html/word_unece_intro.html
 - lib/isodoc/un/html/word_unece_plenary_titlepage.html
 - lib/isodoc/un/html/word_unece_titlepage.html
+- lib/isodoc/un/html/wordstyle.css
 - lib/isodoc/un/html/wordstyle.scss
 - lib/isodoc/un/html_convert.rb
+- lib/isodoc/un/i18n-en.yaml
+- lib/isodoc/un/i18n.rb
+- lib/isodoc/un/init.rb
 - lib/isodoc/un/metadata.rb
 - lib/isodoc/un/pdf_convert.rb
 - lib/isodoc/un/presentation_xml_convert.rb