isodoc 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e69024aaaf44cd4e14adf54c3a7ae462ca5400306a9ccc20c74834ad101418
-  data.tar.gz: 39060f4e2b83d5211610b75d39474449191b0ef8f8d543672fc6a40eba55f7bd
+  metadata.gz: 8160c3e32a52cffb4ec08452c22872631c0a55dfd3ae81b3bb5dfdf6269769c6
+  data.tar.gz: bb0f4a1a46099a5315d97991b6bff04a4f08a5364f8b5d4a3ae74bc4c2a2ea6c
 SHA512:
-  metadata.gz: 2eeb99cfc5aebc17b5e07b2496467cc822a547c61d08e5b572b6575da8402b3beee4c6b854e8ee7feefaaa215e6aecd055670f9653e1d9c38538928ab6d06a85
-  data.tar.gz: 6a185f46948895262590d32bf58d311f53938a0f122d84e26d722a661d1a48fdf63aa043f5d8f094928d1441eb6b00f844182376300b3cf5c44311e35dea2849
+  metadata.gz: 221dafa4fa11246d7b0e61c5553c6199e2a4a58bc409d6389a889a5cb4bee761c6e5a7a8d2936acefd41083cb86436845a6719519d50a675774149fd5a2c92ad
+  data.tar.gz: de02f2a399990422f41dd6380bd337462b3a90609e1e6caefb7266d117a24b29b17a1b69015188cd087373eeb00ba097678aeed669d8bf7b2a1c73037c7e306b

data/lib/isodoc/function/blocks.rb

@@ -137,13 +137,13 @@ module IsoDoc
 
       def para_parse(node, out)
         out.p **attr_code(para_attrs(node)) do |p|
-          node.children.each { |n| parse(n, p) }
+                    children_parse(node, p)
         end
       end
 
       def attribution_parse(node, out)
-        out.div class: "QuoteAttribution" do |d|
-          node.children.each { |n| parse(n, d) }
+        out.div class: "QuoteAttribution" do |div|
+                    children_parse(node, div)
         end
       end
 
@@ -167,14 +167,14 @@ module IsoDoc
 
       def toc_parse(node, out)
         out.div class: "toc" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
 
       def source_parse(node, out)
         out.div class: "BlockSource" do |d|
           d.p do |p|
-            node.children.each { |n| parse(n, p) }
+                      children_parse(node, p)
           end
         end
       end
@@ -201,7 +201,7 @@ module IsoDoc
         tag = node.parent.name == "fmt-footnote-container" ? "aside" : "div"
         id = node["is_table"] ? node["reference"] : node["id"]
         out.send tag, id: "fn:#{id}", class: "footnote" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
     end

data/lib/isodoc/function/blocks_example_note.rb

@@ -4,7 +4,7 @@ module IsoDoc
       def example_label(_node, div, name)
         name.nil? and return
         div.p class: "example-title" do |_p|
-          name.children.each { |n| parse(n, div) }
+                    children_parse(name, div)
         end
       end
 

data/lib/isodoc/function/form.rb

@@ -4,9 +4,7 @@ module IsoDoc
       def form_parse(node, out)
         out.div **attr_code(class: node["class"],
                             id: node["id"]) do |div|
-          node.children.each do |n|
-            parse(n, div)
-          end
+          children_parse(node, div)
         end
       end
 
@@ -34,9 +32,7 @@ module IsoDoc
       end
 
       def label_parse(node, out)
-        node.children.each do |n|
-          parse(n, out)
-        end
+        children_parse(node, out)
       end
 
       def option_parse(node, out); end

data/lib/isodoc/function/inline.rb

@@ -10,7 +10,7 @@ module IsoDoc
           if node.elements.empty? && node.text.strip.empty?
             l << @c.encode(node["target"].sub(/^mailto:/, ""), :basic,
                            :hexadecimal)
-          else node.children.each { |n| parse(n, l) }
+          else children_parse(node, l)
           end
         end
       end
@@ -74,8 +74,7 @@ module IsoDoc
       def termrefelem_parse(node, out)
         if node.text.strip.empty?
           out << "Termbase #{node['base']}, term ID #{node['target']}"
-        else
-          node.children.each { |n| parse(n, out) }
+        else children_parse(node, out)
         end
       end
 
@@ -142,7 +141,7 @@ module IsoDoc
 
       def smallcap_parse(node, xml)
         xml.span style: "font-variant:small-caps;" do |s|
-          node.children.each { |n| parse(n, s) }
+          children_parse(node, s)
         end
       end
 
@@ -158,13 +157,13 @@ module IsoDoc
 
       def add_parse(node, out)
         out.span class: "addition" do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def del_parse(node, out)
         out.span class: "deletion" do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
@@ -177,19 +176,19 @@ module IsoDoc
 
       def ruby_parse(node, out)
         out.ruby do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def rt_parse(node, out)
         out.rt do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def rb_parse(node, out)
         out.rb do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
@@ -198,7 +197,7 @@ module IsoDoc
       end
 
       def children_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        node&.children&.each { |n| parse(n, out) }
       end
 
       def location_parse(node, out); end

data/lib/isodoc/function/inline_simple.rb

@@ -31,50 +31,50 @@ module IsoDoc
 
       def keyword_parse(node, out)
         out.span class: "keyword" do |s|
-          node.children.each { |n| parse(n, s) }
+          children_parse(node, s)
         end
       end
 
       def em_parse(node, out)
         out.i do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def strong_parse(node, out)
         out.b do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def sup_parse(node, out)
         out.sup do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def sub_parse(node, out)
         out.sub do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def tt_parse(node, out)
         out.tt do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def strike_parse(node, out)
         out.s do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
 
       def underline_parse(node, out)
         node["style"] and style = "text-decoration: #{node['style']}"
         out.u **attr_code(style: style) do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
     end

data/lib/isodoc/function/reqt.rb

@@ -40,10 +40,8 @@ module IsoDoc
       end
 
       def div_parse(node, out)
-        out.div **reqt_attrs(node, node["type"]) do |t|
-          node.children.each do |n|
-            parse(n, t)
-          end
+        out.div **reqt_attrs(node, node["type"]) do |div|
+          children_parse(node, div)
         end
       end
     end

data/lib/isodoc/function/section.rb

@@ -199,28 +199,28 @@ module IsoDoc
       def copyright_parse(node, out)
         @bare and return
         out.div class: "boilerplate-copyright" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
 
       def license_parse(node, out)
         @bare and return
         out.div class: "boilerplate-license" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
 
       def legal_parse(node, out)
         @bare and return
         out.div class: "boilerplate-legal" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
 
       def feedback_parse(node, out)
         @bare and return
         out.div class: "boilerplate-feedback" do |div|
-          node.children.each { |n| parse(n, div) }
+                    children_parse(node, div)
         end
       end
 

data/lib/isodoc/function/section_titles.rb

@@ -90,7 +90,7 @@ module IsoDoc
       def variant_title(node, out)
         out.p **attr_code(style: "display:none;",
                           class: "variant-title-#{node['type']}") do |p|
-          node.children.each { |c| parse(c, p) }
+          children_parse(node, p)
         end
       end
     end

data/lib/isodoc/function/setup.rb

@@ -13,8 +13,8 @@ module IsoDoc
         filename = filepath.sub_ext("").sub(/\.presentation$/, "").to_s
         dir = init_dir(filename, debug)
         @filename = filename
-        @localdir = @baseassetpath || filepath.parent.to_s
-        @localdir += "/"
+        @output_dir = File.dirname(filename)
+        @localdir = (@baseassetpath || filepath.parent.to_s) + "/"
         @sourcedir = @localdir
         @sourcefilename and
           @sourcedir = "#{Pathname.new(@sourcefilename).parent}/"

data/lib/isodoc/function/terms.rb

@@ -2,7 +2,7 @@ module IsoDoc
   module Function
     module Terms
       def definition_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def modification_parse(node, out)
@@ -78,7 +78,7 @@ module IsoDoc
 
       def termref_parse(node, out)
         out.p do |p|
-          node.children.each { |n| parse(n, p) }
+          children_parse(node, p)
         end
       end
 
@@ -89,7 +89,7 @@ module IsoDoc
         out.p class: "TermNum", id: node["id"] do |p|
           name&.children&.each { |n| parse(n, p) }
         end
-        node.children.each { |n| parse(n, out) }
+        children_parse(node, out)
       end
 
       def termdocsource_parse(_node, _out); end

data/lib/isodoc/function/utils.rb

@@ -236,6 +236,10 @@ module IsoDoc
         path.tr!(%{/}, "\\")
         path[/\s/] ? "\"#{path}\"" : path
       end
+
+      def imgfile_suffix(uri, suffix)
+        "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.#{suffix}"
+      end
     end
   end
 end

data/lib/isodoc/html_function/form.rb

@@ -5,9 +5,7 @@ module IsoDoc
         out.form **attr_code(id: node["id"], name: node["name"],
                              class: node["class"],
                              action: node["action"]) do |div|
-          node.children.each do |n|
-            parse(n, div)
-          end
+          children_parse(node, div)
         end
       end
 
@@ -27,17 +25,13 @@ module IsoDoc
           id: node["id"], name: node["name"], size: node["size"],
           disabled: node["disabled"], multiple: node["multiple"]
         ) do |div|
-          node.children.each do |n|
-            parse(n, div)
-          end
+          children_parse(node, div)
         end
       end
 
       def label_parse(node, out)
         out.label **attr_code(for: node["for"]) do |div|
-          node.children.each do |n|
-            parse(n, div)
-          end
+          children_parse(node, div)
         end
       end
 
@@ -46,9 +40,7 @@ module IsoDoc
           disabled: node["disabled"], selected: node["selected"],
           value: node["value"]
         ) do |o|
-          node.children.each do |n|
-            parse(n, o)
-          end
+          children_parse(node, o)
         end
       end
 

data/lib/isodoc/metadata_contributor.rb

@@ -56,41 +56,63 @@ module IsoDoc
     end
 
     def iso?(org)
-      name = org&.at(ns("./name"))&.text
-      abbrev = org&.at(ns("./abbreviation"))&.text
-      abbrev == "ISO" ||
-        name == "International Organization for Standardization"
+      org[:abbr] == "ISO" ||
+        org[:name] == "International Organization for Standardization"
     end
 
     def agency1(xml)
       agency = ""
       publisher = []
-      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
-                   "organization")).each do |org|
-        name = org.at(ns("./name[@language = '#{@lang}']")) ||
-          org.at(ns("./name"))
-        agency1 = org.at(ns("./abbreviation"))&.text || name&.text
-        publisher << name.text if name
+      logos = []
+      agency_data(xml).each do |org|
+        agency1 = org[:abbr] || org[:name]
+        org[:name] and publisher << org[:name]
+        org[:logo] and logos << org[:logo]
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
-      [agency, publisher]
+      [agency.sub(%r{/$}, ""), publisher, logos]
+    end
+
+    AGENCY_DATA = { subdivision: "./subdivision",
+                    pub_phone: "./phone[not(@type = 'fax')]",
+                    abbr: "./abbreviation",
+                    logo: "./logo/image/@src",
+                    pub_fax: "./phone[@type = 'fax']", pub_email: "./email",
+                    pub_uri: "./uri" }.freeze
+
+    def agency_data(xml)
+      xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
+                   "organization")).each_with_object([]) do |org, m|
+                     m << agency_data1(org)
+                   end
+    end
+
+    def agency_data1(org)
+      ret = {}
+      n = org.at(ns("./name[@language = '#{@lang}']")) ||
+        org.at(ns("./name")) and ret[:name] = n.text
+      AGENCY_DATA.each do |k, v|
+        n = org.at(ns(v)) and ret[k] = n.text
+      end
+      ret
     end
 
     def agency(xml)
-      agency, publisher = agency1(xml)
-      set(:agency, agency.sub(%r{/$}, ""))
+      agency, publisher, logos = agency1(xml)
+      set(:agency, agency)
       set(:publisher, connectives_strip(@i18n.boolean_conj(publisher, "and")))
+      set(:copublisher_logos, logos)
       agency_addr(xml)
     end
 
     def agency_addr(xml)
       a = xml.at(ns("//bibdata/contributor[xmlns:role/@type = 'publisher'][1]/" \
                     "organization")) or return
-      { subdivision: "./subdivision", pub_phone: "./phone[not(@type = 'fax')]",
-        pub_fax: "./phone[@type = 'fax']", pub_email: "./email",
-        pub_uri: "./uri" }.each do |k, v|
-          n = a.at(ns(v)) and set(k, n.text)
-        end
+      data = agency_data1(a)
+      data.compact.each do |k, v|
+        %i(name abbr logo).include?(k) and next
+        set(k, v)
+      end
       n = a.at(ns("./address/formattedAddress")) and
         set(:pub_address, n.children.to_xml)
     end

data/lib/isodoc/presentation_function/autonum.rb

@@ -27,8 +27,10 @@ module IsoDoc
     end
 
     def prefix_name_labels(node)
-      { elem: node["id"],
-        name: "_#{UUIDTools::UUID.random_create}" }
+      @new_ids ||= {}
+      id = "_#{UUIDTools::UUID.random_create}"
+      @new_ids[id] = nil
+      { elem: node["id"], name: id }
     end
 
     def prefix_name_postprocess(node, elem)
@@ -45,7 +47,7 @@ module IsoDoc
     end
 
     def semx_fmt_dup(elem)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      add_id(elem)
       new = Nokogiri::XML(<<~XML).root
         <semx xmlns='#{elem.namespace.href}' element='#{elem.name}' source='#{elem['original-id'] || elem['id']}'>#{to_xml(elem.children)}</semx>
       XML

data/lib/isodoc/presentation_function/footnotes.rb

@@ -22,7 +22,7 @@ module IsoDoc
 
     def fnbody(fnote, seen)
       body = Nokogiri::XML::Node.new("fmt-fn-body", fnote.document)
-      body["id"] = "_#{UUIDTools::UUID.random_create}"
+      add_id(body)
       body["target"] = fnote["id"]
       body["reference"] = fnote["reference"]
       body << semx_fmt_dup(fnote)
@@ -147,8 +147,8 @@ module IsoDoc
 
     def comment_body(elem)
       c1 = elem.after("<fmt-review-body/>").next
-      elem.attributes.each_key { |k| c1[k] = elem[k] }
-      c1["id"] = "_#{UUIDTools::UUID.random_create}"
+      elem.attributes.each_key { |k| k == "id" or c1[k] = elem[k] }
+      add_id(c1)
       c1 << semx_fmt_dup(elem)
     end
 
@@ -182,7 +182,7 @@ module IsoDoc
 
     def comment_bookmark_start(from, elem)
       ret = from.before("<fmt-review-start/>").previous
-      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      add_id(ret)
       ret["source"] = elem["from"]
       comment_to_bookmark_attrs(elem, ret, start: true)
       ret << comment_bookmark_start_label(elem)
@@ -191,7 +191,7 @@ module IsoDoc
 
     def comment_bookmark_end(to, elem)
       ret = to.after("<fmt-review-end/>").next
-      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      add_id(ret)
       ret["source"] = elem["to"]
       comment_to_bookmark_attrs(elem, ret, start: false)
       ret << comment_bookmark_end_label(elem)

data/lib/isodoc/presentation_function/ids.rb

@@ -1,32 +1,65 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def add_id_text
+      id = "_#{UUIDTools::UUID.random_create}"
+      @new_ids[id] = nil
+      %(id="#{id}")
+    end
+
+    def add_id(elem)
+      elem["id"] and return
+      id = "_#{UUIDTools::UUID.random_create}"
+      elem["id"] = id
+      @new_ids[id] = nil
+    end
+
     def id_validate(docxml)
-      repeat_id_validate(docxml)
+      add_missing_presxml_id(docxml)
+      repeat_id_validate(docxml) # feeds orig_id_cleanup
+      orig_id_cleanup(docxml)
       idref_validate(docxml)
+      contenthash_id_cleanup(docxml)
+    end
+
+    def add_missing_presxml_id(docxml)
+      docxml.xpath(ns("//fmt-name | //fmt-title | //fmt-definition | " \
+        "//fmt-sourcecode | //fmt-provision")).each do |x|
+        add_id(x)
+      end
     end
 
     def repeat_id_validate1(elem)
       if @doc_ids[elem["id"]]
-        @log.add("Anchors", elem,
-                 "Anchor #{elem['id']} has already been " \
-                 "used at line #{@doc_ids[elem['id']]}", severity: 0)
+        @log&.add("Anchors", elem,
+                  "Anchor #{elem['id']} has already been " \
+                  "used at line #{@doc_ids[elem['id']]}", severity: 0)
       end
       @doc_ids[elem["id"]] = elem.line
     end
 
     def repeat_id_validate(doc)
-      @log or return
       @doc_ids = {}
       doc.xpath("//*[@id]").each do |x|
         repeat_id_validate1(x)
       end
     end
 
+    # if have moved a new GUID id to original-id in copying, move it back to id
+    def orig_id_cleanup(docxml)
+      @doc_orig_ids = {}
+      docxml.xpath("//*[@original-id]").each do |x|
+        if !@doc_ids[x["original-id"]] && !x["id"]
+          x["id"] = x["original-id"]
+          x.delete("original-id")
+          @doc_ids[x["id"]] = x.line
+        else
+          @doc_orig_ids[x["original-id"]] = x.line
+        end
+      end
+    end
+
     def idref_validate(doc)
       @log or return
-      doc.xpath("//*[@original-id]").each do |x|
-        @doc_ids[x["original-id"]] = x.line
-      end
       Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
         doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
           idref_validate1(x, e[1])
@@ -37,12 +70,14 @@ module IsoDoc
     def idref_validate1(node, attr)
       node[attr].strip.empty? and return
       @doc_ids[node[attr]] and return
+      @doc_orig_ids[node[attr]] and return
       @log.add("Anchors", node,
                "Anchor #{node[attr]} pointed to by #{node.name} " \
                "is not defined in the document", severity: 1)
     end
 
     def provide_ids(docxml)
+      @new_ids = {} # guids assigned within Presentation XML
       anchor_sanitise(docxml)
       populate_id(docxml)
       add_missing_id(docxml)
@@ -65,8 +100,11 @@ module IsoDoc
 
     def add_missing_id(docxml)
       docxml.xpath(ns("//source | //modification | //erefstack | //fn | " \
-        "//review | //floating-title")).each do |s|
-        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
+        "//review | //floating-title | //li | //executivesummary | " \
+        "//preface/abstract | //foreword | //introduction | //annex | " \
+        "//acknowledgements | //clause | //references | //terms | " \
+        "//preferred | //deprecates | //admitted | //related")).each do |s|
+        add_id(s)
       end
     end
 
@@ -75,5 +113,38 @@ module IsoDoc
       ret = ident.split("#", 2)
       ret.map { |x| Metanorma::Utils::to_ncname(x) }.join("#")
     end
+
+    def contenthash_id_cleanup(docxml)
+      add_new_contenthash_id(docxml, @new_ids)
+      xref_new_contenthash_id(docxml, @new_ids)
+    end
+
+    def add_new_contenthash_id(docxml, ids)
+      %w(original-id id).each do |k|
+        docxml.xpath("//*[@#{k}]").each do |x|
+          ids.has_key?(x[k]) or next
+          new_id = contenthash(x)
+          ids[x[k]] = new_id
+          x[k] = new_id
+        end
+      end
+    end
+
+    def xref_new_contenthash_id(docxml, ids)
+      Metanorma::Utils::anchor_attributes(presxml: true).each do |e|
+        docxml.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
+          ids.has_key?(x[e[1]]) or next
+          #require "debug"; binding.b unless ids[x[e[1]]] 
+          ids[x[e[1]]] or next
+          x[e[1]] = ids[x[e[1]]]
+        end
+      end
+    end
+
+    # TODO duplicate of standoc
+    def contenthash(elem)
+      Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
+        .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
+    end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -180,9 +180,5 @@ module IsoDoc
       node["height"] = e["height"]
       node["width"] = e["width"]
     end
-
-    def imgfile_suffix(uri, suffix)
-      "#{File.join(File.dirname(uri), File.basename(uri, '.*'))}.#{suffix}"
-    end
   end
 end

data/lib/isodoc/presentation_function/index.rb

@@ -4,10 +4,6 @@ module IsoDoc
       false
     end
 
-    def add_id
-      %(id="_#{UUIDTools::UUID.random_create}")
-    end
-
     def strip_index(docxml)
       docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end
@@ -15,8 +11,10 @@ module IsoDoc
     def index(xml)
       if enable_indexsect && xml.at(ns("//index"))
         i = xml.at(ns("//indexsect")) ||
-          xml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}" \
-                             "</title></indexsect>").first
+          xml.root.add_child(
+            "<indexsect #{add_id_text}>" \
+             "<fmt-title #{add_id_text}>#{@i18n.index}</fmt-title></indexsect>",
+          ).first
         index = sort_indexterms(xml.xpath(ns("//index")),
                                 xml.xpath(ns("//index-xref[@also = 'false']")),
                                 xml.xpath(ns("//index-xref[@also = 'true']")))
@@ -89,7 +87,7 @@ module IsoDoc
     end
 
     def index_entries_head(head, entries, opt)
-      ret = "<li>#{head}"
+      ret = "<li #{add_id_text}>#{head}"
       xref = entries&.dig(:xref)&.join(", ")
       see = index_entries_see(entries, :see)
       also = index_entries_see(entries, :also)
@@ -173,7 +171,7 @@ module IsoDoc
     def index2bookmark(node)
       node.name = "bookmark"
       node.children.each(&:remove)
-      node["id"] = "_#{UUIDTools::UUID.random_create}"
+      add_id(node)
       node.delete("to")
     end
   end

data/lib/isodoc/presentation_function/metadata.rb

@@ -18,7 +18,7 @@ module IsoDoc
 
     def attachments_extract(docxml)
       docxml.at(ns("//metanorma-extension/attachment")) or return
-      dir = File.join(@localdir, "_#{@outputfile}_attachments")
+      dir = File.join(@output_dir, "_#{@outputfile}_attachments")
       FileUtils.rm_rf(dir)
       FileUtils.mkdir_p(dir)
       docxml.xpath(ns("//metanorma-extension/attachment")).each do |a|

data/lib/isodoc/presentation_function/refs.rb

@@ -211,6 +211,7 @@ module IsoDoc
       date_note = bib.at(ns("./note[@type = 'Unpublished-Status']"))
       date_note.nil? and return ret
       id = "_#{UUIDTools::UUID.random_create}"
+      @new_ids[id] = nil
       "#{ret}<fn id='#{id}' reference='#{id}'><p>#{date_note.content}</p></fn>"
     end
 

data/lib/isodoc/presentation_function/section.rb

@@ -44,7 +44,7 @@ module IsoDoc
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
       is_unnumbered = unnumbered_clause?(elem)
-      lbl = @xrefs.anchor(elem["id"], :label, !is_unnumbered)
+      lbl = @xrefs.anchor(elem["id"], :label, false)
       if is_unnumbered || !lbl
         prefix_name(elem, {}, nil, "title")
       else
@@ -179,7 +179,7 @@ module IsoDoc
 
     def toc_refs(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
-        lbl = @xrefs.anchor(x["target"], :label) or next
+        lbl = @xrefs.anchor(x["target"], :label, false) or next
         x.add_first_child "#{lbl}<span class='fmt-caption-delim'><tab/></span>"
       end
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -47,7 +47,7 @@ module IsoDoc
     end
 
     def termnote_label(elem)
-      @xrefs.anchor(elem["id"], :label) || "???"
+      @xrefs.anchor(elem["id"], :label, false) || "???"
     end
 
     def termdefinition(docxml)
@@ -71,9 +71,9 @@ module IsoDoc
 
     def multidef(_elem, defn, fmt_defn)
       ret = defn.each_with_object([]) do |f, m|
-        m << "<li>#{to_xml(semx_fmt_dup(f))}</li>"
+        m << "<li #{add_id_text}>#{to_xml(semx_fmt_dup(f))}</li>"
       end
-      fmt_defn << "<ol>#{ret.join("\n")}</ol>"
+      fmt_defn << "<ol #{add_id_text}>#{ret.join("\n")}</ol>"
     end
 
     def singledef(_elem, defn, fmt_defn)
@@ -191,7 +191,7 @@ module IsoDoc
     end
 
     def term1(elem)
-      lbl = @xrefs.anchor(elem["id"], :label) or return
+      lbl = @xrefs.anchor(elem["id"], :label, false) or return
       prefix_name(elem, {}, "#{lbl}#{clausedelim}", "name")
     end
   end

data/lib/isodoc/presentation_function/title.rb

@@ -87,9 +87,8 @@ module IsoDoc
     def toc_title(docxml)
       docxml.at(ns("//preface/clause[@type = 'toc']")) and return
       ins = toc_title_insert_pt(docxml) or return
-      id = UUIDTools::UUID.random_create.to_s
       ins.previous = <<~CLAUSE
-        <clause type = 'toc' id='_#{id}'><fmt-title depth='1'>#{@i18n.table_of_contents}</fmt-title></clause>
+        <clause type = 'toc' #{add_id_text}><fmt-title depth='1'>#{@i18n.table_of_contents}</fmt-title></clause>
       CLAUSE
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.10".freeze
+  VERSION = "3.1.11".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -120,14 +120,33 @@ module IsoDoc
         end
       end
 
+      def datauri_word(uri)
+        ret = %r{^data:}.match?(uri) ? save_dataimage(uri) : uri
+        if ret.end_with?(".svg")
+          v = Vectory::Svg.from_node(Nokogiri::XML(File.read(ret))).to_emf
+          target_path = imgfile_suffix(ret, "emf")
+          v.write(target_path).to_uri.content
+          ret = target_path
+        end
+        ret
+      end
+
       def info(xml, out)
-        @tocfigurestitle =
-          xml.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
-        @toctablestitle =
-          xml.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
-        @tocrecommendationstitle = xml
-          .at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
+        toc_info(xml)
         super
+        if logos = @meta.get[:copublisher_logos] # may be DataURI
+          logos.map! { |l| datauri_word(l) }
+          @meta.set(:copublisher_logos, logos)
+        end
+        @meta.get
+      end
+
+      def toc_info(xml)
+        toc = "metanorma-extension/toc"
+        @tocfigurestitle = xml.at(ns("//#{toc}[@type = 'figure']/title"))&.text
+        @toctablestitle = xml.at(ns("//#{toc}[@type = 'table']/title"))&.text
+        @tocrecommendationstitle =
+          xml.at(ns("//#{toc}[@type = 'recommendation']/title"))&.text
       end
 
       def table_of_contents(clause, out)

data/lib/isodoc/word_function/comments.rb

@@ -46,7 +46,7 @@ module IsoDoc
         out.div style: "mso-element:comment", id: node["id"] do |div|
           div.span style: %{mso-comment-author:"#{node['reviewer']}"}
           make_comment_target(div)
-          node.children.each { |n| parse(n, div) }
+          children_parse(node, div)
         end
       end
 

data/lib/isodoc/word_function/footnotes.rb

@@ -16,7 +16,7 @@ module IsoDoc
         tag = aside ? "aside" : "div"
         id = node["is_table"] ? node["reference"] : node["id"]
         out.send tag, id: "ftn#{id}" do |div|
-          node.children.each { |n| parse(n, div) }
+          children_parse(node, div)
         end
       end
 
@@ -36,7 +36,8 @@ module IsoDoc
       def footnote_parse(node, out)
         table_footnote?(node) and return table_footnote_parse(node, out)
         fn = node["reference"] # || UUIDTools::UUID.random_create.to_s
-        @seen_footnote.include?(fn) and return seen_footnote_parse(node, out, fn)
+        @seen_footnote.include?(fn) and return seen_footnote_parse(node, out,
+                                                                   fn)
         @fn_bookmarks[fn] = bookmarkid
         f = footnote_label_process(node)
         out.span style: "mso-bookmark:_Ref#{@fn_bookmarks[fn]}",

data/lib/isodoc/word_function/inline.rb

@@ -67,7 +67,7 @@ module IsoDoc
                    "##{node['target']}"
                  end
         out.a(href: target) do |l|
-          node.children.each { |n| parse(n, l) }
+          children_parse(node, l)
         end
       end
 
@@ -84,14 +84,14 @@ module IsoDoc
           r.replace(r.at(ns("./ruby/rb")))
         end
         out.ruby do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
         double_ruby and out << "(#{double_ruby.text})"
       end
 
       def rt_parse(node, out)
         out.rt **{ style: "font-size: 6pt;" } do |e|
-          node.children.each { |n| parse(n, e) }
+          children_parse(node, e)
         end
       end
     end

data/lib/isodoc/xref/xref_gen.rb

@@ -147,7 +147,7 @@ refer_list)
             list_item_value(li, c, depth,
                             { list_anchor:, prev_label:,
                               refer_list: depth == 1 ? refer_list : nil })
-          li["id"] ||= "_#{UUIDTools::UUID.random_create}"
+          #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:,

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -106,7 +106,7 @@ module IsoDoc
 
       def preface_name_anchors(clause, level, title)
         xref = semx(clause, title, clause.name)
-        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
+        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label: nil, level:,
             xref:, title: nil,
@@ -162,7 +162,7 @@ module IsoDoc
         xref = labelled_autonum(@labels["clause"], num)
         label = num
         c = clause_title(clause) and title = semx(clause, c, "title")
-        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
+        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
@@ -184,7 +184,7 @@ module IsoDoc
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, label)
         c = clause_title(clause) and title = semx(clause, c, "title")
-        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
+        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref: labelled_autonum(@labels["annex"], num), title:,
             elem: @labels["annex"], type: "clause",

data/lib/isodoc/xslfo_convert.rb

@@ -13,6 +13,8 @@ module IsoDoc
                        pdfallowaccesscontent: "--allow-access-content",
                        pdfallowassembledocument: "--allow-assemble-document",
                        pdfallowprinthq: "--allow-print-hq",
+                       pdfstylesheet: "--xsl-file",
+                       pdfstylesheet_override: "--xsl-file-override",
                        pdfencryptmetadata: "--encrypt-metadata" }.freeze
     MN2PDF_DEFAULT_ARGS = { "--syntax-highlight": nil }.freeze
 
@@ -54,23 +56,38 @@ module IsoDoc
           @aligncrosselements.tr(",", " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
-      ret.merge(@pdf_cmd_options)
+      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
+      end
+      if ret["--xsl-file"]
+        @xsl = ret["--xsl-file"]
+        ret.delete("--xsl-file")
+      end
+      ret
     end
 
     # input_file: keep-alive tempfile
     def convert(input_fname, file = nil, debug = false,
                 output_fname = nil)
-      file ||= File.read(input_fname, encoding: "utf-8")
-      _, docxml, filename = input_xml_path(input_fname, file, debug)
-      xsl = pdf_stylesheet(docxml) or return
-      Pathname.new(xsl).absolute? or xsl = File.join(@libdir, xsl)
-      @doctype = Nokogiri::XML(file).at(ns("//bibdata/ext/doctype"))&.text
+      _, docxml, filename = convert_prep(input_fname, file, debug)
+      opts = pdf_options(docxml, input_fname)
       ::Metanorma::Output::XslfoPdf.new.convert(
         filename, output_fname || output_filename(input_fname),
-        xsl, pdf_options(docxml, input_fname)
+        @xsl, opts
       )
     end
 
+    def convert_prep(input_fname, file, debug)
+      file ||= File.read(input_fname, encoding: "utf-8")
+      _, docxml, filename = input_xml_path(input_fname, file, debug)
+      @xsl = pdf_stylesheet(docxml) or return
+      Pathname.new(@xsl).absolute? or @xsl = File.join(@libdir, @xsl)
+      @doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
+      [file, docxml, filename]
+    end
+
     def output_filename(input_fname)
       out = input_fname.sub(/\.presentation\.xml$/, ".xml")
       File.join(File.dirname(input_fname),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64