asciimath2unitsml 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161503157f4b3622c8bcae6ece418ed5f675a95f409d60017287017c923f7749
-  data.tar.gz: 48571d4a30ea4ade2f864178dcb473c9a636d71d5088b64a2356e3cbfa5f2886
+  metadata.gz: a2279898112af9b3602b0f7ed1a713adc4130015a3f616767d364952fb87b8ff
+  data.tar.gz: 2bf900fe40159a836fed5bbbcdc7f76c7911083242e12962949b269fafe2e92d
 SHA512:
-  metadata.gz: a50f75b036f2a19dcd1925965f192d1652ddabc242ce22c33efcfaf0d03c0ee5118c46021f22ee02237f93e5e32492c922466fd7f3206a20713c7a2bf749e6ef
-  data.tar.gz: 279f88fb13d2ed6961b42fec192312b52b82d993daf4efa2750de21b2e240b2b63702d82dac831e4dc3a0b86bd6b797cbbca057809d4c971eb27bf71548f9010
+  metadata.gz: 8d3c8c4ca3db1208f5764ddd0cf2ab221548dceb3ac99d69a14778bd05dc4aec07a54064ae408908aacf27f5dbdd456fbca6eb42f29cc626527d518f03ae831f
+  data.tar.gz: 3b1d4a11f5db9225b20802ab261ba67099f977a66af680a1aaa19ffe2fdb6f6bbf78f0088f5473fe7b1e23083a72a32f9e130a9fe71abe240f9f306610bdef64

data/lib/asciimath2unitsml/parse.rb

@@ -156,16 +156,16 @@ module Asciimath2UnitsML
         text = x.text.sub(%r{^unitsml\((.+)\)$}m, "\\1")
         units, origtext, normtext, quantity, name, symbol = parse(text)
         rendering = symbol ? embeddedmathml(asciimath2mathml(symbol)) : mathmlsymbol(units, false)
-        delim = x&.previous_element ? delimspace(rendering) : ""
-        x.replace("#{delim}<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
+        x.replace("#{delimspace(rendering, x)}<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
                   "#{unitsml(units, origtext, normtext, quantity, name)}")
       end
       dedup_ids(xml)
     end
 
-    def delimspace(x)
-      text = HTMLEntities.new.encode(Nokogiri::XML("<mrow>#{x}</mrow>").text.strip)
-      /[[:alnum:]]/.match(text) ?
+    def delimspace(rendering, elem)
+      return "" if elem&.previous_element && elem&.previous_element.name != "mn"
+      text = HTMLEntities.new.encode(Nokogiri::XML("<mrow>#{rendering}</mrow>").text.strip)
+      /\p{L}|\p{N}/.match(text) ?
         "<mo rspace='thickmathspace'>&#x2062;</mo>" : "<mo>&#x2062;</mo>"
     end
 

data/lib/asciimath2unitsml/version.rb

@@ -1,3 +1,3 @@
 module Asciimath2UnitsML
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

data/lib/unitsdb/units.yaml

@@ -4340,8 +4340,8 @@
   unit_symbols:
     - id: "deg"
       ascii: "deg"
-      html: "º"
-      mathml: "<mi mathvariant='normal'>&#186;</mi>"
+      html: "&#176;"
+      mathml: "<mi mathvariant='normal'>&#176;</mi>"
       latex: \ensuremath{\mathrm{^{\circ}}}
       unicode: "º"
   root_units:

data/spec/conv_spec.rb

@@ -106,7 +106,7 @@ RSpec.describe Asciimath2UnitsML do
 OUTPUT
     end
 
-     it "does not insert space before non-alphabetic units" do
+  it "does not insert space before non-alphabetic units" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     1 "unitsml(degK)" + 1 "unitsml(prime)"
 INPUT
@@ -163,6 +163,67 @@ INPUT
 OUTPUT
      end
 
+  it "does not insert space before operators" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    8 "unitsml(kg)" cdot "unitsml(m)"
+INPUT
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>8</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu2'>
+           <mi mathvariant='normal'>kg</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu2' dimensionURL='#NISTd2'>
+           <UnitSystem name='SI' type='SI_base' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>kilogram</UnitName>
+           <UnitSymbol type='HTML'>kg</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>kg</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+           <RootUnits>
+             <EnumeratedRootUnit unit='gram' prefix='k'/>
+           </RootUnits>
+         </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>
+           <PrefixSymbol type='unicode'>k</PrefixSymbol>
+           <PrefixSymbol type='LaTeX'>k</PrefixSymbol>
+           <PrefixSymbol type='HTML'>k</PrefixSymbol>
+         </Prefix>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd2'>
+           <Mass symbol='M' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq2' dimensionURL='#NISTd2' quantityType='base'>
+           <QuantityName xml:lang='en-US'>mass</QuantityName>
+         </Quantity>
+         <mo>&#x22C5;</mo>
+         <mrow xref='U_NISTu1'>
+           <mi mathvariant='normal'>m</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu1' dimensionURL='#NISTd1'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>meter</UnitName>
+           <UnitSymbol type='HTML'>m</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>m</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd1'>
+           <Length symbol='L' powerNumerator='1'/>
+         </Dimension>
+       </math>
+OUTPUT
+  end
+
   it "deals with sqrt units" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     1 "unitsml(sqrt(Hz))"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciimath2unitsml
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath