isodoc 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f0e05f77735c813b7b9a87ffd569cd025d4f47397ca799f72b4853feb6122ef
-  data.tar.gz: '01821bce42580bfd1d2119c505bfdd4ea8dbc2df0794a0c19d53ed2e2f004df4'
+  metadata.gz: 819d3c20ea4ccb0037115026969f618e21162b177380574c7d2c3be138ef6f69
+  data.tar.gz: cb207eec17fa2a44459809689955e60ac612d4db3d44f5c0ad3d91a30da084e2
 SHA512:
-  metadata.gz: 49d7914e7011f2d681c3919bac3148ac6bef4a6050597cbbef8f78a60fda60c89137aefb3f6b8f54b25caa1feaf1a78bfa9ef62ea67c58161018730c4476fcf6
-  data.tar.gz: e797d276719f0c36bba46a6409122f265cbff8bef922759f2d517ff4189ca0b1500674a63cf96337c953dd6f0c87ef6453a3c7d9819c1f85ebcbb4121f1e1bca
+  metadata.gz: 27592d4f55312126f518f475247fdb73125c24af3c1a1e47ed9dadfa9e47418c8b3656ddf8cee4aaa7584ba6852facb051bc6d34cce2b17c16f97cbd077fce7d
+  data.tar.gz: 190486f76b78338fd7078175141af00165ae0f6f540394ba00b34f35a398aa10f04b8107eeb95e3f60772892aa52a57a2894674a21350ee88eb4e1d413e95631

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/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/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.2.3".freeze
+  VERSION = "3.2.4".freeze
 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.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-04 00:00:00.000000000 Z
+date: 2025-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64