latex-decode 0.0.10 → 0.0.11

data/Gemfile

@@ -2,6 +2,9 @@ source :rubygems
 gemspec
 
 group :development do
-	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:ruby_19]
-	gem 'ruby-debug', :platforms => [:ruby_18]
-end
+	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:mri_19]
+	gem 'ruby-debug', :platforms => [:mri_18]
+end
+
+
+gem 'unicode', '~> 0.4', :platforms => [:mri, :rbx, :mswin, :mingw]

data/features/diacritics.feature

@@ -8,7 +8,6 @@ Feature: Decode LaTeX diacritics
 
 	Scenarios: Diacritics
 		| latex   | unicode | description                                  |
-		| \\~{}   | ~       |                                              |
 		| \\\`{o} | ò       | grave accent                                 |
 		| \\\'{o} | ó       | acute accent                                 |
 		| \\^{o}  | ô       | circumflex                                   |

data/features/punctuation.feature

@@ -36,6 +36,7 @@ Feature: Decode LaTeX punctuation directives
     | -       | -       | hyphen      |
     | --      | –       | en-dash     |
     | ---     | —       | em-dash     |
+    | \\~{}   | ~       | tilde       |
 
   Scenarios: Quotation marks
     | latex   | unicode | description         |

data/features/special_characters.feature

@@ -15,6 +15,6 @@ Feature: Decode LaTeX special characters
     | \\{                  | {       |
     | \\}                  | }       |
     | \\_                  | _       |
-    | \\~{}                | ~       |
+    | \\textasciitilde{}   | ~       |
     | \\textbackslash{}    | \\      |
     | \\textasciicircum{}  | ^       |

data/latex-decode.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
   s.description = 'Decodes strings formatted in LaTeX to equivalent Unicode strings.'
   s.license     = 'GPL-3'
 
-  s.add_runtime_dependency('unicode', '~> 0.4')
-
   s.add_development_dependency('rake', '~> 0.8')
   s.add_development_dependency('bundler', '~> 1.0')
   s.add_development_dependency('rdoc', '~> 3.6')

data/lib/latex/decode.rb

@@ -17,8 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'unicode'
-
 require 'latex/decode/version'
 require 'latex/decode/compatibility'
 require 'latex/decode/base'
@@ -45,7 +43,7 @@ module LaTeX
       
       Decode::Base.strip_braces(string)
       
-      Unicode::normalize_C(string)
+      LaTeX.normalize_C(string)
     end
   end
 end

data/lib/latex/decode/accents.rb

@@ -17,7 +17,7 @@ module LaTeX
 
       @patterns = [
         ruby_18 {
-          /\\(#{ map.keys.map { |k| Regexp.escape(k) }.join('|') })\{([[:alpha:]]*)\}/ou          
+          /\\(#{ map.keys.map { |k| Regexp.escape(k) }.join('|') })\{([[:alpha:]]+)\}/ou
         } ||
         ruby_19 {
           /\\(#{ map.keys.map { |k| Regexp.escape(k) }.join('|') })\{(\p{L}\p{M}*)\}/ou

data/lib/latex/decode/compatibility.rb

@@ -18,4 +18,42 @@ else
 
   def ruby_18; false; end
   def ruby_19; yield; end
+end
+
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  
+  # Use the Java native Unicode normalizer
+  module LaTeX
+    def self.normalize_C(string)
+      java.text.Normalizer.normalize(string, java.text.Normalizer::Form::NFC).to_s
+    end
+  end
+  
+else
+
+	begin
+  	require 'unicode'
+
+    # Use the Unicode gem
+    module LaTeX
+      def self.normalize_C(string)
+        Unicode::normalize_C(string)
+      end
+    end
+	rescue LoadError
+    begin
+      require 'active_support/multibyte/chars'
+      
+      # Use ActiveSupport's normalizer
+      module LaTeX
+        def self.normalize_C(string)
+          ActiveSupport::Multibyte::Chars.new(string).normalize(:c).to_s
+        end
+      end
+    rescue LoadError
+  		fail "Failed to load unicode normalizer: please gem install unicode (or active_support)"
+    end
+	end
+
 end

data/lib/latex/decode/punctuation.rb

@@ -29,6 +29,7 @@ module LaTeX
         rangle             ⟩
         textasciicircum    ^
         textbackslash      \\
+        textasciitilde     ~
       }].freeze
 
       @symbols = Hash[*%w[

data/lib/latex/decode/version.rb

@@ -1,5 +1,5 @@
 module LaTeX
   module Decode
-    VERSION = '0.0.10'.freeze
+    VERSION = '0.0.11'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: latex-decode
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: unicode
-  requirement: &70305758476260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70305758476260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70305758475220 !ruby/object:Gem::Requirement
+  requirement: &70308628195760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70305758475220
+  version_requirements: *70308628195760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70305758473880 !ruby/object:Gem::Requirement
+  requirement: &70308628194620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70305758473880
+  version_requirements: *70308628194620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70305758472780 !ruby/object:Gem::Requirement
+  requirement: &70308628193800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *70305758472780
+  version_requirements: *70308628193800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70305758470880 !ruby/object:Gem::Requirement
+  requirement: &70308628213200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70305758470880
+  version_requirements: *70308628213200
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70305758469080 !ruby/object:Gem::Requirement
+  requirement: &70308628210800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70305758469080
+  version_requirements: *70308628210800
 description: Decodes strings formatted in LaTeX to equivalent Unicode strings.
 email:
 - http://sylvester.keil.or.at