# HG changeset patch # User Sean Russell # Date 1327760402 18000 # Sat Jan 28 09:20:02 2012 -0500 # Node ID 20b3975f2966e6fe673799b533982b6838d26fde # Parent 02e85dc2d1defef981ddc5712025bd38bd64f26f Fixes #289, Incorrect list generation. Also turns off debug for json renderer. diff --git a/json_renderer.rb b/json_renderer.rb --- a/json_renderer.rb +++ b/json_renderer.rb @@ -69,10 +69,11 @@ require 'parser' require 'renderer' File.open(ARGV[0] || "markup.txt") { |fin| - p = RML::Parser.new( true ) + p = RML::Parser.new() a = { 'dot' => ['cp $RML_INPUT $RML_OUTPUT', 'txt']} r = RML::Renderer.new( RML::JSONRenderer.new(:output => STDOUT), a, p) - p.parse(fin) { |l| STDERR.puts l.inspect } + p.parse(fin) + #p.parse(fin) { |l| STDERR.puts l.inspect } r.render( p.tokens ) } end diff --git a/parser.rb b/parser.rb --- a/parser.rb +++ b/parser.rb @@ -238,7 +238,7 @@ when :definition attrs = { :flavor => :definition, :term => content[0].strip } content = content[1] - when "*" + when "*", "-" list_type = :u_list flavor = :bullet when /\[([_X])\]/ @@ -320,7 +320,7 @@ tag = content.strip.downcase return [{ :alignment => alignment, :level => level, - :id => tag }, content] + :id => tag }, [content]] end diff --git a/pdf.rb b/pdf.rb --- a/pdf.rb +++ b/pdf.rb @@ -402,10 +402,10 @@ unicode = true bullet,idnt = "\xE2\x9C\x94",12 when :upper_alpha - bullet,idnt = "%c."%(?A + @list_idx[-1]),15 + bullet,idnt = "%c."%(?A.ord + @list_idx[-1]),15 @list_idx[-1] += 1 when :lower_alpha - bullet,idnt = "%c."%(?a + @list_idx[-1]),15 + bullet,idnt = "%c."%(?a.ord + @list_idx[-1]),15 @list_idx[-1] += 1 when :number, :auto @list_idx[-1] += 1