mathml2asciimath 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0bf53f8a6af53a8d414c8dc9aae0378255d64d69faeb07e359bc0e51c4caaca
-  data.tar.gz: 0174f418f60e0daee2195440e9ba963957671cf54eeb1f95808a8c7c150efbe5
+  metadata.gz: 43c4f60fbcf9b1119395d0149960d84e16746522ea840e5b57c25578b51a35b3
+  data.tar.gz: 4a5d43531774ad6ed874e023a010b51a2bb0613cbf9ce024ad29d35eb4f91662
 SHA512:
-  metadata.gz: 7b2f948572d56d2291798de4d120a439f349c3dca20c0a7a392fdbfa7e4361c1e7e406e6f151c3db82ad938a4386d3e64b2ccc3237d159263d40555c2f455b88
-  data.tar.gz: e43a9b43057bc6053d5e188463af41dd222ea812a1da32d6a6367cde91463c2295c7cce060f340564c0ef4c9f856af39a677656ff583e04f63e7eaf8ab950756
+  metadata.gz: 9855d06f3c4dafa65f336ed9f78efd3858d83d30a81a78aee3ba3f9c73d202c1bf772c13394f79940ed5451b171a8a112740d732d1c13cf10ae048b1725cb4f4
+  data.tar.gz: b5f226d83b1418a2427e53527cc7154eff5aadd75563d653f459cb56f2bccbd312b1ce75cdee163d9974b7579112616010f387cf4e1caaf123b8ae0659e41f1c

data/.github/workflows/macos.yml

@@ -1,14 +1,18 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +24,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/ubuntu.yml

@@ -1,14 +1,18 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,8 +24,20 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
           bundle exec rake
+      - name: Trigger dependent repositories
+        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
+        env:
+          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
+          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+        run: |
+          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
+          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
+          for repo in $DEPENDENT_REPOS
+          do
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY
+          done

data/.github/workflows/windows.yml

@@ -1,14 +1,18 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +25,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.2)
-    ffi (1.11.2)
+    ffi (1.12.2)
     formatador (0.2.5)
     guard (2.16.1)
       formatador (>= 0.2.4)
@@ -30,21 +30,20 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     htmlentities (4.3.4)
-    json (2.2.0)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.0.13)
+    lumberjack (1.2.4)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
     nenv (0.3.0)
-    nokogiri (1.10.7)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
@@ -53,23 +52,23 @@ GEM
     rainbow (3.0.0)
     rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-match_fuzzy (0.1.3)
       rspec (>= 3.2)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     rubocop (0.54.0)
       parallel (~> 1.10)
       parser (>= 2.5)
@@ -79,20 +78,19 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.1)
     shellany (0.0.1)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.1)
+    thor (1.0.1)
     timecop (0.9.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.1)
+  bundler
   byebug (~> 9.1)
   guard (~> 2.14)
   guard-rspec (~> 4.7)

data/README.adoc

@@ -1,8 +1,9 @@
 = mathml2asciimath
 
 image:https://img.shields.io/gem/v/mathml2asciimath.svg["Gem Version", link="https://rubygems.org/gems/mathml2asciimath"]
-image:https://img.shields.io/travis/metanorma/mathml2asciimath/master.svg["Travis Build Status", link="https://travis-ci.com/metanorma/mathml2asciimath"]
-image:https://ci.appveyor.com/api/projects/status/0vqhxs3swgl3jvwn?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/metanorma/mathml2asciimath"]
+image:https://github.com/metanorma/mathml2asciimath/workflows/ubuntu/badge.svg["Ubuntu Build Status", link="https://github.com/metanorma/mathml2asciimath/actions?query=workflow%3Aubuntu"]
+image:https://github.com/metanorma/mathml2asciimath/workflows/macos/badge.svg["OSX Build Status", link="https://github.com/metanorma/mathml2asciimath/actions?query=workflow%3Amacos"]
+image:https://github.com/metanorma/mathml2asciimath/workflows/windows/badge.svg["Windows Build Status", link="https://github.com/metanorma/mathml2asciimath/actions?query=workflow%3Awindows"]
 image:https://codeclimate.com/github/metanorma/mathml2asciimath/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/mathml2asciimath"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/mathml2asciimath.svg["Pull Requests", link="https://github.com/metanorma/mathml2asciimath/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/mathml2asciimath/latest.svg["Commits since latest",link="https://github.com/metanorma/mathml2asciimath/releases"]

data/lib/mathml2asciimath/m2a.rb

@@ -12,43 +12,44 @@ module MathML2AsciiMath
   end
 
   def self.encodechars(x)
-    x.gsub(/\u03b1/, "\\alpha").
-      gsub(/\u03b2/, "\\beta").
-      gsub(/\u03b3/, "\\gamma").
-      gsub(/\u0393/, "\\Gamma").
-      gsub(/\u03b4/, "\\delta").
-      gsub(/\u0394/, "\\Delta").
-      gsub(/\u2206/, "\\Delta").
-      gsub(/\u03b5/, "\\epsilon").
-      gsub(/\u025b/, "\\varepsilon").
-      gsub(/\u03b6/, "\\zeta").
-      gsub(/\u03b7/, "\\eta").
-      gsub(/\u03b8/, "\\theta").
-      gsub(/\u0398/, "\\Theta").
-      gsub(/\u03d1/, "\\vartheta").
-      gsub(/\u03b9/, "\\iota").
-      gsub(/\u03ba/, "\\kappa").
-      gsub(/\u03bb/, "\\lambda").
-      gsub(/\u039b/, "\\Lambda").
-      gsub(/\u03bc/, "\\mu").
-      gsub(/\u03bd/, "\\nu").
-      gsub(/\u03be/, "\\xi").
-      gsub(/\u039e/, "\\Xi").
-      gsub(/\u03c0/, "\\pi").
-      gsub(/\u03a0/, "\\Pi").
-      gsub(/\u03c1/, "\\rho").
-      gsub(/\u03c2/, "\\beta").
-      gsub(/\u03c3/, "\\sigma").
-      gsub(/\u03a3/, "\\Sigma").
-      gsub(/\u03c4/, "\\tau").
-      gsub(/\u03c5/, "\\upsilon").
-      gsub(/\u03c6/, "\\phi").
-      gsub(/\u03a6/, "\\Phi").
-      gsub(/\u03d5/, "\\varphi").
-      gsub(/\u03c7/, "\\chi").
-      gsub(/\u03c8/, "\\psi").
-      gsub(/\u03a8/, "\\Psi").
-      gsub(/\u03c9/, "\\omega").
+    x.gsub(/\u03b1/, "alpha").
+      gsub(/\u03b2/, "beta").
+      gsub(/\u03b3/, "gamma").
+      gsub(/\u0393/, "Gamma").
+      gsub(/\u03b4/, "delta").
+      gsub(/\u0394/, "Delta").
+      gsub(/\u2206/, "Delta").
+      gsub(/\u03b5/, "epsilon").
+      gsub(/\u025b/, "varepsilon").
+      gsub(/\u03b6/, "zeta").
+      gsub(/\u03b7/, "eta").
+      gsub(/\u03b8/, "theta").
+      gsub(/\u0398/, "Theta").
+      gsub(/\u03d1/, "vartheta").
+      gsub(/\u03b9/, "iota").
+      gsub(/\u03ba/, "kappa").
+      gsub(/\u03bb/, "lambda").
+      gsub(/\u039b/, "Lambda").
+      gsub(/\u03bc/, "mu").
+      gsub(/\u03bd/, "nu").
+      gsub(/\u03be/, "xi").
+      gsub(/\u039e/, "Xi").
+      gsub(/\u03c0/, "pi").
+      gsub(/\u03a0/, "Pi").
+      gsub(/\u03c1/, "rho").
+      gsub(/\u03c2/, "beta").
+      gsub(/\u03c3/, "sigma").
+      gsub(/\u03a3/, "Sigma").
+      gsub(/\u03c4/, "tau").
+      gsub(/\u03c5/, "upsilon").
+      gsub(/\u03c6/, "phi").
+      gsub(/\u03a6/, "Phi").
+      gsub(/\u03d5/, "varphi").
+      gsub(/\u03c7/, "chi").
+      gsub(/\u03c8/, "psi").
+      gsub(/\u03a8/, "Psi").
+      gsub(/\u03c9/, "omega").
+      gsub(/\u03a9/, "omega").
       gsub(/\u22c5/, "*").
       gsub(/\u2219/, "*").
       gsub(/\u00b7/, "*").
