bibtex-ruby 4.0.8 → 4.0.9

data/lib/bibtex/names.rb

@@ -1,17 +1,17 @@
 #--
 # 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
 # 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,16 +23,16 @@ module BibTeX
   # A BibTeX Names value is an ordered list of name values.
   class Names < Value
     include Enumerable
-    
+
     def_delegators :@tokens, :each, :sort
-    
+
     def self.parse(string)
       new(NameParser.new.parse(string))
     rescue => e
       BibTeX.log.info(e.message)
       nil
     end
-    
+
     def initialize(*arguments)
       @tokens = []
       arguments.flatten.compact.each do |argument|
@@ -43,15 +43,15 @@ module BibTeX
     def replace(*arguments)
       self
     end
-    
+
     def join
       self
     end
-    
+
     def value(options = {})
       @tokens.map { |n| n.to_s(options) }.join(' and ')
     end
-    
+
     def to_s(options = {})
       return value unless options.has_key?(:quotes)
       q = [options[:quotes]].flatten
@@ -61,30 +61,30 @@ module BibTeX
     def name?
       true
     end
-    
+
     def numeric?
       false
     end
-    
+
     def atomic?
       true
     end
-    
+
     alias names? name?
     alias symbol? numeric?
-    
+
     def to_name
       self
     end
-    
+
     def to_citeproc(options = {})
       map { |n| n.to_citeproc(options) }
     end
-    
+
     def strip_braces
       gsub!(/\{|\}/,'')
     end
-    
+
     def add(name)
       case
       when name.is_a?(Name)
@@ -96,10 +96,10 @@ module BibTeX
       end
       self
     end
-    
+
     alias << add
     alias push add
-    
+
     [:convert!, :rename_if, :rename_unless, :extend_initials].each do |method_id|
       define_method(method_id) do |*arguments|
         tokens.each { |t| t.send(method_id, *arguments) }
@@ -110,7 +110,7 @@ module BibTeX
     def <=>(other)
       other.respond_to?(:to_a) ? to_a <=> other.to_a  : super
     end
-    
+
   end
 
   # A Name comprises individual name parts (first, last, prefix and suffix),
@@ -118,46 +118,46 @@ module BibTeX
   class Name < Struct.new(:first, :last, :prefix, :suffix)
     extend Forwardable
     include Comparable
-    
+
     BibTeXML = {
       :first  => :first,
       :last   => :last,
       :prefix => :prelast,
       :suffix => :lineage
     }.freeze
-    
+
     def_delegators :to_s, :=~, :===,
       *String.instance_methods(false).reject { |m| m =~ /^\W|to_s|replace|each|first|last|!$/ }
-    
-    class << self    
+
+    class << self
       def parse(string)
         [NameParser.new.parse(string)].flatten[0]
       end
-      
+
       # Returns true if thing looks like a name.
       # Actually converts thing to a string and tries to parse it.
       def looks_like?(thing)
         thing.respond_to?(:to_s) && [Name.new.parse(string)].flatten.compact.empty?
       end
     end
-    
+
     def initialize(attributes = {})
       set(attributes)
     end
-    
+
     def initalize_copy(other)
       each_pair { |k,v| self[k] = v.dup }
     end
-    
+
     # Set the name tokens to the values defined in the passed-in hash.
     def set(attributes = {})
       attributes.each_pair do |key, value|
         send("#{key}=", value) if respond_to?(key)
       end
-      
+
       self
     end
-    
+
     def blank?
       to_a.compact.empty?
     end
@@ -174,7 +174,7 @@ module BibTeX
       token.gsub!(/\b([[:upper:]]\.)([[:upper:]][[:lower:]]+)/, '\1 \2')
       token
     end
-    
+
     # Returns true if the first name consists solely of initials.
     def initials?
       !(first.nil? || first.empty? || first.to_s =~ /[[:alpha:]]{2,}[^\.]/)
@@ -192,7 +192,7 @@ module BibTeX
         end
       end
     end
-    
+
     # Renames the tokens according to the passed-in attributes if all of the
     # conditions match or if the given block returns true.
     def rename_if(attributes, conditions = {})
@@ -203,10 +203,10 @@ module BibTeX
           respond_to?(key) && send(key) == value
         end
       end
-      
+
       self
     end
-    
+
     def rename_unless(attributes, conditions = {})
       if block_given?
         set(attributes) unless yield self
@@ -215,10 +215,10 @@ module BibTeX
           respond_to?(key) && send(key) == value
         end
       end
-      
+
       self
     end
-    
+
     # call-seq:
     #   name.display_order #=> 'Edgar Allen Poe'
     #   name.display_order :initials => true #=> 'E.A. Poe'
@@ -227,9 +227,9 @@ module BibTeX
     def display_order(options = {})
       [options[:initials] ? initials : first, prefix, last, suffix].compact.join(' ')
     end
-    
+
     alias display display_order
-    
+
     # call-seq:
     #   name.sort_order #=> 'Poe, Edgar Allen'
     #   name.sort_order :initials => true #=> 'Poe, E.A.'
@@ -238,19 +238,19 @@ module BibTeX
     def sort_order(options = {})
       [[prefix, last].compact.join(' '), suffix, options[:initials] ? initials : first].compact.join(', ')
     end
-    
+
     alias to_s sort_order
-        
+
     def <=>(other)
       other.is_a?(Name) ? sort_order <=> other.sort_order : super
     end
-    
+
     def to_hash
       Hash[each_pair.to_a]
     end
 
     def to_xml
-      require 'rexml/document'      
+      require 'rexml/document'
       xml = REXML::Element.new('bibtex:person')
 
       each_pair do |part, text|
@@ -260,10 +260,10 @@ module BibTeX
           xml.add_element(element)
         end
       end
-      
+
       xml
     end
-    
+
     [:strip!, :upcase!, :downcase!, :sub!, :gsub!, :chop!, :chomp!, :rstrip!].each do |method_id|
       define_method(method_id) do |*arguments, &block|
         each do |part|
@@ -272,11 +272,11 @@ module BibTeX
         self
       end
     end
-    
+
     def convert(*filters)
       dup.convert!(*filters)
     end
-    
+
     def convert!(*filters)
       filters.flatten.each do |filter|
 
@@ -287,10 +287,10 @@ module BibTeX
           self[k] = f.apply(v) unless v.nil?
         end
       end
-      
+
       self
     end
-    
+
     def to_citeproc(options = {})
       hash = {}
       hash['family'] = family unless family.nil?
@@ -299,15 +299,15 @@ module BibTeX
       hash[options[:particle] || 'non-dropping-particle'] = prefix unless prefix.nil?
       hash
     end
-    
+
     alias family last
-    alias family= last=    
+    alias family= last=
     alias given first
     alias given= first=
     alias jr suffix
     alias jr= suffix=
     alias von prefix
-    alias von= prefix=    
-   
+    alias von= prefix=
+
   end
 end

data/lib/bibtex/parser.rb

@@ -14,48 +14,48 @@ module BibTeX
 module_eval(<<'...end bibtex.y/module_eval...', 'bibtex.y', 89)
 
   attr_reader :lexer, :options
-  
+
   @defaults = {
     :include => [:errors],
     :allow_missing_keys => false,
     :debug => false
   }.freeze
-  
+
   class << self
     attr_reader :defaults
   end
-  
+
   def initialize(options = {})
     @options = Parser.defaults.merge(options)
     @lexer = Lexer.new(@options)
   end
 
   def parse(input)
-    @yydebug = debug?   
+    @yydebug = debug?
 
-    lexer.analyse(input)    
+    lexer.analyse(input)
     do_parse
     #yyparse(@lexer,:each)
   end
-  
+
   def next_token
     lexer.next_token
   end
-  
+
   def debug?
     options[:debug] || ENV['DEBUG']
   end
-  
+
   def allow_missing_keys?
     options[:allow_missing_keys]
   end
-  
+
   def missing_key
     unless allow_missing_keys?
       raise ParseError, "Failed to parse BibTeX entry: cite-key missing"
     end
   end
-  
+
   def on_error(tid, val, vstack)
     message =
       "Failed to parse BibTeX on value #{val.inspect} (#{token_to_str(tid) || '?'}) #{ vstack.inspect}"
@@ -242,189 +242,189 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'bibtex.y', 32)
   def _reduce_1(val, _values, result)
-     result = BibTeX::Bibliography.new(@options) 
+     result = BibTeX::Bibliography.new(@options)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 33)
   def _reduce_2(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 35)
   def _reduce_3(val, _values, result)
-     result = BibTeX::Bibliography.new(@options) << val[0] 
+     result = BibTeX::Bibliography.new(@options) << val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 36)
   def _reduce_4(val, _values, result)
-     result << val[1] 
+     result << val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 38)
   def _reduce_5(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 39)
   def _reduce_6(val, _values, result)
-     result = BibTeX::MetaContent.new(val[0]) 
+     result = BibTeX::MetaContent.new(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 40)
   def _reduce_7(val, _values, result)
-     result = BibTeX::Error.new(val[0]) 
+     result = BibTeX::Error.new(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 42)
   def _reduce_8(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 43)
   def _reduce_9(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 44)
   def _reduce_10(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 45)
   def _reduce_11(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 47)
   def _reduce_12(val, _values, result)
-     result = BibTeX::Comment.new(val[2]) 
+     result = BibTeX::Comment.new(val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 49)
   def _reduce_13(val, _values, result)
-     result = '' 
+     result = ''
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 50)
   def _reduce_14(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 52)
   def _reduce_15(val, _values, result)
-     result = BibTeX::Preamble.new(val[2]) 
+     result = BibTeX::Preamble.new(val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 54)
   def _reduce_16(val, _values, result)
-     result = BibTeX::String.new(val[2][0],val[2][1]); 
+     result = BibTeX::String.new(val[2][0],val[2][1]);
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 56)
   def _reduce_17(val, _values, result)
-     result = [val[0].downcase.to_sym, val[2]] 
+     result = [val[0].downcase.to_sym, val[2]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 58)
   def _reduce_18(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 59)
   def _reduce_19(val, _values, result)
-     result << val[2] 
+     result << val[2]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 61)
   def _reduce_20(val, _values, result)
-     result = val[0].downcase.to_sym 
+     result = val[0].downcase.to_sym
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 62)
   def _reduce_21(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 63)
   def _reduce_22(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 65)
   def _reduce_23(val, _values, result)
-     result = val[0] << val[1] 
+     result = val[0] << val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 66)
   def _reduce_24(val, _values, result)
-     result = val[0] << val[1] 
+     result = val[0] << val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 67)
   def _reduce_25(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 69)
   def _reduce_26(val, _values, result)
-     result = BibTeX::Entry.new(:bibtex_type => val[0].downcase.to_sym, :bibtex_key => val[2]) 
+     result = BibTeX::Entry.new(:bibtex_type => val[0].downcase.to_sym, :bibtex_key => val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 71)
   def _reduce_27(val, _values, result)
-     missing_key 
+     missing_key
     result
   end
 .,.,
@@ -433,35 +433,35 @@ module_eval(<<'.,.,', 'bibtex.y', 71)
 
 module_eval(<<'.,.,', 'bibtex.y', 74)
   def _reduce_29(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 75)
   def _reduce_30(val, _values, result)
-     result.merge!(val[2]) 
+     result.merge!(val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 77)
   def _reduce_31(val, _values, result)
-     result = { val[0].downcase.to_sym => val[2] } 
+     result = { val[0].downcase.to_sym => val[2] }
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 79)
   def _reduce_32(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'bibtex.y', 80)
   def _reduce_33(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,