isodoc 2.12.0 → 2.12.2

data/lib/isodoc/presentation_function/xrefs.rb

@@ -7,13 +7,14 @@ module IsoDoc
         prefix_container(container_container,
                          anchor_xref(node, container, container: true),
                          node, target)
-      l10n(@i18n.nested_xref.sub("%1", container_label)
-        .sub("%2", linkend))
+      l10n(connectives_spans(@i18n.nested_xref
+        .sub("%1", "<span class='fmt-xref-container'>#{container_label}</span>")
+        .sub("%2", linkend)))
     end
 
     def anchor_value(id)
-      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :value) ||
-        @xrefs.anchor(id, :label) || @xrefs.anchor(id, :xref)
+      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :label) ||
+        @xrefs.anchor(id, :value) || @xrefs.anchor(id, :xref)
     end
 
     def anchor_linkend(node, linkend)
@@ -55,14 +56,15 @@ module IsoDoc
 
     def anchor_xref_short(node, target, container)
       if (l = node["label"]) && !container
-        @i18n.l10n("#{l} #{anchor_value(target)}")
+        v = anchor_value(target)
+        @i18n.l10n(%[<span class="fmt-element-name">#{l}</span> #{v}])
       else @xrefs.anchor(target, :xref)
       end
     end
 
     def anchor_xref_full(num, title)
       (!title.nil? && !title.empty?) or return nil
-      l10n("#{num}, #{title}")
+      l10n("#{num}<span class='fmt-comma'>,</span> #{title}")
     end
 
     def prefix_container?(container, node)
@@ -133,9 +135,13 @@ module IsoDoc
     def combine_conn(list)
       list.size == 1 and list.first[:label]
       if list[1..].all? { |l| l[:conn] == "and" }
-        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "and")
+        connectives_spans(@i18n.boolean_conj(list.map do |l|
+          loc2xref(l)
+        end, "and"))
       elsif list[1..].all? { |l| l[:conn] == "or" }
-        @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "or")
+        connectives_spans(@i18n.boolean_conj(list.map do |l|
+          loc2xref(l)
+        end, "or"))
       else
         ret = loc2xref(list[0])
         list[1..].each { |l| ret = i18n_chain_boolean(ret, l) }
@@ -144,8 +150,9 @@ module IsoDoc
     end
 
     def i18n_chain_boolean(value, entry)
-      @i18n.send("chain_#{entry[:conn]}").sub("%1", value)
-        .sub("%2", loc2xref(entry))
+      connectives_spans(@i18n.send("chain_#{entry[:conn]}")
+        .sub("%1", value)
+        .sub("%2", loc2xref(entry)))
     end
 
     def can_conflate_xref_rendering?(locs)

data/lib/isodoc/presentation_xml_convert.rb

@@ -55,15 +55,16 @@ module IsoDoc
       # feeds middle_title
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
-      rearrange_clauses docxml # feeds toc, display_order, clausetitle, 
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle,
       # clause, middle_title
       middle_title docxml
+      missing_title docxml # feeds clause
       annex docxml
       clause docxml # feeds clausetitle
       term docxml
-      index docxml
       clausetitle docxml # feeds floattitle
       floattitle docxml # feeds rearrange_clauses
+      index docxml # fed by strip_duplicate_ids
       toc docxml
       display_order docxml
     end
@@ -78,7 +79,10 @@ module IsoDoc
       note docxml
       admonition docxml
       source docxml
+      ul docxml
       ol docxml
+      dl docxml
+      quote docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.12.0".freeze
+  VERSION = "2.12.2".freeze
 end

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)
@@ -164,8 +136,8 @@ module IsoDoc
           div.p do |_p|
             parse(node.at(ns("./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/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

@@ -25,13 +25,13 @@ module IsoDoc
 
       def dl_parse_nontable(node, out)
         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)
+          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
       end
 
@@ -58,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)
@@ -85,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_cover.rb

@@ -22,7 +22,6 @@ 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
 
@@ -32,7 +31,6 @@ 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
 

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/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

@@ -17,10 +17,10 @@ module IsoDoc
           { path: "//sections/clause[@type = 'scope']" },
           { path: @klass.norm_ref_xpath },
           { path: "//sections/terms | " \
-            "//sections/clause[descendant::terms]" },
+            "//sections/clause[descendant::terms]", multi: true },
           { path: "//sections/definitions | " \
             "//sections/clause[descendant::definitions]" \
-            "[not(descendant::terms)]" },
+            "[not(descendant::terms)]", multi: true },
           { path: @klass.middle_clause(docxml), multi: true },
         ]
       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 "#{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_types.rb

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

data/lib/isodoc/xref/xref_gen.rb

@@ -28,14 +28,18 @@ module IsoDoc
         autonum
       end
 
-      def termnote_label(note)
-        @labels["termnote"].gsub("%", note.to_s)
+      def termnote_label(node, label)
+        if label.blank?
+          @labels["termnote"].gsub(/%\s?/, "")
+        else
+          @labels["termnote"].gsub("%", semx(node, label.to_s))
+        end
       end
 
       def increment_label(elems, node, counter, increment: true)
         elems.size == 1 && !node["number"] and return ""
         counter.increment(node) if increment
-        " #{counter.print}"
+        counter.print
       end
 
       def termnote_anchor_names(docxml)
@@ -44,10 +48,10 @@ module IsoDoc
           t.xpath(ns("./termnote")).noblank.each do |n|
             c.increment(n)
             @anchors[n["id"]] =
-              { label: termnote_label(c.print), type: "termnote",
+              { label: termnote_label(n, c.print), type: "termnote",
                 value: c.print, elem: @labels["termnote"],
                 container: t["id"],
-                xref: "#{@labels['note_xref']} #{c.print}" }
+                xref: anchor_struct_xref(c.print, n, @labels["note_xref"]) }
           end
         end
       end
@@ -63,7 +67,7 @@ module IsoDoc
               { label: idx, type: "termexample",
                 value: idx, elem: @labels["example_xref"],
                 container: t["id"],
-                xref: "#{@labels['example_xref']} #{idx}" }
+                xref: anchor_struct_xref(idx, n, @labels["example_xref"]) }
           end
         end
       end
@@ -73,7 +77,7 @@ module IsoDoc
           notes = s.xpath(child_asset_path("note")) -
             s.xpath(ns(".//figure//note | .//table//note"))
           note_anchor_names1(notes, Counter.new)
-          note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+          note_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
@@ -81,7 +85,8 @@ module IsoDoc
         notes.noblank.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(notes, n, counter), n,
-                          @labels["note_xref"], "note", false)
+                          @labels["note_xref"], "note",
+                          { container: true, unnumb: false })
         end
       end
 
@@ -90,7 +95,7 @@ module IsoDoc
           s.at(ns(".//admonition[@type = 'box']")) or next
           notes = s.xpath(child_asset_path("admonition[@type = 'box']"))
           admonition_anchor_names1(notes, Counter.new)
-          admonition_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+          admonition_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
@@ -98,7 +103,8 @@ module IsoDoc
         notes.noblank.each do |n|
           @anchors[n["id"]] ||=
             anchor_struct(increment_label(notes, n, counter), n,
-                          @labels["box"], "admonition", n["unnumbered"])
+                          @labels["box"], "admonition",
+                          { container: true, unnumb: n["unnumbered"] })
         end
       end
 
@@ -106,7 +112,7 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(child_asset_path("example"))
           example_anchor_names1(notes, Counter.new)
-          example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+          example_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
@@ -114,7 +120,8 @@ module IsoDoc
         notes.noblank.each do |n|
           @anchors[n["id"]] ||=
             anchor_struct(increment_label(notes, n, counter), n,
-                          @labels["example_xref"], "example", n["unnumbered"])
+                          @labels["example_xref"], "example",
+                          { unnumb: n["unnumbered"], container: true })
         end
       end
 
@@ -122,27 +129,35 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-          c = list_counter
+          c = list_counter(0, {})
           notes.noblank.each do |n|
-            @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
-                                              @labels["list"], "list", false)
+            @anchors[n["id"]] =
+              anchor_struct(increment_label(notes, n, c), n,
+                            @labels["list"], "list",
+                            { unnumb: false, container: true })
             list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
           end
-          list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+          list_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
-      def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0)
+      def list_item_delim
+        ")"
+      end
+
+      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+refer_list)
+        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0, {})
         list.xpath(ns("./li")).each do |li|
           bare_label, label =
-            list_item_value(li, c, depth, { list_anchor:, prev_label:,
-                                            refer_list: depth == 1 ? refer_list : nil })
-          li["id"] and @anchors[li["id"]] =
-                         { label: bare_label, bare_xref: "#{label})",
-                           xref: "#{label})",
-                           type: "listitem", refer_list:,
-                           container: list_anchor[:container] }
+            list_item_value(li, c, depth,
+                            { list_anchor:, prev_label:,
+                              refer_list: depth == 1 ? refer_list : nil })
+          li["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          @anchors[li["id"]] =
+            { label: bare_label, bare_xref: "#{label})", type: "listitem",
+              xref: %[#{label}#{delim_wrap(list_item_delim)}], refer_list:,
+              container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label,
                                    refer_list)
@@ -152,18 +167,21 @@ module IsoDoc
 
       def list_item_value(entry, counter, depth, opts)
         label = counter.increment(entry).listlabel(entry.parent, depth)
+        s = semx(entry, label)
         [label,
-         list_item_anchor_label(label, opts[:list_anchor], opts[:prev_label],
+         list_item_anchor_label(s, opts[:list_anchor], opts[:prev_label],
                                 opts[:refer_list])]
       end
 
       def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
         prev_label.empty? or
-          label = @i18n.list_nested_xref.sub("%1", "#{prev_label})")
-            .sub("%2", label)
+          label = @klass.connectives_spans(@i18n.list_nested_xref
+            .sub("%1", %[#{prev_label}#{delim_wrap(list_item_delim)}])
+            .sub("%2", label))
         refer_list and
-          label = @i18n.list_nested_xref.sub("%1", list_anchor[:xref])
-            .sub("%2", label)
+          label = @klass.connectives_spans(@i18n.list_nested_xref
+            .sub("%1", list_anchor[:xref])
+            .sub("%2", label))
         label
       end
 
@@ -172,7 +190,7 @@ module IsoDoc
           notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
             s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
           deflist_anchor_names1(notes, Counter.new)
-          deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
+          deflist_anchor_names(s.xpath(ns(child_sections)))
         end
       end
 
@@ -180,14 +198,15 @@ module IsoDoc
         notes.noblank.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(notes, n, counter), n,
-                          @labels["deflist"], "deflist", false)
+                          @labels["deflist"], "deflist",
+                          { unnumb: false, container: true })
           deflist_term_anchor_names(n, @anchors[n["id"]])
         end
       end
 
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
-          label = "#{list_anchor[:xref]}: #{dt2xreflabel(li)}"
+          label = deflist_term_anchor_lbl(li, list_anchor)
           li["id"] and @anchors[li["id"]] =
                          { xref: label, type: "deflistitem",
                            container: list_anchor[:container] }
@@ -197,6 +216,11 @@ module IsoDoc
         end
       end
 
+      def deflist_term_anchor_lbl(listitem, list_anchor)
+        s = semx(listitem, dt2xreflabel(listitem))
+        %(#{list_anchor[:xref]}#{delim_wrap(":")} #{s}</semx>)
+      end
+
       def dt2xreflabel(dterm)
         label = dterm.dup
         label.xpath(ns(".//p")).each { |x| x.replace(x.children) }