isodoc 3.2.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0e05f77735c813b7b9a87ffd569cd025d4f47397ca799f72b4853feb6122ef
-  data.tar.gz: '01821bce42580bfd1d2119c505bfdd4ea8dbc2df0794a0c19d53ed2e2f004df4'
+  metadata.gz: c9fdc30bd68584b0e694c4ebc052d9d5c9377ff0b97d470bf9a71b422cc4c01d
+  data.tar.gz: 6eb37637765b514734b06b12beaee5769884636b9163844d6bfd8396e4beff49
 SHA512:
-  metadata.gz: 49d7914e7011f2d681c3919bac3148ac6bef4a6050597cbbef8f78a60fda60c89137aefb3f6b8f54b25caa1feaf1a78bfa9ef62ea67c58161018730c4476fcf6
-  data.tar.gz: e797d276719f0c36bba46a6409122f265cbff8bef922759f2d517ff4189ca0b1500674a63cf96337c953dd6f0c87ef6453a3c7d9819c1f85ebcbb4121f1e1bca
+  metadata.gz: d8368550186c0826ce9f4cf4634b2c00970622eae12ed79582e8ef4002d88349e019a2a641877acf51747513f57d97a3d5bcf98695c5f58f638bec986b73331d
+  data.tar.gz: c57d4d8f9a1c32fdef6f3828ee5b11d798de609e80cb72f0eec89a980235d28e5dbabd64431a9c683bbd430f406ddee169547c1af4dfe4bf15c2cfdbfa490d52

data/lib/isodoc/function/footnotes.rb

@@ -38,8 +38,7 @@ module IsoDoc
         fnbody.xpath(ns(".//fmt-fn-label")).each do |s|
           s["class"] = "TableFootnoteRef"
           s.name = "span"
-          d = s.at(ns("./span[@class = 'fmt-caption-delim']")) and
-            s.next = d
+          d = s.at(ns("./span[@class = 'fmt-caption-delim']")) and s.next = d
         end
       end
 

data/lib/isodoc/function/setup.rb

@@ -14,7 +14,7 @@ module IsoDoc
         dir = init_dir(filename, debug)
         @filename = filename
         @output_dir = File.dirname(filename)
-        @localdir = (@baseassetpath || filepath.parent.to_s) + "/"
+        @localdir = "#{@baseassetpath || filepath.parent.to_s}/"
         @sourcedir = @localdir
         @sourcefilename and
           @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"

data/lib/isodoc/metadata.rb

@@ -58,7 +58,7 @@ module IsoDoc
     end
 
     def docstatus(xml, _out)
-      published_default(xml)
+      published = published_default(xml)
       s = xml.at(ns("//bibdata/status/stage#{NOLANG}")) or return
       s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
       set(:stage, status_print(s.text))
@@ -69,23 +69,23 @@ module IsoDoc
         set(:substage_display, i1)
       (i2 = xml.at(ns("//bibdata/status/iteration"))&.text) and
         set(:iteration, i2)
-      unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))
+      !published && set(:stageabbr, stage_abbr(s.text))
     end
 
     def published_default(xml)
       override = xml.at(ns("//semantic-metadata/stage-published"))&.text
       default = override || "true"
       ret = default == "false"
-      s = xml.at(ns("//bibdata/status/stage#{NOLANG}"))
-      override || !s or ret = unpublished(s.text)
       set(:unpublished, ret)
+      default == "true"
     end
 
     def stage_abbr(docstatus)
       status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join
     end
 
-    def unpublished(status)
+    # KILL
+    def unpublishedx(status)
       !status.casecmp("published").zero?
     end
 

data/lib/isodoc/metadata_contributor.rb

@@ -107,14 +107,14 @@ module IsoDoc
       set(:agency, agency)
       set(:publisher, connectives_strip(@i18n.boolean_conj(publisher, "and")))
       set(:copublisher_logos, logos.map { |l| to_datauri(l) })
-      set(:copublisher_logo_attrs, copublisher_logo_attrs(xml))
+      set(:copublisher_logo_attrs, contrib_logo_attrs(xml, "publisher"))
       agency_addr(xml)
     end
 
-    def copublisher_logo_attrs(xml)
+    def contrib_logo_attrs(xml, role)
       xml.xpath(ns("//metanorma-extension/presentation-metadata/*"))
         .each_with_object([]) do |x, m|
-          copublisher_logo_attr?(x) or next
+          contrib_logo_attr?(x, role) or next
           p = x.name.split(/[_-]/)
           idx = (p[4] || "1").to_i - 1
           m[idx] ||= {}
@@ -123,8 +123,8 @@ module IsoDoc
         end
     end
 
-    def copublisher_logo_attr?(elem)
-      elem.name.start_with?("logo-publisher-") or return false
+    def contrib_logo_attr?(elem, role)
+      elem.name.start_with?("logo-#{role}-") or return false
       p = elem.name.split(/[_-]/)
       %w(doc html).include?(p[2]) &&
         %w(height width).include?(p[3]) &&

data/lib/isodoc/presentation_function/docid.rb

@@ -49,16 +49,22 @@ module IsoDoc
       id
     end
 
+    def xml_to_string_skip_fn(node)
+      node1 = node.dup
+      node1.xpath(ns(".//fn")).each(&:remove)
+      to_xml(node1.children)
+    end
+
     def bracket_if_num(num)
       num.nil? and return nil
-      num = to_xml(num.children).sub(/^\[/, "").sub(/\]$/, "")
+      num = xml_to_string_skip_fn(num).sub(/^\[/, "").sub(/\]$/, "")
       /^\d+$/.match?(num) and return "[#{num}]"
       num
     end
 
     def unbracket1(ident)
       ident.nil? and return nil
-      ident.is_a?(String) or ident = to_xml(ident.children)
+      ident.is_a?(String) or ident = xml_to_string_skip_fn(ident)
       ident.sub(/^\[/, "").sub(/\]$/, "")
     end
 

data/lib/isodoc/presentation_function/footnotes.rb

@@ -55,7 +55,8 @@ module IsoDoc
     end
 
     def table_fn(elem)
-      fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      fnotes = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")) -
+        elem.xpath(ns("./fmt-name//fn"))
       ret = footnote_collect(fnotes)
       f = footnote_container(fnotes, ret) and elem << f
     end
@@ -80,9 +81,11 @@ module IsoDoc
 
     def non_document_footnotes(docxml)
       table_fns = docxml.xpath(ns("//table//fn")) -
-        docxml.xpath(ns("//table/name//fn"))
+        docxml.xpath(ns("//table/name//fn")) -
+        docxml.xpath(ns("//table/fmt-name//fn"))
       fig_fns = docxml.xpath(ns("//figure//fn")) -
-        docxml.xpath(ns("//figure/name//fn"))
+        docxml.xpath(ns("//figure/name//fn")) -
+        docxml.xpath(ns("//figure/fmt-name//fn"))
       table_fns + fig_fns
     end
 
@@ -117,7 +120,8 @@ module IsoDoc
 
     # move footnotes into key
     def figure_fn(elem)
-      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn"))
+      fn = elem.xpath(ns(".//fn")) - elem.xpath(ns("./name//fn")) -
+        elem.xpath(ns("./fmt-name//fn"))
       fn.empty? and return
       dl = figure_key_insert_pt(elem)
       footnote_collect(fn).each do |f|
@@ -169,8 +173,10 @@ module IsoDoc
     end
 
     # Do not insert a comment bookmark inside another comment bookmark
+    # Also avoid list labels, which are typically not rendered downstream
+    # as selectable text
     AVOID_COMMENT_BOOKMARKS = <<~XPATH.freeze
-      [not(ancestor::xmlns:fmt-annotation-start)][not(ancestor::xmlns:fmt-annotation-end)]
+      [not(ancestor::xmlns:fmt-annotation-start)][not(ancestor::xmlns:fmt-annotation-end)][not(ancestor::xmlns:fmt-name[parent::xmlns:li])]
     XPATH
 
     def comment_bookmarks_locate(elem)

data/lib/isodoc/presentation_function/refs.rb

@@ -4,9 +4,9 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def references(docxml)
       bibliography_bibitem_number(docxml)
-      renderings = references_render(docxml)
+      @ref_renderings = references_render(docxml)
       docxml.xpath(ns("//references/bibitem")).each do |x|
-        bibitem(x, renderings)
+        bibitem(x, @ref_renderings)
         reference_name(x)
       end
       hidden_items(docxml)

data/lib/isodoc/presentation_xml_convert.rb

@@ -86,8 +86,6 @@ module IsoDoc
       index docxml # fed by strip_duplicate_ids
       toc docxml
       display_order docxml # feeds document_footnotes
-      document_footnotes docxml
-      comments docxml
     end
 
     def block(docxml)
@@ -111,6 +109,8 @@ module IsoDoc
     end
 
     def inline(docxml)
+      document_footnotes docxml
+      comments docxml
       bibitem_lookup(docxml) # feeds citeas
       fmt_ref docxml # feeds citeas, xref, eref, origin, concept
       citeas docxml # feeds xref, eref, origin, concept

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.2.3".freeze
+  VERSION = "3.2.5".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -63,6 +63,7 @@ module IsoDoc
         word_floating_titles(docxml)
         word_section_breaks(docxml)
         word_tab_clean(docxml)
+        word_fn_cleanup(docxml)
         authority_cleanup(docxml)
         word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
@@ -197,6 +198,23 @@ module IsoDoc
           end
         end
       end
+
+      TABLE_FN_ADJ = <<~XPATH.freeze
+        //a[@class='TableFootnoteRef'][following-sibling::*[1][self::a[@class='TableFootnoteRef']]]
+      XPATH
+
+      FN_ADJ = <<~XPATH.freeze
+        //span[@class='MsoFootnoteReference'][following-sibling::*[1][self::span[@class='MsoFootnoteReference']]]
+      XPATH
+
+      def word_fn_cleanup(docxml)
+        docxml.xpath(TABLE_FN_ADJ).each do |a|
+          a.next = '<span class="TableFootnoteRef">, </span>'
+        end
+        docxml.xpath(FN_ADJ).each do |a|
+          a.next = '<span class="MsoFootnoteReference">, </span>'
+        end
+      end
     end
   end
 end

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -92,15 +92,13 @@ module IsoDoc
       end
 
       def toc_word_class_list(classes)
-        classes.map do |x|
-          / /.match?(x) ? %("#{x}") : x
-        end.join(",")
+        classes.map { |x| "#{x},1" }.join(",")
       end
 
       def word_toc_reqt_preface1
         <<~TOC
           <span lang="EN-GB"><span style='mso-element:field-begin'></span><span
-          style='mso-spacerun:yes'>&#xA0;</span>TOC \\h \\z \\t #{toc_word_class_list reqt_toc_class}
+          style='mso-spacerun:yes'>&#xA0;</span>TOC \\h \\z \\t "#{toc_word_class_list reqt_toc_class}"
           <span style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -108,14 +106,14 @@ module IsoDoc
       def word_toc_table_preface1
         <<~TOC
           <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
-          \\h \\z \\t #{toc_word_class_list table_toc_class} <span style='mso-element:field-separator'></span></span>
+          \\h \\z \\t "#{toc_word_class_list table_toc_class}" <span style='mso-element:field-separator'></span></span>
         TOC
       end
 
       def word_toc_figure_preface1
         <<~TOC
           <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
-          \\h \\z \\t #{toc_word_class_list figure_toc_class} <span style='mso-element:field-separator'></span></span>
+          \\h \\z \\t "#{toc_word_class_list figure_toc_class}" <span style='mso-element:field-separator'></span></span>
         TOC
       end
 

data/lib/isodoc/xslfo_convert.rb

@@ -58,8 +58,15 @@ module IsoDoc
         ret["--param baseassetpath="] = @baseassetpath
       ret = ret.merge(@pdf_cmd_options)
       %w(--xsl-file --xsl-file-override).each do |x|
-        ret[x] &&= Pathname.new(File.expand_path(ret[x])).to_s
-        # .relative_path_from(File.dirname(@xsl)).to_s
+        if ret[x]
+          ret[x] = if File.absolute_path?(ret[x])
+                     Pathname.new(ret[x]).to_s
+                   else
+                     Pathname.new(
+                       File.expand_path(File.join(@baseassetpath, ret[x])),
+                     ).to_s
+                   end
+        end
       end
       if ret["--xsl-file"]
         @xsl = ret["--xsl-file"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64