metanorma-un 0.5.6 → 0.5.11

data/lib/isodoc/un/word_convert.rb

@@ -20,7 +20,11 @@ module IsoDoc
                      '"Times New Roman",serif'),
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                        '"Times New Roman",serif'),
-          monospacefont: '"Courier New",monospace'
+                       monospacefont: '"Courier New",monospace',
+                       normalfontsize: "10.5pt",
+                       monospacefontsize: "10.0pt",
+                       smallerfontsize: "10.0pt",
+                       footnotefontsize: "9.0pt",
         }
       end
 

data/lib/isodoc/un/xref.rb

@@ -23,8 +23,10 @@ module IsoDoc
       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)
+        i = 0
+        docxml.xpath(ns(q)).each do |c|
+          section_names(c, i, 1)
+          i += 1
         end
       end
 
@@ -56,14 +58,14 @@ module IsoDoc
       def label_leaf_section(clause, lvl)
         @paranumber += 1
         @anchors[clause["id"]] = {label: @paranumber.to_s, 
-                                  xref: "paragraph #{@paranumber}", 
+                                  xref: l10n("#{@labels['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}", 
+                                  xref: l10n("#{@labels['paragraph']} #{num}.#{@paranumber}"), 
                                   level: lvl, type: "paragraph" }
       end
 
@@ -109,7 +111,7 @@ module IsoDoc
           label_annex_leaf_section(clause, num, 1) and return
         @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
                                    type: "clause", value: num,
-                                   xref: "#{@labels['annex']} #{num}", level: 1 }
+                                   xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -126,7 +128,7 @@ module IsoDoc
         leaf_section?(clause) and
           label_annex_leaf_section(clause, num, level) and return
         /\.(?<leafnum>[^.]+$)/ =~ num
-        @anchors[clause["id"]] = { label: leafnum, xref: "#{@labels['annex']} #{num}",
+        @anchors[clause["id"]] = { label: leafnum, xref: l10n("#{@labels['annex']} #{num}"),
                                    level: level, type: "clause" }
         i = 1
         clause.xpath(ns("./clause | ./references")).each do |c|

data/lib/metanorma/un/processor.rb

@@ -2,14 +2,6 @@ require "metanorma/processor"
 
 module Metanorma
   module UN
-    def self.fonts_used
-      {
-        html: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-        doc: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-        pdf: ["Arial", "Arial Black", "Courier", "Times New Roman", "HanSans"],
-      }
-    end
-
     class Processor < Metanorma::Processor
 
       def initialize
@@ -26,6 +18,17 @@ module Metanorma
         )
       end
 
+      def fonts_manifest
+        {
+          "Arial" => nil,
+          "Arial Black" => nil,
+          "Courier" => nil,
+          "Times New Roman" => nil,
+          "STIX Two Math" => nil,
+          "Source Han Sans" => nil,
+        }
+      end
+
       def version
         "Metanorma::UN #{Metanorma::UN::VERSION}"
       end

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.5.6"
+    VERSION = "0.5.11"
   end
 end

data/metanorma-unece.gemspec

@@ -30,8 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "iso-639"
 
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.7.0"
+  spec.add_dependency "isodoc", "~> 1.4.2"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roman-numerals
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement