omml2mathml 0.0.3 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45efd33145318d0b3ce1406aae50d46e3cba646d5cf9a05b661b320ab9ca2b4
-  data.tar.gz: b25769831d9c2ebc9a2168f2e4da0f9119af26139f4a35473a3109448b4cd90e
+  metadata.gz: f7ace8eb8ce776ab6bf79a84a413703233e23af57605ef4314937c8e494c1a5b
+  data.tar.gz: a7d16ba5c1036dafd44442de68559ada29024961c6af72d763266a414a9068fe
 SHA512:
-  metadata.gz: 21519f37edb4a0ffa0cf9ca70b6c013ea954c8e68ea58727018993fdc0915ac5daab2aca2e16b4d2adf39eeb4b121b5e717639b0a3f37d8f53175a7b71aeb872
-  data.tar.gz: ef15748172219598bf8b0a7bd5028de105ed79059a84a70dc4183a230fe033b592e03315f997e530541e41f535cfcd547b03f01adc13e6c9d7eafcaba6f53d8e
+  metadata.gz: 797ad140a03873d956cbc680abf370710d2d4e8a1e2844743063d10fbf6ad11dc5421cf77977e994a3ee7763d14fe0c47456fe87a92566920758dacfa6e77bc8
+  data.tar.gz: d6b4919a6941459f2ca62910c631b58cf42283d5615adbf62e4baee34752036450a3851d02a03691dc277f43b9f42eb298cf4f10161400dde6b5ea3ce328070d

data/.github/workflows/rake.yml

@@ -0,0 +1,42 @@
+# 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@v2
+        with:
+          submodules: true
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/.gitignore

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

data/.rubocop.yml

@@ -1,10 +1,12 @@
 # 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:
-  TargetRubyVersion: 2.3
-Rails:
-  Enabled: true
+  DisplayCopNames: false
+  StyleGuideCopsOnly: false
+  TargetRubyVersion: 2.4

data/README.adoc

@@ -1,9 +1,10 @@
 = omml2mathml
   
 image:https://img.shields.io/gem/v/omml2mathml.svg["Gem Version", link="https://rubygems.org/gems/omml2mathml"]
-image:https://img.shields.io/travis/metanorma/omml2mathml/master.svg["Travis Build Status", link="https://travis-ci.org/metanorma/omml2mathml"]
-image:https://ci.appveyor.com/api/projects/status/vp0jam9miy9lvftj?svg=true["Appveyor Build Status", link="https://ci.appveyor.com/project/ribose/omml2mathml"]
-image:https://codeclimate.com/github/metanorma/omml2mathml/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/omml2mathml"]
+image:https://github.com/plurimath/omml2mathml/workflows/rake/badge.svg["Build Status", link="https://github.com/plurimath/omml2mathml/actions?query=workflow%3Arake"]
+image:https://codeclimate.com/github/plurimath/omml2mathml/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/plurimath/omml2mathml"]
+image:https://img.shields.io/github/issues-pr-raw/plurimath/omml2mathml.svg["Pull Requests", link="https://github.com/plurimath/omml2mathml/pulls"]
+image:https://img.shields.io/github/commits-since/plurimath/omml2mathml/latest.svg["Commits since latest",link="https://github.com/plurimath/omml2mathml/releases"]
 
 Convert Office Math Markup to MathML
 

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.3".freeze
+  VERSION = "0.0.8".freeze
 end
 

data/omml2mathml.gemspec

@@ -14,25 +14,25 @@ Gem::Specification.new do |spec|
     This is a Ruby gem for converting Office Math Markup (OMML) into MathML within Word HTML documents.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/metanorma/omml2mathml"
+  spec.homepage      = "https://github.com/plurimath/omml2mathml"
   spec.license       = "BSD-2-Clause"
 
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "nokogiri", "~> 1.11"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   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"
 end

data/spec/omml2mathml_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Omml2Mathml do
   it "processes a document" do
     html = Omml2Mathml.convert("spec/test.html").sub(/<\?xml[^>]+>/, "").sub(/<!DOCTYPE[^>]+>/, "")
     expect(html).to be_equivalent_to <<~"OUTPUT"
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
+<html xmlns="http://www.w3.org/TR/REC-html40" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
 
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -19,11 +19,11 @@ RSpec.describe Omml2Mathml do
 <link rel="Edit-Time-Data" href="Part%201_General.fld/editdata.mso"/>
 </head>
 
-<body lang="EL" link="blue" vlink="purple" style="tab-interval:20.0pt" xml:lang="EL">
+<body lang="EL" link="blue" vlink="purple" style="tab-interval:20.0pt">
 
 <div class="WordSection3">
 
-  <p class="MsoNormal"><span lang="EN-US" style="mso-fareast-font-family:SimSun;&#10;mso-fareast-theme-font:minor-fareast;mso-ansi-language:EN-US;mso-fareast-language:&#10;ZH-CN" xml:lang="EN-US">This standard applies to the elliptic curves over the finite field </span><mml:math>
+  <p class="MsoNormal"><span lang="EN-US" style="mso-fareast-font-family:SimSun;&#10;mso-fareast-theme-font:minor-fareast;mso-ansi-language:EN-US;mso-fareast-language:&#10;ZH-CN">This standard applies to the elliptic curves over the finite field </span><mml:math>
 <mml:msub>
   <mml:mrow>
     <mml:mrow>
@@ -36,8 +36,10 @@ RSpec.describe Omml2Mathml do
     </mml:mrow>
   </mml:mrow>
 </mml:msub>
-</mml:math><span lang="EN-US" style="mso-fareast-font-family:SimSun;mso-fareast-theme-font:minor-fareast;&#10;mso-ansi-language:EN-US;mso-fareast-language:ZH-CN" xml:lang="EN-US"><span style="mso-spacerun:yes">&#xA0;</span>(the prime </span><mml:math>
-<mml:mi>p</mml:mi><mml:msup>
+</mml:math><span lang="EN-US" style="mso-fareast-font-family:SimSun;mso-fareast-theme-font:minor-fareast;&#10;mso-ansi-language:EN-US;mso-fareast-language:ZH-CN"><span style="mso-spacerun:yes">&#xA0;</span>(the prime </span><mml:math>
+<mml:mi>p</mml:mi>
+<mml:mo>&gt;</mml:mo>
+<mml:msup>
   <mml:mrow>
     <mml:mrow>
       <mml:mn>2</mml:mn>
@@ -49,7 +51,7 @@ RSpec.describe Omml2Mathml do
     </mml:mrow>
   </mml:mrow>
 </mml:msup>
-</mml:math><span lang="EN-US" style="mso-fareast-font-family:SimSun;mso-fareast-theme-font:minor-fareast;&#10;mso-ansi-language:EN-US;mso-fareast-language:ZH-CN" xml:lang="EN-US">).<p/></span></p>
+</mml:math><span lang="EN-US" style="mso-fareast-font-family:SimSun;mso-fareast-theme-font:minor-fareast;&#10;mso-ansi-language:EN-US;mso-fareast-language:ZH-CN">).<p/></span></p>
 
 </div>
 </body>

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: omml2mathml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   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
@@ -126,16 +126,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -167,22 +167,21 @@ dependencies:
 description: 'This is a Ruby gem for converting Office Math Markup (OMML) into MathML
   within Word HTML documents.
 
-'
+  '
 email:
 - open.source@ribose.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rake.yml"
+- ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/console
 - bin/rspec
 - bin/setup
@@ -195,11 +194,11 @@ files:
 - spec/omml2mathml_spec.rb
 - spec/spec_helper.rb
 - spec/test.html
-homepage: https://github.com/metanorma/omml2mathml
+homepage: https://github.com/plurimath/omml2mathml
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,16 +206,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Convert Office Math Markup to MathML
 test_files: []

data/.travis.yml

@@ -1,17 +0,0 @@
-dist: trusty
-language: ruby
-sudo: false
-
-before_install:
-  - gem install bundler -v 2.0.1
-
-rvm:
-  - 2.5
-  - 2.4
-  - 2.3
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-

data/Gemfile.lock

@@ -1,111 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omml2mathml (0.0.3)
-      nokogiri
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.0)
-    byebug (9.1.0)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    equivalent-xml (0.6.0)
-      nokogiri (>= 1.4.3)
-    ffi (1.10.0)
-    formatador (0.2.5)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    json (2.2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    nenv (0.3.0)
-    nokogiri (1.10.2)
-      mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.17.0)
-    parser (2.6.2.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-match_fuzzy (0.1.3)
-      rspec (>= 3.2)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.54.0)
-      parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    shellany (0.0.1)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
-    timecop (0.9.1)
-    unicode-display_width (1.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 2.0.1)
-  byebug (~> 9.1)
-  equivalent-xml (~> 0.6)
-  guard (~> 2.14)
-  guard-rspec (~> 4.7)
-  omml2mathml!
-  rake (~> 12.0)
-  rspec
-  rspec-match_fuzzy
-  rubocop (= 0.54.0)
-  simplecov (~> 0.15)
-  timecop (~> 0.9)
-
-BUNDLED WITH
-   2.0.1

data/appveyor.yml

@@ -1,30 +0,0 @@
-version: '{build}'
-
-environment:
-  matrix:
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: 23
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake
-