asciimath2unitsml 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca1751cf852b77599154aa142ea719f0510210ddebb667ace7225cb94f7d598f
-  data.tar.gz: 332e23b81a688d1386a4f084dc3db1f401e1e7634beb70c17466e18a23d1f51a
+  metadata.gz: 939880ec148bae10c193dc7958d2866ff5788d7e98617158bfde25a736576b13
+  data.tar.gz: dc8d0afdfc6c134341735b55bfed5ae68b50da906ea5765e8404135d58adf011
 SHA512:
-  metadata.gz: f300b5a9c8af814f4c61ff9be4407f45350fedfc76a7c9b3e4da90a793fcf5cf7004b24e5719a562cc2cb355bb8be355ee4d1e23909f6bbbd4060a97affcd7de
-  data.tar.gz: abeedd889b14c45eeeb90a2f56fc5a09de04ca54f7b15f39677ad516fda17426dbd47977fdc71199ed77424639dd4c86a40164672dd81aad92fd512f872b1723
+  metadata.gz: f2f5e07977df15d3354ce4e509c585de929caf592ccd9ccd6974d5830b932b0982bd1c7c3cc0483c028e64846032925907316406f0f95cb9c6dda49ecb1ef2b6
+  data.tar.gz: e1f358839665b8b815772e32c30ecaea7581061962d7b87cb5e844aaddaed666ae1b95fb2885e7f8eff4bc0d656325660eeba5cf5a45414690614e987da7f31f

data/README.adoc

@@ -1,3 +1,9 @@
+image:https://img.shields.io/gem/v/asciimath2unitsml.svg["Gem Version", link="https://rubygems.org/gems/asciimath2unitsml"]
+image:https://github.com/plurimath/asciimath2unitsml/workflows/rake/badge.svg["Build Status", link="https://github.com/plurimath/asciimath2unitsml/actions?workflow=rake"]
+// image:https://codeclimate.com/github/plurimath/asciimath2unitsml/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/plurimath/asciimath2unitsml"]
+image:https://img.shields.io/github/issues-pr-raw/plurimath/asciimath2unitsml.svg["Pull Requests", link="https://github.com/plurimath/asciimath2unitsml/pulls"]
+image:https://img.shields.io/github/commits-since/plurimath/asciimath2unitsml/latest.svg["Commits since latest",link="https://github.com/plurimath/asciimath2unitsml/releases"]
+
 = asciimath2unitsml
 Convert Units expressions via MathML to UnitsML
 
@@ -43,6 +49,13 @@ https://github.com/unitsml/unitsdb/blob/master/units.yaml[]), that quantity is a
 otherwise, no quantity is added unless explicitly nominated in this way.
 * `unitsml(unit-string, name: NAME)` provides a name for the unit, if one is not already available
 from UnitsDB. For example, `unitsml(cal_th/cm^2, name: langley)`.
+* `unitsml(unit-string, symbol: SYMBOL)` provides an alternate symbol for the unit, in AsciiMath.
+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.)
+
+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").
 
 == Rendering
 
@@ -54,6 +67,9 @@ The gem follows the MathML Units convention of inserting a spacing invisible tim
 (`<mo rspace='thickmathspace'>&#x2062;</mo>`) between any numbers (`<mn>`) and unit expressions
 in MathML, and representing units in MathML as non-italic variables (`<mi mathvariant='normal'>`).
 
+Space is not inserted between a number and a unit expression, when that unit expression wholly consists
+of punctuation: _1 m_, _1 °C_, but _9° 7′ 22″_.
+
 == Example
 
 [source]

data/lib/asciimath2unitsml/conv.rb

@@ -35,6 +35,10 @@ module Asciimath2UnitsML
       @multiplier = multiplier(options[:multiplier] || "\u00b7")
     end
 
+    def float_to_display(f)
+      ret = f.to_f.round(1).to_s.sub(/\.0$/, "")
+    end
+
     def prefix(units)
       units.map { |u| u[:prefix] }.reject { |u| u.nil? }.uniq.map do |p|
         <<~END
@@ -61,7 +65,7 @@ module Asciimath2UnitsML
 
     def units2dimensions(units)
       norm = decompose_units(units)
-      return if norm.any? { |u| u[:unit] == "unknown" || u[:prefix] == "unknown" }
+      return if norm.any? { |u| u[:unit] == "unknown" || u[:prefix] == "unknown" || u[:unit].nil? }
       norm.map do |u|
         { dimension: U2D[u[:unit]][:dimension],
           unit: u[:unit],
@@ -71,7 +75,7 @@ module Asciimath2UnitsML
     end
 
     def dimension1(u)
-      %(<#{u[:dimension]} symbol="#{u[:symbol]}" powerNumerator="#{u[:exponent]}"/>)
+      %(<#{u[:dimension]} symbol="#{u[:symbol]}" powerNumerator="#{float_to_display(u[:exponent])}"/>)
     end
 
     def dim_id(dims)
@@ -81,7 +85,9 @@ module Asciimath2UnitsML
                       AmountOfSubstance LuminousIntensity PlaneAngle)
         .map { |h| dimhash.dig(h, :exponent) }.join(":")
       id = @dimensions_id&.values&.select { |d| d.vector == dimsvector }&.first&.id and return id.to_s
-      "D_" + dims.map { |d| U2D[d[:unit]][:symbol] + (d[:exponent] == 1 ? "" : d[:exponent].to_s) }.join("")
+      "D_" + dims.map do |d|
+        U2D[d[:unit]][:symbol] + (d[:exponent] == 1 ? "" : float_to_display(d[:exponent]))
+      end.join("")
     end
 
     def decompose_units(units)
@@ -94,7 +100,7 @@ module Asciimath2UnitsML
         else
           m[-1] = { prefix: combine_prefixes(@prefixes[m[-1][:prefix]], @prefixes[k[:prefix]]),
                     unit: m[-1][:unit],
-                    exponent: (k[:exponent]&.to_i || 1) + (m[-1][:exponent]&.to_i || 1) }
+                    exponent: (k[:exponent]&.to_f || 1) + (m[-1][:exponent]&.to_f || 1) }
         end
       end
     end
@@ -102,7 +108,8 @@ module Asciimath2UnitsML
     # treat g not kg as base unit: we have stripped the prefix k in parsing
     # reduce units down to basic units
     def decompose_unit(u)
-      if u[:unit] == "g" then u
+      if u[:unit].nil? then u
+      elsif u[:unit] == "g" then u
       elsif @units[u[:unit]].system_type == "SI_base" then u
       elsif !@units[u[:unit]].si_derived_bases
         { prefix: u[:prefix], unit: "unknown", exponent: u[:exponent] }
@@ -111,7 +118,7 @@ module Asciimath2UnitsML
           m << { prefix: !k[:prefix].nil? && !k[:prefix].empty? ? 
                  combine_prefixes(@prefixes_id[k[:prefix]], @prefixes[u[:prefix]]) : u[:prefix],
                  unit: @units_id[k[:id]].symbolid,
-                 exponent: (k[:power]&.to_i || 1) * (u[:exponent]&.to_i || 1) }
+                 exponent: (k[:power]&.to_i || 1) * (u[:exponent]&.to_f || 1) }
         end
       end
     end
@@ -121,7 +128,7 @@ module Asciimath2UnitsML
       return p1.symbolid if p2.nil?
       return p2.symbolid if p1.nil?
       return "unknown" if p1.base != p2.base
-      @prefixes.each do |p|
+      @prefixes.each do |_, p|
         return p.symbolid if p.base == p1.base && p.power == p1.power + p2.power
       end
       "unknown"

data/lib/asciimath2unitsml/parse.rb

@@ -94,12 +94,17 @@ module Asciimath2UnitsML
         /\^-?\d+/.r.map { |m| m.sub(/\^/, "") }
       multiplier = %r{\*|//|/}.r.map { |x| { multiplier: x[0] } }
       unit = 
+        seq("sqrt(", unit1, ")") { |x| { prefix: nil, unit: x[1], display_exponent: "0.5" } } |
+        seq("sqrt(", prefix1, unit1, ")") { |x| { prefix: x[1], unit: x[2], display_exponent: "0.5" } } |
+        seq("sqrt(", prefix2, unit1, ")") { |x| { prefix: x[1], unit: x[2], display_exponent: "0.5" } } |
         seq(unit1, exponent._? & multiplier) { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
         seq(unit1, exponent._?).eof { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
         seq(prefix1, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0] ) } } |
         seq(prefix2, unit1, exponent._? ) { |x| { prefix: x[0], unit: x[1], display_exponent: (x[2][0] ) } } |
-        "1".r.map { |_| { prefix: nil, unit: "1", display_exponent: nil } }
-      units = unit.join(multiplier)
+        "1".r.map { |_| { prefix: nil, unit: "1", display_exponent: nil } } 
+      units = seq(prefix2, "-") { |x| [{ prefix: x[0], unit: nil, display_exponent: nil }] } |
+        seq(prefix1, "-") { |x| [{ prefix: x[0], unit: nil, display_exponent: nil }] } |
+        unit.join(multiplier)
       parser = units.eof
     end
 
@@ -117,11 +122,12 @@ module Asciimath2UnitsML
       units = postprocess1(units)
       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*/, "")
       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]
+      [units, text[0], normtext, quantity, name, symbol]
     end
 
     def postprocess1(units)
@@ -148,7 +154,7 @@ module Asciimath2UnitsML
       "mol" => { dimension: "AmountOfSubstance", order: 6, symbol: "N" },
       "cd" => { dimension: "LuminousIntensity", order: 7, symbol: "J" },
       "deg" => { dimension: "PlaneAngle", order: 8, symbol: "Phi" },
-    }
+    }.freeze
 
     def Asciimath2UnitsML(expression)
       xml = Nokogiri::XML(asciimath2mathml(expression))
@@ -161,14 +167,21 @@ 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 = parse(text)
-        delim = x&.previous_element&.name == "mn" ? "<mo rspace='thickmathspace'>&#x2062;</mo>" : ""
-        x.replace("#{delim}<mrow xref='#{unit_id(origtext)}'>#{mathmlsymbol(units, false)}</mrow>\n"\
+        units, origtext, normtext, quantity, name, symbol = parse(text)
+        rendering = symbol ? embeddedmathml(asciimath2mathml(symbol)) : mathmlsymbol(units, false)
+        delim = x&.previous_element&.name == "mn" ? delimspace(rendering) : ""
+        x.replace("#{delim}<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) ?
+        "<mo rspace='thickmathspace'>&#x2062;</mo>" : "<mo>&#x2062;</mo>"
+    end
+
     def dedup_ids(xml)
       %w(Unit Dimension Prefix Quantity).each do |t|
         xml.xpath(".//m:#{t}/@xml:id", "m" => UNITSML_NS).map { |a| a.text }.uniq.each do |v|
@@ -187,6 +200,12 @@ module Asciimath2UnitsML
       gsub(/<math>/, "<math xmlns='#{MATHML_NS}'>")
     end
 
+    def embeddedmathml(mathml)
+      x = Nokogiri::XML(mathml)
+      x.xpath(".//m:mi", "m" => MATHML_NS).each { |mi| mi["mathvariant"] = "normal" }
+      x.children.to_xml
+    end
+
     def ambig_units
       u = @units_id.each_with_object({}) do |(k, v), m|
         v.symbolids.each do |x|

data/lib/asciimath2unitsml/render.rb

@@ -10,6 +10,7 @@ module Asciimath2UnitsML
         { html: HTMLEntities.new.encode(x), mathml: "<mo>#{HTMLEntities.new.encode(x)}</mo>" }
       end
     end
+
     def render(unit, style)
       @symbols[unit][style] || unit
     end
@@ -17,33 +18,56 @@ module Asciimath2UnitsML
     def htmlsymbol(units, normalise)
       units.map do |u|
         if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:html] : u[:multiplier]
+        elsif u[:unit].nil? && u[:prefix]
+          @prefixes[u[:prefix]].html
         else
-          u[:display_exponent] and exp = "<sup>#{u[:display_exponent].sub(/-/, "&#x2212;")}</sup>"
-          base = render(normalise ? @units[u[:unit]].symbolid : u[:unit], :html)
-          "#{u[:prefix]}#{base}#{exp}"
+          base = (u[:prefix] || "") + render(normalise ? @units[u[:unit]].symbolid : u[:unit], :html)
+          htmlsymbol_exponent(u, base)
         end
       end.join("")
     end
 
+    def htmlsymbol_exponent(u, base)
+      if u[:display_exponent] == "0.5"
+        base = "&#x221a;#{base}"
+      elsif u[:display_exponent]
+        exp = "<sup>#{u[:display_exponent].sub(/-/, "&#x2212;")}</sup>"
+        base += exp
+      end
+      base
+    end
+
     def mathmlsymbol(units, normalise)
       exp = units.map do |u|
         if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:mathml] : "<mo>#{u[:multiplier]}</mo>"
+        elsif u[:unit].nil? && u[:prefix]
+          %(<mi mathvariant='normal'>#{@prefixes[u[:prefix]].html}</mi>)
         else
-          base = render(normalise ? @units[u[:unit]].symbolid : u[:unit], :mathml)
-          if u[:prefix]
-            base = base.match(/<mi mathvariant='normal'>/) ?
-              base.sub(/<mi mathvariant='normal'>/, "<mi mathvariant='normal'>#{u[:prefix]}") :
-              "<mrow><mi mathvariant='normal'>#{u[:prefix]}#{base}</mrow>"
-          end
-          if u[:display_exponent]
-            exp = "<mn>#{u[:display_exponent]}</mn>".sub(/<mn>-/, "<mo>&#x2212;</mo><mn>")
-            base = "<msup><mrow>#{base}</mrow><mrow>#{exp}</mrow></msup>"
-          end
-          base
+          mathmlsymbol1(u, normalise)
         end
       end.join("")
     end
 
+    def mathmlsymbol1(u, normalise)
+      base = render(normalise ? @units[u[:unit]].symbolid : u[:unit], :mathml)
+      if u[:prefix]
+        base = base.match(/<mi mathvariant='normal'>/) ?
+          base.sub(/<mi mathvariant='normal'>/, "<mi mathvariant='normal'>#{u[:prefix]}") :
+          "<mrow><mi mathvariant='normal'>#{u[:prefix]}#{base}</mrow>"
+      end
+      mathmlsymbol_exponent(u, base)
+    end
+
+    def mathmlsymbol_exponent(u, base)
+      if u[:display_exponent] == "0.5"
+        base = "<msqrt>#{base}</msqrt>"
+      elsif u[:display_exponent]
+        exp = "<mn>#{u[:display_exponent]}</mn>".sub(/<mn>-/, "<mo>&#x2212;</mo><mn>")
+        base = "<msup><mrow>#{base}</mrow><mrow>#{exp}</mrow></msup>"
+      end
+      base
+    end
+
     def mathmlsymbolwrap(units, normalise)
       <<~END
       <math xmlns='#{MATHML_NS}'><mrow>#{mathmlsymbol(units, normalise)}</mrow></math>

data/lib/asciimath2unitsml/unit.rb

@@ -6,11 +6,12 @@ module Asciimath2UnitsML
 
     def unit_id(text)
       text = text.gsub(/[()]/, "")
-      "U_" +
-        (@units[text] ? @units[text].id : text.gsub(/\*/, ".").gsub(/\^/, ""))
+      /-$/.match(text) and return @prefixes[text.sub(/-$/, "")].id
+      "U_" + (@units[text] ? @units[text].id : text.gsub(/\*/, ".").gsub(/\^/, ""))
     end
 
     def unit(units, origtext, normtext, dims, name)
+      return if units_only(units).any? { |x| x[:unit].nil? }
       dimid = dim_id(dims)
       norm_units = normalise_units(units)
       <<~END
@@ -34,6 +35,7 @@ module Asciimath2UnitsML
 
     # kg exception
     def unitsystem(units)
+      return if units_only(units).any? { |x| x[:unit].nil? }
       ret = []
       units = units_only(units)
       units.any? { |x| @units[x[:unit]].system_name != "SI" } and
@@ -64,6 +66,7 @@ module Asciimath2UnitsML
     end
 
     def rootunits(units)
+      return if units_only(units).any? { |x| x[:unit].nil? }
       return if units.size == 1 && !units[0][:prefix]
       exp = units_only(units).map do |u|
         prefix = " prefix='#{u[:prefix]}'" if u[:prefix]

data/lib/asciimath2unitsml/version.rb

@@ -1,3 +1,3 @@
 module Asciimath2UnitsML
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/unitsdb/quantities.yaml

@@ -2437,3 +2437,24 @@ NISTq43:
   quantity_type: derived
   quantity_name:
     - organ dose equivalent
+
+NISTq1000:
+  dimension_url: "#NISTd85"
+  quantity_type: derived
+  quantity_name:
+    - mass fraction
+    - mole fraction
+  unit_reference:
+    - name: parts per million
+      url: "#NISTu400"
+
+NISTq1001:
+  dimension_url: "#NISTd16"
+  quantity_type: derived
+  quantity_name:
+    - apparent power
+  unit_reference:
+    - name: var
+      url: "#NISTu401"
+
+

data/lib/unitsdb/units.yaml

@@ -4372,6 +4372,12 @@
       mathml: "<mi mathvariant='normal'>&#8243;</mi>"
       latex: \ensuremath{\mathrm{''}}
       unicode: "″"
+    - id: "as"
+      ascii: "as"
+      html: "as"
+      mathml: "<mi mathvariant='normal'>as</mi>"
+      latex: \ensuremath{\mathrm{as}}
+      unicode: "as"
   root_units:
     enumerated_root_units:
       - unit: "arc_second"
@@ -6543,6 +6549,12 @@
       mathml: "<msub><mrow><mi mathvariant='normal'>cal</mi></mrow><mrow><mi mathvariant='normal'>th</mi></mrow></msub>"
       latex: \ensuremath{\mathrm{cal_th}}
       unicode: "cal_th"
+    - id: "cal"
+      ascii: "cal"
+      html: "cal"
+      mathml: "<mi mathvariant='normal'>cal</mi>"
+      latex: \ensuremath{\mathrm{cal}}
+      unicode: "cal"
   root_units:
     enumerated_root_units:
       - unit: "thermo_calorie"
@@ -10620,3 +10632,61 @@
     - name: "length"
       url: "#NISTq1"
 
+"NISTu400":
+  dimension_url: "#NISTd85"
+  short:
+  root: false
+  unit_system:
+    type: "SI_derived_non-special"
+    name: "SI"
+  unit_name:
+    - "parts per million"
+  unit_symbols:
+    - id: "ppm"
+      ascii: "ppm"
+      html: "ppm"
+      mathml: "<mi mathvariant='normal'>ppm</mi>"
+      latex: \ensuremath{\mathrm{ppm}}
+      unicode: "ppm"
+  quantity_reference:    
+    - name: "mass quantity"
+      url: "#NISTq1000"
+
+"NISTu401":
+  dimension_url: "#NISTd16"
+  short: var
+  root: true
+  unit_system:
+    type: "SI_derived_non-special"
+    name: "SI"
+  unit_name:
+    - "var"
+  unit_symbols:
+    - id: "var"
+      ascii: "var"
+      html: "var"
+      mathml: "<mi mathvariant='normal'>var</mi>"
+      latex: \ensuremath{\mathrm{var}}
+      unicode: "var"
+  root_units:
+    enumerated_root_units:
+      - unit: "volt"
+        power_denominator: 1
+        power_numerator: 1
+      - unit: "ampere"
+        power_denominator: 1
+        power_numerator: 1
+  quantity_reference:
+    - name: "apparent power"
+      url: "#NISTq1001"
+  si_derived_bases:
+    - id: NISTu1
+      prefix:
+      power: 2
+    - id: NISTu27
+      prefix: p10_3
+      power: 1
+    - id: NISTu3
+      prefix:
+      power: -3
+

data/spec/conv_spec.rb

@@ -106,6 +106,96 @@ RSpec.describe Asciimath2UnitsML do
 OUTPUT
     end
 
+     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
+<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>
+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))"
+    INPUT
+    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+  <mn>1</mn>
+  <mo rspace='thickmathspace'>&#x2062;</mo>
+  <mrow xref='U_sqrtHz'>
+    <msqrt>
+      <mi mathvariant='normal'>Hz</mi>
+    </msqrt>
+  </mrow>
+  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_Hz0.5' dimensionURL='#D_T-0.5'>
+    <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+    <UnitName xml:lang='en'>Hz^0.5</UnitName>
+    <UnitSymbol type='HTML'>&#x221A;Hz</UnitSymbol>
+    <UnitSymbol type='MathML'>
+      <math xmlns='http://www.w3.org/1998/Math/MathML'>
+        <mrow>
+          <msqrt>
+            <mi mathvariant='normal'>Hz</mi>
+          </msqrt>
+        </mrow>
+      </math>
+    </UnitSymbol>
+  </Unit>
+  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_T-0.5'>
+    <Time symbol='T' powerNumerator='-0.5'/>
+  </Dimension>
+</math>
+    OUTPUT
+  end
+
   it "deals with kg and g" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     1 "unitsml(kg)" + 1 "unitsml(g)"
