latex-decode 0.1.0-java → 0.1.1-java

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
+bundler_args: --without debug
 rvm:
   - 1.9.3
   - 1.9.2
   - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
+#  - rbx-18mode
   - rbx-19mode
   - ruby-head
   - jruby-head
@@ -16,7 +17,3 @@ notifications:
     - sk@semicolon.at
   on_success: change
   on_failure: always
-matrix:
-  allow_failures:
-    rvm:
-      - rbx-18mode

data/Gemfile

@@ -1,11 +1,17 @@
 source 'https://rubygems.org'
 gemspec
 
-group :development do
-	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:mri_19]
-	gem 'ruby-debug', :platforms => [:mri_18]
+group :test do
+  gem 'rake'
+  gem 'rspec', '~> 2.13'
+  gem 'cucumber', '~> 1.2'
 end
 
-gem 'rake', :groups => [:test, :development]
+group :debug do
+	gem 'debugger', :platforms => [:mri_19, :mri_20]
+	gem 'ruby-debug', :platforms => [:mri_18]
+end
 
 gem 'unicode', '~> 0.4', :platforms => [:mri, :rbx, :mswin, :mingw]
+
+gem 'ritex', '~> 1.0.1'

data/features/maths.feature

@@ -0,0 +1,9 @@
+# Feature: Convert LaTeX maths to MathML
+#   As a maths-inclined hacker who works with LaTeX
+#   I want to convert LaTeX maths to MathML
+# 
+#   Scenario: Inline maths environment
+#     When I decode the string '$I_{S}A$'
+#     Then the result should be '<msub><mi>I</mi><mrow><mi>S</mi></mrow></msub><mi>A</mi>'
+#     When I decode the string '\underline{firstName LastName$3^g$}'
+#     Then the result should be ''

data/features/non-latex.feature

@@ -1,6 +1,6 @@
 Feature: Keep non-LaTeX markup as it is
   As a hacker who works with LaTeX
-  I want to be preserve non-LaTeX text as it is
+  I want to preserve non-LaTeX text as it is
 
   Scenario: Standalone escape characters
     When I decode the string '\\'

data/features/special_characters.feature

@@ -11,6 +11,7 @@ Feature: Decode LaTeX special characters
     | \\\&                 | &       |
     | \\#                  | #       |
     | \\$                  | $       |
+    | \\;                  | ;       |
     | \\%                  | %       |
     | \\{                  | {       |
     | \\}                  | }       |

data/features/support/env.rb

@@ -1 +1,7 @@
-require 'latex/decode'
+begin
+  require 'debugger'
+rescue LoadError
+  # ignore
+end
+  
+require 'latex/decode'

data/latex-decode.gemspec

@@ -21,10 +21,6 @@ Gem::Specification.new do |s|
     s.platform    = 'ruby'
   end
 
-  s.add_development_dependency('bundler', '~> 1.0')
-  s.add_development_dependency('rspec', '~> 2.6')
-  s.add_development_dependency('cucumber', "~> 1.0")
-
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables  = []

data/lib/latex/decode.rb

@@ -1,18 +1,18 @@
 #--
 # LaTeX::Decode
-# Copyright (C) 2011 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2011-2013 Sylvester Keil <sylvester.keil.or.at>
 # Copyright (C) 2010 François Charette
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
@@ -23,26 +23,29 @@ require 'latex/decode/base'
 
 require 'latex/decode/accents'
 require 'latex/decode/diacritics'
+require 'latex/decode/maths'
 require 'latex/decode/punctuation'
 require 'latex/decode/symbols'
 
 module LaTeX
-  
+
   class << self
     def decode (string)
       return string unless string.respond_to?(:to_s)
 
       string = string.is_a?(String) ? string.dup : string.to_s
-      
+
       Decode::Base.normalize(string)
-      
+
+      Decode::Maths.decode!(string)
+
       Decode::Accents.decode!(string)
       Decode::Diacritics.decode!(string)
       Decode::Punctuation.decode!(string)
       Decode::Symbols.decode!(string)
-      
+
       Decode::Base.strip_braces(string)
-      
+
       LaTeX.normalize_C(string)
     end
   end

data/lib/latex/decode/base.rb

@@ -20,7 +20,6 @@ module LaTeX
         end
         
         def decode! (string)
-          puts name unless patterns
           patterns.each do |pattern|
             string.gsub!(pattern) { |m| [$2,map[$1],$3].compact.join }
           end

data/lib/latex/decode/compatibility.rb

@@ -14,8 +14,8 @@ else
 
   module LaTeX
     def self.to_unicode(string)
-			string
-		end
+      string
+    end
   end
 
   def ruby_18; false; end
@@ -33,9 +33,8 @@ if RUBY_PLATFORM == 'java'
   end
   
 else
-
-	begin
-  	require 'unicode'
+  begin
+    require 'unicode'
 
     # Use the Unicode gem
     module LaTeX
@@ -43,7 +42,7 @@ else
         Unicode::normalize_C(string)
       end
     end
-	rescue LoadError
+  rescue LoadError
     begin
       require 'active_support/multibyte/chars'
       
@@ -54,8 +53,37 @@ else
         end
       end
     rescue LoadError
-  		fail "Failed to load unicode normalizer: please gem install unicode (or active_support)"
+      fail "Failed to load unicode normalizer: please gem install unicode (or active_support)"
+    end
+  end
+end
+
+module LaTeX
+  begin
+    require 'ritex'
+
+    def self.ritex
+      Ritex::Parser.new(:mathml)
     end
-	end
 
-end
+    def self.to_math_ml(string)
+      ritex.parse string, :nowrap => true, :display => false
+    end
+
+  rescue LoadError
+    begin
+      require 'math_ml'
+      
+      def self.to_math_ml(string)
+        MathML::String.mathml_latex_parser.parse(string, false)
+      end
+
+    rescue LoadError
+      # No MathML conversion
+
+      def self.to_math_ml(string)
+        string
+      end
+    end
+  end
+end

data/lib/latex/decode/maths.rb

@@ -0,0 +1,21 @@
+module LaTeX
+  module Decode
+    
+    class Maths < Decoder
+      @patterns = [
+        /\$([^\$]+)\$/
+      ].freeze
+      
+      def self.decode! (string)
+        patterns.each do |pattern|
+          string.gsub!(pattern) do
+            LaTeX.to_math_ml($1)
+          end
+        end
+        string
+      end
+
+    end
+
+  end
+end

data/lib/latex/decode/punctuation.rb

@@ -47,7 +47,7 @@ module LaTeX
       @patterns = [
         /\\(#{ @macros.keys.map { |k| Regexp.escape(k) }.compact.join('|') })(?:\{\}|\s+|\b|$)/ou,
         /(-+|`{1,2}|'{1,2})/,
-        /()\\([$%#_&])(\{\})?/,
+        /()\\([$%;#_&])(\{\})?/,
         /()\\(~)\{\}/
       ].freeze
       

data/lib/latex/decode/version.rb

@@ -1,5 +1,5 @@
 module LaTeX
   module Decode
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.1.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: latex-decode
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease:
 platform: java
 authors:
@@ -9,56 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  prerelease: false
-  type: :development
+date: 2013-05-06 00:00:00.000000000 Z
+dependencies: []
 description: Decodes strings formatted in LaTeX to equivalent Unicode strings.
 email:
 - http://sylvester.keil.or.at
@@ -77,6 +29,7 @@ files:
 - cucumber.yml
 - features/brackets.feature
 - features/diacritics.feature
+- features/maths.feature
 - features/non-latex.feature
 - features/punctuation.feature
 - features/special_characters.feature
@@ -89,6 +42,7 @@ files:
 - lib/latex/decode/base.rb
 - lib/latex/decode/compatibility.rb
 - lib/latex/decode/diacritics.rb
+- lib/latex/decode/maths.rb
 - lib/latex/decode/punctuation.rb
 - lib/latex/decode/symbols.rb
 - lib/latex/decode/version.rb
@@ -129,6 +83,7 @@ summary: Decodes LaTeX to Unicode.
 test_files:
 - features/brackets.feature
 - features/diacritics.feature
+- features/maths.feature
 - features/non-latex.feature
 - features/punctuation.feature
 - features/special_characters.feature