unitsml 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 216b942e5896cd14dc6f414793f9697c44ae8deb16b7976788dc949185b8a721
-  data.tar.gz: e27267955d2c03610e8d3572e1a3293d5ab8d427b379cd494b54e0b8d6eddee8
+  metadata.gz: 11547b56b21b1dc3c1b34bfa84e230c7e917258c80e094b4f39da986b6497720
+  data.tar.gz: aa06a261218c5445af439f0c88fbfd55ca97dc87c9c135fc489e58eb2dcead57
 SHA512:
-  metadata.gz: 0a7aae9e787177dde8fe99cb6a8a240d7e1fa88c4a2010b43597ee338b3f72d09f3955dd1f65711767bf09c4b6782c958efa312f8826227898293c101b8f6482
-  data.tar.gz: '0952a40267832bb8770a7f6b571f9ce74086cef825c1a26ef479ad80f8be7d8e5afa8c96865ab399fa750ad70ef170c4f067d3f6762d9d63e70bda3ff6fee79d'
+  metadata.gz: 45f920c409f2a1c6c3cab70dcf16ae2b432f4732c5491bab7de6ce6bc01f44d9f40df7325cce1d357ad74a11f3d043156276293f4e74c4e953fc5ff495185f23
+  data.tar.gz: 39994002be2a3f211eb6a4eb9826c63dcf6f06695ac65f42269479981436abad0969c054f3a68929847acbb35b4e3d56ebc1cb371916fadab8f0b824f1b96656

data/lib/unitsml/extender.rb

@@ -14,37 +14,47 @@ module Unitsml
     end
 
     def to_mathml(options)
-      multiplier = case options[:multiplier]
-                   when :space
-                     rspace = "thickmathspace"
-                     "⁢"
-                   when :nospace
-                     "⁢"
-                   else
-                     extender = options[:multiplier] || "⋅"
-                     Utility.string_to_html_entity(extender)
-                   end
+      rspace = "thickmathspace" if options[:multiplier] == :space
+      extender = multiplier(options[:multiplier] || "⋅", unicode: true)
       {
         method_name: :mo,
-        value: ::Mml::Mo.new(value: multiplier, rspace: rspace),
+        value: ::Mml::Mo.new(value: extender, rspace: rspace),
       }
     end
 
     def to_latex(options)
-      options[:multiplier] || "/"
+      multiplier(options[:multiplier] || "/")
     end
 
     def to_asciimath(options)
-      options[:multiplier] || symbol
+      multiplier(options[:multiplier] || symbol)
     end
 
     def to_html(options)
-      options[:multiplier] || "⋅"
+      multiplier(options[:multiplier] || "⋅", unicode: true, html: true)
     end
 
     def to_unicode(options)
-      options[:multiplier] ||
-        symbol == "*" ? "·" : symbol
+      extender = options[:multiplier] ||
+                   symbol == "*" ? "·" : symbol
+      multiplier(extender)
+    end
+
+    private
+
+    def multiplier(extender, unicode: false, html: false)
+      case extender
+      when :space
+        if html
+          " "
+        else
+          unicode ? "⁢" : " "
+        end
+      when :nospace
+        unicode ? "⁢" : ""
+      else
+        unicode ? Utility.string_to_html_entity(extender) : extender
+      end
     end
   end
 end

data/lib/unitsml/formula.rb

@@ -33,15 +33,7 @@ module Unitsml
         math = ::Mml::MathWithNamespace.new(display: "block")
         math.ordered = true
         math.element_order ||= []
-        value.each do |instance|
-          processed_instance = instance.to_mathml(options)
-          case processed_instance
-          when Array
-            processed_instance.each { |hash| add_math_element(math, hash) }
-          when Hash
-            add_math_element(math, processed_instance)
-          end
-        end
+        value.each { |instance| process_value(math, instance.to_mathml(options)) }
         reset_mml_models if plurimath_available?
         math.to_xml.gsub(/&amp;(.*?)(?=<\/)/, '&\1')
       else
@@ -186,6 +178,15 @@ module Unitsml
       ::Mml::Configuration.custom_models = Plurimath::Mathml::Parser::CONFIGURATION
     end
 
+    def process_value(math, mathml_instances)
+      case mathml_instances
+      when Array
+        mathml_instances.each { |hash| process_value(math, hash) }
+      when Hash
+        add_math_element(math, mathml_instances)
+      end
+    end
+
     def update_options(options)
       return options unless root
 

data/lib/unitsml/version.rb

@@ -1,3 +1,3 @@
 module Unitsml
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitsml
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 2025-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities