math-to-itex 0.2.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f05a939cba1dbfa2747fd5c6693f796eb17bec31
-  data.tar.gz: 30d01cfd7e0f33cb1ac0923331b1b5ac44c8e645
+SHA256:
+  metadata.gz: a0c69c903e672a4eca3caabc18d23eb78d927f56b5503514a830f8c216b76810
+  data.tar.gz: a84b98f126d570ece86dcfdf38dc406f4558c5c55f0ef481a4529047116ef041
 SHA512:
-  metadata.gz: 6838353e1d7abd41c25a40177e3d13717ec55056cb67a648204f828fa3b52bf427134c60c44dd11a979ffa7f81fc2967dda7648ef965fe900bf726eb06786883
-  data.tar.gz: 63dfc3d77457092d46078c8860dde0a2c6d1d367bfc592b685d6585cb2d92894a9608ef5855f6d647f5d410c9d0b8cbbaba2886a10f437aa17184ce7f2e002cf
+  metadata.gz: ef8b104005f0e3e04125a2e442ef70d6a555af985a3deab1af6d08e815ba0eb979ccb8ffd548f283fd6324748b56ebba885a2baa36f19fbdd502ae1dc1c45603
+  data.tar.gz: 90a6ef1d7c7df5750481e68201c3a3b53bfc7e8f4716df9a106671943a5a1ef9be0530efc58330cd0b94602aaf872d4aa33e0478237fae294b4b7a814b90e8af

data/README.md

@@ -57,7 +57,7 @@ Currently, the following formats are supported:
 | inline formulas | display formulas |
 | ------------- |-------------|
 | `$...$`      | `$$...$$`
-| `(...)`      | `[...]`
+| `\(...\)`      | `\[...\]`
 |        | `\begin{equation}...\end{equation}`
 
 ## More math stuff

data/Rakefile

@@ -1,11 +1,17 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs << 'test'
   t.test_files = FileList['test/**/*_test.rb']
   t.verbose = true
 end
 
-task :default => [:test]
+task default: [:test]
+
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new(:rubocop)

data/lib/math-to-itex.rb

@@ -1,43 +1,57 @@
-require "math-to-itex/parser"
-require "math-to-itex/support_parens"
-require "math-to-itex/version"
+# frozen_string_literal: true
+
+require 'math-to-itex/parser'
+require 'math-to-itex/version'
 
 module MathToItex
+  class Math
+    def initialize(string)
+      @string = string
+    end
 
-  def self.parens(string)
-    @string = string
-    self
-  end
+    def convert(&block)
+      @string.gsub(MathToItex::Parser::REGEX) do |maths|
+        if /\A\$(?!\$)/.match?(maths)
+          just_maths = maths[1..-2]
+          type = :inline
+        elsif /^\\\((?!\\\()/.match?(maths)
+          just_maths = maths[2..-3]
+          type = :inline
+        elsif /\A\$\$/.match?(maths)
+          just_maths = maths[2..-3]
+          type = :display
+        elsif /\A\\\[(?!\\\[)/.match?(maths)
+          just_maths = maths[2..-3]
+          type = :display
+        elsif /\A\\begin{equation}(?!\\begin{equation})/.match?(maths)
+          just_maths = maths[16..-15]
+          type = :display
+        elsif /\A\\begin{math}(?!\\begin{math})/.match?(maths)
+          just_maths = maths[12..-11]
+          type = :inline
+        elsif /\A\\begin{displaymath}(?!\\begin{displaymath})/.match?(maths)
+          just_maths = maths[19..-18]
+          type = :display
+        elsif /\A\\begin{#{MathToItex::Parser::JOINED_ENVIRONMENTS}}(?!\\begin{#{MathToItex::Parser::JOINED_ENVIRONMENTS}})/.match?(maths)
+          just_maths = maths
+          type = :display
+        end
 
-  def self.convert(&block)
-    @string.gsub(MathToItex::Parser::REGEX) do |maths|
-      if maths =~ /\A\$(?!\$)/
-        just_maths = maths[1..-2]
-        type = :inline
-      elsif maths =~ /^\\\((?!\\\()/
-        just_maths = maths[2..-3]
-        type = :inline
-      elsif maths =~ /\A\$\$/
-        just_maths = maths[2..-3]
-        type = :display
-      elsif maths =~ /\A\\\[(?!\\\[)/
-        just_maths = maths[2..-3]
-        type = :display
-      elsif maths =~ /\A\\begin(?!\\begin)/
-        just_maths = maths[16..-15]
-        type = :display
-      end
+        # this is the format itex2MML expects
+        all_maths = if type == :inline
+                      "$#{just_maths}$"
+                    else
+                      "$$#{just_maths}$$"
+                    end
 
-      # this is the format itex2MML expects
-      if type == :inline
-        just_maths = "$#{just_maths}$"
-      else
-        just_maths = "$$#{just_maths}$$"
-      end
+        next(all_maths) if block.nil?
 
-      next(just_maths) if block.nil?
-
-      yield just_maths, type
+        yield all_maths, type, just_maths
+      end
     end
   end
 end
+
+def MathToItex(string)
+  MathToItex::Math.new(string)
+end

data/lib/math-to-itex/parser.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module MathToItex
   class Parser
+    ENVIRONMENTS = %w[align align\* alignat alignat\* aligned alignedat array Bmatrix bmatrix cases displaymath eqnarray eqnarray\* equation equation\* gather gather\* gathered math matrix multline multline\* pmatrix smallmatrix split subarray svg Vmatrix vmatrix].freeze
+    JOINED_ENVIRONMENTS = ENVIRONMENTS.join('|')
     # https://stackoverflow.com/questions/14182879/regex-to-match-latex-equations
     REGEX = /
     (?<!\\)    # negative look-behind to make sure start is not escaped
@@ -12,19 +16,19 @@ module MathToItex
         # group 3, match escaped bracket
         (\\\[)|
         # group 4, match begin equation
-        (\\begin\{equation\})
+        \\begin\{(#{JOINED_ENVIRONMENTS})\}
     )
     (.*?(\g<1>)?.*?)  # match everything in between including nested LaTeX equations
     (?<!\\)  # negative look-behind to make sure end is not escaped
         # if group 1 was start, match \1
-        (?(1)(?<!\$)\1(?!\$)|
+        (?(1)(?<!\$)\1(?!\$|\d)|
         # if group 2 was start, escaped parenthesis is end
         (?(2)\\\)|
         # if group 3 was start, escaped bracket is end
         (?(3)\\\]|
         # otherwise group 4 was start, match end equation
-        \\end\{equation\}
+        \\end\{\4\}
     )))
-    /x
+    /xm.freeze
   end
 end

data/lib/math-to-itex/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MathToItex
-  VERSION = "0.2.0"
+  VERSION = '0.6.1'
 end

data/math-to-itex.gemspec

@@ -1,24 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'math-to-itex/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "math-to-itex"
+  spec.name          = 'math-to-itex'
   spec.version       = MathToItex::VERSION
-  spec.authors       = ["Garen Torikian"]
-  spec.email         = ["gjtorikian@gmail.com"]
-  spec.summary       = %q{Turn math syntaxes into itex equations.}
-  spec.description   = %q{Pass in a string and turn all math equations into itex equations. Or, pass in a block manipulate multiple matches.}
-  spec.homepage      = "https://github.com/gjtorikian/math-to-itex"
-  spec.license       = "MIT"
+  spec.authors       = ['Garen Torikian']
+  spec.email         = ['gjtorikian@gmail.com']
+  spec.summary       = 'Turn math syntaxes into itex equations.'
+  spec.description   = 'Pass in a string and turn all math equations into itex equations. Or, pass in a block manipulate multiple matches.'
+  spec.homepage      = 'https://github.com/gjtorikian/math-to-itex'
+  spec.license       = 'MIT'
   spec.required_ruby_version = '>= 2.0'
 
-  spec.files         = %w(LICENSE.txt README.md Rakefile math-to-itex.gemspec)
-  spec.files         += Dir.glob("lib/**/*")
+  spec.files = %w[LICENSE.txt README.md Rakefile math-to-itex.gemspec]
+  spec.files += Dir.glob('lib/**/*')
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-standard'
+  spec.add_development_dependency 'test-unit'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: math-to-itex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Garen Torikian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pass in a string and turn all math equations into itex equations. Or,
   pass in a block manipulate multiple matches.
 email:
@@ -37,7 +79,6 @@ files:
 - Rakefile
 - lib/math-to-itex.rb
 - lib/math-to-itex/parser.rb
-- lib/math-to-itex/support_parens.rb
 - lib/math-to-itex/version.rb
 - math-to-itex.gemspec
 homepage: https://github.com/gjtorikian/math-to-itex
@@ -59,8 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Turn math syntaxes into itex equations.

data/lib/math-to-itex/support_parens.rb

@@ -1,15 +0,0 @@
-# from http://coderrr.wordpress.com/2008/11/30/overloading-the-parenthesis-operator-in-ruby/
-
-class Object
-  alias_method :orig_method_missing, :method_missing
-
-  def method_missing(m, *a, &b)
-    klass = begin
-      (self.is_a?(Module) ? self : self.class).const_get(m)
-    rescue NameError
-    end
-
-    return klass.send(:parens, *a, &b)  if klass.respond_to? :parens
-    orig_method_missing m, *a, &b
-  end
-end