asciimath2unitsml 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d06ecf91cb804e1a5827a46ef0e458a0fe1b444a476bc6e9d99ff2dd6c06d37
-  data.tar.gz: 615d0c46c6beb12bea4fb427379ba49835679fb3f1efd56692909d049e9e9be7
+  metadata.gz: 034e77e5697ed13c58b3b172857fcbb44fcf95ee7d3f34e43772d2b8e4c70be7
+  data.tar.gz: 66702bb8b3a6abf29f55f5a4b0beb7b2860e2e19c4b1efa6866d551e6734007f
 SHA512:
-  metadata.gz: 270b64a21c8a566907c1d0a3e81e20f126bd48d277631678b65d662eb8d80da92799e127c0d75f0555226762157eefd1cf27135f3daa1b79693199c00758fa22
-  data.tar.gz: b78b7cc95c55fde702b677e8e0a70126066341afeed726d4e3d00958b4cd4ad4d11850ef694329eca640019b5354bb34fb7efd246d023c065e7c37388c9de87e
+  metadata.gz: d2f364ed5703beed771a4cf82c65abb31a6a1e913cb6a88009a9aa93adc7777775aef63384dd3f11344129bf2d7455fa432187dd1ac80f444127600554bd6737
+  data.tar.gz: 3af5ec03a1422567ddb0dbcea962bc4d5edcbc24497fbd9446a0bd542562ad82cb777e3542459e8c99c095620b2c4eb58514208234f48342a345bb571616a6ec

data/.github/workflows/rake.yml

@@ -0,0 +1,51 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: notify
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/lib/asciimath2unitsml/conv.rb

@@ -17,6 +17,10 @@ module Asciimath2UnitsML
       @quantities = read_yaml("../unitsdb/quantities.yaml")
       @units_id = read_yaml("../unitsdb/units.yaml")
       @units = flip_name_and_id(@units_id)
+      #temporary
+      @units[:degC][:render] = "°C"
+      @units[:degF][:render] = "°F"
+      @units[:Ohm][:render] = "Ω"
       @parser = parser
       @multiplier = multiplier(options[:multiplier] || "\u00b7")
     end
@@ -37,6 +41,7 @@ module Asciimath2UnitsML
     end
 
     def unit_id(text)
+      text = text.gsub(/[()]/, "")
       "U_" +
         (@units[text.to_sym] ? @units[text.to_sym][:id] : text.gsub(/\*/, ".").gsub(/\^/, ""))
     end
@@ -82,12 +87,17 @@ module Asciimath2UnitsML
       END
     end
 
+    def render(unit)
+      #require "byebug"; byebug if unit == "degC"
+      @units[unit.to_sym][:render] || unit
+    end
+
     def htmlsymbol(units)
       units.map do |u|
         if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:html] : u[:multiplier]
         else
           u[:display_exponent] and exp = "<sup>#{u[:display_exponent].sub(/-/, "&#x2212;")}</sup>"
-          "#{u[:prefix]}#{u[:unit]}#{exp}"
+          "#{u[:prefix]}#{render(u[:unit])}#{exp}"
         end
       end.join("")
     end
@@ -96,7 +106,7 @@ module Asciimath2UnitsML
       exp = units.map do |u|
         if u[:multiplier] then u[:multiplier] == "*" ? @multiplier[:mathml] : "<mo>#{u[:multiplier]}</mo>"
         else
-          base = "<mi mathvariant='normal'>#{u[:prefix]}#{u[:unit]}</mi>"
+          base = "<mi mathvariant='normal'>#{u[:prefix]}#{render(u[:unit])}</mi>"
           if u[:display_exponent]
             exp = "<mn>#{u[:display_exponent]}</mn>".sub(/<mn>-/, "<mo>&#x2212;</mo><mn>")
             "<msup><mrow>#{base}</mrow><mrow>#{exp}</mrow></msup>"

data/lib/asciimath2unitsml/parse.rb

@@ -37,8 +37,9 @@ module Asciimath2UnitsML
         @units[k][:type]&.include?("buildable") || /\*|\^/.match(k)
       end.map { |k| Regexp.escape(k) }
       unit1 = /#{unit_keys.sort_by(&:length).reverse.join("|")}/.r
-      exponent = /\^-?\d+/.r.map { |m| m.sub(/\^/, "") }
-      multiplier = %r{[*/]}.r.map { |x| { multiplier: x } }
+      exponent = /\^\(-?\d+\)/.r.map { |m| m.sub(/\^/, "").gsub(/[()]/, "") } |
+        /\^-?\d+/.r.map { |m| m.sub(/\^/, "") }
+      multiplier = %r{\*|//|/}.r.map { |x| { multiplier: x[0] } }
       unit = seq(unit1, exponent._?) { |x| { prefix: nil, unit: x[0], display_exponent: (x[1][0] )} } |
         seq(prefix, unit1, exponent._?) { |x| { prefix: x[0][0], unit: x[1], display_exponent: (x[2][0] ) } }
       units_tail = seq(multiplier, unit) { |x| [x[0], x[1]] }

data/lib/asciimath2unitsml/version.rb

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

data/spec/conv_spec.rb

@@ -3,19 +3,17 @@ require "spec_helper"
 RSpec.describe Asciimath2UnitsML do
   it "converts an AsciiMath string to MathML + UnitsML" do
     expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
-    32 + 5 xx 7 "unitsml(kg^-2)" xx 9 "unitsml(g)" xx 1 "unitsml(kg*s^-2)" xx 812 "unitsml(m*s^-2)" - 9 "unitsml(C^3*A)" + 7 "unitsml(hp)" + 13 "unitsml(A/C^-3)"
+    1 "unitsml(kg*s^-2)" xx 9 "unitsml(g)"
     INPUT
     <math xmlns='http://www.w3.org/1998/Math/MathML'>
-         <mn>32</mn>
-         <mo>+</mo>
-         <mn>5</mn>
-         <mo>&#xD7;</mo>
-         <mn>7</mn>
+         <mn>1</mn>
          <mo rspace='thickmathspace'>&#x2062;</mo>
-         <mrow xref='U_kg-2'>
+         <mrow xref='U_kg.s-2'>
+           <mi mathvariant='normal'>kg</mi>
+           <mo>&#xB7;</mo>
            <msup>
              <mrow>
-               <mi mathvariant='normal'>kg</mi>
+               <mi mathvariant='normal'>s</mi>
              </mrow>
              <mrow>
                <mo>&#x2212;</mo>
@@ -23,19 +21,21 @@ RSpec.describe Asciimath2UnitsML do
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg-2' dimensionURL='#D_M-2'>
-           <UnitSystem name='SI' type='SI_base' xml:lang='en-US'/>
-           <UnitName xml:lang='en'>kg^-2</UnitName>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#D_MT-2'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>kg*s^-2</UnitName>
            <UnitSymbol type='HTML'>
-             kg
+             kg&#xB7;s
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
+                 <mi mathvariant='normal'>kg</mi>
+                 <mo>&#xB7;</mo>
                  <msup>
                    <mrow>
-                     <mi mathvariant='normal'>kg</mi>
+                     <mi mathvariant='normal'>s</mi>
                    </mrow>
                    <mrow>
                      <mo>&#x2212;</mo>
@@ -45,13 +45,18 @@ RSpec.describe Asciimath2UnitsML do
                </mrow>
              </math>
            </UnitSymbol>
+           <RootUnits>
+             <EnumeratedRootUnit unit='gram' prefix='k'/>
+             <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
+           </RootUnits>
          </Unit>
          <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
            <PrefixName xml:lang='en'>kilo</PrefixName>
            <PrefixSymbol type='ASCII'>k</PrefixSymbol>
          </Prefix>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_M-2'>
-           <Mass symbol='M' powerNumerator='-2'/>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_MT-2'>
+           <Mass symbol='M' powerNumerator='1'/>
+           <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
          <mo>&#xD7;</mo>
          <mn>9</mn>
@@ -74,7 +79,41 @@ RSpec.describe Asciimath2UnitsML do
          <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_M'>
            <Mass symbol='M' powerNumerator='1'/>
          </Dimension>
-         <mo>&#xD7;</mo>
+       </math>
+    OUTPUT
+  end
+
+  it "deals with non-metric" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    1 "unitsml(hp)"
+    INPUT
+    <math xmlns='http://www.w3.org/1998/Math/MathML'>
+         <mn>1</mn>
+         <mo rspace='thickmathspace'>&#x2062;</mo>
+         <mrow xref='U_NISTu284'>
+           <mi mathvariant='normal'>hp</mi>
+         </mrow>
+         <Unit xmlns='http://unitsml.nist.gov/2005' 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>
+           <UnitSymbol type='MathML'>
+             <math xmlns='http://www.w3.org/1998/Math/MathML'>
+               <mrow>
+                 <mi mathvariant='normal'>hp</mi>
+               </mrow>
+             </math>
+           </UnitSymbol>
+         </Unit>
+       </math>
+    OUTPUT
+  end
+
+  it "deals with duplicate units" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    1 "unitsml(kg*s^-2)" xx 9 "unitsml(kg*s^-2)"
+    INPUT
+    <math xmlns='http://www.w3.org/1998/Math/MathML'>
          <mn>1</mn>
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_kg.s-2'>
@@ -128,10 +167,10 @@ RSpec.describe Asciimath2UnitsML do
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
          <mo>&#xD7;</mo>
-         <mn>812</mn>
+         <mn>9</mn>
          <mo rspace='thickmathspace'>&#x2062;</mo>
-         <mrow xref='U_NISTu1.u3e-2_1'>
-           <mi mathvariant='normal'>m</mi>
+         <mrow xref='U_kg.s-2'>
+           <mi mathvariant='normal'>kg</mi>
            <mo>&#xB7;</mo>
            <msup>
              <mrow>
@@ -143,17 +182,17 @@ RSpec.describe Asciimath2UnitsML do
              </mrow>
            </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_NISTu1.u3e-2_1' dimensionURL='#D_LT-2'>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_kg.s-2' dimensionURL='#D_MT-2'>
            <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
-           <UnitName xml:lang='en'>meter per second squared</UnitName>
+           <UnitName xml:lang='en'>kg*s^-2</UnitName>
            <UnitSymbol type='HTML'>
-             m&#xB7;s
+             kg&#xB7;s
              <sup>&#x2212;2</sup>
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
-                 <mi mathvariant='normal'>m</mi>
+                 <mi mathvariant='normal'>kg</mi>
                  <mo>&#xB7;</mo>
                  <msup>
                    <mrow>
@@ -168,15 +207,36 @@ RSpec.describe Asciimath2UnitsML do
              </math>
            </UnitSymbol>
            <RootUnits>
-             <EnumeratedRootUnit unit='meter'/>
+             <EnumeratedRootUnit unit='gram' prefix='k'/>
              <EnumeratedRootUnit unit='second' powerNumerator='-2'/>
            </RootUnits>
          </Unit>
-         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_LT-2'>
-           <Length symbol='L' powerNumerator='1'/>
+         <Prefix xmlns='http://unitsml.nist.gov/2005' prefixBase='10' prefixPower='3' xml:id='NISTp10_3'>
+           <PrefixName xml:lang='en'>kilo</PrefixName>
+           <PrefixSymbol type='ASCII'>k</PrefixSymbol>
+         </Prefix>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_MT-2'>
+           <Mass symbol='M' powerNumerator='1'/>
            <Time symbol='T' powerNumerator='-2'/>
          </Dimension>
-         <mo>&#x2212;</mo>
+       </math>
+    OUTPUT
+  end
+
+=begin
+  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)"
+INPUT
+OUTPUT
+  end
+=end
+
+  it "deals with units division" do
+    expect(xmlpp(Asciimath2UnitsML::Conv.new().Asciimath2UnitsML(<<~INPUT))).to be_equivalent_to xmlpp(<<~OUTPUT)
+    9 "unitsml(C^3*A)" + 13 "unitsml(A/C^-3)"
+INPUT
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
          <mn>9</mn>
          <mo rspace='thickmathspace'>&#x2062;</mo>
          <mrow xref='U_C3.A'>
@@ -197,7 +257,7 @@ RSpec.describe Asciimath2UnitsML do
            <UnitSymbol type='HTML'>
              C
              <sup>3</sup>
-              &#xB7;A
+             &#xB7;A
            </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -225,25 +285,56 @@ RSpec.describe Asciimath2UnitsML do
            <ElectricCurrent symbol='I' powerNumerator='4'/>
          </Dimension>
          <mo>+</mo>
-         <mn>7</mn>
+         <mn>13</mn>
          <mo rspace='thickmathspace'>&#x2062;</mo>
-         <mrow xref='U_NISTu284'>
-           <mi mathvariant='normal'>hp</mi>
+         <mrow xref='U_A/C-3'>
+           <mi mathvariant='normal'>A</mi>
+           <mo>/</mo>
+           <msup>
+             <mrow>
+               <mi mathvariant='normal'>C</mi>
+             </mrow>
+             <mrow>
+               <mo>&#x2212;</mo>
+               <mn>3</mn>
+             </mrow>
+           </msup>
          </mrow>
-         <Unit xmlns='http://unitsml.nist.gov/2005' 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>
+         <Unit xmlns='http://unitsml.nist.gov/2005' xml:id='U_A/C-3' dimensionURL='#D_T3I4'>
+           <UnitSystem name='SI' type='SI_derived' xml:lang='en-US'/>
+           <UnitName xml:lang='en'>A*C^3</UnitName>
+           <UnitSymbol type='HTML'>
+             A/C
+             <sup>&#x2212;3</sup>
+           </UnitSymbol>
            <UnitSymbol type='MathML'>
              <math xmlns='http://www.w3.org/1998/Math/MathML'>
                <mrow>
-                 <mi mathvariant='normal'>hp</mi>
+                 <mi mathvariant='normal'>A</mi>
+                 <mo>/</mo>
+                 <msup>
+                   <mrow>
+                     <mi mathvariant='normal'>C</mi>
+                   </mrow>
+                   <mrow>
+                     <mo>&#x2212;</mo>
+                     <mn>3</mn>
+                   </mrow>
+                 </msup>
                </mrow>
              </math>
            </UnitSymbol>
+           <RootUnits>
+             <EnumeratedRootUnit unit='ampere'/>
+             <EnumeratedRootUnit unit='coulomb' powerNumerator='3'/>
+           </RootUnits>
          </Unit>
+         <Dimension xmlns='http://unitsml.nist.gov/2005' xml:id='D_T3I4'>
+           <Time symbol='T' powerNumerator='3'/>
+           <ElectricCurrent symbol='I' powerNumerator='4'/>
+         </Dimension>
        </math>
-    OUTPUT
+OUTPUT
   end
 
   it "converts MathML to MatML + UnitsML" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciimath2unitsml
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -215,6 +215,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
 - Gemfile
 - LICENSE
 - README.adoc