isodoc 3.1.11 → 3.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8160c3e32a52cffb4ec08452c22872631c0a55dfd3ae81b3bb5dfdf6269769c6
-  data.tar.gz: bb0f4a1a46099a5315d97991b6bff04a4f08a5364f8b5d4a3ae74bc4c2a2ea6c
+  metadata.gz: 1ce8e37bf69e8622cfac604ad54ea06088dea5c9eec91226d8d9e3f3761693c4
+  data.tar.gz: 033de119ca1a8300891954739f892434955f9830ac3becdd0d87f479b8914ba2
 SHA512:
-  metadata.gz: 221dafa4fa11246d7b0e61c5553c6199e2a4a58bc409d6389a889a5cb4bee761c6e5a7a8d2936acefd41083cb86436845a6719519d50a675774149fd5a2c92ad
-  data.tar.gz: de02f2a399990422f41dd6380bd337462b3a90609e1e6caefb7266d117a24b29b17a1b69015188cd087373eeb00ba097678aeed669d8bf7b2a1c73037c7e306b
+  metadata.gz: 4d7bf496ad23e75d105f5bdacf73f0d21e537f0d559f53914e78b3da631044500c5887f544290003b3d2508f7926f860ff846857b8ca0a434f23b3f6143033e5
+  data.tar.gz: 6644b38d8a81476e6ac6e11b7884685f2942c0b7ee69d5078ee48276eaba30c3e901fcf112594c8202a6fd41bb81e4e7d149e14de9c59350a1fa0b312344580f

data/lib/isodoc/base_style/all.css

@@ -311,9 +311,15 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+.svg-container {
+  width: 100%; /* or any desired width */
+  display: block; /* ← removes unwanted inline spacing */
+}
+
 svg {
   width: 100%;
-  overflow: visible;
+  height: auto; /* ← key to maintaining aspect ratio */
+  display: block; /* ← removes unwanted inline spacing */
 }
 
 #standard-band {

data/lib/isodoc/base_style/reset.css

@@ -311,7 +311,13 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+.svg-container {
+  width: 100%; /* or any desired width */
+  display: block; /* ← removes unwanted inline spacing */
+}
+
 svg {
   width: 100%;
-  overflow: visible;
+  height: auto; /* ← key to maintaining aspect ratio */
+  display: block; /* ← removes unwanted inline spacing */
 }

data/lib/isodoc/base_style/reset.scss

@@ -277,6 +277,13 @@ visibility:visible;
   padding: 0;
 }
 
+.svg-container {
+  width: 100%; /* or any desired width */
+  display: block;     /* ← removes unwanted inline spacing */
+}
+
 svg {
-   width: 100%; overflow: visible; 
+  width: 100%;
+  height: auto;       /* ← key to maintaining aspect ratio */
+  display: block;     /* ← removes unwanted inline spacing */
 }

data/lib/isodoc/function/inline.rb

@@ -200,33 +200,14 @@ module IsoDoc
         node&.children&.each { |n| parse(n, out) }
       end
 
-      def location_parse(node, out); end
-      def author_parse(node, out); end
-      def xref_label_parse(node, out); end
-      def name_parse(node, out); end
-      def semx_definition_parse(node, out); end
-      def semx_xref_parse(node, out); end
-      def semx_eref_parse(node, out); end
-      def semx_link_parse(node, out); end
-      def semx_origin_parse(node, out); end
-      def date_parse(node, out); end
-      def semx_stem_parse(node, out); end
-      def floating_title_parse(node, out); end
-      def identifier_parse(node, out); end
-      def concept_parse(node, out); end
-      def erefstack_parse(node, out); end
-      def svgmap_parse(node, out); end
-      def amend_parse(node, out); end
-      def semx_sourcecode_parse(node, out); end
-      def review_note_parse(node, out); end
-      def semx_source_parse(node, out); end
-
       def fmt_name_parse(node, out)
         children_parse(node, out)
       end
 
       def fmt_identifier_parse(node, out)
-        children_parse(node, out)
+        out.span style: "white-space: nowrap;" do |s|
+          children_parse(node, s)
+        end
       end
 
       def fmt_concept_parse(node, out)

data/lib/isodoc/function/inline_simple.rb

@@ -77,6 +77,27 @@ module IsoDoc
           children_parse(node, e)
         end
       end
+
+      def location_parse(node, out); end
+      def author_parse(node, out); end
+      def xref_label_parse(node, out); end
+      def name_parse(node, out); end
+      def semx_definition_parse(node, out); end
+      def semx_xref_parse(node, out); end
+      def semx_eref_parse(node, out); end
+      def semx_link_parse(node, out); end
+      def semx_origin_parse(node, out); end
+      def date_parse(node, out); end
+      def semx_stem_parse(node, out); end
+      def floating_title_parse(node, out); end
+      def identifier_parse(node, out); end
+      def concept_parse(node, out); end
+      def erefstack_parse(node, out); end
+      def svgmap_parse(node, out); end
+      def amend_parse(node, out); end
+      def semx_sourcecode_parse(node, out); end
+      def review_note_parse(node, out); end
+      def semx_source_parse(node, out); end
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -100,12 +100,21 @@ module IsoDoc
         ret
       end
 
