metanorma-itu 1.2.0 → 1.2.5

data/lib/isodoc/itu/metadata.rb

@@ -23,6 +23,12 @@ module IsoDoc
         main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
                              "[@type = 'subtitle']"))&.text
         set(:docsubtitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'amendment']"))&.text
+        set(:amendmenttitle, main)
+        main = isoxml&.at(ns("//bibdata/title[@language='#{@lang}']"\
+                             "[@type = 'corrigendum']"))&.text
+        set(:corrigendumtitle, main)
         series = isoxml&.at(ns("//bibdata/series[@type='main']/title"))&.text
         set(:series, series)
         series1 =
@@ -54,6 +60,10 @@ module IsoDoc
         oblig = isoxml&.at(ns("//annex/@obligation"))&.text
         lbl = oblig == "informative" ? @labels["appendix"] : @labels["annex"]
         dn and set(:annexid, @i18n.l10n("#{lbl} #{dn&.text}"))
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/amendment")) and
+          set(:amendmentid, @i18n.l10n("#{@labels["amendment"]} #{dn&.text}"))
+        dn = isoxml.at(ns("//bibdata/ext/structuredidentifier/corrigendum")) and
+          set(:corrigendumid, @i18n.l10n("#{@labels["corrigendum"]} #{dn&.text}"))
       end
 
       def unpublished(status)

data/lib/isodoc/itu/presentation_xml_convert.rb

@@ -48,6 +48,14 @@ module IsoDoc
         node.add_child(link)
       end
 
+      def bibdata_i18n(b)
+        super
+        dn = b.at(ns("./ext/structuredidentifier/amendment")) and
+          dn.children = @i18n.l10n("#{@i18n.get["amendment"]} #{dn&.text}")
+        dn = b.at(ns("./ext/structuredidentifier/corrigendum")) and
+          dn.children = @i18n.l10n("#{@i18n.get["corrigendum"]} #{dn&.text}")
+      end
+
       include Init
     end
   end

data/lib/isodoc/itu/word_cleanup.rb

@@ -0,0 +1,152 @@
+module IsoDoc
+  module ITU
+    class WordConvert < IsoDoc::WordConvert
+      def word_preface_cleanup(docxml)
+        docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
+                     "//h1[@class = 'IntroTitle']").each do |h2|
+          h2.name = "p"
+          h2["class"] = "h1Preface"
+        end
+      end
+
+      def word_term_cleanup(docxml)
+      end
+
+      def word_cleanup(docxml)
+        word_footnote_cleanup(docxml)
+        word_title_cleanup(docxml)
+        word_preface_cleanup(docxml)
+        word_term_cleanup(docxml)
+        word_history_cleanup(docxml)
+        authority_hdr_cleanup(docxml)
+        table_list_style(docxml)
+        super
+        docxml
+      end
+
+      def word_footnote_cleanup(docxml)
+        docxml.xpath("//aside").each do |a|
+          a.first_element_child.children.first.previous =
+            '<span style="mso-tab-count:1"/>'
+        end
+      end
+
+      def word_title_cleanup(docxml)
+        docxml.xpath("//p[@class = 'annex_obligation']").each do |h|
+          h&.next_element&.name == "p" or next
+          h.next_element["class"] ||= "Normalaftertitle"
+        end
+        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
+          h&.parent&.next_element&.name == "p" or next
+          h.parent.next_element["class"] ||= "Normalaftertitle"
+        end
+      end
+
+      def word_history_cleanup(docxml)
+        docxml.xpath("//div[@id='_history']//table").each do |t|
+          t["class"] = "MsoNormalTable"
+          t.xpath(".//td").each { |td| td["style"] = nil }
+        end
+      end
+
+      def word_preface(docxml)
+        super
+        abstractbox = docxml.at("//div[@id='abstractbox']")
+        historybox = docxml.at("//div[@id='historybox']")
+        sourcebox = docxml.at("//div[@id='sourcebox']")
+        keywordsbox = docxml.at("//div[@id='keywordsbox']")
+        abstract = docxml.at("//div[@class = 'Abstract']")
+        history = docxml.at("//div[@class = 'history']")
+        source = docxml.at("//div[@class = 'source']")
+        keywords = docxml.at("//div[@class = 'Keywords']")
+        abstract.parent = abstractbox if abstract && abstractbox
+        history.parent = historybox if history && historybox
+        source.parent = sourcebox if source && sourcebox
+        keywords.parent = keywordsbox if keywords && keywordsbox
+      end
+
+      def toWord(result, filename, dir, header)
+        result = populate_template(result, :word)
+        result = from_xhtml(word_cleanup(to_xhtml(result)))
+        unless @landscapestyle.nil? || @landscapestyle.empty?
+          @wordstylesheet&.open
+          @wordstylesheet&.write(@landscapestyle)
+          @wordstylesheet&.close
+        end
+        Html2Doc.process(
+          result, filename: filename, 
+          stylesheet: @wordstylesheet&.path,
+          header_file: header&.path, dir: dir,
+          asciimathdelims: [@openmathdelim, @closemathdelim],
+          liststyles: { ul: @ulstyle, ol: @olstyle, steps: "l4" })
+        header&.unlink
+        @wordstylesheet&.unlink
+      end
+
+      def authority_hdr_cleanup(docxml)
+        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
+          d.xpath(".//h1 | .//h2").each do |p|
+            p.name = "p"
+            p["class"] = "draftwarningHdr"
+          end
+        end
+        %w(copyright license legal).each do |t|
+          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
+            p = d&.at("./descendant::h1[2]") and
+              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
+            d.xpath(".//h1 | .//h2").each do |p|
+              p.name = "p"
+              p["class"] = "boilerplateHdr"
+            end
+          end
+        end
+      end
+
+      def authority_cleanup(docxml)
+        dest = docxml.at("//div[@class = 'draft-warning']")
+        auth = docxml.at("//div[@id = 'draft-warning']")
+        dest and auth and dest.replace(auth.remove)
+        %w(copyright license legal).each do |t|
+          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
+          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
+          next unless auth && dest
+          t == "copyright" and p = auth&.at(".//p") and
+            p["class"] = "boilerplateHdr"
+          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
+          t == "copyright" or
+            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" 
+          dest.replace(auth.remove)
+        end
+      end
+
+      TOPLIST = "[not(ancestor::ul) and not(ancestor::ol)]".freeze
+
+      def table_list_style(xml)
+        xml.xpath("//table//ul#{TOPLIST} | //table//ol#{TOPLIST}").each do |t|
+          table_list_style1(t, 1)
+        end
+      end
+
+      def table_list_style1(t, num)
+        (t.xpath(".//li") - t.xpath(".//ol//li | .//ul//li")).each do |t1|
+          indent_list(t1, num)
+          t1.xpath("./div | ./p").each { |p| indent_list(p, num) }
+          (t1.xpath(".//ul") - t1.xpath(".//ul//ul | .//ol//ul")).each do |t2|
+            table_list_style1(t2, num + 1)
+          end
+          (t1.xpath(".//ol") - t1.xpath(".//ul//ol | .//ol//ol")).each do |t2|
+            table_list_style1(t2, num + 1)
+          end
+        end
+      end
+
+      def indent_list(li, num)
+        li["style"] = (li["style"] ? li["style"] + ";" : "")
+        li["style"] += "margin-left: #{num * 0.5}cm;text-indent: -0.5cm;"
+      end
+    end
+  end
+end

data/lib/isodoc/itu/word_convert.rb

@@ -1,12 +1,10 @@
 require "isodoc"
 require_relative "init"
+require_relative "word_cleanup"
 require "fileutils"
 
 module IsoDoc
   module ITU
-    # A {Converter} implementation that generates Word output, and a document
-    # schema encapsulation of the document for validation
-
     class WordConvert < IsoDoc::WordConvert
       def initialize(options)
         @libdir = File.dirname(__FILE__)
@@ -27,6 +25,7 @@ module IsoDoc
         body.div **{ class: "WordSection2" } do |div2|
           info docxml, div2 
           boilerplate docxml, div2
+          preface_block docxml, div2
           abstract docxml, div2
           keywords docxml, div2
           preface docxml, div2
@@ -52,71 +51,6 @@ module IsoDoc
         end
       end
 
-      def word_preface_cleanup(docxml)
-        docxml.xpath("//h1[@class = 'AbstractTitle'] | "\
-                     "//h1[@class = 'IntroTitle']").each do |h2|
-          h2.name = "p"
-          h2["class"] = "h1Preface"
-        end
-      end
-
-      def word_term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'TermNum']").each do |t|
-        end
-      end
-
-      def word_cleanup(docxml)
-        word_footnote_cleanup(docxml)
-        word_title_cleanup(docxml)
-        word_preface_cleanup(docxml)
-        word_term_cleanup(docxml)
-        word_history_cleanup(docxml)
-        authority_hdr_cleanup(docxml)
-        super
-        docxml
-      end
-
-      def word_footnote_cleanup(docxml)
-        docxml.xpath("//aside").each do |a|
-          a.first_element_child.children.first.previous =
-            '<span style="mso-tab-count:1"/>'
-        end
-      end
-
-      def word_title_cleanup(docxml)
-        docxml.xpath("//p[@class = 'annex_obligation']").each do |h|
-          h&.next_element&.name == "p" or next
-          h.next_element["class"] ||= "Normalaftertitle"
-        end
-        docxml.xpath("//p[@class = 'FigureTitle']").each do |h|
-          h&.parent&.next_element&.name == "p" or next
-          h.parent.next_element["class"] ||= "Normalaftertitle"
-        end
-      end
-
-      def word_history_cleanup(docxml)
-        docxml.xpath("//div[@id='_history']//table").each do |t|
-          t["class"] = "MsoNormalTable"
-          t.xpath(".//td").each { |td| td["style"] = nil }
-        end
-      end
-
-      def word_preface(docxml)
-        super
-        abstractbox = docxml.at("//div[@id='abstractbox']")
-        historybox = docxml.at("//div[@id='historybox']")
-        sourcebox = docxml.at("//div[@id='sourcebox']")
-        keywordsbox = docxml.at("//div[@id='keywordsbox']")
-        abstract = docxml.at("//div[@class = 'Abstract']")
-        history = docxml.at("//div[@class = 'history']")
-        source = docxml.at("//div[@class = 'source']")
-        keywords = docxml.at("//div[@class = 'Keywords']")
-        abstract.parent = abstractbox if abstract && abstractbox
-        history.parent = historybox if history && historybox
-        source.parent = sourcebox if source && sourcebox
-        keywords.parent = keywordsbox if keywords && keywordsbox
-      end
-
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p **attr_code(class: "formula") do |p|
@@ -156,24 +90,6 @@ module IsoDoc
         { class: node["class"], id: node["id"], style: keep_style(node) }
       end
 
-      def toWord(result, filename, dir, header)
-        result = populate_template(result, :word)
-        result = from_xhtml(word_cleanup(to_xhtml(result)))
-        unless @landscapestyle.nil? || @landscapestyle.empty?
-          @wordstylesheet&.open
-          @wordstylesheet&.write(@landscapestyle)
-          @wordstylesheet&.close
-        end
-        Html2Doc.process(result, filename: filename, 
-                         stylesheet: @wordstylesheet&.path,
-                         header_file: header&.path, dir: dir,
-                         asciimathdelims: [@openmathdelim, @closemathdelim],
-                         liststyles: { ul: @ulstyle, ol: @olstyle, 
-                                       steps: "l4" })
-        header&.unlink
-        @wordstylesheet&.unlink
-      end
-
       def link_parse(node, out)
         out.a **attr_code(href: node["target"], title: node["alt"], 
                           class: "url") do |l|
@@ -185,45 +101,6 @@ module IsoDoc
         end
       end
 
-      def authority_hdr_cleanup(docxml)
-        docxml&.xpath("//div[@id = 'draft-warning']").each do |d|
-          d.xpath(".//h1 | .//h2").each do |p|
-            p.name = "p"
-            p["class"] = "draftwarningHdr"
-          end
-        end
-        %w(copyright license legal).each do |t|
-          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
-            p = d&.at("./descendant::h1[2]") and
-              p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
-            d.xpath(".//h1 | .//h2").each do |p|
-              p.name = "p"
-              p["class"] = "boilerplateHdr"
-            end
-          end
-        end
-      end
-
-      def authority_cleanup(docxml)
-        dest = docxml.at("//div[@class = 'draft-warning']")
-        auth = docxml.at("//div[@id = 'draft-warning']")
-        dest and auth and dest.replace(auth.remove)
-        %w(copyright license legal).each do |t|
-          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
-          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
-          next unless auth && dest
-          t == "copyright" and p = auth&.at(".//p") and
-            p["class"] = "boilerplateHdr"
-          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
-          t == "copyright" or
-            auth << "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>" 
-          dest.replace(auth.remove)
-        end
-      end
-
       def clause_attrs(node)
         ret = {}
         %w(source history).include?(node["type"]) and

data/lib/isodoc/itu/xref.rb

@@ -20,7 +20,7 @@ module IsoDoc
           @labels["appendix"] : @labels["annex"]
         @anchors[clause["id"]] =
           { label: annex_name_lbl(clause, num), type: "clause",
-            xref: "#{lbl} #{num}", level: 1 }
+            xref: "#{lbl} #{num}", level: 1, value: num }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -101,7 +101,7 @@ module IsoDoc
             j = 0
             c.increment(t)
           end
-          label = c.print + (j.zero? ? "" : "-#{(96 + j).chr.to_s}")
+          label = c.print + (j.zero? ? "" : "#{hierfigsep}#{(96 + j).chr.to_s}")
           next if t["id"].nil? || t["id"].empty?
           @anchors[t["id"]] =
             anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
@@ -164,6 +164,7 @@ module IsoDoc
             idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
             @anchors[n["id"]] = 
               { label: termnote_label(idx).strip, type: "termnote",
+                value: idx,
               xref: l10n("#{anchor(t['id'], :xref)}, "\
                          "#{@labels["note_xref"]} #{c.print}") }
 

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.2.0"
+    VERSION = "1.2.5"
   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.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "isodoc", "~> 1.2.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.2.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +301,7 @@ files:
 - lib/isodoc/itu/presentation_xml_convert.rb
 - lib/isodoc/itu/ref.rb
 - lib/isodoc/itu/terms.rb
+- lib/isodoc/itu/word_cleanup.rb
 - lib/isodoc/itu/word_convert.rb
 - lib/isodoc/itu/xref.rb
 - lib/metanorma-itu.rb