isodoc 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e11539f17ee97d00f3b2f4470b384f1caf06cb5d72b11fc408b731f071e55b
-  data.tar.gz: 9f45bc01cc6aa695152e0f237f281bad777eb745836c4f08880467781c722942
+  metadata.gz: eb9c5b4a4ae20094a096ef37012c56b2f125a636c0aa426d135f1b8257cbf205
+  data.tar.gz: a1f5bbeed6904bd7d958ee0fdaeb4b180f0bf5405a42d556f7e787153247130d
 SHA512:
-  metadata.gz: 0174b0cb445a70b50ccaeda366c6d843a924fa481a047eb04c6c65c127b42cf789e274270fb4a6573f10040d0830ea7370081bcf0df366055baddaf7c3d991d0
-  data.tar.gz: cc9cd1214a0ce46d3cc8bd34646f9c2d629c9e1ce6116e2a03fd19dbca5e1f0c07ba1e20b67a1e5b713e6bbaaf4fbe00ccaa69ed580000b161f5cacaf4158d86
+  metadata.gz: a9aa50e9e6b759064321dbb68b46bbe9ab6d321ac73d584aad19b8ecedb109ee48119d06e72c03f7802910946d73ae72e08b24b502d3495d04e7805141de522a
+  data.tar.gz: fb4483cd05281ce5278d745c2ecc7f8b73139e1e47a643700c9112747ce475869c570a1555d836277cb6ed90c7d544b43eda21bc6b81a5f08b7470fb14ad8f73

data/lib/isodoc/presentation_function/bibdata.rb

@@ -16,15 +16,21 @@ module IsoDoc
     end
 
     def extension_insert(xml, path = [])
-      ins = xml.at(ns("//metanorma-extension")) ||
-        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")&.next_element ||
-        xml.root.elements.first.before("<metanorma-extension/>").previous_element
+      ins = extension_insert_pt(xml)
       path.each do |n|
         ins = ins.at(ns("./#{n}")) || ins.add_child("<#{n}/>").first
       end
       ins
     end
 
+    def extension_insert_pt(xml)
+      xml.at(ns("//metanorma-extension")) ||
+        xml.at(ns("//bibdata"))&.after("<metanorma-extension/>")
+          &.next_element ||
+        xml.root.elements.first.before("<metanorma-extension/>")
+          .previous_element
+    end
+
     def preprocess_xslt_insert(docxml)
       content = ""
       p = passthrough_xslt and content += p
@@ -42,7 +48,6 @@ module IsoDoc
           <preprocess-xslt format="#{k}">
             <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
               <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="no"/>
-              <xsl:strip-space elements="*"/>
               <xsl:template match="@* | node()">
               <xsl:copy>
                 <xsl:apply-templates select="@* | node()"/>
@@ -142,7 +147,8 @@ module IsoDoc
       tag_translate(x, lang, hash[x.text])
     end
 
-    # does not allow %Spellout and %Ordinal in the ordinal expression to be mixed
+    # does not allow %Spellout and %Ordinal in the ordinal expression
+    # to be mixed
     def edition_translate(bibdata)
       x = bibdata.at(ns("./edition")) or return
       /^\d+$/.match?(x.text) or return
@@ -221,11 +227,9 @@ module IsoDoc
     end
 
     def trim_hash1(hash)
-      return hash unless hash.is_a? Hash
-
+      hash.is_a?(Hash) or return hash
       hash.each_with_object({}) do |(k, v), g|
-        next if blank?(v)
-
+        blank?(v) and next
         g[k] = case v
                when Hash then trim_hash1(hash[k])
                when Array

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.7.2".freeze
+  VERSION = "2.7.3".freeze
 end

metadata

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