isodoc 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6490ec54ec083e91ab1ccc941676b95d52d3cef3f9b7675e2900e47c1763e47a
-  data.tar.gz: f5190668941e4f42990f024a3852007f3d2a6accfef80e6d242208c814ffe0d0
+  metadata.gz: 03204b29c322d499b52efcfd302668356cc8ba422d42748dda089eaa39f5c6dc
+  data.tar.gz: 2757e0f765b4b83a50f0a88fbbaf3396da2015361c799a92ede42a4b5dcda854
 SHA512:
-  metadata.gz: fb67b78f6de41bcf847ff4bf5846261b54dc9eed3e6ac755d2b13186ee70c4dc78a1c23f4804a47c147ffcc3076fd9845986043a242c3ad60194bd4c4c1435ca
-  data.tar.gz: 694543df44379a3fdde8eebbfefcf13a1d805ae0efbc02743219b7797ca2c5f81171667c3930549e4962fa149f5a8ac518475787489730fb1de3f39f27724abe
+  metadata.gz: 9e2c0e97b4a59bcd5597037e5bcd9a719c9cfcbc60dfd765dbfac4d24408f686e8e13c44e5da0f61b847809ecf5a2d83b5c27baed8a3cd28522e7d5bfa230f9e
+  data.tar.gz: 2b2225a8d1cb5891f0dac44b6be35d075323aaa7ee8792d6b879e4f7a768ac24faec07c3e6d2fc3734fbfeabcbeb1f5f5a7cec8540bfcaa3420d931aebf96d60

data/lib/isodoc/convert.rb

@@ -10,7 +10,7 @@ require "mn-requirements"
 module IsoDoc
   class Convert < ::IsoDoc::Common
     attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models,
-                  :requirements_processor, :doctype
+                  :requirements_processor, :doctype, :bibrender
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -86,7 +86,7 @@ module IsoDoc
 
     def bibrenderer(options = {})
       ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+                                                           i18nhash: @i18n.get))
     end
 
     def convert1(docxml, filename, dir)
@@ -108,7 +108,8 @@ module IsoDoc
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)
       metadata_init(@lang, @script, @locale, @i18n)
-      xref_init(@lang, @script, self, @i18n, { locale: @locale })
+      xref_init(@lang, @script, self, @i18n,
+                { locale: @locale, bibrender: @bibrender })
       docxml = preprocess_xslt(docxml)
       toc_init(docxml)
       [docxml, filename, dir]
@@ -121,7 +122,8 @@ module IsoDoc
       end
       docxml
     rescue ::Error => e
-      require "debug"; binding.b
+      require "debug"
+      binding.b
     end
 
     def extract_preprocess_xslt(docxml)
@@ -136,6 +138,7 @@ module IsoDoc
     def convert_i18n_init(docxml)
       convert_i18n_init1(docxml)
       i18n_init(@lang, @script, @locale)
