bibtex-ruby 2.0.3 → 2.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bibtex-ruby (2.0.2)
+    bibtex-ruby (2.0.4)
       latex-decode (>= 0.0.6)
       multi_json (~> 1.0)
 
@@ -34,7 +34,7 @@ GEM
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     minitest (2.3.1)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
     racc (1.4.6)

data/History.txt

@@ -1,3 +1,10 @@
+2.0.4 / 2011-12-20
+==================
+
+* Added lexer option :strip to strip newlines from literals (thanks to @JLimperg)
+* Added :linebreaks filter
+
+
 2.0.3 / 2011-12-13
 ==================
 

data/Manifest

@@ -5,7 +5,6 @@ LICENSE
 Manifest
 README.md
 Rakefile
-Rakefile.compiled.rbc
 auto.watchr
 bibtex-ruby.gemspec
 examples
@@ -19,6 +18,7 @@ features/issues
 features/issues/braced_strings.feature
 features/issues/crossref.feature
 features/issues/latex_filter.feature
+features/issues/multiline_strings.feature
 features/issues/number_keys.feature
 features/issues/parse_months.feature
 features/issues/slash_keys.feature
@@ -29,78 +29,48 @@ features/query.feature
 features/replacement.feature
 features/step_definitions
 features/step_definitions/bibtex_steps.rb
-features/step_definitions/bibtex_steps.rbc
 features/step_definitions/name_steps.rb
-features/step_definitions/name_steps.rbc
 features/strings.feature
 features/support
 features/support/env.rb
-features/support/env.rbc
 lib
 lib/bibtex
 lib/bibtex/bibliography.rb
-lib/bibtex/bibliography.rbc
 lib/bibtex/bibtex.y
 lib/bibtex/compatibility.rb
-lib/bibtex/compatibility.rbc
 lib/bibtex/elements.rb
-lib/bibtex/elements.rbc
 lib/bibtex/entry.rb
-lib/bibtex/entry.rbc
 lib/bibtex/error.rb
-lib/bibtex/error.rbc
 lib/bibtex/extensions.rb
-lib/bibtex/extensions.rbc
 lib/bibtex/filters
 lib/bibtex/filters/latex.rb
-lib/bibtex/filters/latex.rbc
+lib/bibtex/filters/linebreaks.rb
 lib/bibtex/filters.rb
-lib/bibtex/filters.rbc
 lib/bibtex/lexer.rb
-lib/bibtex/lexer.rbc
 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.rb
-lib/bibtex/parser.rbc
 lib/bibtex/replaceable.rb
-lib/bibtex/replaceable.rbc
 lib/bibtex/ruby.rb
 lib/bibtex/utilities.rb
-lib/bibtex/utilities.rbc
 lib/bibtex/value.rb
-lib/bibtex/value.rbc
 lib/bibtex/version.rb
-lib/bibtex/version.rbc
 lib/bibtex.rb
-lib/bibtex.rbc
 test
 test/benchmark.rb
 test/bibtex
 test/bibtex/test_bibliography.rb
-test/bibtex/test_bibliography.rbc
 test/bibtex/test_elements.rb
-test/bibtex/test_elements.rbc
 test/bibtex/test_entry.rb
-test/bibtex/test_entry.rbc
 test/bibtex/test_filters.rb
-test/bibtex/test_filters.rbc
 test/bibtex/test_lexer.rb
-test/bibtex/test_lexer.rbc
 test/bibtex/test_name_parser.rb
-test/bibtex/test_name_parser.rbc
 test/bibtex/test_names.rb
-test/bibtex/test_names.rbc
 test/bibtex/test_parser.rb
-test/bibtex/test_parser.rbc
 test/bibtex/test_string.rb
-test/bibtex/test_string.rbc
 test/bibtex/test_utilities.rb
-test/bibtex/test_utilities.rbc
 test/bibtex/test_value.rb
-test/bibtex/test_value.rbc
 test/fixtures
 test/fixtures/bibdesk.bib
 test/fixtures/comment.bib
@@ -112,10 +82,6 @@ test/fixtures/no_bibtex.bib
 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
-test/test_export.rb
-test/test_export.rbc
+test/test_export.rb

data/Rakefile

@@ -69,7 +69,7 @@ end
 desc 'Updates the Manifest file'
 task :manifest => ['clean', 'racc'] do
   m = File.open('Manifest', 'w')
-  m.print FileList['**/*'].join("\n")
+  m.print FileList['**/*'].reject{ |f| f.end_with?('rbc') }.join("\n")
   m.close
 end
 

data/features/issues/multiline_strings.feature

@@ -0,0 +1,14 @@
+Feature: Multiline values on single lines
+  As a hacker who works with bibliographies
+  I would find it practical to have multiline values turned to single lines by default
+  Because this is what most BibTeX files will assume.
+
+  Scenario: Multiline value
+    When I parse the following file:
+    """
+    @article{stuff,
+      title = "This very long title must be wrapped and continues
+               on the next line."
+    }
+    """
+    Then the entry with key "stuff" should have a field "title" with the value "This very long title must be wrapped and continues on the next line."

data/lib/bibtex/bibtex.y

@@ -90,10 +90,10 @@ require 'bibtex/lexer'
 
   attr_reader :lexer, :options
   
-	DEFAULTS = { :include => [:errors], :debug => ENV['DEBUG'] == true }.freeze
-	
+  DEFAULTS = { :include => [:errors], :debug => ENV['DEBUG'] == true }.freeze
+  
   def initialize(options = {})
-		@options = DEFAULTS.merge(options)
+    @options = DEFAULTS.merge(options)
     @lexer = Lexer.new(@options)
   end
 
@@ -102,7 +102,7 @@ require 'bibtex/lexer'
     @lexer.analyse(input)
     
     do_parse
-		#yyparse(@lexer,:each)
+    #yyparse(@lexer,:each)
   end
   
   def next_token
@@ -114,8 +114,11 @@ require 'bibtex/lexer'
   end
     
   def on_error(tid, val, vstack)
-    Log.error("Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
-    #raise(ParseError, "Failed to parse BibTeX on value %s (%s) %s" % [val.inspect, token_to_str(tid) || '?', vstack.inspect])
+    message =
+      "Failed to parse BibTeX on value #{val.inspect} (#{token_to_str(tid) || '?'}) #{ vstack.inspect}"
+
+    BibTeX.log.error message
+    raise ParseError, message
   end
 
 # -*- racc -*-

data/lib/bibtex/filters.rb

@@ -6,7 +6,7 @@ module BibTeX
     
     class << self
       # Hook called by Ruby if Filter is subclassed
-      def inherited (base)
+      def inherited(base)
         base.class_eval { include Singleton }
         subclasses << base
       end
@@ -17,7 +17,9 @@ module BibTeX
       end
     end
     
-    def apply (value); value; end
+    def apply(value)
+      value
+    end
     
     alias convert apply
     alias << apply
@@ -31,7 +33,7 @@ module BibTeX
       require filter
     end
 
-    def self.resolve (filter)
+    def self.resolve(filter)
       case
       when filter.respond_to?(:apply)
         filter

data/lib/bibtex/filters/latex.rb

@@ -4,7 +4,7 @@ module BibTeX
   module Filters
     
     class LaTeX < Filter
-      def apply (value)
+      def apply(value)
         ::LaTeX.decode(value)
       end
     end

data/lib/bibtex/filters/linebreaks.rb

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

data/lib/bibtex/lexer.rb

@@ -9,280 +9,298 @@
 # 
 # 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
+# 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/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 
 require 'strscan'
 
 module BibTeX
-	
-	#
-	# The BibTeX::Lexer handles the lexical analysis of BibTeX bibliographies.
-	#
-	class Lexer
-	  extend Forwardable
+  
+  #
+  # The BibTeX::Lexer handles the lexical analysis of BibTeX bibliographies.
+  #
+  class Lexer
+    extend Forwardable
 
-		attr_reader :options, :stack, :mode, :scanner
-		attr_writer :mode
-		
+    attr_reader :options, :stack, :mode, :scanner
+    attr_writer :mode
+    
     def_delegator :@scanner, :string, :data
 
-    DEFAULTS = { :include => [:errors], :strict => true }.freeze
+    @defaults = {
+      :include => [:errors],
+      :strict => true,
+      :strip => true
+    }.freeze
+    
+    MODE = Hash.new(:meta).merge({
+      :bibtex  => :bibtex,  :entry    => :bibtex,
+      :string  => :bibtex,  :preamble => :bibtex,
+      :comment => :bibtex,  :meta     => :meta,
+      :literal => :literal, :content  => :content
+    }).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_accessor :defaults
+    end
     
-		#
-		# Creates a new instance. Possible options and their respective
-		# default values are:
-		#
-		# - :include => [:errors] A list that may contain :meta_content, and
-		#		:errors; depending on whether or not these are present, the respective
-		#		tokens are included in the parse tree.
-		# - :strict => true In strict mode objects can start anywhere; therefore
-		#		the `@' symbol is not possible except inside literals or @comment
-		#		objects; for a more lenient lexer set to false and objects are
-		#		expected to start after a new line (leading white space is permitted).
-		#
-		def initialize(options = {})
-      @options = DEFAULTS.merge(options)
+    #
+    # Creates a new instance. Possible options and their respective
+    # default values are:
+    #
+    # - :include => [:errors] A list that may contain :meta_content, and
+    #   :errors; depending on whether or not these are present, the respective
+    #   tokens are included in the parse tree.
+    # - :strict => true In strict mode objects can start anywhere; therefore
+    #   the `@' symbol is not possible except inside literals or @comment
+    #   objects; for a more lenient lexer set to false and objects are
+    #   expected to start after a new line (leading white space is permitted).
+    # - :strip => true When enabled, newlines will be stripped from quoted
+    #   string values.
+    #
+    def initialize(options = {})
+      @options = Lexer.defaults.merge(options)
       reset
-		end
+    end
 
     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
+      @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)
-		  reset
-		end
+    # Sets the source for the lexical analysis and resets the internal state.
+    def data=(data)
+      @scanner = StringScanner.new(data)
+      reset
+    end
 
     def symbols; @stack.map(&:first); end
     
-		# Returns the next token from the parse stack.
-		def next_token; @stack.shift; end
+    # Returns the next token from the parse stack.
+    def next_token; @stack.shift; end
 
-		# Returns true if the lexer is currenty parsing a BibTeX object.
-		def bibtex_mode?
-			MODE[@mode] == :bibtex
-		end
-				
-		[:meta, :literal, :content].each do |m|
+    # Returns true if the lexer is currenty parsing a BibTeX object.
+    def bibtex_mode?
+      MODE[@mode] == :bibtex
+    end
+        
+    [:meta, :literal, :content].each do |m|
       define_method("#{m}_mode?") { @mode == m }
-		end
+    end
 
-		# Returns true if the lexer is currently parsing the given object type.
-		def active?(object)
-			@active_object == object
-		end
-		
-		# Returns true if the lexer is currently in strict mode.
-		def strict?; !!(@options[:strict]); end
-		
-		# Pushes a value onto the parse stack. Returns the Lexer.
-		def push(value)
-			case value[0]
+    # Returns true if the lexer is currently parsing the given object type.
+    def active?(object)
+      @active_object == object
+    end
+    
+    # Returns true if the lexer is currently in strict mode.
+    def strict?; !!(@options[:strict]); 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
-				if !@stack.empty? && value[0] == @stack[-1][0]
-					@stack[-1][1] << value[1]
-				else
-					@stack.push(value)
-				end
-			when :ERROR
-				@stack.push(value) if @include_errors
-				leave_object
-			when :META_CONTENT				
+        value[1].gsub!(/\n\s*/, ' ') if strip_line_breaks?
+        
+        if !@stack.empty? && value[0] == @stack[-1][0]
+          @stack[-1][1] << value[1]
+        else
+          @stack.push(value)
+        end
+      when :ERROR
+        @stack.push(value) if @include_errors
+        leave_object
+      when :META_CONTENT        
         @stack.push(value) if @include_meta_content
-			else
-				@stack.push(value)
-			end
-						
-			self
-		end
+      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		
+    # Start the lexical analysis.
+    def analyse(string = nil)
+      raise(ArgumentError, 'Lexer: failed to start analysis: no source given!') unless
+        string || @scanner    
 
-			self.data = string || @scanner.string
-			
-			until @scanner.eos?
-				send("parse_#{MODE[@mode]}")
-			end
+      self.data = string || @scanner.string
+      
+      until @scanner.eos?
+        send("parse_#{MODE[@mode]}")
+      end
 
-			push([false, '$end'])
-		end
+      push([false, '$end'])
+    end
 
     private
     
-		def parse_bibtex
-			case
-			when @scanner.scan(/[\s]+/o)
-			when @scanner.scan(/\{/o)
-				@brace_level += 1
-				push([:LBRACE,'{'])
-				@mode = :content if @brace_level > 1 || @brace_level == 1 && active?(:comment)
-			when @scanner.scan(/\}/o)
-				@brace_level -= 1
-				push([:RBRACE,'}'])
-				return leave_object if @brace_level == 0
-				return error_unbalanced_braces if @brace_level < 0
-			when @scanner.scan( /=/o)
-				push([:EQ,'='])
-			when @scanner.scan(/,/o)
-				push([:COMMA,','])
-			when @scanner.scan(/\d+/o)
-				push([:NUMBER,@scanner.matched])
-			when @scanner.scan(/[[:alpha:]\d \/:_!$\.%&*-]+/io)
-				push([:NAME,@scanner.matched.rstrip])
-			when @scanner.scan(/"/o)
-				@mode = :literal
-			when @scanner.scan(/#/o)
-				push([:SHARP,'#'])
-			when @scanner.scan(/@/o)
-				enter_object
-			when @scanner.scan(/./o)
-				error_unexpected_token				
-			end
-		end
-		
-		def parse_meta
-			match = @scanner.scan_until(strict? ? /@[\t ]*/o : /(^|\n)[\t ]*@[\t ]*/o)
-			if @scanner.matched
-				push([:META_CONTENT,match.chop])
-				enter_object
-			else
-				push([:META_CONTENT,@scanner.rest])
-				@scanner.terminate
-			end
-		end
+    def parse_bibtex
+      case
+      when @scanner.scan(/[\s]+/o)
+      when @scanner.scan(/\{/o)
+        @brace_level += 1
+        push([:LBRACE,'{'])
+        @mode = :content if @brace_level > 1 || @brace_level == 1 && active?(:comment)
+      when @scanner.scan(/\}/o)
+        @brace_level -= 1
+        push([:RBRACE,'}'])
+        return leave_object if @brace_level == 0
+        return error_unbalanced_braces if @brace_level < 0
+      when @scanner.scan( /=/o)
+        push([:EQ,'='])
+      when @scanner.scan(/,/o)
+        push([:COMMA,','])
+      when @scanner.scan(/\d+/o)
+        push([:NUMBER,@scanner.matched])
+      when @scanner.scan(/[[:alpha:]\d \/:_!$\.%&*-]+/io)
+        push([:NAME,@scanner.matched.rstrip])
+      when @scanner.scan(/"/o)
+        @mode = :literal
+      when @scanner.scan(/#/o)
+        push([:SHARP,'#'])
+      when @scanner.scan(/@/o)
+        enter_object
+      when @scanner.scan(/./o)
+        error_unexpected_token        
+      end
+    end
+    
+    def parse_meta
+      match = @scanner.scan_until(strict? ? /@[\t ]*/o : /(^|\n)[\t ]*@[\t ]*/o)
+      if @scanner.matched
+        push([:META_CONTENT,match.chop])
+        enter_object
+      else
+        push([:META_CONTENT,@scanner.rest])
+        @scanner.terminate
+      end
+    end
 
-		def parse_content
-			match = @scanner.scan_until(/\{|\}/o)
-			case @scanner.matched
-			when '{'
-				@brace_level += 1
-				push([:CONTENT,match])
-			when '}'
-				@brace_level -= 1
-				case
-				when @brace_level == 0
-					push([:CONTENT,match.chop])
-					push([:RBRACE,'}'])
-					leave_object
-				when @brace_level == 1 && !active?(:comment)
-					push([:CONTENT,match.chop])
-					push([:RBRACE,'}'])
-					@mode = :bibtex
-				when @brace_level < 0
-					push([:CONTENT,match.chop])
-					error_unbalanced_braces
-				else
-					push([:CONTENT,match])
-				end
-			else
-				push([:CONTENT,@scanner.rest])
-				@scanner.terminate
-				error_unterminated_content
-			end
-		end
-		
-		def parse_literal
-			match = @scanner.scan_until(/[\{\}"]/o)
-			case @scanner.matched
-			when '{'
-				@brace_level += 1
-				push([:STRING_LITERAL,match])
-			when '}'
-				@brace_level -= 1
-				if @brace_level < 1
-					push([:STRING_LITERAL,match.chop])
-					error_unbalanced_braces
-				else
-					push([:STRING_LITERAL,match])
-				end
-			when '"'
-				if @brace_level == 1
-					push([:STRING_LITERAL,match.chop])
-					@mode = :bibtex
-				else
-					push([:STRING_LITERAL,match])
-				end
-			when "\n"
-				push([:STRING_LITERAL,match.chop])
-				error_unterminated_string
-			else
-				push([:STRING_LITERAL,@scanner.rest])
-				@scanner.terminate
-				error_unterminated_string
-			end
-		end
-		
-		# Called when the lexer encounters a new BibTeX object.
-		def enter_object
-			@brace_level = 0
-			push [:AT,'@']
+    def parse_content
+      match = @scanner.scan_until(/\{|\}/o)
+      case @scanner.matched
+      when '{'
+        @brace_level += 1
+        push([:CONTENT,match])
+      when '}'
+        @brace_level -= 1
+        case
+        when @brace_level == 0
+          push([:CONTENT,match.chop])
+          push([:RBRACE,'}'])
+          leave_object
+        when @brace_level == 1 && !active?(:comment)
+          push([:CONTENT,match.chop])
+          push([:RBRACE,'}'])
+          @mode = :bibtex
+        when @brace_level < 0
+          push([:CONTENT,match.chop])
+          error_unbalanced_braces
+        else
+          push([:CONTENT,match])
+        end
+      else
+        push([:CONTENT,@scanner.rest])
+        @scanner.terminate
+        error_unterminated_content
+      end
+    end
+    
+    def parse_literal
+      match = @scanner.scan_until(/[\{\}"]/o)
+      case @scanner.matched
+      when '{'
+        @brace_level += 1
+        push([:STRING_LITERAL,match])
+      when '}'
+        @brace_level -= 1
+        if @brace_level < 1
+          push([:STRING_LITERAL,match.chop])
+          error_unbalanced_braces
+        else
+          push([:STRING_LITERAL,match])
+        end
+      when '"'
+        if @brace_level == 1
+          push([:STRING_LITERAL,match.chop])
+          @mode = :bibtex
+        else
+          push([:STRING_LITERAL,match])
+        end
+      else
+        push([:STRING_LITERAL,@scanner.rest])
+        @scanner.terminate
+        error_unterminated_string
+      end
+    end
+    
+    # Called when the lexer encounters a new BibTeX object.
+    def enter_object
+      @brace_level = 0
+      push [:AT,'@']
 
-			case
-			when @scanner.scan(/string/io)
-				@mode = @active_object = :string
-				push [:STRING, @scanner.matched]
-			when @scanner.scan(/preamble/io)
-				@mode = @active_object = :preamble
-				push [:PREAMBLE, @scanner.matched]
-			when @scanner.scan(/comment/io)
-				@mode = @active_object = :comment
-				push [:COMMENT, @scanner.matched]
-			when @scanner.scan(/[a-z\d:_!\.$%&*-]+/io)
-				@mode = @active_object = :entry
-				push [:NAME, @scanner.matched]
+      case
+      when @scanner.scan(/string/io)
+        @mode = @active_object = :string
+        push [:STRING, @scanner.matched]
+      when @scanner.scan(/preamble/io)
+        @mode = @active_object = :preamble
+        push [:PREAMBLE, @scanner.matched]
+      when @scanner.scan(/comment/io)
+        @mode = @active_object = :comment
+        push [:COMMENT, @scanner.matched]
+      when @scanner.scan(/[a-z\d:_!\.$%&*-]+/io)
+        @mode = @active_object = :entry
+        push [:NAME, @scanner.matched]
       else
         error_unexpected_object
-			end
-		end
+      end
+    end
 
-		# Called when parser leaves a BibTeX object.
-		def leave_object
-			@mode, @active_object, @brace_level = :meta, nil, 0
-		end
+    # Called when parser leaves a BibTeX object.
+    def leave_object
+      @mode, @active_object, @brace_level = :meta, nil, 0
+    end
 
-		def error_unbalanced_braces
-			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]
-		end
+    def error_unbalanced_braces
+      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]
+    end
 
-		def error_unterminated_content
-			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]
-		end
+    def error_unterminated_content
+      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]
+    end
 
-		def error_unexpected_object
-			BibTeX.log.warn("Lexer: unexpected object at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
-			backtrace [:E_UNEXPECTED_OBJECT, '@']
-		end
+    def error_unexpected_object
+      BibTeX.log.warn("Lexer: unexpected object at #{@scanner.pos}; brace level #{@brace_level}; mode #{@mode.inspect}.")
+      backtrace [:E_UNEXPECTED_OBJECT, '@']
+    end
 
     def backtrace(error)
       bt = []
@@ -291,6 +309,6 @@ module BibTeX
       push [:ERROR,bt]
     end
     
-	end
-	
+  end
+  
 end