metanorma-itu 1.2.11 → 1.2.12

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -148,7 +148,7 @@ module IsoDoc
         t = f.at(ns("./title")) and t["depth"] = "1"
         lbl = @xrefs.anchor(f['id'], :label, false) or return
         f.elements.first.previous =
-          "<p align='center' keep-with-next='true'>#{@i18n.get['section'].upcase} #{lbl}</p>"
+          "<p keep-with-next='true' class='supertitle'>#{@i18n.get['section'].upcase} #{lbl}</p>"
       end
 
       def annex1(f)
@@ -156,7 +156,7 @@ module IsoDoc
         lbl = @xrefs.anchor(f['id'], :label)
         subhead = (@i18n.l10n("(#{@i18n.get['to']} ") + 
                    f.at(ns("//bibdata/title[@type = 'resolution']")).children.to_xml + @i18n.l10n(")"))
-        f.elements.first.previous = "<p align='center'>#{lbl}<br/>#{subhead}</p>"
+        f.elements.first.previous = "<p class='supertitle'>#{lbl}<br/>#{subhead}</p>"
         if t = f.at(ns("./title"))
           t.children = "<strong>#{t.children.to_xml}</strong>"
         end

data/lib/isodoc/itu/word_convert.rb

@@ -74,9 +74,9 @@ module IsoDoc
       end
 
       def default_fonts(options)
-        { bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+        { bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
                      '"Times New Roman",serif'),
-                     headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+                     headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                                   '"Times New Roman",serif'),
                                   monospacefont: '"Courier New",monospace',
                                   normalfontsize: "12.0pt",

data/lib/isodoc/itu/xref.rb

@@ -4,6 +4,10 @@ require "fileutils"
 module IsoDoc
   module ITU
     class Counter < IsoDoc::XrefGen::Counter
+      def print
+        super.sub(/([0-9])(bis|ter|quater|quinquies|sexies|septies|octies|nonies)$/,
+                  "\\1<em>\\2</em>")
+      end
     end
 
     class Xref < IsoDoc::Xref
@@ -104,7 +108,7 @@ module IsoDoc
       end
 
       def sequential_figure_names(clause)
-        c = IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
@@ -119,7 +123,7 @@ module IsoDoc
       end
 
       def hierarchical_figure_names(clause, num)
-        c = IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
           if t.parent.name == "figure" then j += 1
@@ -144,7 +148,7 @@ module IsoDoc
       end
 
       def hierarchical_formula_names(clause, num)
-        c = IsoDoc::XrefGen::Counter.new
+        c = Counter.new
         clause.xpath(ns(".//formula")).each do |t|
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] = anchor_struct(
@@ -160,7 +164,7 @@ module IsoDoc
 
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-          c = IsoDoc::XrefGen::Counter.new
+          c = Counter.new
           notes = t.xpath(ns(".//termnote"))
           notes.each do |n|
             return if n["id"].nil? || n["id"].empty?
@@ -173,7 +177,7 @@ module IsoDoc
       end
 
       def clause_names(docxml, sect_num)
-        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')][not(@type = 'scope')]")).
+        docxml.xpath(ns("//sections/clause[not(@unnumbered = 'true')][not(@type = 'scope')][not(descendant::terms)]")).
           each do |c|
           section_names(c, sect_num, 1)
         end
@@ -212,7 +216,7 @@ module IsoDoc
         lbl = clause&.at(ns("./title"))&.text || "[#{clause["id"]}]"
         @anchors[clause["id"]] =
           { label: lbl, xref: l10n(%{"#{lbl}"}), level: lvl, type: "clause" }
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
           unnumbered_section_names1(c, lvl + 1)
         end
       end

data/lib/metanorma/itu/processor.rb

@@ -24,6 +24,7 @@ module Metanorma
           "Courier" => nil,
           "Courier New" => nil,
           "Times New Roman" => nil,
+          "Source Han Sans" => nil,
           "STIX Two Math" => nil,
         }
       end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.2.11"
+    VERSION = "1.2.12"
   end
 end

data/metanorma-itu.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.7.0"
-  spec.add_dependency "isodoc", "~> 1.4.2"
+  spec.add_dependency "metanorma-standoc", "~> 1.8.0"
+  spec.add_dependency "isodoc", "~> 1.5.0"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement