isodoc 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0dec55aba65a594c5a4ef3916219976edb11e162aee6f806f05bc587466941a
-  data.tar.gz: 47ef329be8d9b6aff1777820aa4901a74400888196227ea5dc08a218793e6f87
+  metadata.gz: c60f8eb9fcf49c289d99f64d901511387ae9d928a93c20ec81c011eb536f8a6a
+  data.tar.gz: f4c33c72526c543b3d7c4929a20dfaa2413e9d007b8d2315aed424e156ad4061
 SHA512:
-  metadata.gz: fd9d0f72fdef518808f6605953fa11d6033c5693a8851807b617bacc0d43315657ed80b8de93f0f46bcfb9d0529f327d647e00947234c5ebefa8666250b57ea9
-  data.tar.gz: 3ef2cc2b5f97c2358e5e888865c8406ce66808e3fb7e62804646b71838ad748e372880ce359648dadd581bc36205e6d347aedbe220f2c9d6a1a7f5ee130d8055
+  metadata.gz: bd64d2a35ac86b7b70d46b4ea3631070291b32ee014199d1bc395c5bf33c130d41527afcce573fddd49dc96a4f97d77a6e21a81ed45afec325ce2da61ad4c6ed
+  data.tar.gz: 758249109707c1a6132311e2706f9b791799960f063546cdc8d125f36919845e03bfc5546d2a68d47c30f782fd20b3de1143e66e88a53b5b5bb766e52407a2a7

data/lib/isodoc/class_utils.rb

@@ -15,8 +15,8 @@ module IsoDoc
     def ns(xpath)
       xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
         .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*[/\[\]])}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
     end
 
     def liquid(doc)

data/lib/isodoc/function/inline.rb

@@ -17,7 +17,13 @@ module IsoDoc
       def location_parse(node, out); end
 
       def span_parse(node, out)
-        node.children.each { |n| parse(n, out) }
+        if node["style"]
+          out.span **{ style: node["style"] } do |s|
+            node.children.each { |n| parse(n, s) }
+          end
+        else
+          node.children.each { |n| parse(n, out) }
+        end
       end
 
       def callout_parse(node, out)
@@ -57,12 +63,11 @@ module IsoDoc
       def eref_url(bibitemid)
         return nil if @bibitems.nil? || @bibitems[bibitemid].nil?
 
-        if url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']"))
-          url.text
-        elsif @bibitems[bibitemid]["hidden"] == "true"
-          @bibitems[bibitemid]&.at(ns("./uri"))&.text
-        else "##{bibitemid}"
-        end
+        url = @bibitems[bibitemid].at(ns("./uri[@type = 'citation']")) and
+          return url.text
+        @bibitems[bibitemid]["hidden"] == "true" and
+          return @bibitems[bibitemid].at(ns("./uri"))&.text
+        "##{bibitemid}"
       end
 
       def eref_parse(node, out)

data/lib/isodoc/function/section_titles.rb

@@ -5,15 +5,15 @@ module IsoDoc
         "."
       end
 
-      def clausedelimspace(out)
+      def clausedelimspace(_node, out)
         insert_tab(out, 1)
       end
 
-      def inline_header_title(out, _node, title)
+      def inline_header_title(out, node, title)
         out.span **{ class: "zzMoveToFollowing" } do |s|
           s.b do |b|
             title&.children&.each { |c2| parse(c2, b) }
-            clausedelimspace(out) if /\S/.match?(title&.text)
+            clausedelimspace(node, out) if /\S/.match?(title&.text)
           end
         end
       end

data/lib/isodoc/function/to_word_html.rb

@@ -218,7 +218,7 @@ module IsoDoc
           when "feedback-statement" then feedback_parse(node, out)
           when "passthrough" then passthrough_parse(node, out)
           when "amend" then amend_parse(node, out)
-          when "tab" then clausedelimspace(out) # in Presentation XML only
+          when "tab" then clausedelimspace(node, out) # in Presentation XML only
           when "svg" then svg_parse(node, out) # in Presentation XML only
           when "add" then add_parse(node, out)
           when "del" then del_parse(node, out)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.5".freeze
+  VERSION = "2.2.0".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -98,7 +98,7 @@ module IsoDoc
         docxml.xpath("//p[@class='Biblio']//span[@style='mso-tab-count:1']")
           .each do |s|
           s.next.text? or next
-          s.next.replace(s.next.text.sub(/^\s+/, ""))
+          s.next.replace(@c.encode(s.next.text.sub(/^\s+/, ""), :hexadecimal))
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath