isodoc 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dfad47b4bae84826332835e54c1010c3ffb1baad8c847db087255ba8a84099d
-  data.tar.gz: 7eda7444d72c11ef8993306d04fc400a4721174d6d379d12b87a2ba18bc710e6
+  metadata.gz: 52d07c6881a991def663f5734c7db5def02b9c0d850571f34200ea9df32868ca
+  data.tar.gz: 5c0f1b18f7cdca0d7673613540d62b92c4a6a426916f3199ebc9dbca75a4144e
 SHA512:
-  metadata.gz: 0d739c93248a158a13a553fbc2056883a873508caf32b26fbb61857ec899415f7bc4a06f732bed6885db34c926c79e6bb76199663ec444e6010eebae1239834f
-  data.tar.gz: 85b469117c9c27b0cda0de0979657bb4008bae9a225af388c6e9fc07c0813d56a07fd4812cced716864091406ebd04a41dec4ec7e2ebc7ce5f19e3728b59ca49
+  metadata.gz: 7282cbd6ea762709618aa7c690eaa52e88235f5acf208ccd11cbb2495456d706aec612c00b2b0989e5f4f10b0e8bea0eef5e2aa8ad70f325449d673b584c9f64
+  data.tar.gz: 9e7ee5294eb3c0214e2b73709ce1dbbf3fafc2cb6d4fcb4cbc518cdb56bb999d58011dfe5357fe3ff45a39eb846905edf4f3b26cd99b74102f8bff285f166632

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (1.0.2)
+    isodoc (1.0.3)
       asciimath
       html2doc (~> 0.8.11)
       htmlentities (~> 4.3.4)
@@ -42,12 +42,12 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.12)
+    html2doc (0.8.13)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size
       mime-types
-      nokogiri
+      nokogiri (>= 1.10.4)
       thread_safe
       uuidtools
     htmlentities (4.3.4)
@@ -108,10 +108,10 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     ruby_dep (1.5.0)
-    sassc (2.2.0)
+    sassc (2.2.1)
       ffi (~> 1.9)
     shellany (0.0.1)
-    simplecov (0.17.0)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/lib/isodoc-yaml/i18n-en.yaml

@@ -37,6 +37,7 @@ termnote: Note % to entry
 list: List
 figure: Figure
 formula: Formula
+inequality: Formula
 table: Table
 requirement: Requirement
 recommendation: Recommendation

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -29,6 +29,7 @@ note_xref: Note
 termnote: Note % à l'article
 figure: Figure
 formula: Formule
+inequality: Formule
 list: Liste
 table: Tableau
 requirement: Exigence

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -31,6 +31,7 @@ note_xref: 注
 termnote: 注%
 figure: 图
 formula: 公式
+inequality: 公式
 list: 列项
 table: 表
 requirement: 要求

data/lib/isodoc/function/i18n.rb

@@ -51,6 +51,7 @@ module IsoDoc::Function
       @figure_lbl = y["figure"]
       @list_lbl = y["list"]
       @formula_lbl = y["formula"]
+      @inequality_lbl = y["inequality"]
       @table_lbl = y["table"]
       @key_lbl = y["key"]
       @example_lbl = y["example"]

data/lib/isodoc/function/table.rb

@@ -51,10 +51,20 @@ module IsoDoc::Function
       )
     end
 
+    def tcaption(node, t)
+      return unless node["summary"]
+      t.caption do |c|
+        c.span **{ style: "display:none" } do |s|
+          s << node["summary"]
+        end
+      end
+    end
+
     def table_parse(node, out)
       @in_table = true
       table_title_parse(node, out)
       out.table **make_table_attr(node) do |t|
+        tcaption(node, t)
         thead_parse(node, t)
         tbody_parse(node, t)
         tfoot_parse(node, t)

data/lib/isodoc/function/xref_counter.rb

@@ -0,0 +1,42 @@
+require "roman-numerals"
+
+module IsoDoc::Function
+  module XrefGen
+    class Counter
+      def initialize
+        @num = 0
+        @letter = ""
+        @subseq = ""
+      end
+
+      def increment(node)
+        return self if node["unnumbered"]
+        if node["subsequence"] != @subseq
+          @subseq = node["subsequence"]
+          @num += 1
+          @letter = node["subsequence"] ? "a" : ""
+        else
+          if @letter.empty?
+            @num += 1
+          else
+            @letter = (@letter.ord + 1).chr.to_s
+          end
+        end
+        self
+      end
+
+      def print
+        "#{@num}#{@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
+end

data/lib/isodoc/function/xref_gen.rb

@@ -1,4 +1,5 @@
 require "roman-numerals"
+require_relative "xref_counter"
 
 module IsoDoc::Function
   module XrefGen
@@ -12,7 +13,7 @@ module IsoDoc::Function
     def anchor(id, lbl, warning = true)
       unless @anchors[id]
         warning and warn "No label has been processed for ID #{id}"
-        return nil
+        return "[#{id}]"
       end
       @anchors.dig(id, lbl)
     end
@@ -23,13 +24,15 @@ module IsoDoc::Function
 
     def termnote_anchor_names(docxml)
       docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
-        t.xpath(ns(".//termnote")).each_with_index do |n, i|
+        c = Counter.new
+        t.xpath(ns(".//termnote")).each do |n|
           return if n["id"].nil? || n["id"].empty?
+          c.increment(n)
           @anchors[n["id"]] =
-            { label: termnote_label(i + 1),
+            { label: termnote_label(c.print),
               type: "termnote",
               xref: l10n("#{anchor(t['id'], :xref)}, "\
-                         "#{@note_xref_lbl} #{i + 1}") }
+                         "#{@note_xref_lbl} #{c.print}") }
         end
       end
     end
@@ -37,13 +40,15 @@ module IsoDoc::Function
     def termexample_anchor_names(docxml)
       docxml.xpath(ns("//term[descendant::termexample]")).each do |t|
         examples = t.xpath(ns(".//termexample"))
-        examples.each_with_index do |n, i|
+        c = Counter.new
+        examples.each do |n|
           return if n["id"].nil? || n["id"].empty?
-          idx = examples.size == 1 ? "" : (i + 1).to_s
+          c.increment(n)
+          idx = examples.size == 1 ? "" : c.print
           @anchors[n["id"]] = {
             type: "termexample",
             label: idx, xref: l10n("#{anchor(t['id'], :xref)}, "\
-                                   "#{@note_xref_lbl} #{i + 1}") }
+                                   "#{@example_xref_lbl} #{c.print}") }
         end
       end
     end
@@ -61,11 +66,12 @@ module IsoDoc::Function
     def note_anchor_names(sections)
       sections.each do |s|
         notes = s.xpath(CHILD_NOTES_XPATH)
-        notes.each_with_index do |n, i|
-          next if @anchors[n["id"]]
-          next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, "note", false)
+        c = Counter.new
+        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, 
+                                            "note", false)
         end
         note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -81,14 +87,13 @@ module IsoDoc::Function
     def example_anchor_names(sections)
       sections.each do |s|
         notes = s.xpath(CHILD_EXAMPLES_XPATH)
-        i = 0
+        c = Counter.new
         notes.each do |n|
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{i + 1}"
+          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl,
                                             "example", n["unnumbered"])
-          i += 1 unless n["unnumbered"]
         end
         example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
@@ -98,9 +103,10 @@ module IsoDoc::Function
       sections.each do |s|
         notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
           s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-        notes.each_with_index do |n, i|
+        c = Counter.new
+        notes.each do |n|
           next if n["id"].nil? || n["id"].empty?
-          idx = notes.size == 1 ? "" : " #{i + 1}"
+          idx = notes.size == 1 ? "" : " #{c.increment(n).print}"
           @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list", false)
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
@@ -108,21 +114,13 @@ module IsoDoc::Function
       end
     end
 
-    def listlabel(depth, i)
-      return i.to_s if [2, 7].include? depth
-      return (96 + i).chr.to_s if [1, 6].include? depth
-      return (64 + i).chr.to_s if [4, 9].include? depth
-      return RomanNumerals.to_roman(i).downcase if [3, 8].include? depth
-      return RomanNumerals.to_roman(i).upcase if [5, 10].include? depth
-      return i.to_s
-    end
-
     def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-      list.xpath(ns("./li")).each_with_index do |li, i|
-        label = listlabel(depth, i + 1)
+      c = Counter.new
+      list.xpath(ns("./li")).each do |li|
+        label = c.increment(li).listlabel(depth)
         label = "#{prev_label}.#{label}" unless prev_label.empty?
         label = "#{list_anchor[:xref]} #{label}" if refer_list
