bibtex-ruby 1.3.11 → 1.3.12

data/Gemfile

@@ -2,8 +2,9 @@ source :rubygems
 gemspec
 
 group :debug do
-	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:ruby_19]
-	gem 'ruby-debug', :platforms => [:ruby_18]
+	gem 'ruby-debug19', :require => 'ruby-debug', :platforms => [:mri_19]
+	gem 'ruby-debug', :platforms => [:mri_18]
+	gem 'rbx-trepanning', :platforms => [:rbx]
 end
 
 group :profile do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (1.3.11)
+    bibtex-ruby (1.3.12)
       latex-decode (>= 0.0.3)
 
 GEM
@@ -39,7 +39,14 @@ GEM
       term-ansicolor (>= 1.0.4)
     racc (1.4.6)
     rake (0.9.2)
+    rbx-linecache (1.3)
+      rbx-require-relative
     rbx-require-relative (0.0.5)
+    rbx-trepanning (1.8.7)
+      columnize
+      diff-lcs
+      rbx-linecache (~> 1.2)
+      rbx-require-relative (>= 0.0.4)
     rdoc (3.9.1)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -75,6 +82,7 @@ DEPENDENCIES
   mynyml-redgreen (~> 0.7)
   racc (~> 1.4)
   rake (~> 0.9)
+  rbx-trepanning
   rdoc (~> 3.9)
   ruby-debug
   ruby-debug19

data/History.txt

@@ -1,3 +1,7 @@
+1.3.12 / 2011-09-06 
+===================================
+
+* Improved default keys for BibTeX entries
 
 1.3.11 'happy #rbxday' / 2011-08-05 
 ===================================

data/Manifest

@@ -57,13 +57,11 @@ lib/bibtex/filters.rb
 lib/bibtex/filters.rbc
 lib/bibtex/lexer.rb
 lib/bibtex/lexer.rbc
-lib/bibtex/name_parser.output
 lib/bibtex/name_parser.rb
 lib/bibtex/name_parser.rbc
 lib/bibtex/names.rb
 lib/bibtex/names.rbc
 lib/bibtex/names.y
-lib/bibtex/parser.output
 lib/bibtex/parser.rb
 lib/bibtex/parser.rbc
 lib/bibtex/replaceable.rb
@@ -77,6 +75,7 @@ lib/bibtex/version.rb
 lib/bibtex/version.rbc
 lib/bibtex.rb
 lib/bibtex.rbc
+profile.png
 test
 test/benchmark.rb
 test/bibtex
@@ -114,6 +113,7 @@ test/fixtures/preamble.bib
 test/fixtures/roundtrip.bib
 test/helper.rb
 test/helper.rbc
+test/profile.dot
 test/profile.rb
 test/test_bibtex.rb
 test/test_bibtex.rbc

data/Rakefile

@@ -1,4 +1,6 @@
 # -*- ruby -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
 
 require 'rake/clean'
 require 'rake/testtask'
@@ -44,12 +46,12 @@ task :test => ['racc','test_task']
 file 'lib/bibtex/parser.output' => ['lib/bibtex/parser.rb']
 file 'lib/bibtex/parser.rb' => ['lib/bibtex/bibtex.y'] do
   # sh 'racc -v -g -o lib/bibtex/parser.rb lib/bibtex/bibtex.y'
-  sh 'bundle exec racc -v -o lib/bibtex/parser.rb lib/bibtex/bibtex.y'
+  sh 'bundle exec racc -o lib/bibtex/parser.rb lib/bibtex/bibtex.y'
 end
 
 file 'lib/bibtex/name_parser.rb' => ['lib/bibtex/names.y'] do
   # sh 'racc -v -g -o lib/bibtex/name_parser.rb lib/bibtex/names.y'
-  sh 'bundle exec racc -v -o lib/bibtex/name_parser.rb lib/bibtex/names.y'
+  sh 'bundle exec racc -o lib/bibtex/name_parser.rb lib/bibtex/names.y'
 end
 
 desc 'Runs the benchmarks (and plots the results)'

data/lib/bibtex.rb

@@ -1,17 +1,17 @@
 #--
 # BibTeX-Ruby
 # Copyright (C) 2010-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/>.
 #++
@@ -45,7 +45,8 @@ module BibTeX
 	Log.level = ENV.has_key?('DEBUG') ? Logger::DEBUG : Logger::WARN
 	Log.datetime_format = '%Y-%m-%d %H:%M:%S'
 
-  def self.log; BibTeX::Log end
+  def self.log; BibTeX::Log; end
+
 end
 
 # Load debugger
@@ -64,4 +65,4 @@ require 'bibtex/entry'
 require 'bibtex/error'
 require 'bibtex/parser'
 require 'bibtex/bibliography'
-require 'bibtex/utilities'
+require 'bibtex/utilities'

data/lib/bibtex/bibtex.y

@@ -33,7 +33,7 @@ rule
   bibliography : /* empty */                       { result = BibTeX::Bibliography.new(@options) }
                | objects                           { result = val[0] }
 
-  objects : object                                 { result = BibTeX::Bibliography.new << val[0] }
+  objects : object                                 { result = BibTeX::Bibliography.new(@options) << val[0] }
           | objects object                         { result << val[1] }
 
   object : AT at_object                            { result = val[1] }

data/lib/bibtex/entry.rb

@@ -102,7 +102,7 @@ module BibTeX
     }.map(&:intern)]).freeze
 
 	  
-		attr_reader :type, :fields
+		attr_reader :fields, :type		
     def_delegators :@fields, :empty?, :each, :each_pair
 
 		# Creates a new instance. If a hash is given, the entry is populated accordingly.
@@ -142,9 +142,10 @@ module BibTeX
 		  @key ||= default_key
 		end
 
-		alias id key		
+		alias id key
 		alias id= key=
-		
+
+		# TODO we should be more lenient: allow strings as key or don't check at all
 		# Sets the type of the entry.
 		def type=(type)
 			raise(ArgumentError, "types must be convertible to Symbol; was: #{type.class.name}.") unless type.respond_to?(:to_sym)
@@ -152,20 +153,26 @@ module BibTeX
 		end
 		
 		def has_type?(type)
-      type.to_s.match(/^entry$/i) || @type == type.to_sym || super
-    end
+			type.to_s.match(/^entry$/i) || @type == type.to_sym || super
+		end
     
     def has_field?(field)
       @fields.has_key?(field)
     end
     
 		def method_missing(name, *args, &block)
-		  return self[name] if @fields.has_key?(name)
-		  return self.send(:add, name.to_s.chop.to_sym, args[0]) if name.to_s.match(/=$/)		  
-      return $2 ? convert!($1, &block) : convert($1, &block) if name =~ /^(?:convert|from)_([a-z]+)(!)?$/
-		  super
+			case
+			when @fields.has_key?(name)
+				@fields[name]
+			when name.to_s =~ /^(.+)=$/
+				send(:add, $1.to_sym, args[0]) 		  
+			when name =~ /^(?:convert|from)_([a-z]+)(!)?$/
+				$2 ? convert!($1, &block) : convert($1, &block)
+			else
+				super
+			end
 		end
-		
+
 		def respond_to?(method)
 		  @fields.has_key?(method.to_sym) || method.to_s.match(/=$/) || method =~ /^(?:convert|from)_([a-z]+)(!)?$/ || super
 		end
@@ -178,15 +185,15 @@ module BibTeX
 		# Renames the given field names unless a field with the new name already
 		# exists.
 		def rename!(*arguments)
-		  Hash[*arguments.flatten].each_pair do |from,to|
-		    if @fields.has_key?(from) && !@fields.has_key?(to)
-		      @fields[to] = @fields[from]
-		      @fields.delete(from)
-	      end
-		  end
-		  self
+			Hash[*arguments.flatten].each_pair do |from,to|
+				if @fields.has_key?(from) && !@fields.has_key?(to)
+					@fields[to] = @fields[from]
+					@fields.delete(from)
+				end
+			end
+			self
 		end
-		
+
 		alias :rename_fields :rename
 		alias :rename_fields! :rename!
 		
@@ -358,7 +365,25 @@ module BibTeX
 		protected
 		
 		def default_key
-		  object_id.to_s.to_sym
+			a = case fields[:author]
+			when Names
+				author[0].last
+			when Value
+				author.to_s[/\w+/]
+			else
+				nil
+			end
+			
+			case
+			when a && has_field?(:year) && has_field?(:title)
+				[a,year,title.to_s[/\w{4,}/]].join.downcase.to_sym
+			when a && has_field?(:year)
+				[a,year].join.downcase.to_sym
+			when has_field?(:year) && has_field?(:title)
+				[year,title.to_s[/\w{4,}/]].join.downcase.to_sym
+			else
+		  	object_id.to_s
+			end
 		end
 		
 	end

data/lib/bibtex/entry.rbc

@@ -2697,7 +2697,7 @@ I
 I
 21
 I
-16d
+173
 I
 22
 I
@@ -2713,7 +2713,7 @@ I
 I
 3e
 I
-16d
+173
 I
 3f
 I
@@ -2864,7 +2864,7 @@ I
 I
 a
 I
-16d
+173
 I
 b
 I
@@ -2872,7 +2872,7 @@ I
 I
 19
 I
-16d
+173
 I
 1a
 I
@@ -3473,7 +3473,7 @@ x
 14
 method_missing
 i
-173
+163
 95
 19
 2
@@ -3486,19 +3486,16 @@ i
 1
 1
 9
-23
-5
+22
+39
+0
 20
 0
-47
 49
 2
 1
-11
 8
-24
-1
-15
+162
 20
 0
 49
@@ -3509,7 +3506,7 @@ i
 13
 70
 9
-48
+45
 15
 44
 43
@@ -3526,18 +3523,16 @@ i
 8
 1
 9
-79
+74
 5
 7
 9
-20
-0
-49
-3
-0
-49
+4
+5
+78
+98
 10
-0
+2
 49
 11
 0
@@ -3547,14 +3542,12 @@ i
 49
 2
 1
+47
 49
 12
 3
-11
 8
-80
-1
-15
+162
 20
 0
 7
@@ -3562,7 +3555,7 @@ i
 13
 70
 9
-101
+94
 15
 44
 43
@@ -3576,76 +3569,73 @@ i
 6
 13
 49
-15
+8
 1
 9
-167
+159
 4
 5
 79
 98
-16
+10
 2
 9
-140
+133
 5
 4
 5
 78
 98
-16
+10
 2
 20
 2
 13
 70
 10
-134
+127
 44
 43
-17
+15
 12
 49
-18
+16
 1
 47
 50
-19
+17
 1
 8
-164
+157
 5
 4
 5
 78
 98
-16
+10
 2
 20
 2
 13
 70
 10
-160
+153
 44
 43
-17
+15
 12
 49
-18
+16
 1
 47
 50
-20
+18
 1
-11
 8
-168
-1
-15
+162
 54
 89
-21
+19
 11
 I
 8
@@ -3658,7 +3648,7 @@ I
 I
 1
 p
-22
+20
 x
 7
 @fields
@@ -3676,20 +3666,20 @@ x
 6
 Regexp
 s
-2
-=$
+7
+^(.+)=$
 x
 3
 new
 x
-5
-match
+2
+=~
 x
 3
 add
 x
-4
-chop
+24
+regexp_last_match_result
 x
 6
 to_sym
@@ -3701,12 +3691,6 @@ s
 31
 ^(?:convert|from)_([a-z]+)(!)?$
 x
-2
-=~
-x
-24
-regexp_last_match_result
-x
 4
 Proc
 x
@@ -3730,41 +3714,41 @@ a2
 I
 4
 I
-a3
+a4
 I
-18
+d
 I
-0
+a5
 I
-19
+16
 I
-a4
+a6
 I
-50
+32
 I
-0
+a7
 I
-51
+4a
 I
-a5
+a8
 I
-a4
+63
 I
-0
+a9
 I
-a7
+9d
 I
-a5
+0
 I
-a8
+9f
 I
-0
+ab
 I
-a9
+a2
 I
-a6
+0
 I
-ad
+a3
 x
 53
 /Users/sylvester/Work/bibtex-ruby/lib/bibtex/entry.rb
@@ -3917,11 +3901,11 @@ p
 I
 -1
 I
-a9
+af
 I
 0
 I
-aa
+b0
 I
 4b
 x
@@ -3978,11 +3962,11 @@ p
 I
 -1
 I
-ae
+b4
 I
 0
 I
-af
+b5
 I
 b
 x
@@ -4159,23 +4143,23 @@ p
 I
 0
 I
-b5
+bb
 I
 a
 I
-b6
+bc
 I
 24
 I
-b7
+bd
 I
 37
 I
-b8
+be
 I
 40
 I
-b6
+bc
 I
 41
 I
@@ -4201,15 +4185,15 @@ p
 I
 -1
 I
-b4
+ba
 I
 0
 I
-b5
+bb
 I
 13
 I
-bb
+c1
 I
 15
 x
@@ -4271,11 +4255,11 @@ p
 I
 -1
 I
-c2
+c8
 I
 0
 I
-c3
+c9
 I
 b
 x
@@ -4330,11 +4314,11 @@ p
 I
 -1
 I
-c8
+ce
 I
 0
 I
-c9
+cf
 I
 d
 x
@@ -4508,11 +4492,11 @@ p
 I
 0
 I
-d6
+dc
 I
 a
 I
-d7
+dd
 I
 35
 x
@@ -4534,15 +4518,15 @@ p
 I
 -1
 I
-d5
+db
 I
 0
 I
-d6
+dc
 I
 13
 I
-d9
+df
 I
 15
 x
@@ -4604,11 +4588,11 @@ p
 I
 -1
 I
-e0
+e6
 I
 0
 I
-e1
+e7
 I
 b
 x
@@ -4773,11 +4757,11 @@ p
 I
 0
 I
-e7
+ed
 I
 4
 I
-e8
+ee
 I
 33
 I
@@ -4800,11 +4784,11 @@ p
 I
 -1
 I
-e6
+ec
 I
 0
 I
-e7
+ed
 I
 e
 x
@@ -4962,19 +4946,19 @@ p
 I
 -1
 I
-ed
+f3
 I
 0
 I
-ee
+f4
 I
 4
 I
-ef
+f5
 I
 15
 I
-f0
+f6
 I
 27
 I
@@ -4982,7 +4966,7 @@ I
 I
 28
 I
-f1
+f7
 I
 3a
 I
@@ -4990,7 +4974,7 @@ I
 I
 3b
 I
-f2
+f8
 I
 59
 I
@@ -4998,7 +4982,7 @@ I
 I
 5a
 I
-f3
+f9
 I
 5c
 x
@@ -5072,19 +5056,19 @@ p
 I
 -1
 I
-f7
+fd
 I
 0
 I
-f8
+fe
 I
 4
 I
-f9
+ff
 I
 15
 I
-fa
+100
 I
 17
 x
@@ -5220,7 +5204,7 @@ p
 I
 0
 I
-ff
+105
 I
 f
 x
@@ -5239,11 +5223,11 @@ p
 I
 -1
 I
-fd
+103
 I
 0
 I
-fe
+104
 I
 15
 I
@@ -5251,11 +5235,11 @@ I
 I
 16
 I
-ff
+105
 I
 21
 I
-100
+106
 I
 23
 x
@@ -5336,15 +5320,15 @@ p
 I
 -1
 I
-103
+109
 I
 0
 I
-104
+10a
 I
 16
 I
-105
+10b
 I
 18
 x
@@ -5416,11 +5400,11 @@ p
 I
 -1
 I
-108
+10e
 I
 0
 I
-109
+10f
 I
 14
 x
@@ -5517,11 +5501,11 @@ p
 I
 -1
 I
-10c
+112
 I
 0
 I
-10d
+113
 I
 24
 I
@@ -5529,7 +5513,7 @@ I
 I
 25
 I
-10e
+114
 I
 27
 x
@@ -5708,27 +5692,27 @@ p
 I
 0
 I
-117
+11d
 I
 4
 I
-118
+11e
 I
 f
 I
-119
+11f
 I
 1b
 I
-11a
+120
 I
 23
 I
-11b
+121
 I
 32
 I
-118
+11e
 I
 33
 I
@@ -5754,23 +5738,23 @@ p
 I
 -1
 I
-115
+11b
 I
 0
 I
-116
+11c
 I
 12
 I
-116
+11c
 I
 15
 I
-117
+11d
 I
 1e
 I
-11e
+124
 I
 20
 x
@@ -5919,7 +5903,7 @@ p
 I
 0
 I
-123
+129
 I
 24
 x
@@ -5948,11 +5932,11 @@ p
 I
 -1
 I
-122
+128
 I
 e
 I
-123
+129
 I
 1c
 x
@@ -6169,15 +6153,15 @@ p
 I
 -1
 I
-127
+12d
 I
 e
 I
-128
+12e
 I
 31
 I
-129
+12f
 I
 70
 x
@@ -6395,7 +6379,7 @@ p
 I
 0
 I
-12f
+135
 I
 1f
 x
@@ -6417,23 +6401,23 @@ p
 I
 -1
 I
-12c
+132
 I
 e
 I
-12d
+133
 I
 31
 I
-12e
+134
 I
 4f
 I
-12f
+135
 I
 57
 I
-130
+136
 I
 5a
 x
@@ -6724,11 +6708,11 @@ p
 I
 0
 I
-136
+13c
 I
 a
 I
-137
+13d
 I
 34
 I
@@ -6760,27 +6744,27 @@ p
 I
 -1
 I
-133
+139
 I
 e
 I
-134
+13a
 I
 2b
 I
-135
+13b
 I
 57
 I
-136
+13c
 I
 5f
 I
-139
+13f
 I
 6f
 I
-13a
+140
 I
 72
 x
@@ -6973,15 +6957,15 @@ p
 I
 -1
 I
-13d
+143
 I
 0
 I
-13e
+144
 I
 1e
 I
-13f
+145
 I
 2f
 I
@@ -6989,7 +6973,7 @@ I
 I
 30
 I
-140
+146
 I
 60
 x
@@ -7291,19 +7275,19 @@ p
 I
 0
 I
-14a
+150
 I
 a
 I
-14b
+151
 I
 31
 I
-14c
+152
 I
 43
 I
-14d
+153
 I
 4c
 x
@@ -7328,27 +7312,27 @@ p
 I
 -1
 I
-145
+14b
 I
 e
 I
-146
+14c
 I
 17
 I
-148
+14e
 I
 3a
 I
-149
+14f
 I
 4d
 I
-14a
+150
 I
 55
 I
-14f
+155
 I
 58
 x
@@ -7469,11 +7453,11 @@ p
 I
 -1
 I
-158
+15e
 I
 0
 I
-159
+15f
 I
 38
 I
@@ -7599,7 +7583,7 @@ p
 I
 0
 I
-15e
+164
 I
 29
 I
@@ -7625,15 +7609,15 @@ p
 I
 -1
 I
-15d
+163
 I
 0
 I
-15e
+164
 I
 8
 I
-15f
+165
 I
 a
 x
@@ -7761,11 +7745,11 @@ p
 I
 -1
 I
-162
+168
 I
 0
 I
-163
+169
 I
 49
 I
@@ -7830,11 +7814,11 @@ p
 I
 -1
 I
-168
+16e
 I
 0
 I
-169
+16f
 I
 a
 x
@@ -8151,127 +8135,127 @@ a2
 I
 3cf
 I
-a9
+af
 I
 3dd
 I
-ae
+b4
 I
 3eb
 I
-b4
+ba
 I
 3f9
 I
-be
+c4
 I
 403
 I
-bf
+c5
 I
 40d
 I
-c2
+c8
 I
 41b
 I
-c8
+ce
 I
 429
 I
-d5
+db
 I
 437
 I
-dc
+e2
 I
 441
 I
-e0
+e6
 I
 44f
 I
-e6
+ec
 I
 45d
 I
-ed
+f3
 I
 46b
 I
-f7
+fd
 I
 479
 I
-fd
+103
 I
 487
 I
-103
+109
 I
 495
 I
-108
+10e
 I
 4a3
 I
-10c
+112
 I
 4b1
 I
-111
+117
 I
 4bb
 I
-115
+11b
 I
 4c9
 I
-122
+128
 I
 4d7
 I
-127
+12d
 I
 4e5
 I
-12c
+132
 I
 4f3
 I
-133
+139
 I
 501
 I
-13d
+143
 I
 50f
 I
-143
+149
 I
 519
 I
-145
+14b
 I
 527
 I
-158
+15e
 I
 535
 I
-15d
+163
 I
 543
 I
-162
+168
 I
 551
 I
-166
+16c
 I
 555
 I
-168
+16e
 I
 563
 x