@@ -359,6 +449,34 @@ INPUT
 OUTPUT
   end
 
+  it "deals with standalone prefixes" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    "unitsml(p-)" "unitsml(da-)"
+    INPUT
+    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+  <mrow xref='NISTp10_-12'>
+    <mi mathvariant='normal'>p</mi>
+  </mrow>
+  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-12' xml:id='NISTp10_-12'>
+    <PrefixName xml:lang='en'>pico</PrefixName>
+    <PrefixSymbol type='ASCII'>p</PrefixSymbol>
+    <PrefixSymbol type='unicode'>p</PrefixSymbol>
+    <PrefixSymbol type='LaTeX'>p</PrefixSymbol>
+    <PrefixSymbol type='HTML'>p</PrefixSymbol>
+  </Prefix>
+   <mrow xref='NISTp10_1'>
+   <mi mathvariant='normal'>da</mi>
+ </mrow>
+ <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='1' xml:id='NISTp10_1'>
+   <PrefixName xml:lang='en'>deka</PrefixName>
+   <PrefixSymbol type='ASCII'>da</PrefixSymbol>
+   <PrefixSymbol type='unicode'>da</PrefixSymbol>
+   <PrefixSymbol type='LaTeX'>da</PrefixSymbol>
+   <PrefixSymbol type='HTML'>da</PrefixSymbol>
+ </Prefix>
+</math>
+    OUTPUT
+  end
 
   it "deals with units division" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
@@ -695,6 +813,73 @@ OUTPUT
     OUTPUT
   end
 
+  it "deals with dimension decomposition with like units" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    9 "unitsml(mW*cm^(-2))"
+INPUT
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>9</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_mW.cm-2'>
+           <mi mathvariant='normal'>mW</mi>
+           <mo>&#xB7;</mo>
+           <msup>
+             <mrow>
+               <mi mathvariant='normal'>cm</mi>
+             </mrow>
+             <mrow>
+               <mo>&#x2212;</mo>
+               <mn>2</mn>
+             </mrow>
+           </msup>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_mW.cm-2'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>mW*cm^-2</UnitName>
+           <UnitSymbol type='HTML'>
+             mW&#xB7;cm
+             <sup>&#x2212;2</sup>
+           </UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>mW</mi>
+                 <mo>&#xB7;</mo>
+                 <msup>
+                   <mrow>
+                     <mi mathvariant='normal'>cm</mi>
+                   </mrow>
+                   <mrow>
+                     <mo>&#x2212;</mo>
+                     <mn>2</mn>
+                   </mrow>
+                 </msup>
+               </mrow>
+             </math>
+           </UnitSymbol>
+           <RootUnits>
+             <EnumeratedRootUnit unit='watt' prefix='m'/>
+             <EnumeratedRootUnit unit='meter' prefix='c' powerNumerator='-2'/>
+           </RootUnits>
+         </Unit>
+         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-3' xml:id='NISTp10_-3'>
+           <PrefixName xml:lang='en'>milli</PrefixName>
+           <PrefixSymbol type='ASCII'>m</PrefixSymbol>
+           <PrefixSymbol type='unicode'>m</PrefixSymbol>
+           <PrefixSymbol type='LaTeX'>m</PrefixSymbol>
+           <PrefixSymbol type='HTML'>m</PrefixSymbol>
+         </Prefix>
+         <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>
+       </math>
+OUTPUT
+  end
+
   it "deals with quantity input" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     9 "unitsml(m, quantity: NISTq103)"
@@ -803,5 +988,96 @@ INPUT
 OUTPUT
     end
 
+    it "deals with symbol input" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    9 "unitsml(m, symbol: La)" + 10 "unitsml(cm*s^-2, symbol: cm cdot s^-2)"
+INPUT
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>9</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu1'>
+           <math>
+             <mi mathvariant='normal'>L</mi>
+             <mi mathvariant='normal'>a</mi>
+           </math>
+         </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>
+         <mo>+</mo>
+         <mn>10</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_cm.s-2'>
+           <math>
+             <mi mathvariant='normal'>c</mi>
+             <mi mathvariant='normal'>m</mi>
+             <mo>&#x22C5;</mo>
+             <msup>
+               <mrow>
+                 <mi mathvariant='normal'>s</mi>
+               </mrow>
+               <mrow>
+                 <mo>&#x2212;</mo>
+               </mrow>
+             </msup>
+             <mn>2</mn>
+           </math>
+         </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

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