omml2mathml 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17247f910432e00811501068633cf13b08608f94b6f9fd292b4ba890850f6c96
-  data.tar.gz: 7a9fca5bb1669e55a5f099652de29d316162498a3ec522aa93c3d48f1c684151
+  metadata.gz: a43e81376b59d50a063fee2bba22d0c8389be9815aa9c8b7ab8b5b7ba8db0ea4
+  data.tar.gz: 9a47fa58de802b21d87f9ce3209bacdb53f4a89a3fed825f86c2bc9840f44e75
 SHA512:
-  metadata.gz: '069bc912bdc98d86feaddcdc355604b4c8279ca3290467961e196db8fe2c80b369586366ac58c19bafc71f1fe3f1ff206f223f350850df0609a09525211070eb'
-  data.tar.gz: 38b3f348a5ca4f3078a4cf96b232346801ff224689b2bf78a4de00e9cd6b301dca6d02414cef18ce4787e8d8dd559f7a1d89190f39ec9c8f29851438fe8e45fa
+  metadata.gz: d2fad476725d69a5efac5468bc73e9b063374f7741a9599d33fc77e7e508f667f15928e134c17b30044bf792d523ee702cc4b62a79dae6dee2935da45254ecb8
+  data.tar.gz: 49e1f30ffeef309e521549fb5832d969de61e788274ff85ab95a2992d643278fb2c6ae03a525d4dca62fe33075d32245dbdede78d9f6f3cf8740077816d79a8d

data/.github/workflows/rake.yml

@@ -10,23 +10,6 @@ on:
 
 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: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    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
+    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/lib/omml2mathml/convert.rb

@@ -2,151 +2,157 @@ require "nokogiri"
 
 module Omml2Mathml
   module_function
+
   def convert(filename)
-  @tags = %w{
-acc
-accPr
-aln
-alnScr
-argPr
-argSz
-bar
-barPr
-baseJc
-begChr
-borderBox
-borderBoxPr
-box
-boxPr
-brk
-brkBin
-brkBinSub
-cGp
-cGpRule
-chr
-count
-cSp
-ctrlPr
-d
-defJc
-deg
-degHide
-den
-diff
-dispDef
-dPr
-e
-endChr
-eqArr
-eqArrPr
-f
-fName
-fPr
-func
-funcPr
-groupChr
-groupChrPr
-grow
-hideBot
-hideLeft
-hideRight
-hideTop
-interSp
-intLim
-intraSp
-jc
-lim
-limLoc
-limLow
-limLowPr
-limUpp
-limUppPr
-lit
-lMargin
-m
-mathFont
-mathPr
-maxDist
-mc
-mcJc
-mcPr
-mcs
-mPr
-mr
-nary
-naryLim
-naryPr
-noBreak
-nor
-num
-objDist
-oMath
-oMathPara
-oMathParaPr
-opEmu
-phant
-phantPr
-plcHide
-pos
-postSp
-preSp
-r
-rad
-radPr
-rMargin
-rPr
-rSp
-rSpRule
-scr
-sepChr
-show
-shp
-smallFrac
-sPre
-sPrePr
-sSub
-sSubPr
-sSubSup
-sSubSupPr
-sSup
-sSupPr
-strikeBLTR
-strikeH
-strikeTLBR
-strikeV
-sty
-sub
-subHide
-sup
-supHide
-t
-transp
-type
-vertJc
-wrapIndent
-wrapRight
-zeroAsc
-zeroDesc
-zeroWid
-  }
+    @tags = %w{
+      acc
+      accPr
+      aln
+      alnScr
+      argPr
+      argSz
+      bar
+      barPr
+      baseJc
+      begChr
+      borderBox
+      borderBoxPr
+      box
+      boxPr
+      brk
+      brkBin
+      brkBinSub
+      cGp
+      cGpRule
+      chr
+      count
+      cSp
+      ctrlPr
+      d
+      defJc
+      deg
+      degHide
+      den
+      diff
+      dispDef
+      dPr
+      e
+      endChr
+      eqArr
+      eqArrPr
+      f
+      fName
+      fPr
+      func
+      funcPr
+      groupChr
+      groupChrPr
+      grow
+      hideBot
+      hideLeft
+      hideRight
+      hideTop
+      interSp
+      intLim
+      intraSp
+      jc
+      lim
+      limLoc
+      limLow
+      limLowPr
+      limUpp
+      limUppPr
+      lit
+      lMargin
+      m
+      mathFont
+      mathPr
+      maxDist
+      mc
+      mcJc
+      mcPr
+      mcs
+      mPr
+      mr
+      nary
+      naryLim
+      naryPr
+      noBreak
+      nor
+      num
+      objDist
+      oMath
+      oMathPara
+      oMathParaPr
+      opEmu
+      phant
+      phantPr
+      plcHide
+      pos
+      postSp
+      preSp
+      r
+      rad
+      radPr
+      rMargin
+      rPr
+      rSp
+      rSpRule
+      scr
+      sepChr
+      show
+      shp
+      smallFrac
+      sPre
+      sPrePr
+      sSub
+      sSubPr
+      sSubSup
+      sSubSupPr
+      sSup
+      sSupPr
+      strikeBLTR
+      strikeH
+      strikeTLBR
+      strikeV
+      sty
+      sub
+      subHide
+      sup
+      supHide
+      t
+      transp
+      type
+      vertJc
+      wrapIndent
+      wrapRight
+      zeroAsc
+      zeroDesc
+      zeroWid
+    }
 
-  @mathml = {}
-  @tags.each do |t| 
-    @mathml["m_#{t.downcase}"] = t
-  end
+    @mathml = {}
+    @tags.each do |t|
+      @mathml["m_#{t.downcase}"] = t
+    end
 
-    html = Nokogiri::HTML.parse(File.read(filename, encoding: "utf-8").
-                                gsub(/\r/, "").gsub(/<m:/, "<m_").
-                                gsub(/<\/m:/, "</m_").
-                                gsub(/<!\[if !msEquation\]>/,
-                                     "<!--if !msEquation-->"))
-    @xslt = Nokogiri::XSLT(File.open(File.join(File.dirname(__FILE__), "xhtml-mathml.xsl"), "rb"))
+    html = Nokogiri::HTML.parse(File.read(filename, encoding: "utf-8")
+                                .gsub(/\r/, "").gsub(/<m:/, "<m_")
+                                .gsub(/<\/m:/, "</m_")
+      .gsub(/<!\[endif\]>/, "<!--endif-->")
+      .gsub(/<!\[endif\]-->/, "<!--endif-- -->")
+                                .gsub(/<!\[if !msEquation\]>/,
+                                      "<!--if !msEquation-->"))
+    @xslt = Nokogiri::XSLT(File.open(
+                             File.join(File.dirname(__FILE__),
+                                       "xhtml-mathml.xsl"), "rb"
+                           ))
     html.traverse do |n|
       if n.comment?
-        if /^\[if gte msEquation 12\]>/.match n.text 
-          n.replace(n.text.sub(/\[if gte msEquation 12\]>/, "").
-                    sub(/<!\[endif\]/, ""))
-        elsif /^if !msEquation/.match n.text
+        if /^\[if gte msEquation 12\]>/.match? n.text
+          n.replace(n.text.sub(/\[if gte msEquation 12\]>/, "")
+                    .sub(/<!--endif-->/, ""))
+        elsif /^if !msEquation/.match? n.text
           n.next.remove
           n.remove
         else
@@ -155,28 +161,28 @@ zeroWid
       end
     end
     xml = Nokogiri::XML(html.to_xhtml)
-    ns = xml.root.add_namespace 'm', "http://schemas.microsoft.com/office/2004/12/omml"
+    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("//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("//*[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"}, "")
+      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

data/lib/omml2mathml/version.rb

@@ -1,4 +1,4 @@
 module Omml2Mathml
-  VERSION = "0.0.11".freeze
+  VERSION = "0.0.12".freeze
 end
 

data/omml2mathml.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "nokogiri", "~> 1.12"
+  spec.add_dependency "nokogiri", "~> 1"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omml2mathml
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: Convert Office Math Markup to MathML