isodoc 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b8b00c0831edf5095dd6d4e24e93f9f6c5fb1fb5fa54d7b9ee67d6821f46d4
-  data.tar.gz: 991204e016a3bc3817ecab867cbdfce29dfec3d9c58b46d84a08e1a557828f22
+  metadata.gz: 5facc53bb7c8a88619fbf516d9d4d749ee960311f32dcf9f536375ee0c25a806
+  data.tar.gz: a6fc8b7e15083a368e3527d4e745977de12fddf02d907163fcc142f41fa96fa2
 SHA512:
-  metadata.gz: d2fe45089897f94107456c2b5035b30fb1b5b4ec30b102e7a057aadd4df3e46a00bef8b61bbbcd97265ee526bbd4ed758ead5c01c6d1086a6f22fa7f76558ed5
-  data.tar.gz: 1b9bb6319fc0f65c4b613080cc05fe04da20cfec092b62976ea4664d58d3998eb3ad4c87ff6645d03a22f84b2dcc000e43de39d4351b55befac7b01471d6ddf7
+  metadata.gz: 55858670ba62d093769824d5888ba78d4af4170626c18e2f575e0fcfbaa6ea2e461b920664ad60911304329536846b89cd54d55688f43c9674938e426a366472
+  data.tar.gz: 0aded4a1dd614f01e6d5cff9ed4e8b6f7d4065694e156ec0023fdb7f9525243bd64bc9579a008587274c43f3d5a8af29aa88366cc366632e269434458734701a

data/lib/isodoc/convert.rb

@@ -50,6 +50,7 @@ module IsoDoc
     # sourcehighlighter: whether to apply sourcecode highlighting
     # semantic_xml_insert: whether to insert into presentation XML
     #   a copy of semantic XML
+    # output_formats: hash of supported output formats and suffixes
     def initialize(options) # rubocop:disable Lint/MissingSuper
       @options = options_preprocess(options)
       init_stylesheets(@options)
@@ -97,7 +98,7 @@ module IsoDoc
     end
 
     def convert_init(file, input_filename, debug)
-      docxml = Nokogiri::XML(file) { |config| config.huge }
+      docxml = Nokogiri::XML(file, &:huge)
       filename, dir = init_file(input_filename, debug)
       docxml.root.default_namespace = ""
       convert_i18n_init(docxml)

data/lib/isodoc/function/blocks.rb

@@ -205,6 +205,8 @@ module IsoDoc
           end
         end
       end
+
+      def columnbreak_parse(node, out); end
     end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -252,6 +252,7 @@ module IsoDoc
           when "variant-title" then variant_title(node, out)
           when "span" then span_parse(node, out)
           when "location" then location_parse(node, out)
+          when "columnbreak" then columnbreak_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/function/utils.rb

@@ -3,6 +3,9 @@ require "metanorma-utils"
 module IsoDoc
   module Function
     module Utils
+      Hash.include Metanorma::Utils::Hash
+      Array.include Metanorma::Utils::Array
+
       def to_xml(node)
         self.class.to_xml(node)
       end
@@ -166,8 +169,8 @@ module IsoDoc
           .merge(@labels ? { labels: @labels } : {})
           .merge(@meta.labels ? { labels: @meta.labels } : {})
           .merge(fonts_options || {})
-        template = liquid(docxml)
-        template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
+        liquid(docxml).render(meta.stringify_all_keys
+          .transform_values { |v| empty2nil(v) })
           .gsub("<", "<").gsub(">", ">").gsub("&", "&")
       end
 

data/lib/isodoc/init.rb

@@ -48,6 +48,7 @@ module IsoDoc
       @aligncrosselements = options[:aligncrosselements]
       @modspecidentifierbase = options[:modspecidentifierbase]
       @sourcehighlighter = options[:sourcehighlighter]
+      @output_formats = options[:output_formats] || {}
     end
 
     def init_arrangement(options)

data/lib/isodoc/metadata.rb

@@ -3,7 +3,7 @@ require_relative "metadata_contributor"
 
 module IsoDoc
   class Metadata
-    attr_accessor :fonts_options
+    attr_accessor :fonts_options, :labels
 
     def ns(xpath)
       Common::ns(xpath)

data/lib/isodoc/presentation_function/image.rb

@@ -109,6 +109,7 @@ module IsoDoc
     end
 
     def svg_to_emf(node)
+      @output_formats[:doc] or return
       uri = svg_to_emf_uri(node)
       svg_impose_height_attr(node)
       ret = imgfile_suffix(uri, "emf")

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.6.5".freeze
+  VERSION = "2.6.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc