RubyGems - asciimath2unitsml - Versions diffs - 0.2.4 → 0.2.5 - Mend

asciimath2unitsml 0.2.4 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/README.adoc +4 -1
data/lib/asciimath2unitsml/conv.rb +1 -1
data/lib/asciimath2unitsml/parse.rb +9 -4
data/lib/asciimath2unitsml/render.rb +3 -2
data/lib/asciimath2unitsml/version.rb +1 -1
data/spec/conv_spec.rb +172 -52
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2279898112af9b3602b0f7ed1a713adc4130015a3f616767d364952fb87b8ff
-  data.tar.gz: 2bf900fe40159a836fed5bbbcdc7f76c7911083242e12962949b269fafe2e92d
+  metadata.gz: 9c5ec436a8b058ce5c93dc246a8493d88a724c7d5f1048b8e42f7a1429791d3c
+  data.tar.gz: a7106b478a1efa4f48c0133c9b644d77197db0d71031d48152274c9c43dde1f6
 SHA512:
-  metadata.gz: 8d3c8c4ca3db1208f5764ddd0cf2ab221548dceb3ac99d69a14778bd05dc4aec07a54064ae408908aacf27f5dbdd456fbca6eb42f29cc626527d518f03ae831f
-  data.tar.gz: 3b1d4a11f5db9225b20802ab261ba67099f977a66af680a1aaa19ffe2fdb6f6bbf78f0088f5473fe7b1e23083a72a32f9e130a9fe71abe240f9f306610bdef64
+  metadata.gz: e9fd0281fea82d844d833ae155875ab1b52d22cf384185a32330ed18709759aee6df93fb281e0b7844fe14bd79200211646d37b0152a0190a32b81d8d0176153
+  data.tar.gz: 8cee75e492900a7ac7e622134feb3c1f0e10503af231af87c7f55d01c88aaf9d817ed66f753249ac5fe5c355a1de9963f3e6b3ed21379996335c89efccc9d022

data/README.adoc CHANGED Viewed

@@ -53,6 +53,8 @@ from UnitsDB. For example, `unitsml(cal_th/cm^2, name: langley)`.
 The unit-string gives the canonical representation of the unit, but SYMBOL is what will be rendered.
 For example, `unitsml(cal_th/cm^2, name: langley, symbol: La)`, or `unitsml(mm*s^-2, symbol: mm cdot s^-2)`.
 (All variables in SYMBOL are rendered upright, as is the default for units.)
+* `unitsml(unit-string, multiplier: SYMBOL)` provides an alternate symbol for the multiliper of
+units. The options are an XML entity, or the values `space` or `nospace` (for which see discussion under _Usage_).
 Standalone prefixes can be recognised by replacing the unit with hyphen; so `unitsml(p-)` corresponds
 to the standalone prefix "pico" (and is rendered as "p").
@@ -230,7 +232,7 @@ This table can be generated (in Asciidoc format) through `Asciimath2UnitsML::Con
 | ton | ton of TNT (energy equivalent): `ton_TNT` | ton of refrigeration (12 000 Btu_IT/h): `ton_refrigeration` | | | |
 | tsp | teaspoon: `tsp` | teaspoon (FDA): `tsp_label` | | | |
 | yd | yard: `yd` | yard (based on US survey foot): `yd_US_survey` | | | |
-| &#186; | degree (degree of arc): `deg` | | | | |
+| &#176; | degree (degree of arc): `deg` | | | | |
 | &#947; | gamma: `gamma` | | | | |
 | &#956; | micron: `micron` | | | | |
 | &#8486; | ohm: `Ohm` | | | | |
@@ -258,3 +260,4 @@ This table can be generated (in Asciidoc format) through `Asciimath2UnitsML::Con
 | &#176;R | degree Rankine: `degR` | | | | |
 | &#x19b;~C~ | natural unit of length: `lambda-bar_C` | | | | |
 |===

data/lib/asciimath2unitsml/conv.rb CHANGED Viewed

@@ -63,7 +63,7 @@ module Asciimath2UnitsML
       END
     end
-        U2D = {
+    U2D = {
       "m" => { dimension: "Length", order: 1, symbol: "L" },
       "g" => { dimension: "Mass", order: 2, symbol: "M" },
       "kg" => { dimension: "Mass", order: 2, symbol: "M" },

data/lib/asciimath2unitsml/parse.rb CHANGED Viewed

@@ -123,11 +123,12 @@ module Asciimath2UnitsML
       quantity = text[1..-1]&.select { |x| /^quantity:/.match(x) }&.first&.sub(/^quantity:\s*/, "")
       name = text[1..-1]&.select { |x| /^name:/.match(x) }&.first&.sub(/^name:\s*/, "")
       symbol = text[1..-1]&.select { |x| /^symbol:/.match(x) }&.first&.sub(/^symbol:\s*/, "")
+      multiplier = text[1..-1]&.select { |x| /^multiplier:/.match(x) }&.first&.sub(/^multiplier:\s*/, "")
       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[0], normtext, quantity, name, symbol]
+      [units, text[0], normtext, quantity, name, symbol, multiplier]
     end
     def postprocess1(units)
@@ -154,16 +155,20 @@ module Asciimath2UnitsML
       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, origtext, normtext, quantity, name, symbol = parse(text)
-        rendering = symbol ? embeddedmathml(asciimath2mathml(symbol)) : mathmlsymbol(units, false)
+        units, origtext, normtext, quantity, name, symbol, multiplier = parse(text)
+        rendering = symbol ? embeddedmathml(asciimath2mathml(symbol)) :
+          mathmlsymbol(units, false, multiplier)
         x.replace("#{delimspace(rendering, x)}<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
                   "#{unitsml(units, origtext, normtext, quantity, name)}")
       end
       dedup_ids(xml)
     end
+    # if previous sibling's last descendent non-whitespace is MathML and mn or mi, no space
     def delimspace(rendering, elem)
-      return "" if elem&.previous_element && elem&.previous_element.name != "mn"
+      prec_text_elem = elem.xpath("./preceding-sibling::*[namespace-uri() = '#{MATHML_NS}']/"\
+                                  "descendant::text()[normalize-space()!=''][last()]/parent::*").last
+      return "" if prec_text_elem.nil? || !%w(mn mi).include?(prec_text_elem&.name)
       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>"

data/lib/asciimath2unitsml/render.rb CHANGED Viewed

@@ -42,9 +42,10 @@ module Asciimath2UnitsML
       base
     end
-    def mathmlsymbol(units, normalise)
+    def mathmlsymbol(units, normalise, multiplier = nil)
+      multiplier = multiplier ? "<mo>#{multiplier}</mo>" : @multiplier[:mathml]
       exp = units.map do |u|
-        if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:mathml] : "<mo>#{u[:multiplier]}</mo>"
+        if u[:multiplier] then u[:multiplier] == "*" ? multiplier : "<mo>#{u[:multiplier]}</mo>"
         elsif u[:unit].nil? && u[:prefix]
           %(<mi mathvariant='normal'>#{htmlent(@prefixes[u[:prefix]].html)}</mi>)
         else

data/lib/asciimath2unitsml/version.rb CHANGED Viewed

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

data/spec/conv_spec.rb CHANGED Viewed

@@ -66,7 +66,7 @@ RSpec.describe Asciimath2UnitsML do
     OUTPUT
   end
-    it "deals with non-Ascii units and prefixes" do
+  it "deals with non-Ascii units and prefixes" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     1 "unitsml(um)"
     INPUT
@@ -108,58 +108,116 @@ OUTPUT
   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)"
+    1 "unitsml(degK)" + 1 "unitsml(prime)" + ii(theta) = s//r "unitsml(rad)" + 10^(12) "unitsml(Hz)"
 INPUT
 <math xmlns='http://www.w3.org/1998/Math/MathML'>
-  <mn>1</mn>
-  <mo rspace='thickmathspace'>&#x2062;</mo>
-  <mrow xref='U_NISTu5'>
-    <mi mathvariant='normal'>&#xB0;K</mi>
-  </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu5' dimensionURL='#NISTd5'>
-    <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
-    <UnitName xml:lang='en'>kelvin</UnitName>
-    <UnitSymbol type='HTML'>K</UnitSymbol>
-    <UnitSymbol type='MathML'>
-      <math xmlns='http://www.w3.org/1998/Math/MathML'>
-        <mrow>
-          <mi mathvariant='normal'>K</mi>
-        </mrow>
-      </math>
-    </UnitSymbol>
-  </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd5'>
-    <ThermodynamicTemperature symbol='Theta' powerNumerator='1'/>
-  </Dimension>
-  <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq5' dimensionURL='#NISTd5' quantityType='base'>
-    <QuantityName xml:lang='en-US'>thermodynamic temperature</QuantityName>
-  </Quantity>
-  <mo>+</mo>
-  <mn>1</mn>
-  <mo>&#x2062;</mo>
-  <mrow xref='U_NISTu147'>
-    <mi mathvariant='normal'>&#x2032;</mi>
-  </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu147'>
-    <UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>
-    <UnitName xml:lang='en'>minute (minute of arc)</UnitName>
-    <UnitSymbol type='HTML'>&#x2032;</UnitSymbol>
-    <UnitSymbol type='MathML'>
-      <math xmlns='http://www.w3.org/1998/Math/MathML'>
-        <mrow>
-          <mi mathvariant='normal'>&#x2032;</mi>
-        </mrow>
-      </math>
-    </UnitSymbol>
-  </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd9'>
-    <PlaneAngle symbol='Phi' powerNumerator='1'/>
-  </Dimension>
-  <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq9' dimensionURL='#NISTd9' quantityType='base'>
-    <QuantityName xml:lang='en-US'>plane angle</QuantityName>
-    <QuantityName xml:lang='en-US'>angle</QuantityName>
-  </Quantity>
-</math>
+         <mn>1</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu5'>
+           <mi mathvariant='normal'>&#xB0;K</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu5' dimensionURL='#NISTd5'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>kelvin</UnitName>
+           <UnitSymbol type='HTML'>K</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>K</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd5'>
+           <ThermodynamicTemperature symbol='Theta' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq5' dimensionURL='#NISTd5' quantityType='base'>
+           <QuantityName xml:lang='en-US'>thermodynamic temperature</QuantityName>
+         </Quantity>
+         <mo>+</mo>
+         <mn>1</mn>
+         <mo>&#x2062;</mo>
+         <mrow xref='U_NISTu147'>
+           <mi mathvariant='normal'>&#x2032;</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu147'>
+           <UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>minute (minute of arc)</UnitName>
+           <UnitSymbol type='HTML'>&#x2032;</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>&#x2032;</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd9'>
+           <PlaneAngle symbol='Phi' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq9' dimensionURL='#NISTd9' quantityType='base'>
+           <QuantityName xml:lang='en-US'>plane angle</QuantityName>
+           <QuantityName xml:lang='en-US'>angle</QuantityName>
+         </Quantity>
+         <mo>+</mo>
+         <mstyle mathvariant='italic'>
+           <mi>&#x3B8;</mi>
+         </mstyle>
+         <mo>=</mo>
+         <mi>s</mi>
+         <mo>/</mo>
+         <mi>r</mi>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu9'>
+           <mi mathvariant='normal'>rad</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu9' dimensionURL='#D_L0'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>radian</UnitName>
+           <UnitSymbol type='HTML'>rad</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>rad</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_L0'>
+           <Length symbol='L' powerNumerator='0'/>
+         </Dimension>
+         <mo>+</mo>
+         <msup>
+           <mrow>
+             <mn>10</mn>
+           </mrow>
+           <mrow>
+             <mn>12</mn>
+           </mrow>
+         </msup>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu31'>
+           <mi mathvariant='normal'>Hz</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu31' dimensionURL='#NISTd24'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>hertz</UnitName>
+           <UnitSymbol type='HTML'>Hz</UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>Hz</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd24'>
+           <Time symbol='T' powerNumerator='-1'/>
+         </Dimension>
+         <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq45' dimensionURL='#NISTd24' quantityType='base'>
+           <QuantityName xml:lang='en-US'>frequency</QuantityName>
+         </Quantity>
+       </math>
 OUTPUT
      end
@@ -562,7 +620,6 @@ INPUT
     <QuantityName xml:lang='en-US'>mass</QuantityName>
   </Quantity>
   <mo>+</mo>
-  <mo rspace='thickmathspace'>&#x2062;</mo>
   <mrow xref='U_um'>
     <mi mathvariant='normal'>&#xB5;m</mi>
   </mrow>
@@ -1189,5 +1246,68 @@ INPUT
 OUTPUT
     end
+        it "deals with multiplier input" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    10 "unitsml(cm*s^-2, multiplier: xx)"
+INPUT
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+  <mn>10</mn>
+  <mo rspace='thickmathspace'>&#x2062;</mo>
+  <mrow xref='U_cm.s-2'>
+    <mi mathvariant='normal'>cm</mi>
+    <mo>xx</mo>
+    <msup>
+      <mrow>
+        <mi mathvariant='normal'>s</mi>
+      </mrow>
+      <mrow>
+        <mo>&#x2212;</mo>
+        <mn>2</mn>
+      </mrow>
+    </msup>
+  </mrow>
+  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_cm.s-2' dimensionURL='#NISTd28'>
+    <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+    <UnitName xml:lang='en'>cm*s^-2</UnitName>
+    <UnitSymbol type='HTML'>
+      cm&#xB7;s
+      <sup>&#x2212;2</sup>
+    </UnitSymbol>
+    <UnitSymbol type='MathML'>
+      <math xmlns='http://www.w3.org/1998/Math/MathML'>
+        <mrow>
+          <mi mathvariant='normal'>cm</mi>
+          <mo>&#xB7;</mo>
+          <msup>
+            <mrow>
+              <mi mathvariant='normal'>s</mi>
+            </mrow>
+            <mrow>
+              <mo>&#x2212;</mo>
+              <mn>2</mn>
+            </mrow>
+          </msup>
+        </mrow>
+      </math>
+    </UnitSymbol>
+    <RootUnits>
+      <EnumeratedRootUnit unit='meter' prefix='c'/>
+      <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
+    </RootUnits>
+  </Unit>
+  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-2' xml:id='NISTp10_-2'>
+    <PrefixName xml:lang='en'>centi</PrefixName>
+    <PrefixSymbol type='ASCII'>c</PrefixSymbol>
+    <PrefixSymbol type='unicode'>c</PrefixSymbol>
+    <PrefixSymbol type='LaTeX'>c</PrefixSymbol>
+    <PrefixSymbol type='HTML'>c</PrefixSymbol>
+  </Prefix>
+  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd28'>
+    <Length symbol='L' powerNumerator='1'/>
+    <Time symbol='T' powerNumerator='-2'/>
+  </Dimension>
+</math>
+OUTPUT
+        end
 end

metadata CHANGED Viewed

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