isodoc 2.10.0 → 3.0.0

data/lib/isodoc/word_function/body.rb

@@ -102,40 +102,12 @@ module IsoDoc
         end
       end
 
-      def note_p_parse(node, div)
-        name = node.at(ns("./name"))&.remove
-        div.p class: "Note" do |p|
-          p.span class: "note_label" do |s|
-            name&.children&.each { |n| parse(n, s) }
-          end
-          insert_tab(p, 1)
-          node.first_element_child.children.each { |n| parse(n, p) }
-        end
-        node.element_children[1..-1].each { |n| parse(n, div) }
+      def note_p_class
+        "Note"
       end
 
-      def note_parse1(node, div)
-        name = node.at(ns("./name"))&.remove
-        div.p class: "Note" do |p|
-          p.span class: "note_label" do |s|
-            name&.children&.each { |n| parse(n, s) }
-          end
-          insert_tab(p, 1)
-        end
-        node.children.each { |n| parse(n, div) }
-      end
-
-      def termnote_parse(node, out)
-        name = node&.at(ns("./name"))&.remove
-        out.div **note_attrs(node) do |div|
-          div.p class: "Note" do |p|
-            if name
-              name.children.each { |n| parse(n, p) }
-              p << termnote_delim
-            end
-            para_then_remainder(node.first_element_child, node, p, div)
-          end
-        end
+      def termnote_p_class
+        "Note"
       end
 
       def para_attrs(node)
@@ -162,10 +134,10 @@ module IsoDoc
       def formula_parse1(node, out)
         out.div **attr_code(class: "formula") do |div|
           div.p do |_p|
-            parse(node.at(ns("./stem")), div)
+            parse(node.at(ns("./fmt-stem")), div)
             insert_tab(div, 1)
-            if lbl = node&.at(ns("./name"))&.text
-              div << "(#{lbl})"
+            if lbl = node&.at(ns("./fmt-name"))&.text
+              div << lbl
             end
           end
         end
@@ -185,10 +157,10 @@ module IsoDoc
         page_break(out)
         out.div **attr_code(preface_attrs(clause)) do |div|
           div.p class: "zzContents" do |p|
-            clause.at(ns("./title"))&.children&.each { |c| parse(c, p) }
+            clause.at(ns("./fmt-title"))&.children&.each { |c| parse(c, p) }
           end
           clause.elements.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end

data/lib/isodoc/word_function/comments.rb

@@ -64,7 +64,6 @@ module IsoDoc
         'span[@style="MsoCommentReference"]'.freeze
 
       def embed_comment_in_comment_list(docxml)
-        # docxml.xpath(COMMENT_IN_COMMENT_LIST).each do |x|
         docxml.xpath(COMMENT_IN_COMMENT_LIST1).each do |x|
           n = x.next_element
           n&.children&.first&.add_previous_sibling(x.remove)

data/lib/isodoc/word_function/footnotes.rb

@@ -83,7 +83,7 @@ module IsoDoc
 
       def footnote_parse(node, out)
         return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
-          !node.ancestors.map(&:name).include?("name")
+          !node.ancestors.map(&:name).include?("fmt-name")
 
         fn = node["reference"] || UUIDTools::UUID.random_create.to_s
         return seen_footnote_parse(node, out, fn) if @seen_footnote.include?(fn)

data/lib/isodoc/word_function/lists.rb

@@ -24,13 +24,15 @@ module IsoDoc
       end
 
       def dl_parse_nontable(node, out)
-        node["id"] and bookmark_parse(node, out)
-        list_title_parse(node, out)
-        node.elements.select { |n| dt_dd?(n) }
-          .each_slice(2) do |dt, dd|
-          dl_parse_nontable1(out, dt, dd)
+        out.div **attr_code(class: "figdl") do |div|
+          node["id"] and bookmark_parse(node, div)
+          list_title_parse(node, div)
+          node.elements.select { |n| dt_dd?(n) }
+            .each_slice(2) do |dt, dd|
+            dl_parse_nontable1(div, dt, dd)
+          end
+          dl_parse_notes(node, div)
         end
-        dl_parse_notes(node, out)
       end
 
       WORD_EMBED_DL_ATTRS =
@@ -56,13 +58,13 @@ module IsoDoc
 
       def ddef_other_paras(out, ddef)
         ddef.elements&.first&.name == "p" or return
-        ddef.children[1..-1].each { |n| parse(n, out) }
+        ddef.children[1..].each { |n| parse(n, out) }
       end
 
       def dl_parse_table(node, out)
         list_title_parse(node, out)
         out.table **attr_code(id: node["id"],
-                              class: (node["class"] || "dl")) do |v|
+                              class: node["class"] || "dl") do |v|
           node.elements.select { |n| dt_dd?(n) }
             .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)
@@ -83,7 +85,9 @@ module IsoDoc
       end
 
       def dl_parse_table_notes(node, out)
-        remainder = node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+        remainder = node.elements.reject do |n|
+          dt_dd?(n) || n.name == "fmt-name"
+        end
         remainder.empty? and return
         out.tr do |tr|
           tr.td colspan: 2 do |td|

data/lib/isodoc/word_function/postprocess.rb

@@ -64,10 +64,16 @@ module IsoDoc
         word_tab_clean(docxml)
         authority_cleanup(docxml)
         word_footnote_format(docxml)
+        word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml
       end
 
+      def word_remove_empty_toc(docxml)
+        docxml.at("//div[@class = 'TOC']//p[@class = 'MsoToc1']") and return
+        remove_toc_div(docxml)
+      end
+
       def word_sourcecode_annotations(html)
         ann = ".//div[@class = 'annotation']"
         html.xpath("//p[@class = '#{sourcecode_style}'][#{ann}]")

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -2,8 +2,10 @@ module IsoDoc
   module WordFunction
     module Postprocess
       def word_preface(docxml)
-        word_cover(docxml) if @wordcoverpage
-        word_intro(docxml, @wordToClevels) if @wordintropage
+        @wordcoverpage && !@wordcoverpage.empty? and
+          word_cover(docxml)
+        @wordintropage && !@wordintropage.empty? and
+          word_intro(docxml, @wordToClevels)
       end
 
       def word_remove_empty_sections(docxml)
@@ -20,7 +22,7 @@ module IsoDoc
         cover = File.read(@wordcoverpage, encoding: "UTF-8")
         cover = populate_template(cover, :word)
         coverxml = to_word_xhtml_fragment(cover)
-        ins.children.first.previous = coverxml.to_xml(encoding: "US-ASCII")
+        ins.add_first_child coverxml.to_xml(encoding: "US-ASCII")
       end
 
       def word_intro(docxml, level)
@@ -29,7 +31,7 @@ module IsoDoc
                            docxml, level)
         intro = populate_template(intro, :word)
         introxml = to_word_xhtml_fragment(intro)
-        ins.children.first.previous = introxml.to_xml(encoding: "US-ASCII")
+        ins.add_first_child introxml.to_xml(encoding: "US-ASCII")
       end
 
       # add namespaces for Word fragments

data/lib/isodoc/word_function/postprocess_table.rb

@@ -44,7 +44,7 @@ module IsoDoc
 
       def word_nested_tables(docxml)
         docxml.xpath("//table").each do |t|
-          t.xpath(".//table").reverse.each do |tt|
+          t.xpath(".//table").reverse_each do |tt|
             t.next = tt.remove
           end
         end

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -4,11 +4,7 @@ module IsoDoc
       def insert_toc(intro, docxml, level)
         toc = assemble_toc(docxml, level)
         if intro&.include?("WORDTOC")
-          if s = docxml.at("//div[@class = 'TOC']")
-            s&.previous_element&.elements&.first&.name == "br" and
-              s&.previous_element&.remove # page break
-            s.remove
-          end
+          remove_toc_div(docxml)
           intro.sub("WORDTOC", toc)
         else
           source = docxml.at("//div[@class = 'TOC']") and
@@ -17,6 +13,14 @@ module IsoDoc
         end
       end
 
+      def remove_toc_div(docxml)
+        s = docxml.at("//div[@class = 'TOC']") or return
+        prev = s.previous_element
+        prev&.elements&.first&.name == "br" and
+          prev&.remove # page break
+        s.remove
+      end
+
       def assemble_toc(docxml, level)
         toc = ""
         toc += make_WordToC(docxml, level)
@@ -165,7 +169,7 @@ module IsoDoc
       def recommmendation_sort_key(header)
         m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
         m ||= [header, nil]
-        ret = "#{recommmendation_sort_key1(m[1])}::"
+        ret = "#{recommmendation_sort_key1(m[1]&.strip)}::"
         m[2] and ret += ("%04d" % m[2].to_i).to_s
         ret
       end

data/lib/isodoc/word_function/table.rb

@@ -34,7 +34,7 @@ module IsoDoc
       def make_tr_attr_style(cell, row, rowmax, totalrows, opt)
         top = row.zero? ? "#{SW1} 1.5pt;" : "none;"
         bottom = "#{SW1} #{rowmax >= totalrows ? '1.5' : '1.0'}pt;"
-        ret = <<~STYLE.gsub(/\n/, "")
+        ret = <<~STYLE.delete("\n")
           border-top:#{top}mso-border-top-alt:#{top}
           border-bottom:#{bottom}mso-border-bottom-alt:#{bottom}
         STYLE
@@ -46,7 +46,7 @@ module IsoDoc
       def keep_rows_together(_cell, rowmax, totalrows, opt)
         opt[:header] and return true
         @table_line_count > 15 and return false
-        (totalrows <= 10 && rowmax < totalrows)
+        totalrows <= 10 && rowmax < totalrows
       end
 
       def tbody_parse(node, table)

data/lib/isodoc/xref/clause_order.rb

@@ -0,0 +1,41 @@
+module IsoDoc
+  module XrefGen
+    module Sections
+      def clause_order(docxml)
+        { preface: clause_order_preface(docxml),
+          main: clause_order_main(docxml),
+          annex: clause_order_annex(docxml),
+          back: clause_order_back(docxml) }
+      end
+
+      def clause_order_preface(_docxml)
+        [{ path: "//preface/*", multi: true }]
+      end
+
+      def clause_order_main(docxml)
+        [
+          { path: "//sections/clause[@type = 'scope']" },
+          { path: @klass.norm_ref_xpath },
+          { path: "//sections/terms | " \
+            "//sections/clause[descendant::terms]", multi: true },
+          { path: "//sections/definitions | " \
+            "//sections/clause[descendant::definitions]" \
+            "[not(descendant::terms)]", multi: true },
+          { path: @klass.middle_clause(docxml), multi: true },
+        ]
+      end
+
+      def clause_order_annex(_docxml)
+        [{ path: "//annex", multi: true }]
+      end
+
+      def clause_order_back(_docxml)
+        [
+          { path: @klass.bibliography_xpath },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
+      end
+    end
+  end
+end

data/lib/isodoc/xref/xref_anchor.rb

@@ -1,4 +1,5 @@
 require "singleton"
+require_relative "xref_util"
 
 module IsoDoc
   module XrefGen
@@ -29,37 +30,51 @@ module IsoDoc
         @anchors
       end
 
-      def anchor_struct_label(lbl, elem)
+      def anchor_struct_label(lbl, node, elem)
         case elem
-        when @labels["appendix"] then l10n("#{elem} #{lbl}")
+        when @labels["appendix"]
+          s = "<semx element='autonum' source='#{node['id'] || node[:id]}'>" \
+            "#{lbl}</semx>"
+          "<span class='fmt-element-name'>#{elem}</span> #{s}"
         else
-          lbl.to_s
+          anchor_struct_value(lbl, elem)
         end
       end
 
-      def anchor_struct_xref(lbl, elem)
-        l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+      def anchor_struct_xref(lbl, node, elem)
+        unless lbl.blank?
+          lbl = semx(node, lbl)
+          s = " #{anchor_struct_value(lbl, elem)}"
+        end
+        l10n("<span class='fmt-element-name'>#{elem}</span>#{s}")
+          .gsub(/ $/, "")
       end
 
       def anchor_struct_value(lbl, elem)
         case elem
-        when @labels["formula"], @labels["inequality"] then "(#{lbl})"
+          # TODO hardcoded ( ) ?
+        when @labels["formula"], @labels["inequality"] then <<~SPAN.strip
+          #{delim_wrap('(')}#{lbl}#{delim_wrap(')')}
+        SPAN
         else
-          lbl
+          lbl.to_s
         end
       end
 
-      def anchor_struct(lbl, container, elem, type, unnumb = false)
-        ret = {}
-        ret[:label] = unnumb == "true" ? nil : anchor_struct_label(lbl, elem)
-        ret[:xref] = anchor_struct_xref(unnumb == "true" ? "(??)" : lbl, elem)
-        ret[:xref].gsub!(/ $/, "")
-        ret[:container] = @klass.get_clause_id(container) unless container.nil?
-        ret[:type] = type
-        ret[:elem] = elem
-        ret[:value] = anchor_struct_value(lbl, elem)
+      # def anchor_struct(lbl, container, elem, type, unnumb = false)
+      def anchor_struct(lbl, node, elem_name, type, opt = {})
+        ret = { type: type, elem: elem_name, label: nil }
+        opt[:unnumb] != "true" and
+          ret[:label] = anchor_struct_label(lbl, node, elem_name)
+        ret[:xref] =
+          anchor_struct_xref(opt[:unnumb] == "true" ? "(??)" : lbl, node,
+                             elem_name)
+        ret[:container] = @klass.get_clause_id(node) if opt[:container]
+        ret[:value] = stripsemx(lbl)
         ret
       end
+
+      include ::IsoDoc::XrefGen::Util
     end
   end
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -1,4 +1,5 @@
 require "roman-numerals"
+require "twitter_cldr"
 
 module IsoDoc
   module XrefGen
@@ -26,6 +27,7 @@ module IsoDoc
         @style = opts[:numerals]
         @skip_i = opts[:skip_i]
         @prefix = opts[:prefix]
+        @separator = opts[:separator] || "."
         @base = ""
         if num.is_a? String
           if /^\d+$/.match?(num)
@@ -139,7 +141,8 @@ module IsoDoc
       end
 
       def increment(node)
-        @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
+        @unnumbered = node["unnumbered"] == "true" ||
+          node["hidden"] == "true" and return self
         reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))
@@ -150,12 +153,23 @@ module IsoDoc
         self
       end
 
+      def style_number(num)
+        num.nil? and return num
+        case @style
+        when :roman then RomanNumerals.to_roman(num)
+        when :japanese then num.localize(:ja).spellout
+        else num
+        end
+      end
+
       def print
         @unnumbered and return nil
         @prefix_override and return @prefix_override
         num = @number_override || @num
-        out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
-        "#{@prefix}#{@base}#{out}#{@letter_override || @letter}"
+        out = style_number(num)
+        prefix = @prefix
+        prefix &&= "#{prefix}#{@separator}"
+        "#{prefix}#{@base}#{out}#{@letter_override || @letter}"
       end
 
       def ol_type(list, depth)
@@ -176,6 +190,7 @@ module IsoDoc
         when :alphabet_upper then (64 + @num).chr.to_s
         when :roman then RomanNumerals.to_roman(@num).downcase
         when :roman_upper then RomanNumerals.to_roman(@num).upcase
+        when :japanese then num.localize(:ja).spellout
         end
       end
     end

data/lib/isodoc/xref/xref_counter_types.rb

@@ -0,0 +1,14 @@
+require_relative "xref_counter"
+
+module IsoDoc
+  class Xref
+    def clause_counter(num = 0, opts = {})
+      opts[:numerals] ||= :arabic
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+
+    def list_counter(num = 0, opts = {})
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+  end
+end