@@ -163,109 +164,142 @@ module MathML2AsciiMath
     out = ""
     if node.text?
       return encodechars(HTMLEntities.new.decode(node.text))
-    else
-      case node.name.sub(/^[^:]*:/, "")
-      when "math"
-        node.elements.each { |n| out << parse(n) }
-        return out
-      when "mrow"
-        outarr = []
-        node.children.each { |n| outarr << parse(n) }
-        out = outarr.join("")
-        if %w{mfrac msub munder munderover}.include? node.parent.name.sub(/^[^:]*:/, "")
-          out = "(#{out})"
-        end
-        return out
-      when "mfenced"
-        outarr = []
-        open = node["open"] || "("
-        close = node["close"] || ")"
-        separator = "," # TODO currently ignore the supplied separators
-        node.elements.each { |n| outarr << parse(n) }
-        out = outarr.join(separator)
-        return "#{open}#{out}#{close}"
-      when "msqrt"
-        node.children.each { |n| out << parse(n) }
-        return "sqrt(#{out})"
-      when "mfrac"
-        return "(#{parse(node.elements[0])})/(#{parse(node.elements[1])})"
-      when "msup"
-        sup = parse(node.elements[1])
-        sup = "(#{sup})" unless sup.length == 1
-        op = parse(node.elements[0]).gsub(/ $/, "")
-        return "#{op}^#{sup}"
-      when "msub"
-        sub = parse(node.elements[1])
-        sub = "(#{sub})" unless sub.length == 1
-        op = parse(node.elements[0]).gsub(/ $/, "")
-        return "#{op}_#{sub}"
-      when "munderover", "msubsup"
-        sub = parse(node.elements[1])
-        sub = "(#{sub})" unless sub.length == 1
-        sup = parse(node.elements[2])
-        sup = "(#{sup})" unless sup.length == 1
-        op = parse(node.elements[0]).gsub(/ $/, "")
-        return "#{op}_#{sub}^#{sup}"
-      when "munder"
-        elem1 = parse(node.elements[1]).sub(/^\s+/, "").sub(/\s+$/, "")
-        accent = case elem1
-                 when "\u0332" then "ul"
-                 when "\u23df" then "ubrace"
-                 else
-                   "underset"
-                 end
-        if accent == "underset"
-          return "underset(#{elem1})(#{parse(node.elements[0])})"
-        else
-          return "#{accent} #{parse(node.elements[0])}"
-        end
-      when "mover"
-        elem1 = parse(node.elements[1]).sub(/^\s+/, "").sub(/\s+$/, "")
-        accent = case elem1
-                 when "\u005e" then "hat"
-                 when "\u00af" then "bar"
-                 #when "\u2192" then "vec"
-                 when "->" then "vec"
-                 when "." then "dot"
-                 when ".." then "ddot"
-                 when "\u23de" then "obrace"
-                 else
-                   "overset"
-                 end
-        if accent == "overset"
-          return "overset(#{elem1})(#{parse(node.elements[0])})"
-        else
-          return "#{accent} #{parse(node.elements[0])}"
-        end
-      when "mtable"
-        rows = []
-        node.elements.each { |n| rows << parse(n) }
-        return "[#{rows.join(",")}]"
-      when "mtr"
-        cols = []
-        node.elements.each { |n| cols << parse(n) }
-        return "[#{cols.join(",")}]"
-      when "mtd"
-        node.elements.each { |n| out << parse(n) }
-        return "#{out}"
-      when "mn", "mtext"
-        node.children.each { |n| out << parse(n) }
-        return "#{out}"
-      when "mi"
-        # mi is not meant to have space around it, but Word is conflating operators and operands
-        node.children.each { |n| out << parse(n) }
-        out = " #{out} " if /[^a-zA-Z0-9',]|[a-z][a-z]/.match out
-        return out
-      when "mo"
-        node.children.each { |n| out << parse(n) }
-        out = " #{out} " unless node["fence"]
-        return out
-      when "mstyle"
-        node.children.each { |n| out << parse(n) }
-        return out
+    end
+
+    case node.name.sub(/^[^:]*:/, "")
+    when "math"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return outarr.join(" ")
+
+    when "annotation"
+      return ""
+
+    when "semantics"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return outarr.join(" ")
+
+    when "mrow"
+      outarr = []
+      node.children.each { |n| outarr << parse(n).strip }
+      out = outarr.join(" ")
+      if %w{mfrac msub munder munderover}.include? node.parent.name.sub(/^[^:]*:/, "")
+        out = "(#{out})"
+      end
+      return out
+
+    when "mfenced"
+      outarr = []
+      open = node["open"] || "("
+      close = node["close"] || ")"
+      separator = "," # TODO currently ignore the supplied separators
+      node.elements.each { |n| outarr << parse(n).strip }
+      out = outarr.join(separator)
+      return "#{open}#{out}#{close}"
+
+    when "msqrt"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return "sqrt(#{outarr.join(" ")})"
+
+    when "mfrac"
+      return "(#{parse(node.elements[0])})/(#{parse(node.elements[1])})"
+
+    when "msup"
+      sup = parse(node.elements[1])
+      sup = "(#{sup})" unless sup.length == 1
+      op = parse(node.elements[0]).gsub(/ $/, "")
+      return "#{op}^#{sup}"
+
+    when "msub"
+      sub = parse(node.elements[1])
+      sub = "(#{sub})" unless sub.length == 1
+      op = parse(node.elements[0]).gsub(/ $/, "")
+      return "#{op}_#{sub}"
+
+    when "munderover", "msubsup"
+      sub = parse(node.elements[1])
+      sub = "(#{sub})" unless sub.length == 1
+      sup = parse(node.elements[2])
+      sup = "(#{sup})" unless sup.length == 1
+      op = parse(node.elements[0]).gsub(/ $/, "")
+      return "#{op}_#{sub}^#{sup}"
+
+    when "munder"
+      elem1 = parse(node.elements[1]).sub(/^\s+/, "").sub(/\s+$/, "")
+      accent = case elem1
+               when "\u0332" then "ul"
+               when "\u23df" then "ubrace"
+               else
+                 "underset"
+               end
+      if accent == "underset"
+        return "underset(#{elem1})(#{parse(node.elements[0])})"
+      else
+        return "#{accent} #{parse(node.elements[0])}"
+      end
+    when "mover"
+      elem1 = parse(node.elements[1]).sub(/^\s+/, "").sub(/\s+$/, "")
+      accent = case elem1
+               when "\u005e" then "hat"
+               when "\u00af" then "bar"
+               #when "\u2192" then "vec"
+               when "->" then "vec"
+               when "." then "dot"
+               when ".." then "ddot"
+               when "\u23de" then "obrace"
+               else
+                 "overset"
+               end
+      if accent == "overset"
+        return "overset(#{elem1})(#{parse(node.elements[0])})"
       else
-        node.to_xml
+        return "#{accent} #{parse(node.elements[0])}"
       end
+
+    when "mtable"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return "[#{outarr.join(",")}]"
+
+    when "mtr"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return "[#{outarr.join(",")}]"
+
+    when "mtd"
+      outarr = []
+      node.elements.each { |n| outarr << parse(n).strip }
+      return "#{outarr.join(",")}"
+
+    when "mn", "mtext"
+      outarr = []
+      node.children.each { |n| outarr << parse(n).strip }
+      return "#{outarr.join("")}"
+
+    when "mi"
+      # mi is not meant to have space around it, but Word is conflating operators and operands
+      outarr = []
+      node.children.each { |n| outarr << parse(n).strip }
+      out = outarr.join(" ")
+      out = " #{out} " if /[^a-zA-Z0-9',]|[a-z][a-z]/.match out
+      return out
+
+    when "mo"
+      outarr = []
+      node.children.each { |n| outarr << parse(n).strip }
+      out = outarr.join(" ")
+      out = " #{out} " unless node["fence"]
+      return out
+
+    when "mstyle"
+      outarr = []
+      node.children.each { |n| outarr << parse(n).strip }
+      out = outarr.join(" ")
+    else
+      node.to_xml
+
     end
   end
 end

data/lib/mathml2asciimath/version.rb

@@ -1,4 +1,4 @@
 module MathML2AsciiMath
-  VERSION = "0.0.8".freeze
+  VERSION = "0.0.9".freeze
 end
 

data/mathml2asciimath.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "nokogiri", ">= 1.10.4"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "rspec-match_fuzzy", "~> 0.1.3"
   spec.add_development_dependency "guard", "~> 2.14"

data/spec/mathml_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe MathML2AsciiMath do
     </mstyle>
     </math>
     INPUT
-    a diamond x^2\n  + b xx x\n  + c_3
+    a diamond x^2 + b xx x + c_3
     OUTPUT
   end
 
@@ -27,7 +27,7 @@ RSpec.describe MathML2AsciiMath do
     </mrow>
     </math>
     INPUT
-    a diamond x^(2d)\n+ b xx x\n+ c_(ab)
+    a diamond x^(2d) + b xx x + c_(ab)
     OUTPUT
   end
 
@@ -105,7 +105,7 @@ RSpec.describe MathML2AsciiMath do
 </munder>
     </math>
     INPUT
-    ubrace (\nx\n+\ny\n+\nz\n)
+    ubrace ( x + y + z )
     OUTPUT
   end
 
@@ -124,7 +124,7 @@ RSpec.describe MathML2AsciiMath do
 </munder>
     </math>
     INPUT
-    ul (\nx\n+\ny\n+\nz\n)
+    ul ( x + y + z )
     OUTPUT
   end
 
@@ -143,7 +143,7 @@ RSpec.describe MathML2AsciiMath do
 </munder>
     </math>
     INPUT
-    underset(fred)((\nx\n+\ny\n+\nz\n))
+    underset(fred)(( x + y + z ))
     OUTPUT
   end
 
@@ -159,11 +159,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo> &#x23DE;</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    obrace\nx\n+\ny\n+\nz
+    obrace x + y + z
     OUTPUT
   end
 
@@ -179,11 +179,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo> &#x5e;</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    hat\nx\n+\ny\n+\nz
+    hat x + y + z
     OUTPUT
   end
 
@@ -199,11 +199,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo> &#xaf;</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    bar\nx\n+\ny\n+\nz
+    bar x + y + z
     OUTPUT
   end
 
@@ -211,7 +211,7 @@ RSpec.describe MathML2AsciiMath do
     expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
     <math xmlns="http://www.w3.org/1998/Math/MathML">
 <mover accent="true">
-  <mrow>  
+  <mrow>
     <mi> x </mi>
     <mo> + </mo>
     <mi> y </mi>
@@ -219,11 +219,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo>&#x2192;</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    vec\nx\n+\ny\n+\nz
+    vec x + y + z
     OUTPUT
   end
 
@@ -231,7 +231,7 @@ RSpec.describe MathML2AsciiMath do
     expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
     <math xmlns="http://www.w3.org/1998/Math/MathML">
 <mover accent="true">
-  <mrow>  
+  <mrow>
     <mi> x </mi>
     <mo> + </mo>
     <mi> y </mi>
@@ -239,11 +239,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo> .</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    dot\nx\n+\ny\n+\nz
+    dot x + y + z
     OUTPUT
   end
 
@@ -251,7 +251,7 @@ RSpec.describe MathML2AsciiMath do
     expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
     <math xmlns="http://www.w3.org/1998/Math/MathML">
 <mover accent="true">
-  <mrow>  
+  <mrow>
     <mi> x </mi>
     <mo> + </mo>
     <mi> y </mi>
@@ -259,11 +259,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo>..</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    ddot\nx\n+\ny\n+\nz
+    ddot x + y + z
     OUTPUT
   end
 
@@ -271,7 +271,7 @@ RSpec.describe MathML2AsciiMath do
     expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
     <math xmlns="http://www.w3.org/1998/Math/MathML">
 <mover accent="true">
-  <mrow>  
+  <mrow>
     <mi> x </mi>
     <mo> + </mo>
     <mi> y </mi>
@@ -279,11 +279,11 @@ RSpec.describe MathML2AsciiMath do
     <mi> z </mi>
   </mrow>
   <mo>fred</mo>
-</mover> 
+</mover>
 
     </math>
     INPUT
-    overset(fred)(\nx\n+\ny\n+\nz\n)
+    overset(fred)( x + y + z )
     OUTPUT
   end
 
@@ -312,12 +312,100 @@ RSpec.describe MathML2AsciiMath do
     OUTPUT
   end
 
-    it "processes some unknown MathML" do
+  it "processes <semantics> wrapping element" do
+    expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
+    <math xmlns="http://www.w3.org/1998/Math/MathML">
+      <semantics>
+        <mrow>
+          <mover accent="true">
+            <mi>&#x3BB;</mi>
+            <mo>&#xAF;</mo>
+          </mover>
+          <mo stretchy="false">(</mo>
+          <msub>
+            <mi>t</mi>
+            <mn>1</mn>
+          </msub>
+          <mo>,</mo>
+          <mtext>&#x2009;</mtext>
+          <msub>
+            <mi>t</mi>
+            <mn>2</mn>
+          </msub>
+          <mo stretchy="false">)</mo>
+        </mrow>
+      </semantics>
+    </math>
+    INPUT
+    bar lambda ( t_1 , t_2 )
+    OUTPUT
+  end
+
+  it "processes <math> without xmlns" do
+    expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
+    <math>
+      <semantics>
+        <mrow>
+          <mover accent="true">
+            <mi>z</mi>
+            <mo>&#xAF;</mo>
+          </mover>
+          <mo stretchy="false">(</mo>
+          <msub>
+            <mi>t</mi>
+            <mn>1</mn>
+          </msub>
+          <mo>,</mo>
+          <mtext>&#x2009;</mtext>
+          <msub>
+            <mi>t</mi>
+            <mn>2</mn>
+          </msub>
+          <mo stretchy="false">)</mo>
+        </mrow>
+      </semantics>
+    </math>
+    INPUT
+    bar z ( t_1 , t_2 )
+    OUTPUT
+  end
+
+  it "processes and skips <annotation> element" do
+    expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
+    <math>
+      <semantics>
+        <mrow>
+          <mover accent="true">
+            <mi>z</mi>
+            <mo>&#xAF;</mo>
+          </mover>
+          <mo stretchy="false">(</mo>
+          <msub>
+            <mi>t</mi>
+            <mn>1</mn>
+          </msub>
+          <mo>,</mo>
+          <mtext>&#x2009;</mtext>
+          <msub>
+            <mi>t</mi>
+            <mn>2</mn>
+          </msub>
+          <mo stretchy="false">)</mo>
+        </mrow>
+        <annotation encoding="MathType-MTEF">MathType@MTEF@5@5@+=feaagCart1ev2aaatCvAUfeBSjuyZL2yd9gzLbvyNv2CaerbuLwBLnhiov2DGi1BTfMBaeXatLxBI9gBaerbbjxAHXgarqqtubsr4rNCHbGeaGqipG0dh9qqWrVepG0dbbL8F4rqqrVepeea0xe9LqFf0xc9q8qqaqFn0lXdHiVcFbIOFHK8Feea0dXdar=Jb9hs0dXdHuk9fr=xfr=xfrpeWZqaaeqabiGaciGacaqadmaadaqaaqaaaOqaaiqadQhagaqeaiaacIcacaWG0bWaaSbaaSqaaiaaigdaaeqaaOGaaiilaiaaysW7caWG0bWaaSbaaSqaaiaaikdaaeqaaOGaaiykaaaa@3DCE@</annotation>
+      </semantics>
+    </math>
+    INPUT
+    bar z ( t_1 , t_2 )
+    OUTPUT
+  end
+
+  it "processes some unknown MathML" do
     expect(MathML2AsciiMath.m2a(<<~INPUT)).to match_fuzzy <<~OUTPUT
     <math xmlns="http://www.w3.org/1998/Math/MathML">
     <mrow>
   <mi> x </mi>
-  <mo> + </mo> 
+  <mo> + </mo>
   <mphantom>
     <mi> y </mi>
     <mo> + </mo>
@@ -326,7 +414,7 @@ RSpec.describe MathML2AsciiMath do
 </mrow>
     </math>
     INPUT
-    x\n+\n<mphantom>\n<mi> y </mi>\n<mo> + </mo>\n</mphantom>\nz
+    x + <mphantom>\n<mi> y </mi>\n<mo> + </mo>\n</mphantom> z
     OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathml2asciimath
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -227,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Convert MathML to AsciiMath