metanorma-itu 1.0.16 → 1.0.17

data/lib/isodoc/itu/metadata.rb

@@ -11,7 +11,8 @@ module IsoDoc
             File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
         set(:logo_comb,
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
-        set(:logo_word, File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
+        set(:logo_word,
+            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
       end
 
       def title(isoxml, _out)
@@ -68,11 +69,18 @@ module IsoDoc
       end
 
       def keywords(isoxml, _out)
-        keywords = []
-        isoxml.xpath(ns("//bibdata/keyword")).each do |kw|
-          keywords << kw.text
+        super
+        set(:keywords, get[:keywords].sort)
+      end
+
+      def doctype(isoxml, _out)
+        d = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
+        set(:doctype_original, d)
+        if d == "recommendation-annex"
+          set(:doctype, "Recommendation")
+        else
+          super
         end
-        set(:keywords, keywords.sort)
       end
 
       def ip_notice_received(isoxml, _out)

data/lib/isodoc/itu/ref.rb

@@ -17,12 +17,14 @@ module IsoDoc
       end
 
       def nonstd_bibitem(list, b, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+        list.tr **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
           id = render_identifier(bibitem_ref_code(b))
-          ref << (id[0] || "[#{id[1]}]")
-          date_note_process(b, ref)
-          insert_tab(ref, 1)
-          reference_format(b, ref)
+          ref.td **{style: "vertical-align:top"} do |td|
+            td << (id[0] || "[#{id[1]}]")&.
+              gsub(/-/, "&#x2011;")&.gsub(/ /, "&#xa0;")
+            date_note_process(b, td)
+          end
+          ref.td { |td| reference_format(b, td) }
         end
       end
 
@@ -30,11 +32,35 @@ module IsoDoc
         nonstd_bibitem(list, b, ordinal, biblio)
       end
 
+      def biblio_list(f, div, biblio)
+        div.table **{ class: "biblio", border: "0" } do |t|
+          i = 0
+          t.tbody do |tbody|
+            f.elements.each do |b|
+              if b.name == "bibitem"
+                next if implicit_reference(b)
+                i += 1
+                nonstd_bibitem(tbody, b, i, biblio)
+              else
+                unless %w(title clause references).include? b.name
+                  tbody.tx do |tx|
+                    parse(b, tx)
+                  end
+                end
+              end
+            end
+          end
+        end
+        f.xpath(ns("./clause | ./references")).each do |x|
+          parse(x, div)
+        end
+      end
+
       def bracket_if_num(x)
-      return nil if x.nil?
-      x = x.text.sub(/^\[/, "").sub(/\]$/, "")
-      "[#{x}]"
-    end
+        return nil if x.nil?
+        x = x.text.sub(/^\[/, "").sub(/\]$/, "")
+        "[#{x}]"
+      end
 
       def reference_format(b, r)
         reference_format_start(b, r)
@@ -50,7 +76,7 @@ module IsoDoc
       end
 
       IGNORE_IDS =
-  "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
+        "@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor'".freeze
 
       def multi_bibitem_ref_code(b)
         id = b.xpath(ns("./docidentifier[not(@type = 'metanorma' or #{IGNORE_IDS})]"))

data/lib/isodoc/itu/terms.rb

@@ -39,7 +39,7 @@ module IsoDoc
             insert_tab(b, 1)
             term.children.each { |n| parse(n, b) }
           end
-          source and p << " [#{source.value}]"
+          source and p << " #{bracket_opt(source.value)}"
           p << ": "
         end
         defn and defn.children.each { |n| parse(n, div) }

data/lib/isodoc/itu/word_convert.rb

@@ -214,8 +214,9 @@ module IsoDoc
           next unless auth && dest
           t == "copyright" and p = auth&.at(".//p") and
             p["class"] = "boilerplateHdr"
-          auth&.xpath(".//p[not(@class)]")&.each do |p|
+          auth&.xpath(".//p[not(@class)]")&.each_with_index do |p, i|
             p["class"] = "boilerplate"
+            i == 0 && t == "copyright" and p["style"] = "text-align:center;"
           end
           auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" unless t == "copyright"
           dest.replace(auth.remove)

data/lib/isodoc/itu/xref.rb

@@ -67,10 +67,6 @@ module IsoDoc
         termexample_anchor_names(d)
       end
 
-      def hiersep
-        "-"
-      end
-
       MIDDLE_SECTIONS = "//clause[title = 'Scope'] | "\
         "//foreword | //introduction | //acknowledgements | "\
         "//references[@normative = 'true'] | "\
@@ -126,6 +122,17 @@ module IsoDoc
           end
         end
       end
+
+      def hierarchical_formula_names(clause, num)
+      c = IsoDoc::Function::XrefGen::Counter.new
+      clause.xpath(ns(".//formula")).each do |t|
+        next if t["id"].nil? || t["id"].empty?
+        @anchors[t["id"]] =
+          anchor_struct("#{num}-#{c.increment(t).print}", nil,
+                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        "formula", t["unnumbered"])
+      end
+    end
     end
   end
 end

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.16"
+    VERSION = "1.0.17"
   end
 end

data/metanorma-itu.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.4.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement