asciimath2unitsml 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049ec45166f29cb157a85f9a5d3ac4ec6b1235ed1e673879623477b0b793c402'
-  data.tar.gz: 1671804ae7f17bc92268b7c77f7206d216f0c7b08a4318d7e9a3df116f45c47c
+  metadata.gz: 3d06ecf91cb804e1a5827a46ef0e458a0fe1b444a476bc6e9d99ff2dd6c06d37
+  data.tar.gz: 615d0c46c6beb12bea4fb427379ba49835679fb3f1efd56692909d049e9e9be7
 SHA512:
-  metadata.gz: 6a4f6944f43e7a5336b648d8db1027bd93b4672d2ac22f90dc7277d4a6553959623db23b043bbd792cf9c4b351862980cee35b0828d44ac060ec21207fe7bf41
-  data.tar.gz: 8c8836120abac3f0a3fa49877efe3619c188af201e82d3afd37e56327063c624e629ac953b96eb5842cadf7186c354827773979d0291d94ab346ee528f699283
+  metadata.gz: 270b64a21c8a566907c1d0a3e81e20f126bd48d277631678b65d662eb8d80da92799e127c0d75f0555226762157eefd1cf27135f3daa1b79693199c00758fa22
+  data.tar.gz: b78b7cc95c55fde702b677e8e0a70126066341afeed726d4e3d00958b4cd4ad4d11850ef694329eca640019b5354bb34fb7efd246d023c065e7c37388c9de87e

data/README.adoc

@@ -89,6 +89,7 @@ The converter is run as:
 ----
 c = Asciimath2UnitsML::Conv.new()
 c.Asciimath2UnitsML({Asciimath string containing "unitsml()"})
+c.MathML2UnitsML({MathML document containing <mtext>unitsml()</mtext>})
 c.MathML2UnitsML({Nokogiri parse of MathML document containing <mtext>unitsml()</mtext>})
 ----
 

data/lib/asciimath2unitsml/conv.rb

@@ -32,17 +32,21 @@ module Asciimath2UnitsML
       end
     end
 
+    def units_only(units)
+      units.reject { |u| u[:multiplier] }
+    end
+
     def unit_id(text)
       "U_" +
         (@units[text.to_sym] ? @units[text.to_sym][:id] : text.gsub(/\*/, ".").gsub(/\^/, ""))
     end
 
-    def unit(units, text, dims)
+    def unit(units, origtext, normtext, dims)
       dimid = dim_id(dims)
       <<~END
-      <Unit xmlns='#{UNITSML_NS}' xml:id='#{unit_id(text)}'#{dimid ? " dimensionURL='##{dimid}'" : ""}>
+      <Unit xmlns='#{UNITSML_NS}' xml:id='#{unit_id(origtext)}'#{dimid ? " dimensionURL='##{dimid}'" : ""}>
       #{unitsystem(units)}
-      #{unitname(units, text)}
+      #{unitname(units, normtext)}
       #{unitsymbol(units)}
       #{rootunits(units)}
       </Unit>
@@ -51,6 +55,7 @@ module Asciimath2UnitsML
 
     def unitsystem(units)
       ret = []
+      units = units_only(units)
       units.any? { |x| @units[x[:unit].to_sym][:si] != true } and
         ret << "<UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>"
       if units.any? { |x| @units[x[:unit].to_sym][:si] == true }
@@ -79,21 +84,27 @@ module Asciimath2UnitsML
 
     def htmlsymbol(units)
       units.map do |u|
-        u[:exponent] and exp = "<sup>#{u[:exponent].sub(/-/, "&#x2212;")}</sup>"
-        "#{u[:prefix]}#{u[:unit]}#{exp}"
-      end.join(@multiplier[:html])
+        if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:html] : u[:multiplier]
+        else
+          u[:display_exponent] and exp = "<sup>#{u[:display_exponent].sub(/-/, "&#x2212;")}</sup>"
+          "#{u[:prefix]}#{u[:unit]}#{exp}"
+        end
+      end.join("")
     end
 
     def mathmlsymbol(units)
       exp = units.map do |u|
-        base = "<mi mathvariant='normal'>#{u[:prefix]}#{u[:unit]}</mi>"
-        if u[:exponent]
-          exp = "<mn>#{u[:exponent]}</mn>".sub(/<mn>-/, "<mo>&#x2212;</mo><mn>")
-          "<msup><mrow>#{base}</mrow><mrow>#{exp}</mrow></msup>"
+        if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:mathml] : "<mo>#{u[:multiplier]}</mo>"
         else
-          base
+          base = "<mi mathvariant='normal'>#{u[:prefix]}#{u[:unit]}</mi>"
+          if u[:display_exponent]
+            exp = "<mn>#{u[:display_exponent]}</mn>".sub(/<mn>-/, "<mo>&#x2212;</mo><mn>")
+            "<msup><mrow>#{base}</mrow><mrow>#{exp}</mrow></msup>"
+          else
+            base
+          end
         end
-      end.join(@multiplier[:mathml])
+      end.join("")
     end
 
     def mathmlsymbolwrap(units)
@@ -106,9 +117,9 @@ module Asciimath2UnitsML
 
     def rootunits(units)
       return if units.size == 1
-      exp = units.map do |u|
+      exp = units_only(units).map do |u|
         prefix = " prefix='#{u[:prefix]}'" if u[:prefix]
-        exponent = " powerNumerator='#{u[:exponent]}'" if u[:exponent]
+        exponent = " powerNumerator='#{u[:exponent]}'" if u[:exponent] && u[:exponent] != "1"
         "<EnumeratedRootUnit unit='#{@units[u[:unit].to_sym][:name]}'#{prefix}#{exponent}/>"
       end.join("\n")
       <<~END
@@ -159,7 +170,7 @@ module Asciimath2UnitsML
     end
 
     def normalise_units(units)
-      gather_units(units.map { |u| normalise_unit(u) }.flatten)
+      gather_units(units_only(units).map { |u| normalise_unit(u) }.flatten)
     end
 
     def gather_units(units)
@@ -197,10 +208,10 @@ module Asciimath2UnitsML
       "unknown"
     end
 
-    def unitsml(units, text)
+    def unitsml(units, origtext, normtext)
       dims = units2dimensions(units)
       <<~END
-      #{unit(units, text, dims)}
+      #{unit(units, origtext, normtext, dims)}
       #{prefix(units)}
       #{dimension(dims)}
       END

data/lib/asciimath2unitsml/parse.rb

@@ -38,10 +38,10 @@ module Asciimath2UnitsML
       end.map { |k| Regexp.escape(k) }
       unit1 = /#{unit_keys.sort_by(&:length).reverse.join("|")}/.r
       exponent = /\^-?\d+/.r.map { |m| m.sub(/\^/, "") }
