bibtex-ruby 4.0.8 → 4.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d64317001625640bf064c17d4887b6b928856de
-  data.tar.gz: 50cb45e9195303203aebc75d80e47cd854faef6b
+  metadata.gz: 2f2055578c69cdfb2aa719688639882a4d68932a
+  data.tar.gz: 8c7bd4bd76d72e4ed17ce9389cfb4909021295b9
 SHA512:
-  metadata.gz: 022b85f39d311a2eeae7f4e442ab01f221b8f80f6b8db30802626022850772c8f22da68c9bba7120f51b01c23864b82a826681ef26d57409e8098d57f0655674
-  data.tar.gz: c0ee691a2a1d7ad70f6e05f5e1a998aad491c8b959287d0a09841fe7aa53d133829732c9cb66ee59e717d43d6a8681cf0da66d5e7d5716d08b9276d6463556be
+  metadata.gz: cf24c8ee4bb399cfe75a8a095dc121183c1ba0ee0c34bfc80897a875dac1c9258c26c75daddc18bc2b0e8b5f5e8171e7b030b78b71fdc1d0db3f246849a09696
+  data.tar.gz: 846351ae31be705763d67ea66ccc460769d0781d0451b16dc6d2cf1949cddcece14649b2d961ee15f7cc9ee9b3ae2d5f78ef66b6fe746fa451d3abf6c5f11380

data/History.txt

@@ -1,3 +1,7 @@
+4.0.9 / 2015-01-20
+==================
+* Improve BibTeX::Value comparison
+
 4.0.8 / 2015-01-12
 ==================
 * Ruby 2.2 support

data/examples/bib2yaml.rb

@@ -5,8 +5,8 @@ require 'bibtex'
 require 'yaml'
 
 if ARGV.length < 1
-  puts "Usage: #{$0} <bib> [<yml>]" 
+  puts "Usage: #{$0} <bib> [<yml>]"
 else
   out = ARGV.length == 2 ? File.open(ARGV[1], 'w') : STDOUT
   out.puts BibTeX.open(ARGV[0]).to_yaml
-end
+end

data/lib/bibtex.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014	Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015	Sylvester Keil <sylvester.keil.or.at>
 #
 # 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

data/lib/bibtex/bibliography.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014  Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015  Sylvester Keil <sylvester.keil.or.at>
 #
 # 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

data/lib/bibtex/elements.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015 Sylvester Keil <sylvester.keil.or.at>
 #
 # 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

data/lib/bibtex/entry.rb

@@ -1,6 +1,6 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014 Sylvester Keil <sylvester.keil.or.at>
+# Copyright (C) 2010-2015 Sylvester Keil <sylvester.keil.or.at>
 #
 # 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

data/lib/bibtex/extensions.rb

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2011  Sylvester Keil <sylvester.keil.or.at>
-# 
+#
 # 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/>.
 #++
@@ -21,5 +21,5 @@ module BibTeX
 	module Extensions
 
 	end
-	
-end
+
+end

data/lib/bibtex/filters/latex.rb

@@ -1,13 +1,13 @@
 require 'latex/decode'
- 
+
 module BibTeX
   module Filters
-    
+
     class LaTeX < Filter
       def apply(value)
         ::LaTeX.decode(value)
       end
     end
-    
+
   end
-end
+end

data/lib/bibtex/filters/linebreaks.rb

@@ -1,11 +1,11 @@
 module BibTeX
   module Filters
-    
+
     class LineBreaks < Filter
       def apply(value)
         value.to_s.gsub(/\n\s*/, ' ')
       end
     end
-    
+
   end
-end
+end

data/lib/bibtex/lexer.rb

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
-# Copyright (C) 2010-2014 Sylvester Keil <http://sylvester.keil.or.at>
-# 
+# Copyright (C) 2010-2015 Sylvester Keil <http://sylvester.keil.or.at>
+#
 # 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/>.
 #++
@@ -19,7 +19,7 @@
 require 'strscan'
 
 module BibTeX
-  
+
   #
   # The BibTeX::Lexer handles the lexical analysis of BibTeX bibliographies.
   #
@@ -28,7 +28,7 @@ module BibTeX
 
     attr_reader :options, :stack, :mode, :scanner
     attr_writer :mode
-    
+
     def_delegator :@scanner, :string, :data
 
     @defaults = {
@@ -37,7 +37,7 @@ module BibTeX
       :allow_missing_keys => false,
       :strip => true
     }.freeze
-    
+
     # Patterns Cache (#37: MacRuby does not cache regular expressions)
     @patterns = {
       :space        => /[\s]+/o,
@@ -62,18 +62,18 @@ module BibTeX
       :key          => /\s*[[:alpha:][:digit:] \/:_!$\?\.%+;&\*-]+,/io,
       :optional_key => /\s*[[:alpha:][:digit:] \/:_!$\?\.%+;&\*-]*,/io
     }.freeze
-    
+
     MODE = Hash.new(:meta).merge({
       :bibtex  => :bibtex,  :entry    => :bibtex,
       :string  => :bibtex,  :preamble => :bibtex,
       :comment => :bibtex,  :meta     => :meta,
       :literal => :literal, :content  => :content
     }).freeze
-    
+
     class << self
       attr_reader :defaults, :patterns
     end
-    
+
     #
     # Creates a new instance. Possible options and their respective
     # default values are:
@@ -96,14 +96,14 @@ module BibTeX
     def reset
       @stack, @brace_level, @mode, @active_object = [], 0, :meta, nil
       @scanner.reset if @scanner
-      
+
       # cache options for speed
       @include_meta_content = @options[:include].include?(:meta_content)
       @include_errors = @options[:include].include?(:errors)
-      
+
       self
     end
-    
+
     # Sets the source for the lexical analysis and resets the internal state.
     def data=(data)
       @scanner = StringScanner.new(data)
@@ -111,7 +111,7 @@ module BibTeX
     end
 
     def symbols; @stack.map(&:first); end
-    
+
     # Returns the next token from the parse stack.
     def next_token; @stack.shift; end
 
@@ -119,7 +119,7 @@ module BibTeX
     def bibtex_mode?
       MODE[@mode] == :bibtex
     end
-        
+
     [:meta, :literal, :content].each do |m|
       define_method("#{m}_mode?") { @mode == m }
     end
@@ -128,26 +128,26 @@ module BibTeX
     def active?(object)
       @active_object == object
     end
-    
+
     # Returns true if the lexer is currently in strict mode.
     def strict?
       !!@options[:strict]
     end
-    
+
     def allow_missing_keys?
       !!@options[:allow_missing_keys]
     end
-    
+
     def strip_line_breaks?
       !!options[:strip] && !active?(:comment)
     end
-    
+
     # Pushes a value onto the parse stack. Returns the Lexer.
     def push(value)
       case value[0]
       when :CONTENT, :STRING_LITERAL
         value[1].gsub!(/\n\s*/, ' ') if strip_line_breaks?
-        
+
         if !@stack.empty? && value[0] == @stack[-1][0]
           @stack[-1][1] << value[1]
         else
@@ -156,22 +156,22 @@ module BibTeX
       when :ERROR
         @stack.push(value) if @include_errors
         leave_object
-      when :META_CONTENT        
+      when :META_CONTENT
         @stack.push(value) if @include_meta_content
       else
         @stack.push(value)
       end
-            
+
       self
     end
 
     # Start the lexical analysis.
     def analyse(string = nil)
       raise(ArgumentError, 'Lexer: failed to start analysis: no source given!') unless
-        string || @scanner    
+        string || @scanner
 
       self.data = string || @scanner.string
-      
+
       until @scanner.eos?
         send("parse_#{MODE[@mode]}")
       end
@@ -180,7 +180,7 @@ module BibTeX
     end
 
     private
-    
+
     def parse_bibtex
       case
       when @scanner.scan(Lexer.patterns[:lbrace])
@@ -209,10 +209,10 @@ module BibTeX
       when @scanner.scan(Lexer.patterns[:space])
         # skip
       when @scanner.scan(Lexer.patterns[:period])
-        error_unexpected_token        
+        error_unexpected_token
       end
     end
-    
+
     def parse_meta
       match = @scanner.scan_until(Lexer.patterns[strict? ? :strict_next : :next])
       if @scanner.matched
@@ -253,7 +253,7 @@ module BibTeX
         error_unterminated_content
       end
     end
-    
+
     def parse_literal
       match = @scanner.scan_until(Lexer.patterns[:unquote])
       case @scanner.matched
@@ -281,7 +281,7 @@ module BibTeX
         error_unterminated_string
       end
     end
-    
+
     # Called when the lexer encounters a new BibTeX object.
     def enter_object
       @brace_level = 0
@@ -300,7 +300,7 @@ module BibTeX
       when @scanner.scan(Lexer.patterns[:entry])
         @mode = @active_object = :entry
         push [:NAME, @scanner.matched]
-        
+
         # TODO: DRY - try to parse key
         if @scanner.scan(Lexer.patterns[:lbrace])
           @brace_level += 1
@@ -311,10 +311,10 @@ module BibTeX
             push [:KEY, @scanner.matched.chop.strip]
           end
         end
-        
+
       else
         error_unexpected_object
-      end      
+      end
     end
 
     # Called when parser leaves a BibTeX object.
@@ -326,7 +326,7 @@ module BibTeX
       BibTeX.log.warn("Lexer: unbalanced braces at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
       backtrace [:E_UNBALANCED, @scanner.matched]
     end
-    
+
     def error_unterminated_string
       BibTeX.log.warn("Lexer: unterminated string at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
       backtrace [:E_UNTERMINATED_STRING, @scanner.matched]
@@ -336,7 +336,7 @@ module BibTeX
       BibTeX.log.warn("Lexer: unterminated content at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
       backtrace [:E_UNTERMINATED_CONTENT, @scanner.matched]
     end
-    
+
     def error_unexpected_token
       BibTeX.log.warn("Lexer: unexpected token `#{@scanner.matched}' at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
       backtrace [:E_UNEXPECTED_TOKEN, @scanner.matched]
@@ -353,7 +353,7 @@ module BibTeX
       bt << error
       push [:ERROR,bt]
     end
-    
+
   end
-  
+
 end

data/lib/bibtex/name_parser.rb

@@ -296,7 +296,7 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'names.y', 31)
   def _reduce_1(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
@@ -305,14 +305,14 @@ module_eval(<<'.,.,', 'names.y', 31)
 
 module_eval(<<'.,.,', 'names.y', 33)
   def _reduce_3(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 34)
   def _reduce_4(val, _values, result)
-     result << val[2] 
+     result << val[2]
     result
   end
 .,.,
@@ -320,7 +320,7 @@ module_eval(<<'.,.,', 'names.y', 34)
 module_eval(<<'.,.,', 'names.y', 38)
   def _reduce_5(val, _values, result)
              result = Name.new(:last => val[0])
-       
+
     result
   end
 .,.,
@@ -328,7 +328,7 @@ module_eval(<<'.,.,', 'names.y', 38)
 module_eval(<<'.,.,', 'names.y', 42)
   def _reduce_6(val, _values, result)
              result = Name.new(:first => val[0], :last => val[1])
-       
+
     result
   end
 .,.,
@@ -336,7 +336,7 @@ module_eval(<<'.,.,', 'names.y', 42)
 module_eval(<<'.,.,', 'names.y', 46)
   def _reduce_7(val, _values, result)
              result = Name.new(:first => val[0], :von => val[1], :last => val[2])
-       
+
     result
   end
 .,.,
@@ -344,7 +344,7 @@ module_eval(<<'.,.,', 'names.y', 46)
 module_eval(<<'.,.,', 'names.y', 50)
   def _reduce_8(val, _values, result)
              result = Name.new(:von => val[0], :last => val[1])
-       
+
     result
   end
 .,.,
@@ -352,7 +352,7 @@ module_eval(<<'.,.,', 'names.y', 50)
 module_eval(<<'.,.,', 'names.y', 54)
   def _reduce_9(val, _values, result)
              result = Name.new(:last => val[0], :jr => val[2][0], :first => val[2][1])
-       
+
     result
   end
 .,.,
@@ -360,7 +360,7 @@ module_eval(<<'.,.,', 'names.y', 54)
 module_eval(<<'.,.,', 'names.y', 58)
   def _reduce_10(val, _values, result)
              result = Name.new(:von => val[0], :last => val[1], :jr => val[3][0], :first => val[3][1])
-       
+
     result
   end
 .,.,
@@ -368,7 +368,7 @@ module_eval(<<'.,.,', 'names.y', 58)
 module_eval(<<'.,.,', 'names.y', 62)
   def _reduce_11(val, _values, result)
              result = Name.new(:von => val[0,2].join(' '), :last => val[2], :jr => val[4][0], :first => val[4][1])
-       
+
     result
   end
 .,.,
@@ -377,14 +377,14 @@ module_eval(<<'.,.,', 'names.y', 62)
 
 module_eval(<<'.,.,', 'names.y', 67)
   def _reduce_13(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 68)
   def _reduce_14(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
@@ -395,14 +395,14 @@ module_eval(<<'.,.,', 'names.y', 68)
 
 module_eval(<<'.,.,', 'names.y', 72)
   def _reduce_17(val, _values, result)
-     result = [nil,val[0]] 
+     result = [nil,val[0]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'names.y', 73)
   def _reduce_18(val, _values, result)
-     result = [val[0],val[2]] 
+     result = [val[0],val[2]]
     result
   end
 .,.,
@@ -411,7 +411,7 @@ module_eval(<<'.,.,', 'names.y', 73)
 
 module_eval(<<'.,.,', 'names.y', 76)
   def _reduce_20(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,
@@ -424,7 +424,7 @@ module_eval(<<'.,.,', 'names.y', 76)
 
 module_eval(<<'.,.,', 'names.y', 81)
   def _reduce_24(val, _values, result)
-     result = val.join(' ') 
+     result = val.join(' ')
     result
   end
 .,.,