RubyGems - asciimath2unitsml - Versions diffs - 0.2.2 → 0.3.1 - Mend

asciimath2unitsml 0.2.2 → 0.3.1

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 (13) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/.rubocop.yml +14 -0
data/README.adoc +4 -1
data/asciimath2unitsml.gemspec +1 -1
data/lib/asciimath2unitsml/conv.rb +37 -19
data/lib/asciimath2unitsml/parse.rb +20 -14
data/lib/asciimath2unitsml/render.rb +3 -2
data/lib/asciimath2unitsml/version.rb +1 -1
data/lib/unitsdb/units.yaml +7 -3
data/lib/unitsdb_ruby/unitsdb.rb +1 -0
data/spec/conv_spec.rb +436 -113
metadata +8 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559a334bc2dbe285ed496346392630e62b5c301fc23e521ff57a6f2161a3a0ed
-  data.tar.gz: 981ab1de7d97ce54dd464d707217aab81bfb9be404686c52f3999ef3ec7f44af
+  metadata.gz: 2eabcf099e41ebc168ea5904e903893af61c95667e0f778fdf17e39e18fd867a
+  data.tar.gz: 6316d4d968b656249cd69b255e8c68f9f0c7307055fe55d205902c9409d21a9b
 SHA512:
-  metadata.gz: fa493805c784f5f18bad7b16eecaf4e4bac7667e72088f5cf712017c8693703a0006122c827e42f8b4665ad5c3a75d8a86bf79ed361409db5555b77f0694f0c5
-  data.tar.gz: 8c0cf5a14e1cba4e915266c838fd2eb2f019009cab9b029f14241d89c2f9c0f78bcb53b7f03712324fccbc9f4914b8f9af461cdc65037c63ee919e7cba4b4a14
+  metadata.gz: 4450d314da42fa0941730c668090c7d3bef43ccd8da4a9ad7e5b29a008dcb8abbf9935732229f988a58cbe624ec10eba52e2400efddb7b09a71b6fe51d9ee579
+  data.tar.gz: 66e66fee285dc9788006a58b98e0e3660b8e829aa29c601eb45a3d2ad263da31582df9267a2a93053f24d0ff89503092395b0ec1ff3ffe8d99ec6161b05a260c

data/.gitignore ADDED Viewed

	@@ -0,0 +1 @@
1	+ .rubocop-https--*

data/.rubocop.yml ADDED Viewed

@@ -0,0 +1,14 @@
+# This project follows the Ribose OSS style guide.
+# https://github.com/riboseinc/oss-guides
+# All project-specific additions and overrides should be specified in this file.
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+# local repo-specific modifications
+AllCops:
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4
+Rails:
+  Enabled: true

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/asciimath2unitsml.gemspec CHANGED Viewed

@@ -57,7 +57,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "= 0.54.0"
+  spec.add_development_dependency "rubocop", "~> 1.5.2"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "rexml"

data/lib/asciimath2unitsml/conv.rb CHANGED Viewed

@@ -10,21 +10,25 @@ require_relative "unit"
 module Asciimath2UnitsML
   MATHML_NS = "http://www.w3.org/1998/Math/MathML".freeze
-  UNITSML_NS = "http://unitsml.nist.gov/2005".freeze
+  UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
   class Conv
     def initialize(options = {})
-      @dimensions_id = read_yaml("../unitsdb/dimensions.yaml").each_with_object({}) do |(k, v), m|
+      @dimensions_id = read_yaml("../unitsdb/dimensions.yaml").
+        each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Dimension.new(k, v)
       end
-      @prefixes_id = read_yaml("../unitsdb/prefixes.yaml").each_with_object({}) do |(k, v), m|
+      @prefixes_id = read_yaml("../unitsdb/prefixes.yaml").
+        each_with_object({}) do |(k, v), m|
         m[k] = UnitsDB::Prefix.new(k, v)
       end
       @prefixes = flip_name_and_symbol(@prefixes_id)
-      @quantities = read_yaml("../unitsdb/quantities.yaml").each_with_object({}) do |(k, v), m|
+      @quantities = read_yaml("../unitsdb/quantities.yaml").
+        each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Quantity.new(k, v)
       end
-      @units_id = read_yaml("../unitsdb/units.yaml").each_with_object({}) do |(k, v), m|
+      @units_id = read_yaml("../unitsdb/units.yaml").
+        each_with_object({}) do |(k, v), m|
         m[k.to_s] = UnitsDB::Unit.new(k.to_s, v)
       end
       @units = flip_name_and_symbols(@units_id)
@@ -63,14 +67,16 @@ 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" },
       "s" => { dimension: "Time", order: 3, symbol: "T" },
       "A" => { dimension: "ElectricCurrent", order: 4, symbol: "I" },
-      "K" => { dimension: "ThermodynamicTemperature", order: 5, symbol: "Theta" },
-      "degK" => { dimension: "ThermodynamicTemperature", order: 5, symbol: "Theta" },
+      "K" => { dimension: "ThermodynamicTemperature", order: 5,
+               symbol: "Theta" },
+      "degK" => { dimension: "ThermodynamicTemperature", order: 5,
+                  symbol: "Theta" },
       "mol" => { dimension: "AmountOfSubstance", order: 6, symbol: "N" },
       "cd" => { dimension: "LuminousIntensity", order: 7, symbol: "J" },
       "deg" => { dimension: "PlaneAngle", order: 8, symbol: "Phi" },
@@ -78,7 +84,9 @@ module Asciimath2UnitsML
     def units2dimensions(units)
       norm = decompose_units(units)
-      return if norm.any? { |u| u[:unit] == "unknown" || u[:prefix] == "unknown" || u[:unit].nil? }
+      return if norm.any? do |u|
+        u[:unit] == "unknown" || u[:prefix] == "unknown" || u[:unit].nil?
+      end
       norm.map do |u|
         { dimension: U2D[u[:unit]][:dimension],
           unit: u[:unit],
@@ -88,7 +96,8 @@ module Asciimath2UnitsML
     end
     def dimension1(u)
-      %(<#{u[:dimension]} symbol="#{u[:symbol]}" powerNumerator="#{float_to_display(u[:exponent])}"/>)
+      %(<#{u[:dimension]} symbol="#{u[:symbol]}"
+      powerNumerator="#{float_to_display(u[:exponent])}"/>)
     end
     def dim_id(dims)
@@ -97,9 +106,11 @@ module Asciimath2UnitsML
       dimsvector = %w(Length Mass Time ElectricCurrent ThermodynamicTemperature
                       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
+      id = @dimensions_id&.values&.select { |d| d.vector == dimsvector }&.
+        first&.id and return id.to_s
       "D_" + dims.map do |d|
-        U2D[d[:unit]][:symbol] + (d[:exponent] == 1 ? "" : float_to_display(d[:exponent]))
+        U2D[d[:unit]][:symbol] +
+          (d[:exponent] == 1 ? "" : float_to_display(d[:exponent]))
       end.join("")
     end
@@ -111,9 +122,12 @@ module Asciimath2UnitsML
       units.sort { |a, b| a[:unit] <=> b[:unit] }.each_with_object([]) do |k, m|
         if m.empty? || m[-1][:unit] != k[:unit] then m << k
         else
-          m[-1] = { prefix: combine_prefixes(@prefixes[m[-1][:prefix]], @prefixes[k[:prefix]]),
-                    unit: m[-1][:unit],
-                    exponent: (k[:exponent]&.to_f || 1) + (m[-1][:exponent]&.to_f || 1) }
+          m[-1] = {
+            prefix: combine_prefixes(
+              @prefixes[m[-1][:prefix]], @prefixes[k[:prefix]]),
+            unit: m[-1][:unit],
+            exponent: (k[:exponent]&.to_f || 1) +
+            (m[-1][:exponent]&.to_f || 1) }
         end
       end
     end
@@ -128,8 +142,10 @@ module Asciimath2UnitsML
         { prefix: u[:prefix], unit: "unknown", exponent: u[:exponent] }
       else
         @units[u[:unit]].si_derived_bases.each_with_object([]) do |k, m|
-          m << { prefix: !k[:prefix].nil? && !k[:prefix].empty? ?
-                 combine_prefixes(@prefixes_id[k[:prefix]], @prefixes[u[:prefix]]) : u[:prefix],
+          prefix = !k[:prefix].nil? && !k[:prefix].empty? ?
+            combine_prefixes(@prefixes_id[k[:prefix]], @prefixes[u[:prefix]]) :
+            u[:prefix]
+          m << { prefix: prefix,
                  unit: @units_id[k[:id]].symbolid,
                  exponent: (k[:power]&.to_i || 1) * (u[:exponent]&.to_f || 1) }
         end
@@ -156,9 +172,11 @@ module Asciimath2UnitsML
     end
     def quantity(normtext, quantity)
-      return unless @units[normtext] && @units[normtext].quantities.size == 1 || @quantities[quantity]
+      return unless @units[normtext] && @units[normtext].quantities.size == 1 ||
+        @quantities[quantity]
       id = quantity || @units[normtext].quantities.first
-      dim = %( dimensionURL="##{@units[normtext].dimension}") if @units[normtext]&.dimension
+      @units[normtext]&.dimension and
+        dim = %( dimensionURL="##{@units[normtext].dimension}")
       <<~END
       <Quantity xmlns='#{UNITSML_NS}' xml:id="#{id}"#{dim} quantityType="base">
       #{quantityname(id)}

data/lib/asciimath2unitsml/parse.rb CHANGED Viewed

@@ -87,7 +87,7 @@ module Asciimath2UnitsML
       prefix2 = /#{@prefixes.keys.select { |x| x.size == 2 }.join("|")}/.r
       prefix1 = /#{@prefixes.keys.select { |x| x.size == 1 }.join("|")}/.r
       unit_keys = @units.keys.reject do |k|
-        @units[k].root&.any? { |x| x[:prefix] } || /\*|\^|\/|^1$/.match(k) || @units[k].prefixed
+        /\*|\^|\/|^1$/.match(k) || @units[k].prefixed
       end.map { |k| Regexp.escape(k) }
       unit1 = /#{unit_keys.sort_by(&:length).reverse.join("|")}/.r
       exponent = /\^\(-?\d+\)/.r.map { |m| m.sub(/\^/, "").gsub(/[()]/, "") } |
@@ -97,14 +97,15 @@ module Asciimath2UnitsML
         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._? & (multiplier | ")".r)) { |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 } }
+        "1".r.map { |_| { prefix: nil, unit: "1", display_exponent: nil } }
+      units1 = "(".r >> lazy{units} << ")" | unit
       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)
+        units1.join(multiplier)
       parser = units.eof
     end
@@ -119,22 +120,23 @@ module Asciimath2UnitsML
     end
     def postprocess(units, text)
-      units = postprocess1(units)
+      units = postprocess1(units.flatten)
       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)
       inverse = false
       units.each_with_object([]) do |u, m|
         if u[:multiplier]
-          inverse = (u[:multiplier] == "/")
+          inverse = !inverse if (u[:multiplier] == "/")
         else
           u[:exponent] = inverse ? "-#{u[:display_exponent] || '1'}" : u[:display_exponent]
           u[:exponent] = u[:exponent]&.sub(/^--+/, "")
@@ -154,18 +156,22 @@ 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)
-        delim = x&.previous_element ? delimspace(rendering) : ""
-        x.replace("#{delim}<mrow xref='#{unit_id(origtext)}'>#{rendering}</mrow>\n"\
+        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
-    def delimspace(x)
-      text = HTMLEntities.new.encode(Nokogiri::XML("<mrow>#{x}</mrow>").text.strip)
-      /[[:alnum:]]/.match(text) ?
+    # if previous sibling's last descendent non-whitespace is MathML and mn or mi, no space
+    def delimspace(rendering, elem)
+      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>"
     end

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.2'.freeze
+  VERSION = '0.3.1'.freeze
 end

data/lib/unitsdb/units.yaml CHANGED Viewed

@@ -1745,6 +1745,7 @@
   dimension_url: "#NISTd15"
   short:
   root: false
+  prefixed: true
   unit_system:
     type: "non-SI_acceptable"
     name: "non-SI"
@@ -2046,6 +2047,7 @@
   dimension_url: "#NISTd16"
   short:
   root: false
+  prefixed: true
   unit_system:
     type: "non-SI_not_acceptable"
     name: "non-SI"
@@ -2398,6 +2400,7 @@
   dimension_url: "#NISTd14"
   short:
   root: false
+  prefixed: true
   unit_system:
     type: "non-SI_not_acceptable"
     name: "non-SI"
@@ -4337,8 +4340,8 @@
   unit_symbols:
     - id: "deg"
       ascii: "deg"
-      html: "&#186;"
-      mathml: "<mi mathvariant='normal'>&#186;</mi>"
+      html: "&#176;"
+      mathml: "<mi mathvariant='normal'>&#176;</mi>"
       latex: \ensuremath{\mathrm{^{\circ}}}
       unicode: "º"
   root_units:
@@ -9981,6 +9984,7 @@
   dimension_url: "#NISTd56"
   short:
   root: false
+  prefixed: true
   unit_system:
     type: "non-SI_not_acceptable"
     name: "non-SI"
@@ -10439,7 +10443,7 @@
       url: "#NISTq1"
 "NISTu400":
-  dimension_url: "#NISTd85"
+  dimension_url: "#NISTd80"
   short:
   root: false
   unit_system:

data/lib/unitsdb_ruby/unitsdb.rb CHANGED Viewed

@@ -135,6 +135,7 @@ module UnitsDB
           @root = hash[:root_units][:enumerated_root_units]
         hash[:quantity_reference] and @quantities = hash[:quantity_reference].map { |x| x[:url].sub(/^#/, "") }
         hash[:si_derived_bases] and @si_derived_bases = hash[:si_derived_bases]
+        @prefixed = (hash[:prefixed] == true)
       rescue
         raise StandardError.new "Parse fail on Unit #{id}: #{hash}"
       end

data/spec/conv_spec.rb CHANGED Viewed

@@ -22,7 +22,7 @@ RSpec.describe Asciimath2UnitsML do
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_mm.s-2' dimensionURL='#NISTd28'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_mm.s-2' dimensionURL='#NISTd28'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>mm*s^-2</UnitName>
            <UnitSymbol type='HTML'>
@@ -51,14 +51,14 @@ RSpec.describe Asciimath2UnitsML do
              <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-3' xml:id='NISTp10_-3'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd28'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd28'>
            <Length symbol='L' powerNumerator='1'/>
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
@@ -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
@@ -77,7 +77,7 @@ RSpec.describe Asciimath2UnitsML do
   <mrow xref='U_um'>
     <mi mathvariant='normal'>&#xB5;m</mi>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_um' dimensionURL='#NISTd1'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_um' dimensionURL='#NISTd1'>
     <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
     <UnitName xml:lang='en'>um</UnitName>
     <UnitSymbol type='HTML'>um</UnitSymbol>
@@ -92,77 +92,196 @@ RSpec.describe Asciimath2UnitsML do
   <EnumeratedRootUnit unit='meter' prefix='u'/>
 </RootUnits>
   </Unit>
-  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-6' xml:id='NISTp10_-6'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='-6' xml:id='NISTp10_-6'>
     <PrefixName xml:lang='en'>micro</PrefixName>
     <PrefixSymbol type='ASCII'>u</PrefixSymbol>
     <PrefixSymbol type='unicode'>&#x3BC;</PrefixSymbol>
     <PrefixSymbol type='LaTeX'>$mu$</PrefixSymbol>
     <PrefixSymbol type='HTML'>&#xB5;</PrefixSymbol>
   </Prefix>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd1'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd1'>
     <Length symbol='L' powerNumerator='1'/>
   </Dimension>
 </math>
 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)"
+    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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd5'>
+           <ThermodynamicTemperature symbol='Theta' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd9'>
+           <PlaneAngle symbol='Phi' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd24'>
+           <Time symbol='T' powerNumerator='-1'/>
+         </Dimension>
+         <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq45' dimensionURL='#NISTd24' quantityType='base'>
+           <QuantityName xml:lang='en-US'>frequency</QuantityName>
+         </Quantity>
+       </math>
 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd2'>
+           <Mass symbol='M' powerNumerator='1'/>
+         </Dimension>
+         <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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))"
@@ -175,7 +294,7 @@ OUTPUT
       <mi mathvariant='normal'>Hz</mi>
     </msqrt>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_Hz0.5' dimensionURL='#D_T-0.5'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
@@ -189,7 +308,7 @@ OUTPUT
       </math>
     </UnitSymbol>
   </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_T-0.5'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='D_T-0.5'>
     <Time symbol='T' powerNumerator='-0.5'/>
   </Dimension>
 </math>
@@ -206,7 +325,7 @@ OUTPUT
          <mrow xref='U_NISTu2'>
            <mi mathvariant='normal'>kg</mi>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu2' dimensionURL='#NISTd2'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
@@ -221,17 +340,17 @@ OUTPUT
   <EnumeratedRootUnit unit='gram' prefix='k'/>
 </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd2'>
            <Mass symbol='M' powerNumerator='1'/>
          </Dimension>
-         <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq2' dimensionURL='#NISTd2' quantityType='base'>
+         <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq2' dimensionURL='#NISTd2' quantityType='base'>
   <QuantityName xml:lang='en-US'>mass</QuantityName>
 </Quantity>
          <mo>+</mo>
@@ -240,7 +359,7 @@ OUTPUT
          <mrow xref='U_NISTu27'>
            <mi mathvariant='normal'>g</mi>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu27' dimensionURL='#NISTd2'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_NISTu27' dimensionURL='#NISTd2'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>gram</UnitName>
            <UnitSymbol type='HTML'>g</UnitSymbol>
@@ -266,7 +385,7 @@ OUTPUT
          <mrow xref='U_NISTu284'>
            <mi mathvariant='normal'>hp</mi>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu284'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_NISTu284'>
            <UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>
            <UnitName xml:lang='en'>horsepower</UnitName>
            <UnitSymbol type='HTML'>hp</UnitSymbol>
@@ -278,12 +397,12 @@ OUTPUT
              </math>
            </UnitSymbol>
          </Unit>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd16'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd16'>
   <Length symbol='L' powerNumerator='2'/>
   <Mass symbol='M' powerNumerator='1'/>
   <Time symbol='T' powerNumerator='-3'/>
 </Dimension>
-<Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq20' dimensionURL='#NISTd16' quantityType='base'>
+<Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq20' dimensionURL='#NISTd16' quantityType='base'>
   <QuantityName xml:lang='en-US'>power</QuantityName>
 </Quantity>
        </math>
@@ -310,7 +429,7 @@ OUTPUT
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>kg*s^-2</UnitName>
            <UnitSymbol type='HTML'>
@@ -339,14 +458,14 @@ OUTPUT
              <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='NISTd37'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd37'>
            <Mass symbol='M' powerNumerator='1'/>
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
@@ -370,6 +489,78 @@ OUTPUT
     OUTPUT
   end
+  it "deals with parentheses" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    10 "unitsml(K/(kg*m))"
+    INPUT
+     <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>10</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_K/kg.m'>
+           <mi mathvariant='normal'>K</mi>
+           <mo>/</mo>
+           <mi mathvariant='normal'>kg</mi>
+           <mo>&#xB7;</mo>
+           <mi mathvariant='normal'>m</mi>
+         </mrow>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_K.kg-1.m-1' dimensionURL='#D_L-1M-1Theta'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>K*kg^-1*m^-1</UnitName>
+           <UnitSymbol type='HTML'>
+             K&#xB7;kg
+             <sup>&#x2212;1</sup>
+             &#xB7;m
+             <sup>&#x2212;1</sup>
+           </UnitSymbol>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>K</mi>
+                 <mo>&#xB7;</mo>
+                 <msup>
+                   <mrow>
+                     <mi mathvariant='normal'>kg</mi>
+                   </mrow>
+                   <mrow>
+                     <mo>&#x2212;</mo>
+                     <mn>1</mn>
+                   </mrow>
+                 </msup>
+                 <mo>&#xB7;</mo>
+                 <msup>
+                   <mrow>
+                     <mi mathvariant='normal'>m</mi>
+                   </mrow>
+                   <mrow>
+                     <mo>&#x2212;</mo>
+                     <mn>1</mn>
+                   </mrow>
+                 </msup>
+               </mrow>
+             </math>
+           </UnitSymbol>
+           <RootUnits>
+             <EnumeratedRootUnit unit='kelvin'/>
+             <EnumeratedRootUnit unit='gram' prefix='k' powerNumerator='-1'/>
+             <EnumeratedRootUnit unit='meter' powerNumerator='-1'/>
+           </RootUnits>
+         </Unit>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='D_L-1M-1Theta'>
+           <Length symbol='L' powerNumerator='-1'/>
+           <Mass symbol='M' powerNumerator='-1'/>
+           <ThermodynamicTemperature symbol='Theta' powerNumerator='1'/>
+         </Dimension>
+       </math>
+    OUTPUT
+  end
   it "deals with notational variants" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
     9 "unitsml(degK)" + 10 "unitsml(K)"
@@ -380,7 +571,7 @@ INPUT
   <mrow xref='U_NISTu5'>
     <mi mathvariant='normal'>&#xB0;K</mi>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu5' dimensionURL='#NISTd5'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
@@ -392,10 +583,10 @@ INPUT
       </math>
     </UnitSymbol>
   </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd5'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd5'>
     <ThermodynamicTemperature symbol='Theta' powerNumerator='1'/>
   </Dimension>
-  <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq5' dimensionURL='#NISTd5' quantityType='base'>
+  <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq5' dimensionURL='#NISTd5' quantityType='base'>
   <QuantityName xml:lang='en-US'>thermodynamic temperature</QuantityName>
 </Quantity>
   <mo>+</mo>
@@ -418,7 +609,7 @@ INPUT
   <mrow xref='U_NISTu362'>
     <mi mathvariant='normal'>mbar</mi>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu362'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_NISTu362'>
     <UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>
     <UnitName xml:lang='en'>millibar</UnitName>
     <UnitSymbol type='HTML'>mbar</UnitSymbol>
@@ -433,14 +624,14 @@ INPUT
       <EnumeratedRootUnit unit='bar' prefix='m'/>
     </RootUnits>
   </Unit>
-  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-3' xml:id='NISTp10_-3'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd14'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd14'>
   <Length symbol='L' powerNumerator='-1'/>
   <Mass symbol='M' powerNumerator='1'/>
   <Time symbol='T' powerNumerator='-2'/>
@@ -457,7 +648,7 @@ OUTPUT
   <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'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='-12' xml:id='NISTp10_-12'>
     <PrefixName xml:lang='en'>pico</PrefixName>
     <PrefixSymbol type='ASCII'>p</PrefixSymbol>
     <PrefixSymbol type='unicode'>p</PrefixSymbol>
@@ -468,7 +659,7 @@ OUTPUT
    <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'>
+ <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='1' xml:id='NISTp10_1'>
    <PrefixName xml:lang='en'>deka</PrefixName>
    <PrefixSymbol type='ASCII'>da</PrefixSymbol>
    <PrefixSymbol type='unicode'>da</PrefixSymbol>
@@ -487,25 +678,24 @@ INPUT
   <mrow xref='NISTp10_-6'>
     <mi mathvariant='normal'>&#xB5;</mi>
   </mrow>
-  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-6' xml:id='NISTp10_-6'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='-6' xml:id='NISTp10_-6'>
     <PrefixName xml:lang='en'>micro</PrefixName>
     <PrefixSymbol type='ASCII'>u</PrefixSymbol>
     <PrefixSymbol type='unicode'>&#x3BC;</PrefixSymbol>
     <PrefixSymbol type='LaTeX'>$mu$</PrefixSymbol>
     <PrefixSymbol type='HTML'>&#xB5;</PrefixSymbol>
   </Prefix>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd2'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd2'>
     <Mass symbol='M' powerNumerator='1'/>
   </Dimension>
-  <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq2' dimensionURL='#NISTd2' quantityType='base'>
+  <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq2' dimensionURL='#NISTd2' quantityType='base'>
     <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>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_um' dimensionURL='#NISTd1'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_um' dimensionURL='#NISTd1'>
     <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
     <UnitName xml:lang='en'>um</UnitName>
     <UnitSymbol type='HTML'>um</UnitSymbol>
@@ -520,7 +710,7 @@ INPUT
       <EnumeratedRootUnit unit='meter' prefix='u'/>
     </RootUnits>
   </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd1'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd1'>
     <Length symbol='L' powerNumerator='1'/>
   </Dimension>
 </math>
@@ -529,7 +719,7 @@ INPUT
   it "deals with units division" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
-    9 "unitsml(A*C^3)" + 13 "unitsml(A/C^-3)"
+    9 "unitsml(A*C^3)" + 13 "unitsml(A/C^-3)" + 2 "unitsml(J/kg*K)"
 INPUT
 <math xmlns='http://www.w3.org/1998/Math/MathML'>
          <mn>9</mn>
@@ -546,7 +736,7 @@ INPUT
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_A.C3' dimensionURL='#D_M3I4'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_A.C3' dimensionURL='#D_M3I4'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>A*C^3</UnitName>
            <UnitSymbol type='HTML'>
@@ -574,7 +764,7 @@ INPUT
              <EnumeratedRootUnit unit='coulomb' powerNumerator='3'/>
            </RootUnits>
          </Unit>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_M3I4'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='D_M3I4'>
            <Mass symbol='M' powerNumerator='3'/>
            <ElectricCurrent symbol='I' powerNumerator='4'/>
          </Dimension>
@@ -594,6 +784,76 @@ INPUT
              </mrow>
            </msup>
          </mrow>
+         <mo>+</mo>
+<mn>2</mn>
+<mo rspace='thickmathspace'>&#x2062;</mo>
+<mrow xref='U_J/kg.K'>
+  <mi mathvariant='normal'>J</mi>
+  <mo>/</mo>
+  <mi mathvariant='normal'>kg</mi>
+  <mo>&#xB7;</mo>
+  <mi mathvariant='normal'>K</mi>
+</mrow>
+<Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_NISTu13.u27p10_3e-1/1.u5e-1/1' dimensionURL='#D_L2M0T-2Theta-1'>
+  <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+  <UnitName xml:lang='en'>joule per kilogram kelvin</UnitName>
+  <UnitSymbol type='HTML'>
+    J&#xB7;kg
+    <sup>&#x2212;1</sup>
+    &#xB7;K
+    <sup>&#x2212;1</sup>
+  </UnitSymbol>
+  <UnitSymbol type='MathML'>
+    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+      <mrow>
+        <mi mathvariant='normal'>J</mi>
+        <mo>&#xB7;</mo>
+        <msup>
+          <mrow>
+            <mi mathvariant='normal'>kg</mi>
+          </mrow>
+          <mrow>
+            <mo>&#x2212;</mo>
+            <mn>1</mn>
+          </mrow>
+        </msup>
+        <mo>&#xB7;</mo>
+        <msup>
+          <mrow>
+            <mi mathvariant='normal'>K</mi>
+          </mrow>
+          <mrow>
+            <mo>&#x2212;</mo>
+            <mn>1</mn>
+          </mrow>
+        </msup>
+      </mrow>
+    </math>
+  </UnitSymbol>
+  <RootUnits>
+    <EnumeratedRootUnit unit='joule'/>
+    <EnumeratedRootUnit unit='gram' prefix='k' powerNumerator='-1'/>
+    <EnumeratedRootUnit unit='kelvin' powerNumerator='-1'/>
+  </RootUnits>
+</Unit>
+<Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd40'>
+  <Length symbol='L' powerNumerator='2'/>
+  <Time symbol='T' powerNumerator='-2'/>
+  <ThermodynamicTemperature symbol='Theta' powerNumerator='-1'/>
+</Dimension>
+<Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='D_L2M0T-2Theta-1'>
+  <Length symbol='L' powerNumerator='2'/>
+  <Mass symbol='M' powerNumerator='0'/>
+  <Time symbol='T' powerNumerator='-2'/>
+  <ThermodynamicTemperature symbol='Theta' powerNumerator='-1'/>
+</Dimension>
        </math>
 OUTPUT
   end
@@ -628,7 +888,7 @@ OUTPUT
              </mrow>
            </msup>
          </mrow>
-          <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg-2' dimensionURL='#D_M-2'>
+          <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
@@ -654,14 +914,14 @@ OUTPUT
   <EnumeratedRootUnit unit='gram' prefix='k' powerNumerator='-2'/>
 </RootUnits>
  </Unit>
- <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+ <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='D_M-2'>
+ <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='D_M-2'>
    <Mass symbol='M' powerNumerator='-2'/>
  </Dimension>
 </math>
@@ -696,7 +956,7 @@ OUTPUT
       </mrow>
     </msup>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
     <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
     <UnitName xml:lang='en'>kg*s^-2</UnitName>
     <UnitSymbol type='HTML'>
@@ -725,14 +985,14 @@ OUTPUT
       <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
     </RootUnits>
   </Unit>
-  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='NISTd37'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd37'>
     <Mass symbol='M' powerNumerator='1'/>
     <Time symbol='T' powerNumerator='-2'/>
   </Dimension>
@@ -757,7 +1017,7 @@ OUTPUT
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>kg*s^-2</UnitName>
            <UnitSymbol type='HTML'>
@@ -786,14 +1046,14 @@ OUTPUT
              <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='NISTd37'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd37'>
            <Mass symbol='M' powerNumerator='1'/>
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
@@ -818,7 +1078,7 @@ OUTPUT
       </mrow>
     </msup>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_kg.s-2' dimensionURL='#NISTd37'>
     <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
     <UnitName xml:lang='en'>kg*s^-2</UnitName>
     <UnitSymbol type='HTML'>
@@ -847,14 +1107,14 @@ OUTPUT
       <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
     </RootUnits>
   </Unit>
-  <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+  <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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='NISTd37'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd37'>
     <Mass symbol='M' powerNumerator='1'/>
     <Time symbol='T' powerNumerator='-2'/>
   </Dimension>
@@ -882,7 +1142,7 @@ INPUT
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_mW.cm-2'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
@@ -911,14 +1171,14 @@ INPUT
              <EnumeratedRootUnit unit='meter' prefix='c' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-3' xml:id='NISTp10_-3'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='-2' xml:id='NISTp10_-2'>
            <PrefixName xml:lang='en'>centi</PrefixName>
            <PrefixSymbol type='ASCII'>c</PrefixSymbol>
            <PrefixSymbol type='unicode'>c</PrefixSymbol>
@@ -939,7 +1199,7 @@ INPUT
   <mrow xref='U_NISTu1'>
     <mi mathvariant='normal'>m</mi>
   </mrow>
-  <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu1' dimensionURL='#NISTd1'>
+  <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
@@ -951,10 +1211,10 @@ INPUT
       </math>
     </UnitSymbol>
   </Unit>
-  <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd1'>
+  <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd1'>
     <Length symbol='L' powerNumerator='1'/>
   </Dimension>
-  <Quantity xmlns='http://unitsml.nist.gov/2005' xml:id='NISTq103' dimensionURL='#NISTd1' quantityType='base'>
+  <Quantity xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTq103' dimensionURL='#NISTd1' quantityType='base'>
     <QuantityName xml:lang='en-US'>position vector</QuantityName>
   </Quantity>
 </math>
@@ -987,7 +1247,7 @@ INPUT
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_cal_th.cm-2'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='U_cal_th.cm-2'>
            <UnitSystem name='not_SI' type='not_SI' xml:lang='en-US'/>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
            <UnitName xml:lang='en'>langley</UnitName>
@@ -1026,7 +1286,7 @@ INPUT
              <EnumeratedRootUnit unit='meter' prefix='c' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-2' xml:id='NISTp10_-2'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' prefixBase='10' prefixPower='-2' xml:id='NISTp10_-2'>
            <PrefixName xml:lang='en'>centi</PrefixName>
            <PrefixSymbol type='ASCII'>c</PrefixSymbol>
            <PrefixSymbol type='unicode'>c</PrefixSymbol>
@@ -1050,7 +1310,7 @@ INPUT
              <mi mathvariant='normal'>a</mi>
            </math>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu1' dimensionURL='#NISTd1'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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>
@@ -1062,7 +1322,7 @@ INPUT
              </math>
            </UnitSymbol>
          </Unit>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='NISTd1'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd1'>
            <Length symbol='L' powerNumerator='1'/>
          </Dimension>
          <mo>+</mo>
@@ -1084,7 +1344,7 @@ INPUT
              <mn>2</mn>
            </math>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_cm.s-2' dimensionURL='#NISTd28'>
+         <Unit xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
@@ -1113,14 +1373,14 @@ INPUT
              <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='-2' xml:id='NISTp10_-2'>
+         <Prefix xmlns='https://schema.unitsml.org/unitsml/1.0' 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'>
+         <Dimension xmlns='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd28'>
            <Length symbol='L' powerNumerator='1'/>
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
@@ -1128,5 +1388,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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' 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='https://schema.unitsml.org/unitsml/1.0' xml:id='NISTd28'>
+    <Length symbol='L' powerNumerator='1'/>
+    <Time symbol='T' powerNumerator='-2'/>
+  </Dimension>
+</math>
+OUTPUT
+        end
 end