+      def svg_supply_viewbox(svg)
+        svg["viewbox"] and return
+        svg["height"] && svg["width"] or return
+        h = svg["height"].sub(/[^0-9]+$/, "")
+        w = svg["width"].sub(/[^0-9]+$/, "")
+        h.to_i.positive? && w.to_i.positive? or return
+        svg["viewbox"] = "0 0 #{w} #{h}"
+      end
+
       def image_body_parse(node, attrs, out)
         if svg = node.at("./m:svg", "m" => "http://www.w3.org/2000/svg")
-          svg.delete("width")
-          svg["height"] = "1px"
-          svg["padding-bottom"] = "calc(100% * 3 / 4);"
-          out.parent.add_child(svg)
+          svg_supply_viewbox(svg)
+          out.div class: "svg-container" do |div|
+            div.parent.add_child(svg)
+          end
         else super
         end
       end

data/lib/isodoc/metadata.rb

@@ -83,7 +83,11 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/[- ]/).map(&:capitalize).join(" ")
+      status.split(/[- ]/).map do |w|
+        letters = w.chars
+        letters.first.upcase!
+        letters.join
+      end.join(" ")
     end
 
     def docid(isoxml, _out)

data/lib/isodoc/presentation_function/bibdata.rb

@@ -6,6 +6,7 @@ module IsoDoc
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)
+      @xrefs.klass.info docxml, nil
     end
 
     def address_precompose(bib)
@@ -38,17 +39,23 @@ module IsoDoc
     end
 
     def bibdata_i18n(bib)
-      hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype")
-      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage")
-      hash_translate(bib, @i18n.get["substage_dict"], "./status/substage")
+      hash_translate(bib, @i18n.get["doctype_dict"], "./ext/doctype",
+                     "//presentation-metadata/doctype-alias", @lang)
+      hash_translate(bib, @i18n.get["stage_dict"], "./status/stage", nil, @lang)
+      hash_translate(bib, @i18n.get["substage_dict"], "./status/substage", nil,
+                     @lang)
       edition_translate(bib)
     end
 
-    def hash_translate(bibdata, hash, xpath, lang = @lang)
-      x = bibdata.at(ns(xpath)) or return
+    # translate dest_xpath in bibdata using lookup in hash
+    # source text is dest_xpath by default, can be alt_source_xpath if given
+    def hash_translate(bibdata, hash, dest_xpath, alt_source_xpath, lang)
+      x = bibdata.at(ns(dest_xpath)) or return
+      alt_source_xpath and doctype = bibdata.at(ns(alt_source_xpath))
+      doctype ||= x
       hash.is_a? Hash or return
-      hash[x.text] or return
-      tag_translate(x, lang, hash[x.text])
+      hash[doctype.text] or return
+      tag_translate(x, lang, hash[doctype.text])
     end
 
     # does not allow %Spellout and %Ordinal in the ordinal expression

data/lib/isodoc/presentation_xml_convert.rb

@@ -41,7 +41,6 @@ module IsoDoc
       provide_ids docxml # feeds @xrefs.parse
       @xrefs.parse docxml
       @xrefs.klass.meta = @meta
-      @xrefs.klass.info docxml, nil
       counter_init
     end
 

data/lib/isodoc/version.rb

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

data/lib/isodoc/word_function/postprocess.rb

@@ -49,6 +49,7 @@ module IsoDoc
         word_preface(docxml)
         word_sourcecode_annotations(docxml)
         word_sourcecode_table(docxml)
+        word_nonbreaking_spans(docxml)
         word_nested_tables(docxml)
         word_colgroup(docxml)
         word_table_align(docxml)
@@ -185,6 +186,17 @@ module IsoDoc
           out[-1].previous = b.remove
         end
       end
+
+      def word_nonbreaking_spans(docxml)
+        docxml.xpath("//span[@style = 'white-space: nowrap;']").each do |s|
+          s.delete("style")
+          s.traverse do |n|
+            n.text? or next
+            n.replace(n.text.gsub(" ", "\u00a0").gsub("-", "\u2011")
+              .gsub(/\.(?=.)/, ".\u2060"))
+          end
+        end
+      end
     end
   end
 end

data/lib/isodoc/xslfo_convert.rb

@@ -59,7 +59,7 @@ module IsoDoc
       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
+        # .relative_path_from(File.dirname(@xsl)).to_s
       end
       if ret["--xsl-file"]
         @xsl = ret["--xsl-file"]
@@ -100,15 +100,15 @@ module IsoDoc
 
     def input_xml_path(input_filename, xml_file, debug)
       docxml, filename, dir = convert_init(xml_file, input_filename, debug)
-      input_filename = Tempfile.open([File.basename(filename), ".xml"],
-                                     mode: File::BINARY | File::SHARE_DELETE,
-                                     encoding: "utf-8") do |f|
-        f.write docxml
-        f
-      end
+      temp_file = Tempfile.open([File.basename(filename), ".xml"],
+                                mode: File::BINARY | File::SHARE_DELETE,
+                                encoding: "utf-8")
+      temp_file.write docxml
+      temp_file.flush
+      @tempfile_cache << temp_file # Add to cache to prevent garbage collection
       FileUtils.rm_rf dir
 
-      [input_filename, docxml, input_filename.path]
+      [temp_file, docxml, temp_file.path]
     end
   end
 end

metadata

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