+      @bibrender ||= bibrenderer
       @reqt_models = requirements_processor
         .new({ default: "default", lang: @lang, script: @script,
                locale: @locale, labels: @i18n.get,

data/lib/isodoc/function/inline.rb

@@ -118,10 +118,14 @@ module IsoDoc
                   width: node["width"] || "auto",
                   title: node["title"],
                   alt: node["alt"] }
-        out.img **attr_code(attrs)
+        image_body_parse(node, attrs, out)
         image_title_parse(out, caption)
       end
 
+      def image_body_parse(_node, attrs, out)
+        out.img **attr_code(attrs)
+      end
+
       def smallcap_parse(node, xml)
         xml.span style: "font-variant:small-caps;" do |s|
           node.children.each { |n| parse(n, s) }

data/lib/isodoc/function/references.rb

@@ -32,8 +32,18 @@ module IsoDoc
 
       def pref_ref_code(bib)
         bib["suppress_identifier"] == "true" and return nil
-        @bibrenderer ||= bibrenderer
-        data, = @bibrenderer.parse(bib)
+        ret = bib.xpath(ns("./docidentifier[@scope = 'biblio-tag']"))
+        ret.empty? or return ret.map(&:text)
+        ret = pref_ref_code_parse(bib) or return nil
+        ins = bib.at(ns("./docidentifier[last()]"))
+        ret.reverse.each do |r|
+          ins.next = "<docidentifier scope='biblio-tag'>#{docid_l10n(r)}</docidentifier>"
+        end
+        ret
+      end
+
+      def pref_ref_code_parse(bib)
+        data, = @bibrender.parse(bib)
         ret = data[:authoritative_identifier] or return nil
         ret.empty? and return nil
         ret

data/lib/isodoc/function/utils.rb

@@ -204,6 +204,7 @@ module IsoDoc
         case img["src"]
         when /^data:/ then save_dataimage(img["src"], false)
         when %r{^([A-Z]:)?/} then img["src"]
+        when nil then nil
         else File.join(@localdir, img["src"])
         end
       end

data/lib/isodoc/html_function/html.rb

@@ -16,7 +16,6 @@ module IsoDoc
       end
 
       def preprocess_xslt(docxml)
-
         super
       end
 
@@ -103,12 +102,15 @@ module IsoDoc
         ret
       end
 
-      def image_parse(node, out, caption)
+      def image_body_parse(node, attrs, out)
         if svg = node.at("./m:svg", "m" => "http://www.w3.org/2000/svg")
-          svg_parse(svg, out)
-          return
+          %i(height width).each do |k|
+            v = attrs[k] and v != "auto" and !v.empty? and
+              svg[k.to_s] = v
+          end
+          out.parent.add_child(svg)
+        else super
         end
-        super
       end
     end
   end

data/lib/isodoc/html_function/postprocess.rb

@@ -66,8 +66,9 @@ module IsoDoc
       def resize_images(docxml)
         docxml.xpath("//*[local-name() = 'img' or local-name() = 'svg']")
           .each do |i|
+          loc = image_localfile(i) or next
           i["width"], i["height"] = Vectory::ImageResize.new
-            .call(i, image_localfile(i), @maxheight, @maxwidth)
+            .call(i, loc, @maxheight, @maxwidth)
         end
         docxml
       end
@@ -76,7 +77,7 @@ module IsoDoc
       def move_images(docxml)
         FileUtils.rm_rf tmpimagedir
         FileUtils.mkdir tmpimagedir
-        docxml.xpath("//*[local-name() = 'img']").each do |i|
+        docxml.xpath("//*[local-name() = 'img'][@src]").each do |i|
           /^data:/.match? i["src"] and next
           @datauriimage ? datauri(i) : move_image1(i)
         end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -3,7 +3,6 @@ require "csv"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def bibdata(docxml)
-      docid_prefixes(docxml)
       a = bibdata_current(docxml) or return
       address_precompose(a)
       bibdata_i18n(a)

data/lib/isodoc/presentation_function/refs.rb

@@ -37,8 +37,8 @@ module IsoDoc
         prep_for_rendering(b)
         m << to_xml(b)
       end.join
-      @xrefs.klass.bibrenderer.render_all("<references>#{refs}</references>",
-                             type: citestyle)
+      @bibrender.render_all("<references>#{refs}</references>",
+                            type: citestyle)
     end
 
     def prep_for_rendering(bib)
@@ -49,10 +49,10 @@ module IsoDoc
 
     def bibitem(xml, renderings)
       @xrefs.klass.implicit_reference(xml) and xml["hidden"] = "true"
-      bibrender(xml, renderings)
+      bibrender_item(xml, renderings)
     end
 
-    def bibrender(xml, renderings)
+    def bibrender_item(xml, renderings)
       if (f = xml.at(ns("./formattedref"))) && xml.at(ns("./title")).nil?
         bibrender_formattedref(f, xml)
       else bibrender_relaton(xml, renderings)

data/lib/isodoc/presentation_xml_convert.rb

@@ -19,6 +19,7 @@ module IsoDoc
     end
 
     def convert1(docxml, _filename, _dir)
+      docid_prefixes(docxml) # feeds @xrefs.parse citation processing
       @xrefs.parse docxml
       bibitem_lookup(docxml)
       info docxml, nil

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.9.2".freeze
+  VERSION = "2.9.3".freeze
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -42,7 +42,9 @@ module IsoDoc
           annex_anchor_names(xml)
           back_clauses_anchor_names(xml)
         end
-        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
+        if @klass.bibrender && (@parse_settings.empty? || @parse_settings[:refs])
+          references(xml)
+        end
       end
 
       def annex_anchor_names(xml)
@@ -98,7 +100,7 @@ module IsoDoc
 
       # preempt clause notes with all other types of note (ISO default)
       def asset_anchor_names(doc)
-        @parse_settings.empty? or return
+        (@parse_settings.empty? || @parse_settings[:assets]) or return
         middle_section_asset_names(doc)
         termnote_anchor_names(doc)
         termexample_anchor_names(doc)

data/lib/isodoc/xref.rb

@@ -15,6 +15,7 @@ module IsoDoc
 
     attr_reader :klass
 
+    # Note: if bibrender is no passed in, do not parse references
     def initialize(lang, script, klass, i18n, options = {})
       @anchors = {}
       @lang = lang
@@ -24,6 +25,7 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @klass.bibrender ||= options[:bibrender]
       @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({
@@ -39,7 +41,7 @@ module IsoDoc
     end
 
     # parse only the elements set, if any are set
-    # defined are: clause: true, refs: true
+    # defined are: clause: true, refs: true, assets: true
     def parse_inclusions(options)
       @parse_settings.merge!(options)
       self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc