bibtex-ruby 1.3.12 → 2.0.0pre1

data/Gemfile

@@ -7,6 +7,13 @@ group :debug do
 	gem 'rbx-trepanning', :platforms => [:rbx]
 end
 
+group :test do
+	gem 'minitest', :platforms => [:ruby_18, :jruby, :rbx]
+  gem 'mynyml-redgreen', ['~>0.7']
+  gem 'autowatchr', ['~>0.1']
+  gem 'cucumber', ['~>1.0']
+end
+
 group :profile do
 	gem 'ruby-prof', ['~>0.10']
 	gem 'gnuplot', ['~>2.3']

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (1.3.12)
+    bibtex-ruby (2.0.0pre1)
       latex-decode (>= 0.0.3)
+      multi_json (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -12,29 +13,28 @@ GEM
       watchr
     builder (3.0.0)
     columnize (0.3.4)
-    cucumber (0.10.7)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    gherkin (2.4.5)
+    gherkin (2.4.18)
       json (>= 1.4.6)
-    gherkin (2.4.5-java)
+    gherkin (2.4.18-java)
       json (>= 1.4.6)
     gnuplot (2.3.6)
-    json (1.5.3)
-    json (1.5.3-java)
+    json (1.5.4)
+    json (1.5.4-java)
     latex-decode (0.0.3)
       unicode (>= 0.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mini_shoulda (0.3.0)
-      minitest (~> 2.1.0)
-    minitest (2.1.0)
+    minitest (2.3.1)
+    multi_json (1.0.3)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
     racc (1.4.6)
@@ -75,10 +75,9 @@ PLATFORMS
 DEPENDENCIES
   autowatchr (~> 0.1)
   bibtex-ruby!
-  cucumber (~> 0.10)
+  cucumber (~> 1.0)
   gnuplot (~> 2.3)
-  json (~> 1.5)
-  mini_shoulda (~> 0.3)
+  minitest
   mynyml-redgreen (~> 0.7)
   racc (~> 1.4)
   rake (~> 0.9)

data/Manifest

@@ -17,6 +17,7 @@ features/bibtex.feature
 features/entries.feature
 features/issues
 features/issues/braced_strings.feature
+features/issues/crossref.feature
 features/issues/latex_filter.feature
 features/issues/number_keys.feature
 features/issues/parse_months.feature
@@ -75,7 +76,6 @@ lib/bibtex/version.rb
 lib/bibtex/version.rbc
 lib/bibtex.rb
 lib/bibtex.rbc
-profile.png
 test
 test/benchmark.rb
 test/bibtex

data/README.md

@@ -1,14 +1,17 @@
 BibTeX-Ruby
 ===========
 
-BibTeX-Ruby is a fairly complete library and parser for BibTeX bibliography
-files; it offers a rich interface to manage, search, or convert BibTeX objects in
-Ruby. It is designed to support all BibTeX objects (including @comment,
-string-replacements via @string, as well as string concatenation using '#')
-and optionally handles all content outside of BibTeX objects as 'meta content'
-which may or may not be included in post-processing. BibTeX-Ruby also includes
-a name parser to support comfortable access to the individual tokens of name
-values.
+BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
+includes a parser for all common BibTeX objects (@string, @preamble,
+@comment and regular entries) and a sophisticated name parser that
+tokenizes correctly formatted names; BibTeX-Ruby recognizes BibTeX string
+replacements, joins values containing multiple strings or variables,
+supports cross-references, and decodes common LaTeX formatting
+instructions to unicode; if you are in a hurry, it also allows for easy
+export/conversion to formats such as YAML, JSON, CiteProc, and XML (BibTeXML).
+
+For a list of projects using BibTeX-Ruby, see
+[the project wiki](https://github.com/inukshuk/bibtex-ruby/wiki/Projects-Using-BibTeX-Ruby).
 
 
 Quickstart
@@ -19,9 +22,9 @@ Quickstart
     >> require 'bibtex'
     => true
     >> b = BibTeX.open('./ruby.bib')
-    >> b[:pickaxe]
+    >> b['pickaxe']
     => "2009"
-    >> b[:pickaxe].title
+    >> b['pickaxe'].title
     => "Programming Ruby 1.9: The Pragmatic Programmer's Guide"
     >> b[:pickaxe].author.length
     => 3
@@ -39,7 +42,8 @@ Quickstart
 BibTeX-Ruby helps you convert your bibliography to JSON, XML, or YAML;
 alternatively, you can export to the JSON format used by
 [CSL](http://citationstyles.org) processors and render the bibliography in
-many styles:
+one of [many different styles](https://github.com/citation-style-language/styles)
+([previews](http://www.zotero.org/styles/)):
 
     >> require 'citeproc'  # requires the citeproc-ruby gem
     => true
@@ -80,10 +84,9 @@ Requirements
 
 * The parser generator [racc](http://i.loveruby.net/en/projects/racc/) is
   required to generate the BibTeX parser and the name parser.
-* The **json** gem is required on older Ruby versions for JSON export.
 
-The bibtex-ruby gem has been tested on Ruby versions 1.8.7 and 1.9.2; it has
-been confirmed to work with REE 1.8.7 x86_64 and JRuby 1.5.6 x86_64-java;
+The BibTeX-Ruby gem has been tested on Ruby versions 1.8.7 and 1.9.2; it has
+been confirmed to work with REE, JRuby, and Rubinius;
 however, there have been some [issues](https://github.com/inukshuk/bibtex-ruby/issues)
 with MacRuby implementations.
 
@@ -139,6 +142,27 @@ Instead of parsing strings you can also create BibTeX elements directly in Ruby:
     > book.key = :mybook
     > bib << book
 
+### Cross References
+
+From version 2.0, BibTeX-Ruby correctly resolves entry cross-references, which are commonly used for entries with type `inbook`, `incollection`, and `inproceedings`. When an entry has a valid citation key in field `crossref`, BibTeX-Ruby will return any fields inherited from the parent entry:
+
+    > b = BibTeX.parse <<-END
+    @inbook{fraassen_1989b,
+    	Crossref = {fraassen_1989},
+    	Pages = {40-64},
+    	Title = {Ideal Science: David Lewis's Account of Laws},
+    }
+
+    @book{fraassen_1989,
+    	Address = {Oxford},
+    	Author = {Bas C. van Fraassen},
+    	Publisher = {Oxford University Press},
+    	Title = {Laws and Symmetry},
+    	Year = 1989
+    }
+    END
+    > b['fraassen_1989b'].booktitle
+     => <"Laws and Symmetry">
 
 ### Queries
 
@@ -274,21 +298,22 @@ Conditional conversions are also supported:
     >> faust1 = '@book{faust1, title = {Faust: Der Trag\"odie Erster Teil}}'
     >> faust2 = '@book{faust2, title = {Faust: Der Trag\"odie Zweiter Teil}}'
     >> p BibTeX.parse(faust1 + faust2).convert(:latex) { |e| e.key == :faust2 }.to_s
-		@book{faust1,
-		  title = {Faust: Der Trag\"odie Erster Teil}
-		}
-		@book{faust2,
-		  title = {Faust: Der Tragödie Zweiter Teil}
-		}
+    @book{faust1,
+      title = {Faust: Der Trag\"odie Erster Teil}
+    }
+    @book{faust2,
+      title = {Faust: Der Tragödie Zweiter Teil}
+    }
 
 If you need to express a condition on the basis of individual fields, use the
 conversion methods of BibTeX::Entry with a block instead (the block will be
 passed the key and value of each field prior to conversion).
 
-### Conversions
+### Exports
 
 Furthermore, BibTeX-Ruby allows you to export your bibliography for processing
 by other tools. Currently supported formats include YAML, JSON, and XML.
+
 Of course, you can also export your bibliography back to BibTeX; if you include
 `:meta_content', your export should be identical to the original '.bib' file,
 except for whitespace, blank lines and letter case (BibTeX-Ruby will downcase
@@ -300,6 +325,52 @@ BibTeX to YAML converter:
 
     >> BibTeX.open('example.bib').to_yaml
 
+Starting with version 2.0, BibTeX-Ruby's `#to_xml` exports your bibliography
+to the [BibTeXML](http//bibtexml.sf.net/) format. By passing the option
+`:extended => true` you can make use of the BibTeXML's extended  format which
+will return individual person elements and name tokens (provided you have
+successfully parsed the names of your bibliography).
+
+    > BibTeX.parse(<<-END).to_xml(:extended => true).write($stdout, 2)
+    " @book{pickaxe,
+    "   Address = {Raleigh, North Carolina},
+    "     Author = {Thomas, Dave, and Fowler, Chad, and Hunt, Andy},
+    "     Publisher = {The Pragmatic Bookshelf},
+    "     Title = {Programming Ruby 1.9: The Pragmatic Programmer's Guide},
+    "     Year = {2009}
+    "   }
+    " END
+
+This example parse a BibTeX entry, formats it as extended BibTeXML,
+and writes the following XML to standard out:
+
+    <?xml version='1.0' encoding='UTF-8'?>
+    <bibtex:file xmlns:bibtex='http://bibtexml.sf.net/'>
+      <bibtex:entry id='pickaxe'>
+        <bibtex:book>
+          <bibtex:address>Raleigh, North Carolina</bibtex:address>
+          <bibtex:person>
+            <bibtex:first>Dave</bibtex:first>
+            <bibtex:last>Thomas</bibtex:last>
+          </bibtex:person>
+          <bibtex:person>
+            <bibtex:first>Chad</bibtex:first>
+            <bibtex:last>Fowler</bibtex:last>
+          </bibtex:person>
+          <bibtex:person>
+            <bibtex:first>Andy</bibtex:first>
+            <bibtex:last>Hunt</bibtex:last>
+          </bibtex:person>
+          <bibtex:author/>
+          <bibtex:publisher>The Pragmatic Bookshelf</bibtex:publisher>
+          <bibtex:title>
+            Programming Ruby 1.9: The Pragmatic Programmer&apos;s Guide
+          </bibtex:title>
+          <bibtex:year>2009</bibtex:year>
+        </bibtex:book>
+      </bibtex:entry>
+    </bibtex:file>
+
 Look at the 'examples' directory for more elaborate examples of a BibTeX to YAML
 and a BibTeX to HTML converter using **#to_citeproc** to format a bibliography
 using [CSL](http://citationstyles.org/).
@@ -345,20 +416,41 @@ quotes; therefore you can simply add the :quotes option with an empty string:
       :title=>"Programming Ruby 1.9: The Pragmatic Programmer's Guide",
       :year=>"2009"}]
 
+
 The Parser
 ----------
 
 The BibTeX-Ruby parser is generated using the awesome
 [racc](http://i.loveruby.net/en/projects/racc/) parser generator. You can take
-look at the grammar definition in the file
+look at the LALR grammar in the file
 [lib/bibtex/bibtex.y](https://github.com/inukshuk/bibtex-ruby/blob/master/lib/bibtex/bibtex.y).
 
 For more information about the BibTeX format and the parser's idiosyncrasies
 [refer to the project wiki](https://github.com/inukshuk/bibtex-ruby/wiki/The-BibTeX-Format).
 
+Contributing
+------------
+
+The BibTeX-Ruby source code is
+[hosted on GitHub](http://github.com/inukshuk/bibtex-ruby/).
+You can check out a copy of the latest code using Git:
+
+    $ git clone https://github.com/inukshuk/bibtex-ruby.git
+
+If you've found a bug or have a question, please open an issue on the
+[BibTeX-Ruby issue tracker](http://github.com/inukshuk/bibtex-ruby/issues).
+Or, for extra credit, clone the BibTeX-Ruby repository, write a failing
+example, or cucumber feature, fix the bug and submit a pull request (for
+useful examples, take a look at the cucumber features in the
+[features/issues/](https://github.com/inukshuk/bibtex-ruby/blob/master/features/issues)
+directory).
+
 
 Credits
 -------
 
 The BibTeX-Ruby package was written by [Sylvester Keil](http://sylvester.keil.or.at/);
 kudos and thanks to all [contributors](https://github.com/inukshuk/bibtex-ruby/contributors)!
+
+BibTeX-Ruby is distributed under the terms and conditions of the GPL. See
+LICENSE for details.

data/bibtex-ruby.gemspec

@@ -11,19 +11,25 @@ Gem::Specification.new do |s|
   s.authors     = ['Sylvester Keil']
   s.email       = ['http://sylvester.keil.or.at']
   s.homepage    = 'http://inukshuk.github.com/bibtex-ruby'
-  s.summary     = 'A BibTeX parser and converter written in Ruby.'
-  s.description = 'A (fairly complete) BibTeX library and parser written in Ruby. Includes a name parser and supports regular BibTeX entries, @comments, string replacement via @string. Allows for easy export/conversion to formats such as YAML, JSON, and XML.'
   s.license     = 'GPL-3'
 
+  s.summary     = 'A BibTeX parser, converter and API for Ruby.'
+  s.description = <<-END_DESCRIPTION
+		BibTeX-Ruby is the Rubyist's swiss-army-knife for all things BibTeX. It
+    includes a parser for all common BibTeX objects (@string, @preamble,
+    @comment and regular entries) and a sophisticated name parser that
+    tokenizes correctly formatted names; BibTeX-Ruby recognizes BibTeX string
+    replacements, joins values containing multiple strings or variables,
+    supports cross-references, and decodes common LaTeX formatting
+    instructions to unicode; if you are in a hurry, it also allows for easy
+    export/conversion to formats such as YAML, JSON, CSL, and XML (BibTeXML).
+	END_DESCRIPTION
+	
   s.add_runtime_dependency('latex-decode', ['>=0.0.3'])
+  s.add_runtime_dependency('multi_json', ['~>1.0'])
 
   s.add_development_dependency('rake', ['~>0.9'])
   s.add_development_dependency('racc', ['~>1.4'])
-  s.add_development_dependency('mini_shoulda', ['~>0.3'])
-  s.add_development_dependency('mynyml-redgreen', ['~>0.7'])
-  s.add_development_dependency('autowatchr', ['~>0.1'])
-  s.add_development_dependency('cucumber', ['~>0.10'])
-  s.add_development_dependency('json', ['~>1.5'])
   s.add_development_dependency('rdoc', ['~>3.9'])
 
   s.files        = File.open('Manifest').readlines.map(&:chomp)

data/features/issues/crossref.feature

@@ -0,0 +1,62 @@
+Feature: Parse BibTeX cross-references
+  As a hacker who works with bibliographies
+  I want to be able to parse BibTeX files with cross-referenced entries
+
+	@wip
+	Scenario: A BibTeX file with six entries and three cross-references
+		When I parse the following file:
+		"""
+		@book{zimmerman_2004,
+			Address = {Oxford},
+			Author = {Dean W. Zimmerman},
+			Editor = {Dean W. Zimmerman},
+			Keywords = {Metaphysics},
+			Publisher = {Oxford University Press},
+			Title = {Oxford Studies in Metaphysics},
+			Volume = {1},
+			Year = {2004}
+		}
+
+		@incollection{hall_2004b,
+			Author = {Ned Hall},
+			Crossref = {zimmerman_2004},
+			Keywords = {Causation},
+			Pages = {255-299},
+			Title = {The Intrinsic Character of Causation}
+		}
+
+		@proceedings{weingartner_1989,
+			Address = {Vienna},
+			Editor = {Paul Weingartner and Gerhard Schurz},
+			Keywords = {Anthology},
+			Publisher = {Verlag H{\"o}lder-Pichter Tempsky},
+			Title = {Philosophy of the Natural Sciences: Proceedings of the 13th International Wittgenstein Symposium},
+			Year = {1989}}
+
+		@inproceedings{cartwright_1989a,
+			Author = {Nancy Cartwright},
+			Crossref = {weingartner_1989},
+			Keywords = {Causation; Quantum Mechanics},
+			Pages = {120-127},
+			Title = {Quantum Causes: The Lesson of the Bell Inequalities}}
+
+		@inbook{fraassen_1989b,
+			Crossref = {fraassen_1989},
+			Pages = {40-64},
+			Title = {Ideal Science: David Lewis's Account of Laws},
+			Url = {http://dx.doi.org/10.1093/0198248601.003.0003}
+		}
+
+		@book{fraassen_1989,
+			Address = {Oxford},
+			Author = {Bas C. van Fraassen},
+			Keywords = {Laws; Lewis},
+			Publisher = {Oxford University Press},
+			Title = {Laws and Symmetry},
+			Url = {http://dx.doi.org/10.1093/0198248601.001.0001},
+			Year = 1989
+		}
+	  """
+	  Then the entry with key "fraassen_1989b" should have a field "Booktitle" with the value "Laws and Symmetry"
+	  And the entry with key "hall_2004b" should have a field "Editor" with the value "Zimmerman, Dean W."
+	  And the entry with key "cartwright_1989a" should have a field "Year" with the value "1989"

data/features/names.feature

@@ -46,7 +46,7 @@ Feature: BibTeX Names
 		| CC dd BB, AA    | AA         | CC dd      | BB      |    |
 		| BB, AA          | AA         |            | BB      |    |
 	
-	@sort @wip
+	@sort
 	Scenarios: Long von parts
 		| name            | first      | von        | last    | jr |
 		| bb cc dd CC, AA | AA         | bb cc dd   | CC      |    |

data/features/step_definitions/bibtex_steps.rb

@@ -61,7 +61,7 @@ end
 
 Then /^my bibliography should contain an entry with (?:key|id) "([^"]*)" and a?n? (\w+) value of "([^"]*)"$/ do |key,field,value|
   refute_nil @bibliography[key.to_s]
-  assert_equal value, @bibliography[key.to_s][field].to_s
+  assert_equal value, @bibliography[key.to_s][field.downcase.to_sym].to_s
 end
 
 
@@ -91,5 +91,5 @@ Then /^the string "([^"]*)" should be "([^"]*)"$/ do |key, value|
 end
 
 Then /^the entry with key "([^"]*)" should have a field "([^"]*)" with the value "([^"]*)"$/ do |key, field, value|
-  assert_equal value, @bibliography[key.to_sym][field.to_sym].to_s
+  assert_equal value, @bibliography[key][field.downcase.to_sym].to_s
 end

data/lib/bibtex.rb

@@ -19,11 +19,13 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'rubygems'
+require 'digest/md5'
 
 require 'bibtex/version'
 require 'logger'
 
+require 'multi_json'
+
 # = BibTeX
 #
 # This module encompasses a parser for BibTeX files and

data/lib/bibtex/bibliography.rb

@@ -31,10 +31,12 @@ module BibTeX
     include Enumerable
     include Comparable
     
-    DEFAULTS = { :parse_names => true, :parse_months => true }.freeze
+    @defaults = { :parse_names => true, :parse_months => true }.freeze
     
     class << self    
 
+			attr_reader :defaults
+			
       # Opens and parses the `.bib' file at the given +path+. Returns
       # a new Bibliography instance corresponding to the file, or, if a block
       # is given, yields the instance to the block, ensuring that the file
@@ -50,7 +52,8 @@ module BibTeX
       # -:filter: convert all entries using the sepcified filter (not set by default)
       #
       def open(path, options = {})
-        b = parse(Kernel.open(path).read, options)
+        b = parse(Kernel.open(path, 'r:UTF-8').read, options)
+				b.path = path
         return b unless block_given?
 
         begin
@@ -61,13 +64,16 @@ module BibTeX
       end
 
       # Parses the given string and returns a corresponding Bibliography instance.
-      def parse(bibtex, options = {})
-        Parser.new(options).parse(bibtex) || Bibliography.new(options)
+      def parse(input, options = {})
+				case input
+				when Array, Hash, Element
+					Bibliography.new(options).add(input)
+				else
+        	Parser.new(options).parse(input) || Bibliography.new(options)
+				end
       end
       
-      #
       # Defines a new accessor that selects elements by type.
-      #
       def attr_by_type(*arguments)
         arguments.each do |type|
           method_id = "#{type}s"
@@ -77,19 +83,21 @@ module BibTeX
     end
   
     attr_accessor :path
+
     attr_reader :data, :strings, :entries, :errors, :options
 
-    attr_by_type :article, :book, :journal, :collection, :preamble, :comment, :meta_content
+    attr_by_type :article, :book, :journal, :collection, :preamble, :comment,
+			:meta_content
     
-    def_delegators :@data, :length, :size, :each, :empty?
-
+    def_delegators :@data, :length, :size, :each, :empty?, :last
+		def_delegators :@entries, :has_key?
     
-    #
+
     # Creates a new bibliography.
-    #
     def initialize(options = {})
-      @options = DEFAULTS.merge(options)
-      @data, @strings, @entries = [], {}, {}
+      @options = Bibliography.defaults.merge(options)
+      @data, @strings = [], {}
+			@entries = Hash.new { |h,k| h.fetch(k.to_s, nil) }
 
       yield self if block_given?
     end
@@ -97,9 +105,8 @@ module BibTeX
     # Adds a new element, or a list of new elements to the bibliography.
     # Returns the Bibliography for chainability.
     def add(*arguments)
-      arguments.flatten.each do |element|
-        raise(ArgumentError, "Failed to add #{ element.inspect } to Bibliography; instance of BibTeX::Element expected.") unless element.is_a?(Element)
-        @data << element.added_to_bibliography(self)
+      Element.parse(arguments.flatten).each do |element|
+        data << element.added_to_bibliography(self)
       end
       self
     end
@@ -107,6 +114,7 @@ module BibTeX
     alias << add
     alias push add
     
+
     # Saves the bibliography to the current path.
     def save(options = {})
       save_to(@path, options)
@@ -115,19 +123,21 @@ module BibTeX
     # Saves the bibliography to a file at the given path. Returns the bibliography.
     def save_to(path, options = {})
       options[:quotes] ||= %w({ })
-      File.open(path, "w") { |f| f.write(to_s(options)) }
+      File.open(path, 'w:UTF-8') { |f| f.write(to_s(options)) }
       self
     end
     
+
     def parse_names
       @entries.each_value { |e| e.parse_names }
       self
     end
-    
+
     def parse_months
       @entries.each_value { |e| e.parse_month }
       self
     end
+
     
     # Converts all enties using the given filter. If an optional block is given
     # the block is used as a condition (the block will be called with each
@@ -137,7 +147,7 @@ module BibTeX
       self
     end
     		
-    #
+
     # Deletes an object, or a list of objects from the bibliography.
     # If a list of objects is to be deleted, you can either supply the list
     # of objects or use a query or block to define the list.
@@ -169,7 +179,7 @@ module BibTeX
     # >> bib[:key]
     # => Returns the first entry with key 'key' or nil
     # >> bib['key']
-    # => Returns all entries with key 'key' or []
+    # => Same as above
     # >> bib['@article']
     # => Returns all entries of type 'article' or []
     # >> bib['@preamble']
@@ -183,10 +193,21 @@ module BibTeX
       raise(ArgumentError, "wrong number of arguments (#{arguments.length} for 1..2)") unless arguments.length.between?(1,2)
 
       case
-      when !([Range, Numeric] & arguments[0].class.ancestors).empty?
-        @data[*arguments] 
-      when arguments.length == 1 && arguments[0].is_a?(Symbol)
-        @entries[arguments[0]]
+      when arguments[0].is_a?(Numeric) || arguments[0].is_a?(Range)
+        data[*arguments] 
+			when arguments.length == 1
+				case
+				when arguments[0].nil?
+					nil
+				when arguments[0].respond_to?(:empty?) && arguments[0].empty?
+					nil
+      	when arguments[0].is_a?(Symbol)
+        	entries[arguments[0]]
+	 			when arguments[0].respond_to?(:start_with?) && !arguments[0].start_with?('@')
+        	entries[arguments[0]]
+				else
+					query(*arguments)
+				end
       else
         query(*arguments)
       end
@@ -208,6 +229,11 @@ module BibTeX
       !errors? && @entries.values.all?(&:valid?)
     end
     
+		# Returns a list of the names of all authors, editors and translators in the Bibliography.
+		def names
+			map(&:names).flatten
+		end
+		
     # Replaces all string symbols which are defined in the bibliography.
     #
     # By default symbols in @string, @preamble and entries are replaced; this
@@ -266,7 +292,7 @@ module BibTeX
     
     # Returns a JSON representation of the bibliography.
     def to_json(options = {})
-      to_a(options).to_json
+      MultiJson.encode(to_a(options))
     end
     
     # Returns a CiteProc JSON representation of the bibliography. Only BibTeX enrties are exported.
@@ -274,15 +300,20 @@ module BibTeX
       q('@entry').map { |o| o.to_citeproc(options) }
     end
     
-    # Returns an XML representation of the bibliography. Only BibTeX entries are exported.
-    def to_xml
+    # Returns a REXML::Document representation of the bibliography using the
+		# BibTeXML format.
+    def to_xml(options = {})
       require 'rexml/document'
 	    
-      xml = REXML::Document.new
+      xml =  REXML::Document.new
       xml << REXML::XMLDecl.new('1.0','UTF-8')
-      root = REXML::Element.new('bibliography')
-      each { |e| root.add_element(e.to_xml) }
-      xml << root
+
+      root = REXML::Element.new('bibtex:file')
+			root.add_namespace('bibtex', 'http://bibtexml.sf.net/')
+			
+      each { |e| root.add_element(e.to_xml(options)) }
+
+      xml.add_element(root)
       xml
     end
 
@@ -307,7 +338,8 @@ module BibTeX
       raise(ArgumentError, "wrong number of arguments (#{arguments.length} for 0..2)") unless arguments.length.between?(0,2)
 
       q, selector = arguments.reverse
-      filter = block ? Proc.new { |e| e.match?(q) && block.call(e) } : Proc.new { |e| e.match?(q) }
+      filter = block ? Proc.new { |e| e.match?(q) && block.call(e) } :
+				Proc.new { |e| e.match?(q) }
 
       send(query_handler(selector), &filter)
     end
@@ -324,6 +356,26 @@ module BibTeX
       other.respond_to?(:to_a) ? to_a <=> other.to_a : nil
     end
     
+		# TODO this should be faster than select_duplicates_by
+		# def detect_duplicates_by(*arguments)
+		# end
+
+		def select_duplicates_by(*arguments)
+			d, fs = Hash.new([]), arguments.flatten.map(&:to_sym)
+			q('@entry') do |e|
+				d[e.generate_hash(fs)] << e
+			end
+			
+			d.values.dup
+		end
+		
+		alias duplicates select_duplicates_by
+		
+		def duplicates?
+			!select_duplicates_by?.empty?
+		end
+		
+		
     private
     
     def query_handler(selector)