isodoc 1.0.26 → 1.1.1

data/lib/isodoc/word_function/postprocess.rb

@@ -32,6 +32,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     end
 
     def postprocess(result, filename, dir)
+      filename = filename.sub(/\.doc$/, "")
       header = generate_header(filename, dir)
       result = from_xhtml(cleanup(to_xhtml(textcleanup(result))))
       toWord(result, filename, dir, header)

data/lib/isodoc/word_function/table.rb

@@ -33,12 +33,12 @@ module IsoDoc::WordFunction
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
-    def make_table_attr(node)
+    def table_attrs(node)
       super.merge(attr_code({
         summary: node["summary"],
         width: node["width"],
         style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}"
       }))
     end
 
@@ -46,7 +46,7 @@ module IsoDoc::WordFunction
       @in_table = true
       table_title_parse(node, out)
       out.div **{ align: "center", class: "table_container" } do |div|
-        div.table **make_table_attr(node) do |t|
+        div.table **table_attrs(node) do |t|
           thead_parse(node, t)
           tbody_parse(node, t)
           tfoot_parse(node, t)

data/lib/isodoc/xref.rb

@@ -0,0 +1,59 @@
+require_relative "xref/xref_anchor"
+require_relative "xref/xref_counter"
+require_relative "xref/xref_gen_seq"
+require_relative "xref/xref_gen"
+require_relative "xref/xref_sect_gen"
+require_relative "class_utils"
+
+module IsoDoc
+  class Xref
+    include XrefGen::Anchor
+    include XrefGen::Blocks
+    include XrefGen::Sections
+
+     def initialize(lang, script, klass, labels, options = {})
+      @anchors = {}
+      @lang = lang
+      @script = script
+      @klass = klass
+      @labels = labels
+      @options = options
+    end
+
+    def get
+      @anchors
+    end
+
+    def anchor(id, lbl, warning = true)
+      return nil if id.nil? || id.empty?
+      unless @anchors[id]
+        if warning
+          @seen ||= Seen_Anchor.instance
+          @seen.seen(id) or warn "No label has been processed for ID #{id}"
+          @seen.add(id)
+          return "[#{id}]"
+        end
+      end
+      @anchors.dig(id, lbl)
+    end
+
+    # extract names for all anchors, xref and label
+    def parse(docxml)
+      initial_anchor_names(docxml)
+      back_anchor_names(docxml)
+      # preempt clause notes with all other types of note (ISO default)
+      note_anchor_names(docxml.xpath(ns("//table | //figure")))
+      note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+      list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+    end
+
+    def ns(xpath)
+      Common::ns(xpath)
+    end
+
+    def l10n(a, lang = @lang, script = @script)
+      IsoDoc::Function::I18n::l10n(a, lang, script)
+    end
+  end
+end

data/lib/isodoc/{function → xref}/xref_anchor.rb

@@ -1,7 +1,7 @@
 require "singleton"
 
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Anchor
     class Seen_Anchor
       include Singleton
 
@@ -12,34 +12,23 @@ module IsoDoc::Function
       def seen(x)
         @seen.has_key?(x)
       end
-      
+
       def add(x)
         @seen[x] = true
       end
     end
 
-    @anchors = {}
+    def initialize()
+      @anchors = {}
+    end
 
     def get_anchors
       @anchors
     end
 
-    def anchor(id, lbl, warning = true)
-      return nil if id.nil? || id.empty?
-      unless @anchors[id]
-        if warning
-          @seen ||= Seen_Anchor.instance
-          @seen.seen(id) or warn "No label has been processed for ID #{id}"
-          @seen.add(id)
-          return "[#{id}]"
-        end
-      end
-      @anchors.dig(id, lbl)
-    end
-
     def anchor_struct_label(lbl, elem)
       case elem
-      when @appendix_lbl then l10n("#{elem} #{lbl}")
+      when @labels["appendix"] then l10n("#{elem} #{lbl}")
       else
         lbl.to_s
       end
@@ -47,8 +36,8 @@ module IsoDoc::Function
 
     def anchor_struct_xref(lbl, elem)
       case elem
-      when @formula_lbl then l10n("#{elem} (#{lbl})")
-      when @inequality_lbl then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then l10n("#{elem} (#{lbl})")
+      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
       else
         l10n("#{elem} #{lbl}")
       end
@@ -59,7 +48,7 @@ module IsoDoc::Function
       ret[:label] = unnumbered == "true" ? nil : anchor_struct_label(lbl, elem)
       ret[:xref] = anchor_struct_xref(unnumbered == "true" ? "(??)" : lbl, elem)
       ret[:xref].gsub!(/ $/, "")