-        li["id"] && @anchors[li["id"]] = { xref: "#{label})",
+        li["id"] and @anchors[li["id"]] = { xref: "#{label})",
                                            type: "listitem",
                                            container: list_anchor[:container] }
         li.xpath(ns("./ol")).each do |ol|
@@ -144,16 +142,18 @@ module IsoDoc::Function
     end
 
     def sequential_figure_names(clause)
-      i = j = 0
+      c = Counter.new
+      j = 0
       clause.xpath(ns(".//figure")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0
-          i += 1 unless t["unnumbered"]
+          c.increment(t)
         end
-        label = i.to_s + (j.zero? ? "" : "-#{j}")
+        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"])
+        @anchors[t["id"]] =
+          anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
       end
     end
 
@@ -168,6 +168,7 @@ 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})")
       else
         l10n("#{elem} #{lbl}")
       end
@@ -184,97 +185,48 @@ module IsoDoc::Function
     end
 
     def sequential_table_names(clause)
-      i = 0
+      c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, nil, @table_lbl, "table", t["unnumbered"])
-        i += 1 unless t["unnumbered"]
+        @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil, 
+                                          @table_lbl, "table", t["unnumbered"])
       end
     end
 
     def sequential_formula_names(clause)
-      i = 0
+      c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @formula_lbl, "formula", t["unnumbered"])
-        i += 1 unless t["unnumbered"]
+        @anchors[t["id"]] =
+          anchor_struct(c.increment(t).print, t, 
+                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        "formula", t["unnumbered"])
       end
     end
 
     FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]".freeze
 
-    def sequential_permission_names(clause)
-      i = 0
-      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @permission_lbl, "permission", t["unnumbered"])
-        sequential_permission_names1(t, i + 1)
-        sequential_requirement_names1(t, i + 1)
-        sequential_recommendation_names1(t, i + 1)
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def sequential_permission_names1(block, lbl)
-      i = 0
-      block.xpath(ns("./permission")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @permission_lbl, "permission", t["unnumbered"])
-        sequential_permission_names1(t, newlbl)
-        sequential_requirement_names1(t, newlbl)
-        sequential_recommendation_names1(t, newlbl)
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def sequential_requirement_names(clause)
-      i = 0
-      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @requirement_lbl, "requirement", t["unnumbered"])
-        sequential_permission_names1(t, i + 1)
-        sequential_requirement_names1(t, i + 1)
-        sequential_recommendation_names1(t, i + 1)
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def sequential_requirement_names1(block, lbl)
-      i = 0
-      block.xpath(ns("./requirement")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @requirement_lbl, "requirement", t["unnumbered"])
-        sequential_permission_names1(t, newlbl)
-        sequential_requirement_names1(t, newlbl)
-        sequential_recommendation_names1(t, newlbl)
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def sequential_recommendation_names(clause)
-      i = 0
-      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each do |t|
+    def sequential_permission_names(clause, klass, label)
+      c = Counter.new
+      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(i + 1, t, @recommendation_lbl, "recommendation", t["unnumbered"])
-        sequential_permission_names1(t, i + 1)
-        sequential_requirement_names1(t, i + 1)
-        sequential_recommendation_names1(t, i + 1)
-        i += 1 unless t["unnumbered"]
+        id = c.increment(t).print
+        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+        sequential_permission_names1(t, id, "permission", @permission_lbl)
+        sequential_permission_names1(t, id, "requirement", @requirement_lbl)
+        sequential_permission_names1(t, id, "recommendation", @recommendation_lbl)
       end
     end
 
-    def sequential_recommendation_names1(block, lbl)
-      i = 0
-      block.xpath(ns("./recommendation")).each do |t|
+    def sequential_permission_names1(block, lbl, klass, label)
+      c = Counter.new
+      block.xpath(ns("./#{klass}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        newlbl = "#{lbl}#{hierfigsep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(newlbl, t, @recommendation_lbl, "recommendation", t["unnumbered"])
-        sequential_permission_names1(t, newlbl)
-        sequential_requirement_names1(t, newlbl)
-        sequential_recommendation_names1(t, newlbl)
-        i += 1 unless t["unnumbered"]
+        id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
+        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
+        sequential_permission_names1(t, id, "permission", @permission_lbl)
+        sequential_permission_names1(t, id, "requirement", @requirement_lbl)
+        sequential_permission_names1(t, id, "recommendation", @recommendation_lbl)
       end
     end
 
@@ -282,9 +234,9 @@ module IsoDoc::Function
       sequential_table_names(clause)
       sequential_figure_names(clause)
       sequential_formula_names(clause)
-      sequential_permission_names(clause)
-      sequential_requirement_names(clause)
-      sequential_recommendation_names(clause)
+      sequential_permission_names(clause, "permission", @permission_lbl)
+      sequential_permission_names(clause, "requirement", @requirement_lbl)
+      sequential_permission_names(clause, "recommendation", @recommendation_lbl)
     end
 
     def hiersep
@@ -296,26 +248,29 @@ module IsoDoc::Function
     end
 
     def hierarchical_figure_names(clause, num)
-      i = j = 0
+      c = Counter.new
+      j = 0
       clause.xpath(ns(".//figure")).each do |t|
         if t.parent.name == "figure" then j += 1
         else
           j = 0
-          i += 1 unless t["unnumbered"]
+          c.increment(t)
         end
-        label = "#{num}#{hiersep}#{i}" + (j.zero? ? "" : "#{hierfigsep}#{j}")
+        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", t["unnumbered"])
+        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
+                                          t["unnumbered"])
       end
     end
 
     def hierarchical_table_names(clause, num)
-      i = 0
+      c = Counter.new
       clause.xpath(ns(".//table")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
-                                          nil, @table_lbl, "table", t["unnumbered"])
-        i += 1 unless t["unnumbered"]
+        @anchors[t["id"]] =
+          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
+                        nil, @table_lbl, "table", t["unnumbered"])
       end
     end
 
@@ -323,57 +278,31 @@ module IsoDoc::Function
       hierarchical_table_names(clause, num)
       hierarchical_figure_names(clause, num)
       hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num)
-      hierarchical_requirement_names(clause, num)
-      hierarchical_recommendation_names(clause, num)
+      hierarchical_permission_names(clause, num, "permission", @permission_lbl)
+      hierarchical_permission_names(clause, num, "requirement", @requirement_lbl)
+      hierarchical_permission_names(clause, num, "recommendation", @recommendation_lbl)
     end
 
     def hierarchical_formula_names(clause, num)
-      i = 0
+      c = Counter.new
       clause.xpath(ns(".//formula")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct("#{num}#{hiersep}#{i + 1}",
-                                          t, @formula_lbl, "formula", t["unnumbered"])
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def hierarchical_permission_names(clause, num)
-      i = 0
-      clause.xpath(ns(".//permission#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @permission_lbl, "permission", t["unnumbered"])
-        sequential_permission_names1(t, lbl)
-        sequential_requirement_names1(t, lbl)
-        sequential_recommendation_names1(t, lbl)
-        i += 1 unless t["unnumbered"]
-      end
-    end
-
-    def hierarchical_requirement_names(clause, num)
-      i = 0
-      clause.xpath(ns(".//requirement#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @requirement_lbl, "requirement", t["unnumbered"])
-        sequential_permission_names1(t, lbl)
-        sequential_requirement_names1(t, lbl)
-        sequential_recommendation_names1(t, lbl)
-        i += 1 unless t["unnumbered"]
+        @anchors[t["id"]] =
+          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
+                        t["inequality"] ? @inequality_lbl : @formula_lbl,
+                        "formula", t["unnumbered"])
       end
     end
 
-    def hierarchical_recommendation_names(clause, num)
-      i = 0
-      clause.xpath(ns(".//recommendation#{FIRST_LVL_REQ}")).each do |t|
+    def hierarchical_permission_names(clause, num, klass, label)
+      c = Counter.new
+      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
         next if t["id"].nil? || t["id"].empty?
-        lbl = "#{num}#{hiersep}#{i + 1}"
-        @anchors[t["id"]] = anchor_struct(lbl, t, @recommendation_lbl, "recommendation", t["unnumbered"])
-        sequential_permission_names1(t, lbl)
-        sequential_requirement_names1(t, lbl)
-        sequential_recommendation_names1(t, lbl)
-        i += 1 unless t["unnumbered"]
+        lbl = "#{num}#{hiersep}#{c.increment(t).print}"
+        @anchors[t["id"]] = anchor_struct(lbl, t, label, klass, t["unnumbered"])
+        sequential_permission_names1(t, lbl, "permission", @permission_lbl)
+        sequential_permission_names1(t, lbl, "requirement", @requirement_lbl)
+        sequential_permission_names1(t, lbl, "recommendation", @recommendation_lbl)
       end
     end
   end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -237,9 +237,9 @@ module IsoDoc::WordFunction
       })
     end
 
-
     def make_table_attr(node)
       super.merge({
+        summary: node["summary"],
         style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
         "mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;"\
         "mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;"\

data/spec/isodoc/table_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
-      <table id="tableD-1" alt="tool tip">
+      <table id="tableD-1" alt="tool tip" summary="long desc">
   <name>Repeatability and reproducibility of <em>husked</em> rice yield</name>
   <thead>
     <tr>
@@ -69,6 +69,9 @@ RSpec.describe IsoDoc do
                <h1 class="ForewordTitle">Foreword</h1>
                <p class="TableTitle" style="text-align:center;">Table 1&#160;&#8212; Repeatability and reproducibility of <i>husked</i> rice yield</p>
                <table id="tableD-1" class="MsoISOTable" style="border-width:1px;border-spacing:0;" title="tool tip">
+               <caption>
+               <span style="display:none">long desc</span>
+               </caption>
                  <thead>
                    <tr>
                      <td rowspan="2" style="text-align:left;border-top:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;padding:0;" scope="col">Description</td>
@@ -139,7 +142,7 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
-      <table id="tableD-1" alt="tool tip">
+      <table id="tableD-1" alt="tool tip" summary="long desc">
   <name>Repeatability and reproducibility of husked rice yield</name>
   <thead>
     <tr>
@@ -205,7 +208,7 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p class="TableTitle" style="text-align:center;">Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
                  <div align="center">
-                 <table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip">
+                 <table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc">
                    <thead>
                      <tr>
                        <td rowspan="2" align="left" style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">Description</td>

data/spec/isodoc/xref_spec.rb

@@ -1988,4 +1988,98 @@ OUTPUT
     OUTPUT
   end
 
+   it "realises subsequences" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+        <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <preface>
+    <foreword id="fwd">
+    <p>
+    <xref target="N1"/>
+    <xref target="N2"/>
+    <xref target="N3"/>
+    <xref target="N4"/>
+    <xref target="N5"/>
+    <xref target="N6"/>
+    <xref target="N7"/>
+    <xref target="N8"/>
+    </p>
+    </foreword>
+        <introduction id="intro">
+        <figure id="N1"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N2" subsequence="A"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N3" subsequence="A"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N4" subsequence="B"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N5" subsequence="B"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N6" subsequence="B"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N7"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+        <figure id="N8"> <name>Split-it-right sample divider</name>
+           <image src="rice_images/rice_image1.png" id="_8357ede4-6d44-4672-bac4-9a85e82ab7f0" mimetype="image/png"/>
+        </figure>
+  </introduction>
+  </iso-standard>
+INPUT
+                   #{HTML_HDR}
+             <br/>
+             <div id="fwd">
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p>
+         <a href="#N1">Figure 1</a>
+         <a href="#N2">Figure 2a</a>
+         <a href="#N3">Figure 2b</a>
+         <a href="#N4">Figure 3a</a>
+         <a href="#N5">Figure 3b</a>
+         <a href="#N6">Figure 3c</a>
+         <a href="#N7">Figure 4</a>
+         <a href="#N8">Figure 5</a>
+         </p>
+             </div>
+             <br/>
+             <div class="Section3" id="intro">
+               <h1 class="IntroTitle">Introduction</h1>
+               <div id="N1" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 1&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N2" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 2a&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N3" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 2b&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N4" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 3a&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N5" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 3b&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N6" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 3c&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N7" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 4&#160;&#8212; Split-it-right sample divider</p></div>
+               <div id="N8" class="figure">
+                <img src="rice_images/rice_image1.png" height="auto" width="auto"/>
+             <p class="FigureTitle" style="text-align:center;">Figure 5&#160;&#8212; Split-it-right sample divider</p></div>
+             </div>
+             <p class="zzSTDTitle1"/>
+           </div>
+         </body>
+       </html>
+    OUTPUT
+   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -336,6 +336,7 @@ files:
 - lib/isodoc/function/terms.rb
 - lib/isodoc/function/to_word_html.rb
 - lib/isodoc/function/utils.rb
+- lib/isodoc/function/xref_counter.rb
 - lib/isodoc/function/xref_gen.rb
 - lib/isodoc/function/xref_sect_gen.rb
 - lib/isodoc/headlesshtml_convert.rb