omml2mathml 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfa1c54f848c3d29efd1dcc85e89732cdbf329aa5dfb0c49d189518d02782a60
-  data.tar.gz: aa652ce2c52abb1da02ef133418c1047151bbfb4c24d5d94cfaa958432035aa4
+  metadata.gz: d8d3157cca03b596ae40b3f9d7712ee732b84e4ef8fe4146d1f5cb3f8ca16730
+  data.tar.gz: d127daebb8555da2fe48d72b990967003963302f9aa5a68f3c1b4b0182dfae4e
 SHA512:
-  metadata.gz: c088a75c2d0ba7567c01c72be1f69a6a2e41801afb942c0092a8a00788a2caa54450770f1e52b48e775be022292e43e3d9eac376329876dfbdaf5659005b5d47
-  data.tar.gz: 4f3a225688003012c229a31c5c74733fe1edc96c18bc568541e0e7f37edad9c3531bca8ac7ee1c07a4adc08b991216d224988295a5e90ae07aa8bcd7cf961fc7
+  metadata.gz: 187e5d2d4966941fd5856898b9b243329747d28277105d0f1aabfefed913628e65d97c1d1ea4c89e2cd1f88391e0335ecb47d5eaabe488562f952a468a497ef6
+  data.tar.gz: 1766b0341e0f43919f88fc05adb4b61326124563545bc3a5f3d82502eaaafd0486a45ff5f83a0533c348f779195e44b2557116913ea35153f9173c5c512e5907

data/.travis.yml

@@ -1,16 +1,16 @@
-dist: trusty
 language: ruby
-sudo: false
-
-before_install:
-  - gem install bundler -v 2.0.1
-
+cache: bundler
+os:
+- linux
+- osx
 rvm:
-  - 2.5
-  - 2.4
-  - 2.3
-  - ruby-head
-
+- 2.5
+- 2.4
+- 2.3
+- ruby-head
+before_install:
+- gem install bundler -v 2.0.1
+- bundle update
 matrix:
   allow_failures:
     - rvm: ruby-head

data/lib/omml2mathml/convert.rb

@@ -132,7 +132,7 @@ zeroWid
 
   @mathml = {}
   @tags.each do |t| 
-    @mathml["m_#{t.downcase}"] = "m:#{t}" 
+    @mathml["m_#{t.downcase}"] = t
   end
 
     html = Nokogiri::HTML.parse(File.read(filename, encoding: "utf-8").
@@ -155,26 +155,29 @@ zeroWid
       end
     end
     xml = Nokogiri::XML(html.to_xhtml)
+    ns = xml.root.add_namespace 'm', "http://schemas.microsoft.com/office/2004/12/omml"
     xml.traverse do |t|
       if t.element? && @mathml.has_key?(t.name)
         t.name = @mathml[t.name]
+        t.namespace = ns
       end
     end
     #xml.xpath("//xmlns:link | //xmlns:style | //*[@class = 'MsoToc1'] | //*[@class = 'MsoToc2'] |//*[@class = 'MsoToc3'] |//*[@class = 'MsoToc4'] |//*[@class = 'MsoToc5'] |//*[@class = 'MsoToc6'] |//*[@class = 'MsoToc7'] |//*[@class = 'MsoToc8'] |//*[@class = 'MsoToc9'] ").each { |x| x.remove }
-    xml.xpath("//*").each do |x|
-      if x.name == "m:oMath" || x.name == "m:oMathPara"
-        out = @xslt.transform(Nokogiri::XML(x.to_xml.sub(/<m:(oMath|oMathPara)>/,"<m:\\1 xmlns:m='http://schemas.openxmlformats.org/officeDocument/2006/math'>")))
-        mml = out.to_xml.gsub(/<\?xml[^>]+>/, '').
-          gsub(%r{<([^:/! >]+ xmlns="http://www.w3.org/1998/Math/MathML")},
-               "<mml:\\1").
-          gsub(%r{<([^:/!>]+)>}, "<mml:\\1>").
-          gsub(%r{</([^:/!>]+)>}, "</mml:\\1>").
-          gsub(%r{ xmlns="http://www.w3.org/1998/Math/MathML"}, "").
-          gsub(%r{ xmlns:mml="http://www.w3.org/1998/Math/MathML"}, "").
-          gsub(%r{ xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"}, "").
-          gsub(%r{ xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"}, "")
-        x.replace("<mml:math>#{mml}</mml:math>")
-      end
+    xml.xpath("//*[local-name()='oMath' or local-name()='oMathPara']").each do |x|
+      # prepare input: delete xmlns & change
+      input = Nokogiri::XML(x.to_xml.sub(/<m:(oMath|oMathPara)>/,
+                                         "<m:\\1 xmlns:m='http://schemas.openxmlformats.org/officeDocument/2006/math'>"))
+      out = @xslt.transform(input)
+      mml = out.to_xml.gsub(/<\?xml[^>]+>/, '').
+        gsub(%r{<([^:/! >]+ xmlns="http://www.w3.org/1998/Math/MathML")},
+             "<mml:\\1").
+        gsub(%r{<([^:/!>]+)>}, "<mml:\\1>").
+        gsub(%r{</([^:/!>]+)>}, "</mml:\\1>").
+        gsub(%r{ xmlns="http://www.w3.org/1998/Math/MathML"}, "").
+        gsub(%r{ xmlns:mml="http://www.w3.org/1998/Math/MathML"}, "").
+        gsub(%r{ xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"}, "").
+        gsub(%r{ xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"}, "")
+      x.replace("<mml:math>#{mml}</mml:math>")
     end
     xml.to_s
   end

data/lib/omml2mathml/version.rb

@@ -1,4 +1,4 @@
 module Omml2Mathml
-  VERSION = "0.0.4".freeze
+  VERSION = "0.0.5".freeze
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omml2mathml
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ribose Inc.