-      ret[:container] = get_clause_id(container) unless container.nil?
+      ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
       ret
     end

data/lib/isodoc/xref/xref_counter.rb

@@ -0,0 +1,74 @@
+require "roman-numerals"
+
+module IsoDoc::XrefGen
+  class Counter
+    def initialize
+      @num = 0
+      @letter = ""
+      @subseq = ""
+      @letter_override = nil
+      @number_override = nil
+    end
+
+    def new_subseq_increment(node)
+      @subseq = node["subsequence"]
+      @num += 1
+      @letter = node["subsequence"] ? "a" : ""
+      if node["number"]
+        /^(?<n>\d*)(?<a>[a-z]*)$/ =~ node["number"]
+        if n || a
+          @letter_override = @letter = a if a
+          @number_override = @num = n.to_i if n
+        else
+          @letter_override = node["number"]
+          @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+        end
+      end
+    end
+
+    def sequence_increment(node)
+      if node["number"]
+        @number_override = node["number"]
+        @num = @number_override.to_i if /^\d+$/.match(@number_override)
+      else
+        @num += 1
+      end
+    end
+
+    def subsequence_increment(node)
+      if node["number"]
+        @letter_override = node["number"]
+        @letter = @letter_override if /^[a-z]$/.match(@letter_override)
+      else
+        @letter = (@letter.ord + 1).chr.to_s
+      end
+    end
+
+    def increment(node)
+      return self if node["unnumbered"]
+      @letter_override = nil
+      @number_override = nil
+      if node["subsequence"] != @subseq
+        new_subseq_increment(node)
+      elsif @letter.empty?
+        sequence_increment(node)
+      else
+        subsequence_increment(node)
+      end
+      self
+    end
+
+    def print
+      "#{@number_override || @num}#{@letter_override || @letter}"
+    end
+
+    def listlabel(depth)
+      return @num.to_s if [2, 7].include? depth
+      return (96 + @num).chr.to_s if [1, 6].include? depth
+      return (64 + @num).chr.to_s if [4, 9].include? depth
+      return RomanNumerals.to_roman(@num).downcase if [3, 8].include? depth
+      return RomanNumerals.to_roman(@num).upcase if [5, 10].include? depth
+      return @num.to_s
+    end
+  end
+end

data/lib/isodoc/{function → xref}/xref_gen.rb

@@ -1,11 +1,9 @@
-require_relative "xref_counter"
-require_relative "xref_anchor"
-require_relative "xref_gen_seq"
+require_relative "xref_gen_seq.rb"
 
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Blocks
     def termnote_label(n)
-      @termnote_lbl.gsub(/%/, n.to_s)
+      @labels["termnote"].gsub(/%/, n.to_s)
     end
 
     def termnote_anchor_names(docxml)
@@ -17,7 +15,7 @@ module IsoDoc::Function
           @anchors[n["id"]] =
             { label: termnote_label(c.print), type: "termnote",
               xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@note_xref_lbl} #{c.print}") }
+                         "#{@labels["note_xref"]} #{c.print}") }
         end
       end
     end
@@ -33,7 +31,7 @@ module IsoDoc::Function
           @anchors[n["id"]] = {
             type: "termexample", label: idx, 
             xref: l10n("#{anchor(t['id'], :xref)}, "\
-                       "#{@example_xref_lbl} #{c.print}") }
+                       "#{@labels["example_xref"]} #{c.print}") }
         end
       end
     end
@@ -57,7 +55,7 @@ module IsoDoc::Function
         notes.each do |n|
           next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, 
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["note_xref"], 
                                             "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -79,7 +77,7 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl,
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
                                             "example", n["unnumbered"])
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -94,7 +92,7 @@ module IsoDoc::Function
         notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list", false)
+          @anchors[n["id"]] = anchor_struct(idx, n, @labels["list"], "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
         list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
@@ -115,16 +113,5 @@ module IsoDoc::Function
         end
       end
     end
-
-    # extract names for all anchors, xref and label
-    def anchor_names(docxml)
-      initial_anchor_names(docxml)
-      back_anchor_names(docxml)
-      # preempt clause notes with all other types of note (ISO default)
-      note_anchor_names(docxml.xpath(ns("//table | //figure")))
-      note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-    end
   end
 end

data/lib/isodoc/{function → xref}/xref_gen_seq.rb

@@ -1,19 +1,32 @@
-module IsoDoc::Function
-  module XrefGen
+module IsoDoc::XrefGen
+  module Blocks
+    def hiersep
+      "."
+    end
+
+    def hierfigsep
+      "-"
+    end
+
+    def subfigure_increment(j, c, t)
+      if t.parent.name == "figure" then j += 1
+      else
+        j = 0
+        c.increment(t)
+      end
+      j
+    end
+
     def sequential_figure_names(clause)
       c = Counter.new
       j = 0
       clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = c.print + (j.zero? ? "" : "-#{j}")
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
-          anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
+          anchor_struct(label, nil, @labels["figure"], "figure", t["unnumbered"])
       end
     end
 
@@ -22,7 +35,7 @@ module IsoDoc::Function
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil, 
-                                          @table_lbl, "table", t["unnumbered"])
+                                          @labels["table"], "table", t["unnumbered"])
       end
     end
 
@@ -32,7 +45,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct(c.increment(t).print, t, 
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
                         "formula", t["unnumbered"])
       end
     end
@@ -51,9 +64,9 @@ module IsoDoc::Function
     end
 
     def sequential_permission_names2(t, id)
-      sequential_permission_names1(t, id, "permission", @permission_lbl)
-      sequential_permission_names1(t, id, "requirement", @requirement_lbl)
-      sequential_permission_names1(t, id, "recommendation", @recommendation_lbl)
+      sequential_permission_names1(t, id, "permission", @labels["permission"])
+      sequential_permission_names1(t, id, "requirement", @labels["requirement"])
+      sequential_permission_names1(t, id, "recommendation", @labels["recommendation"])
     end
 
     def sequential_permission_names1(block, lbl, klass, label)
@@ -70,9 +83,9 @@ module IsoDoc::Function
       sequential_table_names(clause)
       sequential_figure_names(clause)
       sequential_formula_names(clause)
-      sequential_permission_names(clause, "permission", @permission_lbl)
-      sequential_permission_names(clause, "requirement", @requirement_lbl)
-      sequential_permission_names(clause, "recommendation", @recommendation_lbl)
+      sequential_permission_names(clause, "permission", @labels["permission"])
+      sequential_permission_names(clause, "requirement", @labels["requirement"])
+      sequential_permission_names(clause, "recommendation", @labels["recommendation"])
     end
 
     def hierarchical_figure_names(clause, num)
@@ -80,15 +93,11 @@ module IsoDoc::Function
       j = 0
       clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).
         each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
+        j = subfigure_increment(j, c, t)
         label = "#{num}#{hiersep}#{c.print}" +
           (j.zero? ? "" : "#{hierfigsep}#{j}")
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
+        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"], "figure",
                                           t["unnumbered"])
       end
     end
@@ -99,7 +108,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
-                        nil, @table_lbl, "table", t["unnumbered"])
+                        nil, @labels["table"], "table", t["unnumbered"])
       end
     end
 
@@ -107,11 +116,11 @@ module IsoDoc::Function
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num, "permission", @permission_lbl)
+      hierarchical_permission_names(clause, num, "permission", @labels["permission"])
       hierarchical_permission_names(clause, num, "requirement",
-                                    @requirement_lbl)
+                                    @labels["requirement"])
       hierarchical_permission_names(clause, num, "recommendation",
-                                    @recommendation_lbl)
+                                    @labels["recommendation"])
     end
 
     def hierarchical_formula_names(clause, num)
@@ -120,7 +129,7 @@ module IsoDoc::Function
         next if t["id"].nil? || t["id"].empty?
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", nil,
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        t["inequality"] ? @labels["inequality"] : @labels["formula"],
                         "formula", t["unnumbered"])
       end
     end
@@ -135,13 +144,13 @@ module IsoDoc::Function
       end
     end
 
-     def hierarchical_permission_names2(t, id)
-      hierarchical_permission_names1(t, id, "permission", @permission_lbl)
-      hierarchical_permission_names1(t, id, "requirement", @requirement_lbl)
-      hierarchical_permission_names1(t, id, "recommendation", @recommendation_lbl)
+    def hierarchical_permission_names2(t, id)
+      hierarchical_permission_names1(t, id, "permission", @labels["permission"])
+      hierarchical_permission_names1(t, id, "requirement", @labels["requirement"])
+      hierarchical_permission_names1(t, id, "recommendation", @labels["recommendation"])
     end
 
-     def hierarchical_permission_names1(block, lbl, klass, label)
+    def hierarchical_permission_names1(block, lbl, klass, label)
       c = Counter.new
       block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?