isodoc 2.5.10 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a73625d6e0b342e44b34e2c93ef6df6126e1694dbcd9475cc52168da86a8cb8b
-  data.tar.gz: 58bed9e6bd9f0a5812a6e7ee46e90ea2c4e2dc4bf1592a66db4302dd4d579f5c
+  metadata.gz: 14b2734abde4e3ab09b2a0637134ff9346bf2e378cebd580d154ae3799461c92
+  data.tar.gz: 3a1594d3c372cced922b30641dcdda21b1b2c95f8a921bd2d309eb7218952d35
 SHA512:
-  metadata.gz: 28274dab0c28284a969ae3caf93e2065447c8b70b9166385e972b610014eb6bdeea8de3ec25273dfa1aea7fb78eaea463e894a0feeef18b82f0be3f2f479ff7c
-  data.tar.gz: 87c56a3f6c1aefd791ae520d2e3c1e0c7d7060b5d81aca3e64096294cd3c5de28cd71d70ad04db8823457bc90773a8f6b1d427a43e1cdd3ed067b5ab72099c29
+  metadata.gz: 5638291318ca9a1eaa7c626b031afa8116dfb933cb6c8e408904126c367852b3e298735629c356e1d6192b49eec3c5fd8e94f39f5219d486b5aab9832158f43f
+  data.tar.gz: 52320e6fd84d57978a2c803417cfccfedf13e63b3b83c5bcbc73d69f2234a231ff35709b6bcd57dcbd9a622efda6c74c8fae50d132704fe8a655f71e996d2c71

data/isodoc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   end
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "html2doc", "~> 1.5.3"
+  spec.add_dependency "html2doc", "~> 1.6.0"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   spec.add_dependency "emf2svg"

data/lib/isodoc/convert.rb

@@ -113,6 +113,8 @@ module IsoDoc
         docxml = Nokogiri::XSLT(x).transform(docxml)
       end
       docxml
+    rescue
+      require "debug"; binding.b
     end
 
     def extract_preprocess_xslt(docxml)
@@ -156,11 +158,11 @@ module IsoDoc
 
     def middle_clause(_docxml = nil)
       "//clause[parent::sections][not(@type = 'scope')]" \
-        "[not(descendant::terms)]"
+        "[not(descendant::terms)][not(descendant::references)]"
     end
 
     def target_pdf(node)
-      if /#/.match?(node["target"]) then node["target"].sub(/#/, ".pdf#")
+      if node["target"].include?("#") then node["target"].sub("#", ".pdf#")
       else "##{node['target']}"
       end
     end

data/lib/isodoc/function/blocks.rb

@@ -5,10 +5,6 @@ module IsoDoc
     module Blocks
       @annotation = false
 
-      def middle_title(_isoxml, out)
-        out.p(class: "zzSTDTitle1") { |p| p << @meta.get[:doctitle] }
-      end
-
       def figure_name_parse(_node, div, name)
         name.nil? and return
         div.p class: "FigureTitle", style: "text-align:center;" do |p|
@@ -140,6 +136,7 @@ module IsoDoc
         if node["type"] == "floating-title"
           classtype = "h#{node['depth']}"
         end
+        classtype ||= node["class"]
         classtype
       end
 

data/lib/isodoc/function/blocks_example_note.rb

@@ -71,7 +71,7 @@ module IsoDoc
       end
 
       def note_parse1(node, div)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         name and div.p do |p|
           p.span class: "note_label" do |s|
             name.children.each { |n| parse(n, s) }
@@ -110,12 +110,6 @@ module IsoDoc
         @note = false
       end
 
-      def middle_admonitions(isoxml, out)
-        isoxml.xpath(ns("//sections/note | //sections/admonition")).each do |x|
-          parse(x, out)
-        end
-      end
-
       def admonition_name_parse(_node, div, name)
         div.p class: "AdmonitionTitle", style: "text-align:center;" do |p|
           name.children.each { |n| parse(n, p) }

data/lib/isodoc/function/inline.rb

@@ -38,7 +38,7 @@ module IsoDoc
 
       def xref_parse(node, out)
         target = if /#/.match?(node["target"])
-                   node["target"].sub(/#/, ".html#")
+                   node["target"].sub("#", ".html#")
                  else
                    "##{node['target']}"
                  end
@@ -150,7 +150,7 @@ module IsoDoc
       end
 
       def error_parse(node, out)
-        text = node.to_xml.gsub(/</, "&lt;").gsub(/>/, "&gt;")
+        text = node.to_xml.gsub("<", "&lt;").gsub(">", "&gt;")
         out.para do |p|
           p.b(role: "strong") { |e| e << text }
         end

data/lib/isodoc/function/references.rb

@@ -145,21 +145,20 @@ module IsoDoc
 
       def norm_ref_xpath
         "//bibliography/references[@normative = 'true'] | " \
-          "//bibliography/clause[.//references[@normative = 'true']]"
+          "//bibliography/clause[.//references[@normative = 'true']] | " \
+          "//sections/references[@normative = 'true'] | " \
+          "//sections/clause[.//references[@normative = 'true']]"
       end
 
-      def norm_ref(isoxml, out, num)
-        (f = isoxml.at(ns(norm_ref_xpath)) and f["hidden"] != "true") or
-          return num
+      def norm_ref(node, out)
+        node["hidden"] != "true" or return
         out.div do |div|
-          num += 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          if f.name == "clause"
-            f.elements.each { |e| parse(e, div) unless e.name == "title" }
-          else biblio_list(f, div, false)
+          clause_name(node, node.at(ns("./title")), div, nil)
+          if node.name == "clause"
+            node.elements.each { |e| parse(e, div) unless e.name == "title" }
+          else biblio_list(node, div, false)
           end
         end
-        num
       end
 
       def bibliography_xpath
@@ -168,15 +167,14 @@ module IsoDoc
           "//bibliography/references[@normative = 'false']"
       end
 
-      def bibliography(isoxml, out)
-        (f = isoxml.at(ns(bibliography_xpath)) and f["hidden"] != "true") or
-          return
+      def bibliography(node, out)
+        node["hidden"] != "true" or return
         page_break(out)
         out.div do |div|
           div.h1 class: "Section3" do |h1|
-            f.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
           end
-          biblio_list(f, div, true)
+          biblio_list(node, div, true)
         end
       end
 

data/lib/isodoc/function/section.rb

@@ -17,13 +17,11 @@ module IsoDoc
         end
       end
 
-      def clause(isoxml, out)
-        isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
-          out.div **attr_code(clause_attrs(c)) do |s|
-            clause_name(c, c.at(ns("./title")), s, nil)
-            c.elements.reject { |c1| c1.name == "title" }.each do |c1|
-              parse(c1, s)
-            end
+      def clause(node, out)
+        out.div **attr_code(clause_attrs(node)) do |s|
+          clause_name(node, node.at(ns("./title")), s, nil)
+          node.elements.reject { |c1| c1.name == "title" }.each do |c1|
+            parse(c1, s)
           end
         end
       end
@@ -32,44 +30,40 @@ module IsoDoc
         { id: node["id"], class: "Section3" }
       end
 
-      def annex(isoxml, out)
-        isoxml.xpath(ns("//annex")).each do |c|
-          page_break(out)
-          out.div **attr_code(annex_attrs(c)) do |s|
-            c.elements.each do |c1|
-              if c1.name == "title" then annex_name(c, c1, s)
-              else parse(c1, s)
-              end
+      def annex(node, out)
+        page_break(out)
+        out.div **attr_code(annex_attrs(node)) do |s|
+          node.elements.each do |c1|
+            if c1.name == "title" then annex_name(node, c1, s)
+            else parse(c1, s)
             end
           end
         end
       end
 
-      def scope(isoxml, out, num)
-        f = isoxml.at(ns("//clause[@type = 'scope']")) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(f, f&.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def indexsect(node, out)
+        clause_parse(node, out)
+      end
+
+      def scope(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
-        num
       end
 
       TERM_CLAUSE = "//sections/terms | " \
                     "//sections/clause[descendant::terms]".freeze
 
-      def terms_defs(isoxml, out, num)
-        f = isoxml.at(ns(TERM_CLAUSE)) or return num
-        out.div **attr_code(id: f["id"]) do |div|
-          num = num + 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def terms_defs(node, out)
+        out.div **attr_code(id: node["id"]) do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end
         end
-        num
       end
 
       # subclause
@@ -77,16 +71,13 @@ module IsoDoc
         clause_parse(isoxml, out)
       end
 
-      def symbols_abbrevs(isoxml, out, num)
-        f = isoxml.at(ns("//sections/definitions")) or return num
-        out.div **attr_code(id: f["id"], class: "Symbols") do |div|
-          num = num + 1
-          clause_name(f, f.at(ns("./title")), div, nil)
-          f.elements.each do |e|
+      def symbols_abbrevs(node, out)
+        out.div **attr_code(id: node["id"], class: "Symbols") do |div|
+          clause_name(node, node.at(ns("./title")), div, nil)
+          node.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
         end
-        num
       end
 
       # subclause
@@ -171,15 +162,14 @@ module IsoDoc
         end
       end
 
-      def colophon(isoxml, out)
-        isoxml.at(ns("//colophon")) or return
-        page_break(out)
-        isoxml.xpath(ns("//colophon/clause")).each do |f|
-          out.div class: "Section3", id: f["id"] do |div|
-            clause_name(f, f&.at(ns("./title")), div, { class: "IntroTitle" })
-            f.elements.each do |e|
-              parse(e, div) unless e.name == "title"
-            end
+      def colophon(node, out)
+        @seen_colophon or page_break(out)
+        @seen_colophon = true
+        out.div class: "Section3", id: node["id"] do |div|
+          clause_name(node, node.at(ns("./title")), div,
+                      { class: "IntroTitle" })
+          node.elements.each do |e|
+            parse(e, div) unless e.name == "title"
           end
         end
       end
@@ -194,24 +184,6 @@ module IsoDoc
         t.size == 1 && %w(terms definitions references).include?(t[0].name)
       end
 
-      def front(isoxml, out)
-        p = isoxml.at(ns("//preface")) or return
-        p.elements.each do |e|
-          if is_clause?(e.name)
-            case e.name
-            when "abstract" then abstract e, out
-            when "foreword" then foreword e, out
-            when "introduction" then introduction e, out
-            when "executivesummary" then executivesummary e, out
-            when "clause" then preface e, out
-            when "acknowledgements" then acknowledgements e, out
-            end
-          else
-            preface_block(e, out)
-          end
-        end
-      end
-
       def executivesummary(clause, out)
         introduction clause, out
       end

data/lib/isodoc/function/section_titles.rb

@@ -56,7 +56,6 @@ module IsoDoc
 
       # top level clause names
       def clause_name(node, title, div, header_class)
-        preceding_floating_titles(node, div)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
           if title.is_a?(String) then h1 << title
@@ -69,7 +68,6 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 class: "Annex" do |t|
@@ -84,18 +82,6 @@ module IsoDoc
           node.children.each { |c| parse(c, p) }
         end
       end
-
-      def preceding_floating_titles(node, div)
-        return if node.nil?
-
-        out = node.xpath("./preceding-sibling::*")
-          .reverse.each_with_object([]) do |p, m|
-          break m unless p.name == "p"
-
-          m << p
-        end or return
-        out.each { |c| parse(c, div) }
-      end
     end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -82,20 +82,57 @@ module IsoDoc
         section_break(body)
       end
 
+      TOP_ELEMENTS =
+        "//preface/*[@displayorder] | //sections/*[@displayorder] | " \
+        "//annex[@displayorder] | //bibliography/*[@displayorder] | " \
+        "//colophon/*[@displayorder] | //indexsect[@displayorder]"
+          .freeze
+
       def make_body3(body, docxml)
         body.div class: "main-section" do |div3|
           boilerplate docxml, div3
-          preface_block docxml, div3
-          abstract docxml, div3
-          foreword docxml, div3
-          introduction docxml, div3
-          acknowledgements docxml, div3
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::TOP_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
+      # xpath presumed to list elements with displayorder attribute
+      def content(body, docxml, xpath)
+        docxml.xpath(xpath).sort_by { |c| c["displayorder"].to_i }
+          .each do |c|
+            top_element_render(c, body)
+          end
+      end
+
+      def top_element_render(e, out)
+        case e.name
+        when "abstract" then abstract e, out
+        when "foreword" then foreword e, out
+        when "introduction" then introduction e, out
+        when "executivesummary" then executivesummary e, out
+        when "acknowledgements" then acknowledgements e, out
+        when "annex" then annex e, out
+        when "definitions" then symbols_abbrevs e, out
+        when "indexsect" then indexsect e, out
+        when "references"
+          if e["normative"] == "true" then norm_ref e, out
+          else bibliography e, out
+          end
+        when "clause"
+          if e.parent.name == "preface" then preface e, out
+          elsif e.parent.name == "colophon" then colophon e, out
+          elsif e["type"] == "scope" then scope e, out
+          elsif e.at(ns(".//terms")) then terms_defs e, out
+          elsif e.at(ns(".//references[@normative = 'true']"))
+            norm_ref e, out
+          elsif e.at(ns(".//references")) then bibliography e, out
+          else clause e, out
+          end
+        else parse(e, out)
+        end
+      end
+
       def info(isoxml, out)
         @meta.code_css isoxml, out
         @meta.title isoxml, out
@@ -116,22 +153,8 @@ module IsoDoc
         @meta.get
       end
 
-      def middle(isoxml, out)
-        middle_title(isoxml, out)
-        middle_admonitions(isoxml, out)
-        scope isoxml, out, 0
-        norm_ref isoxml, out, 0
-        terms_defs isoxml, out, 0
-        symbols_abbrevs isoxml, out, 0
-        clause isoxml, out
-        annex isoxml, out
-        bibliography isoxml, out
-        colophon isoxml, out
-      end
-
       def boilerplate(node, out)
-        return if @bare
-
+        @bare and return
         boilerplate = node.at(ns("//boilerplate")) or return
         out.div class: "authority" do |s|
           boilerplate.children.each do |n|

data/lib/isodoc/function/utils.rb

@@ -176,6 +176,7 @@ module IsoDoc
         imgtype = "emf" if emf?("#{imgclass}/#{imgtype}")
         imgtype = imgtype.sub(/\+[a-z0-9]+$/, "") # svg+xml
         imgtype = "png" unless /^[a-z0-9]+$/.match? imgtype
+        imgtype == "postscript" and imgtype = "eps"
         Tempfile.open(["image", ".#{imgtype}"]) do |f|
           f.binmode
           f.write(Base64.strict_decode64(imgdata))

data/lib/isodoc/html_function/footnotes.rb

@@ -36,7 +36,7 @@ module IsoDoc
 
       def make_generic_footnote_text(node, fnid)
         noko do |xml|
-          xml.aside **{ id: "fn:#{fnid}", class: "footnote" } do |div|
+          xml.aside id: "fn:#{fnid}", class: "footnote" do |div|
             node.children.each { |n| parse(n, div) }
           end
         end.join("\n")
@@ -59,7 +59,7 @@ module IsoDoc
         return if @seen_footnote.include?(tid + fn)
 
         @in_footnote = true
-        out.aside **{ class: "footnote" } do |a|
+        out.aside class: "footnote" do |a|
           a << make_table_footnote_text(node, tid + fn, fn)
         end
         @in_footnote = false

data/lib/isodoc/html_function/html.rb

@@ -33,16 +33,6 @@ module IsoDoc
         section_break(body)
       end
 
-      def make_body3(body, docxml)
-        body.div class: "main-section" do |div3|
-          boilerplate docxml, div3
-          front docxml, div3
-          middle docxml, div3
-          footnotes div3
-          comments div3
-        end
-      end
-
       def googlefonts
         <<~HEAD.freeze
           <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet"/>

data/lib/isodoc/init.rb

@@ -21,9 +21,9 @@ module IsoDoc
     def toc_init(docxml)
       x = "//metanorma-extension/presentation-metadata" \
           "[name[text() = 'TOC Heading Levels']]/value"
-      n = docxml.at(ns(x.sub(/TOC/, "DOC TOC"))) and
+      n = docxml.at(ns(x.sub("TOC", "DOC TOC"))) and
         @wordToClevels = n.text.to_i
-      n = docxml.at(ns(x.sub(/TOC/, "HTML TOC"))) and
+      n = docxml.at(ns(x.sub("TOC", "HTML TOC"))) and
         @htmlToClevels = n.text.to_i
     end
 
@@ -93,7 +93,7 @@ module IsoDoc
       @fn_bookmarks = {}
     end
 
-        def init_fonts(options)
+    def init_fonts(options)
       @normalfontsize = options[:normalfontsize]
       @smallerfontsize = options[:smallerfontsize]
       @monospacefontsize = options[:monospacefontsize]

data/lib/isodoc/presentation_function/erefs.rb

@@ -4,7 +4,7 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def expand_citeas(text)
       text.nil? and return text
-      HTMLEntities.new.decode(text.gsub(/&amp;#x/, "&#"))
+      HTMLEntities.new.decode(text.gsub("&amp;#x", "&#"))
     end
 
     def erefstack1(elem)
@@ -84,7 +84,7 @@ module IsoDoc
       locs1 = []
       until locs.empty?
         if locs[1] == "to"
-          locs1 << @i18n.chain_to.sub(/%1/, locs[0]).sub(/%2/, locs[2])
+          locs1 << @i18n.chain_to.sub("%1", locs[0]).sub("%2", locs[2])
           locs.shift(3)
         else locs1 << locs.shift
         end

data/lib/isodoc/presentation_function/image.rb

@@ -108,25 +108,37 @@ module IsoDoc
 
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
-      if node.elements&.first&.name == "svg" &&
-          (!node["height"] || node["height"] == "auto")
-        node["height"] = node.elements.first["height"]
-        node["width"] = node.elements.first["width"]
-      end
+      svg_impose_height_attr(node)
       ret = imgfile_suffix(uri, "emf")
-      File.exist?(ret) and return ret
+      if File.exist?(ret) && File.exist?(node["src"])
+        warn "Exists: #{ret}, Exists: #{node['src']}"
+        return ret
+      end
+      warn "Converting..."
       inkscape_convert(uri, ret, '--export-type="emf"')
     end
 
+    def svg_impose_height_attr(node)
+      e = node.elements&.first or return
+      (e.name == "svg" &&
+        (!node["height"] || node["height"] == "auto")) or return
+      node["height"] = e["height"]
+      node["width"] = e["width"]
+    end
+
     def inkscape_convert(uri, file, option)
       exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
                                          "to convert image #{uri}. Aborting."
       uri = Metanorma::Utils::external_path uri
       exe = Metanorma::Utils::external_path exe
-      system(%(#{exe} #{option} #{uri})) and
-        return Metanorma::Utils::datauri(file)
-
-      raise %(Fail on #{exe} #{option} #{uri})
+      warn %(#{exe} #{option} #{uri})
+      err = system %(#{exe} #{option} #{uri})
+      File.exist?(file) and return Metanorma::Utils::datauri(file)
+      file2 = uri + File.extname(file)
+      warn "Checking #{file2}"
+      warn `ls #{File.dirname(file2)}`
+      File.exist?(file2) and return Metanorma::Utils::datauri(file2)
+      raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
     end
 
     def svg_to_emf_uri(node)

data/lib/isodoc/presentation_function/refs.rb

@@ -7,9 +7,21 @@ module IsoDoc
         bibitem(x, renderings)
       end
       hidden_items(docxml)
+      move_norm_ref_to_sections(docxml)
       @xrefs.parse_inclusions(refs: true).parse(docxml)
     end
 
+    def move_norm_ref_to_sections(docxml)
+      docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
+      s = docxml.at(ns("//sections")) ||
+        docxml.at(ns("//preface"))&.after("<sections/>")&.next_element ||
+        docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
+        &.previous_element or return
+      docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
+        s << r.remove
+      end
+    end
+
     def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
@@ -131,7 +143,8 @@ module IsoDoc
       idents = @xrefs.klass.render_identifier(ids)
       ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
                                                  standard, datefn, bib)
-            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn, bib)
+            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
+                                     bib)
             end
       bib << "<biblio-tag>#{ret}</biblio-tag>"
     end
@@ -148,8 +161,8 @@ module IsoDoc
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
-    def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn, _bib)
-      #standard and id = nil
+    def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
+      # standard and id = nil
       ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
       if ids[:sdo]
         ret = prefix_bracketed_ref(ret)

data/lib/isodoc/presentation_function/section.rb

@@ -2,6 +2,14 @@ require_relative "refs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def middle_title(docxml)
+      s = docxml.at(ns("//sections")) or return
+      t = @meta.get[:doctitle]
+      t.nil? || t.empty? and return
+      s.children.first.previous =
+        "<p class='zzSTDTitle1'>#{t}</p>"
+    end
+
     def clause(docxml)
       docxml.xpath(ns("//clause | " \
                       "//terms | //definitions | //references"))
@@ -26,10 +34,10 @@ module IsoDoc
     end
 
     def floattitle(docxml)
-      docxml.xpath(ns("//clause | //annex | //appendix | //introduction | " \
-                      "//foreword | //preface/abstract | //acknowledgements | " \
-                      "//terms | //definitions | //references | //colophon"))
-        .each do |f|
+      p = "//clause | //annex | //appendix | //introduction | //foreword | " \
+          "//preface/abstract | //acknowledgements | //terms | " \
+          "//definitions | //references | //colophon | //indexsect"
+      docxml.xpath(ns(p)).each do |f|
         floattitle1(f)
       end
       # top-level
@@ -94,9 +102,9 @@ module IsoDoc
     end
 
     def display_order_at(docxml, xpath, idx)
-      return idx unless c = docxml.at(ns(xpath))
-
+      c = docxml.at(ns(xpath)) or return idx
       idx += 1
+      idx = preceding_floating_titles(c, idx)
       c["displayorder"] = idx
       idx
     end
@@ -104,11 +112,25 @@ module IsoDoc
     def display_order_xpath(docxml, xpath, idx)
       docxml.xpath(ns(xpath)).each do |c|
         idx += 1
+        idx = preceding_floating_titles(c, idx)
         c["displayorder"] = idx
       end
       idx
     end
 
+    def preceding_floating_titles(node, idx)
+      out = node.xpath("./preceding-sibling::*")
+        .reverse.each_with_object([]) do |p, m|
+        %w(note admonition p).include?(p.name) or break m
+        m << p
+      end
+      out.reject { |c| c["displayorder"] }.reverse.each do |c|
+        c["displayorder"] = idx
+        idx += 1
+      end
+      idx
+    end
+
     def display_order(docxml)
       i = 0
       i = display_order_xpath(docxml, "//preface/*", i)

data/lib/isodoc/presentation_function/terms.rb

@@ -52,6 +52,7 @@ module IsoDoc
         name << ", #{designation_grammar(g).join(', ')}"
       designation_localization(desgn, name)
       designation_pronunciation(desgn, name)
+      designation_bookmarks(desgn, name)
       desgn.children = name.children
     end
 
@@ -94,6 +95,12 @@ module IsoDoc
       name << ", /#{to_xml(f.children)}/"
     end
 
+    def designation_bookmarks(desgn, name)
+      desgn.xpath(ns(".//bookmark")).each do |b|
+        name << b.remove
+      end
+    end
+
     def termexample(docxml)
       docxml.xpath(ns("//termexample")).each { |f| example1(f) }
     end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,8 +1,8 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, node, _target)
-      l10n(@i18n.nested_xref.sub(/%1/, anchor_xref(node, container))
-        .sub(/%2/, linkend))
+      l10n(@i18n.nested_xref.sub("%1", anchor_xref(node, container))
+        .sub("%2", linkend))
     end
 
     def anchor_value(id)
@@ -133,8 +133,8 @@ module IsoDoc
     end
 
     def i18n_chain_boolean(value, entry)
-      @i18n.send("chain_#{entry[:conn]}").sub(/%1/, value)
-        .sub(/%2/, loc2xref(entry))
+      @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

@@ -47,9 +47,11 @@ module IsoDoc
     # to deal with single-term and single-ref annexes
     def section(docxml)
       references docxml
+      # 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, clause
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle, clause, middle_title
+      middle_title docxml
       annex docxml
       clause docxml # feeds clausetitle
       term docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.10".freeze
+  VERSION = "2.6.0".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,6 +1,6 @@
-require_relative "./table"
-require_relative "./inline"
-require_relative "./lists"
+require_relative "table"
+require_relative "inline"
+require_relative "lists"
 
 module IsoDoc
   module WordFunction
@@ -29,25 +29,34 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div class: "WordSection2" do |div2|
           boilerplate docxml, div2
-          front docxml, div2
+          content(div2, docxml, ns("//preface/*[@displayorder]"))
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder] | //annex[@displayorder] | " \
+        "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
+        "//indexsect[@displayorder]".freeze
+
       def make_body3(body, docxml)
         body.div class: "WordSection3" do |div3|
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
-      def para_class(_node)
+      def para_class(node)
         return "Sourcecode" if @annotation
         return "MsoCommentText" if @in_comment
         return "Note" if @note
+        if node["type"] == "floating-title"
+          return "h#{node['depth']}"
+        end
 
+        n = node["class"] and return n
         nil
       end
 

data/lib/isodoc/word_function/inline.rb

@@ -8,7 +8,7 @@ module IsoDoc
       end
 
       def section_break(body, continuous: false)
-        body.p do |p|
+        body.p class: "section-break" do |p|
           if continuous
             p.br clear: "all", style: "page-break-before:auto;" \
                                       "mso-break-type:section-break"
@@ -19,7 +19,7 @@ module IsoDoc
       end
 
       def page_break(out)
-        out.p do |p|
+        out.p class: "page-break" do |p|
           p.br clear: "all",
                style: "mso-special-character:line-break;" \
                       "page-break-before:always"
@@ -58,7 +58,7 @@ module IsoDoc
 
       def xref_parse(node, out)
         target = if /#/.match?(node["target"])
-                   node["target"].sub(/#/, ".doc#")
+                   node["target"].sub("#", ".doc#")
                  else
                    "##{node['target']}"
                  end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,7 +1,7 @@
 require "fileutils"
-require_relative "./postprocess_cover"
-require_relative "./postprocess_toc"
-require_relative "./postprocess_table"
+require_relative "postprocess_cover"
+require_relative "postprocess_toc"
+require_relative "postprocess_table"
 
 module IsoDoc
   module WordFunction
@@ -16,7 +16,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.new(
           filename: filename, imagedir: @localdir,
@@ -56,6 +56,7 @@ module IsoDoc
         word_example_cleanup(docxml)
         word_pseudocode_cleanup(docxml)
         word_image_caption(docxml)
+        word_floating_titles(docxml)
         word_section_breaks(docxml)
         word_tab_clean(docxml)
         authority_cleanup(docxml)
@@ -173,6 +174,21 @@ module IsoDoc
         end
         docxml
       end
+
+      # move p.h1 (floating title) after any page, section breaks
+      def word_floating_titles(docxml)
+        docxml.xpath("//p[@class = 'section-break' or @class = 'page-break']")
+          .each do |b|
+          out = b.xpath("./preceding-sibling::*").reverse
+            .each_with_object([]) do |p, m|
+            (p.name == "p" && p["class"] == "h1") or break m
+            m << p
+          end
+          b.delete("class")
+          out.empty? and next
+          out[-1].previous = b.remove
+        end
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -44,7 +44,7 @@ module IsoDoc
       end
 
       def termnote_label(note)
-        @labels["termnote"].gsub(/%/, note.to_s)
+        @labels["termnote"].gsub("%", note.to_s)
       end
 
       def increment_label(elems, node, counter, increment: true)
@@ -194,11 +194,11 @@ refer_list)
 
       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 = @i18n.list_nested_xref.sub("%1", "#{prev_label})")
+            .sub("%2", label)
         refer_list and
-          label = @i18n.list_nested_xref.sub(/%1/, list_anchor[:xref])
-            .sub(/%2/, label)
+          label = @i18n.list_nested_xref.sub("%1", list_anchor[:xref])
+            .sub("%2", label)
         label
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.5.10
+  version: 2.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement