# HG changeset patch
# User Sean Russell <seanerussell@gmail.com>
# Date 1312332414 14400
#      Tue Aug 02 20:46:54 2011 -0400
# Branch ruby_1.9
# Node ID 73ad7805f641a9cbfe03c0d03b273aaa57eac350
# Parent  fc3c46cac927ebbc77d92fdf5f0aa6743fee81ec
Starting the conversion

diff --git a/parser.rb b/parser.rb
--- a/parser.rb
+++ b/parser.rb
@@ -30,7 +30,7 @@
 				case rest
 				when Fenced
 					rest = $'
-					@token_stack << Token.new(:fenced, {:callout=>$1}, $2)
+					@token_stack << Token.new(:fenced, {callout:$1}, $2)
 				when PbHeading
 					rest = $'
 					data = $&
@@ -125,7 +125,7 @@
 					next
 				when Directive
 					rest = $'
-					@token_stack << Token.new(:directive, {:key => $1, :value => $2}, [])
+					@token_stack << Token.new(:directive, {key:$1, value:$2}, [])
 				when EMPTY
 					rest = $'
 					next
@@ -166,7 +166,7 @@
 					l
 				end
 			}
-			q = Token.new(:quote, {:attribution => attribution}, [])
+			q = Token.new(:quote, {attribution:attribution}, [])
 			while content_lines.length > 0
 				q.content += content_lines.take_while{|k| k.kind_of? Token or k !~ /^>/}
 				rest = content_lines.drop_while{|k| k.kind_of? Token or k !~ /^>/}
@@ -206,7 +206,7 @@
 			when :ident
 				attrs[:flavor] = :ident
 			when :definition
-				attrs = { :flavor => :definition, :term => content[0].strip }
+				attrs = { flavor: :definition, term: content[0].strip }
 				content = content[1]
 			when "*"
 				list_type = :u_list
@@ -214,7 +214,7 @@
 			when /\[([_X])\]/
 				list_type = :u_list
 				flavor = :todo
-				attrs = { :flavor => ($1 == "_" ? :open : :closed) }
+				attrs = { flavor: ($1 == "_" ? :open : :closed) }
 			when "#."
 				list_type = :o_list
 				flavor = :auto
@@ -256,10 +256,10 @@
 				 @list_stack[-1].attrs[:indent] < indent or
 				 @list_stack[-1].attrs[:list_type] != list_type or
 				 @list_stack[-1].attrs[:flavor] != flavor
-				@list_stack << Token.new(:list_start, { :list_type => list_type, 
-																 :indent => indent, :flavor => flavor }, [])
+				@list_stack << Token.new(:list_start, { list_type:list_type, 
+																 indent:indent, flavor:flavor }, [])
 				@token_stack << @list_stack[-1]
-				close_lists << Token.new(:list_end, { :list_type => list_type }, [])
+				close_lists << Token.new(:list_end, { list_type:list_type }, [])
 			end
 			@token_stack << Token.new(:list_item, attrs, [content])
 			@token_stack.concat( close_lists )
@@ -288,9 +288,9 @@
 				when /^/; 6
 				end
 			tag = content.strip.downcase
-			return [{ :alignment  => alignment,
-								:level	    => level,
-							  :id         => tag	}, content]
+			return [{ alignment: alignment,
+								level	   : level,
+							  id       : tag	}, content]
 		end
 
 
@@ -341,7 +341,7 @@
 				content[0].gsub!( /#{p}/, '' )
 				content[-1].gsub!( /#{p}/, '' )
 			end
-			return Token.new(kind, {:indent=>indent, :alignment=>alignment}, [content])
+			return Token.new(kind, {indent:indent, alignment:alignment}, [content])
 		end
 		
 		def is_sidebar(content)
@@ -386,18 +386,18 @@
 		def process_table( indent, coldef, header, rows)
 			align = Parser.get_alignment(indent, (" "*indent)+coldef, @page_width)
 			rule_line = coldef.split(/([^ ]=*)/)[1..-1]
-			@token_stack << Token.new(:table_start, {:alignment=>align}, [])
+			@token_stack << Token.new(:table_start, {alignment:align}, [])
 			
-			@token_stack << Token.new(:row_start, {:class=>:header}, [])
+			@token_stack << Token.new(:row_start, {class::header}, [])
 			split_columns(indent, rule_line, header).each do |align, cell|
-				@token_stack << Token.new(:cell, {:alignment=>align,:class=>:header}, cell)
+				@token_stack << Token.new(:cell, {alignment:align,class::header}, cell)
 			end
-			@token_stack << Token.new(:row_end, {:class=>:header}, [])
+			@token_stack << Token.new(:row_end, {class::header}, [])
 			
 			rows.split(/\n/).each do |row|
 				@token_stack << Token.new(:row_start, {}, [])
 				split_columns(indent, rule_line, row).each do |align, cell|
-					@token_stack << Token.new(:cell, {:alignment=>align}, cell)
+					@token_stack << Token.new(:cell, {alignment:align}, cell)
 				end
 				@token_stack << Token.new(:row_end, {}, [])
 			end
@@ -499,7 +499,7 @@
 				acronym = $1
 				definition = $2
 				@link_refs[acronym] = $2
-				return [Token.new(:adm, {:acronym => acronym, :definition => definition}, [])]
+				return [Token.new(:adm, {acronym:acronym, definition:definition}, [])]
 			when Underscore
 				kind = :underscore
 				before = $`