-      multiplier = /\*/.r
-      unit = seq(unit1, exponent._?) { |x| { prefix: nil, unit: x[0], exponent: x[1][0] } } |
-        seq(prefix, unit1, exponent._?) { |x| { prefix: x[0][0], unit: x[1], exponent: x[2][0] } }
-      units_tail = seq(multiplier, unit) { |u| u[1] }
+      multiplier = %r{[*/]}.r.map { |x| { multiplier: x } }
+      unit = seq(unit1, exponent._?) { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
+        seq(prefix, unit1, exponent._?) { |x| { prefix: x[0][0], unit: x[1], display_exponent: (x[2][0] ) } }
+      units_tail = seq(multiplier, unit) { |x| [x[0], x[1]] }
       units = seq(unit, units_tail.star) { |x| [x[0], x[1]].flatten }
       parser = units.eof
     end
@@ -52,7 +52,29 @@ module Asciimath2UnitsML
         raise Rsec::SyntaxError.new "error parsing UnitsML expression", x, 1, 0
       end
       Rsec::Fail.reset
-      units
+      postprocess(units, x)
+    end
+
+    def postprocess(units, text)
+      units = postprocess1(units)
+      normtext = units_only(units).each.map do |u|
+        exp = u[:exponent] && u[:exponent] != "1" ? "^#{u[:exponent]}" : ""
+        "#{u[:prefix]}#{u[:unit]}#{exp}"
+      end.join("*")
+      [units, text, normtext]
+    end
+
+    def postprocess1(units)
+      inverse = false
+      units.each_with_object([]) do |u, m| 
+        if u[:multiplier]
+          inverse = (u[:multiplier] == "/")
+        else
+          u[:exponent] = inverse ? "-#{u[:display_exponent] || '1'}" : u[:display_exponent]
+          u[:exponent] = u[:exponent]&.sub(/^--+/, "")
+        end
+        m << u
+      end
     end
 
     U2D = {
@@ -73,12 +95,14 @@ module Asciimath2UnitsML
 
     # https://www.w3.org/TR/mathml-units/ section 2: delimit number Invisible-Times unit
     def MathML2UnitsML(xml)
+      xml.is_a? String and xml = Nokogiri::XML(xml)
       xml.xpath(".//m:mtext", "m" => MATHML_NS).each do |x|
         next unless %r{^unitsml\(.+\)$}.match(x.text)
         text = x.text.sub(%r{^unitsml\((.+)\)$}m, "\\1")
-        units = parse(text)
+        units, origtext, normtext = parse(text)
         delim = x&.previous_element&.name == "mn" ? "<mo rspace='thickmathspace'>&#x2062;</mo>" : ""
-        x.replace("#{delim}<mrow xref='#{unit_id(text)}'>#{mathmlsymbol(units)}</mrow>\n#{unitsml(units, text)}")
+        x.replace("#{delim}<mrow xref='#{unit_id(text)}'>#{mathmlsymbol(units)}</mrow>\n"\
+                  "#{unitsml(units, origtext, normtext)}")
       end
       xml
     end

data/lib/asciimath2unitsml/version.rb

@@ -1,3 +1,3 @@
 module Asciimath2UnitsML
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/spec/conv_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 RSpec.describe Asciimath2UnitsML do
   it "converts an AsciiMath string to MathML + UnitsML" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
-    32 + 5 xx 7 "unitsml(kg^-2)" xx 9 "unitsml(g)" xx 1 "unitsml(kg*s^-2)" xx 812 "unitsml(m*s^-2)" - 9 "unitsml(C^3*A)" + 7 "unitsml(hp)"
+    32 + 5 xx 7 "unitsml(kg^-2)" xx 9 "unitsml(g)" xx 1 "unitsml(kg*s^-2)" xx 812 "unitsml(m*s^-2)" - 9 "unitsml(C^3*A)" + 7 "unitsml(hp)" + 13 "unitsml(A/C^-3)"
     INPUT
     <math xmlns='http://www.w3.org/1998/Math/MathML'>
          <mn>32</mn>
@@ -246,6 +246,72 @@ RSpec.describe Asciimath2UnitsML do
     OUTPUT
   end
 
+  it "converts MathML to MatML + UnitsML" do
+    input = <<~INPUT
+      <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>32</mn>
+         <mo>+</mo>
+         <mn>5</mn>
+         <mo>&#xD7;</mo>
+         <mn>7</mn>
+         <mtext>unitsml(kg^-2)</mtext>
+</math>
+    INPUT
+    output = <<~OUTPUT
+     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>32</mn>
+         <mo>+</mo>
+         <mn>5</mn>
+         <mo>&#xD7;</mo>
+         <mn>7</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_kg-2'>
+           <msup>
+             <mrow>
+               <mi mathvariant='normal'>kg</mi>
+             </mrow>
+             <mrow>
+               <mo>&#x2212;</mo>
+               <mn>2</mn>
+             </mrow>
+           </msup>
+         </mrow>
+          <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg-2' dimensionURL='#D_M-2'>
+   <UnitSystem name='SI' type='SI_base' xml:lang='en-US'/>
+   <UnitName xml:lang='en'>kg^-2</UnitName>
+   <UnitSymbol type='HTML'>
+     kg
+     <sup>&#x2212;2</sup>
+   </UnitSymbol>
+   <UnitSymbol type='MathML'>
+     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+       <mrow>
+         <msup>
+           <mrow>
+             <mi mathvariant='normal'>kg</mi>
+           </mrow>
+           <mrow>
+             <mo>&#x2212;</mo>
+             <mn>2</mn>
+           </mrow>
+         </msup>
+       </mrow>
+     </math>
+   </UnitSymbol>
+ </Unit>
+ <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+   <PrefixName xml:lang='en'>kilo</PrefixName>
+   <PrefixSymbol type='ASCII'>k</PrefixSymbol>
+ </Prefix>
+ <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_M-2'>
+   <Mass symbol='M' powerNumerator='-2'/>
+ </Dimension>
+</math>
+OUTPUT
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().MathML2UnitsML(input).to_xml)).to be_equivalent_to xmlpp(output)
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().MathML2UnitsML(Nokogiri::XML(input)).to_xml)).to be_equivalent_to xmlpp(output)
+  end
+
   it "raises error for illegal unit" do
     expect{xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))}.to raise_error(Rsec::SyntaxError)
     12 "unitsml(que?)"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciimath2unitsml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath