org-ruby 0.4.1 → 0.4.2

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.2 / 2009-12-29
+
+* Got rid of the extraneous newline at the start of code blocks.
+* Everything now shows up in code blocks, even org-mode metadata.
+* Fixed bugs:
+  * Regressed smart double quotes with HTML escaping. Added a test
+    case and fixed the regression.
+
 == 0.4.1 / 2009-12-29
 
 * HTML is now escaped by default

data/TAGS

@@ -1,128 +1,133 @@
-
-./spec/parser_spec.rb,0
-
-./spec/headline_spec.rb,0
-
-./spec/line_spec.rb,0
-
-./spec/spec_helper.rb,0
-
-./spec/regexp_helper_spec.rb,0
-
-./spec/textile_output_buffer_spec.rb,0
-
-./lib/org-ruby.rb,242
-module OrgRuby::OrgRuby
2,1
-  def self.version::OrgRuby.version
12,251
-  def self.libpath::OrgRuby.libpath
20,450
-  def self.path::OrgRuby.path
28,695
-  def self.require_all_libs_relative_to::OrgRuby.require_all_libs_relative_to
37,1082
-
-./lib/org-ruby/html_output_buffer.rb,349
-module Orgmode::Orgmode
3,54
-  class HtmlOutputBuffer::Orgmode::HtmlOutputBuffer
5,72
-    def push_mode::Orgmode::HtmlOutputBuffer#push_mode
22,417
-    def pop_mode::Orgmode::HtmlOutputBuffer#pop_mode
27,525
-    def flush!::Orgmode::HtmlOutputBuffer#flush!
32,647
-    def inline_formatting::Orgmode::HtmlOutputBuffer#inline_formatting
62,1689
-
-./lib/org-ruby/output_buffer.rb,1195
-module Orgmode::Orgmode
3,18
-  class OutputBuffer::Orgmode::OutputBuffer
9,297
-    attr_reader :buffer::Orgmode::OutputBuffer#buffer
12,381
-    attr_reader :output::Orgmode::OutputBuffer#output
15,446
-    attr_accessor :output_type::Orgmode::OutputBuffer#output_type
18,532
-    def initialize::Orgmode::OutputBuffer#Orgmode::OutputBuffer.new
22,686
-    def current_mode::Orgmode::OutputBuffer#current_mode
40,1138
-    def current_mode_list?::Orgmode::OutputBuffer#current_mode_list?
44,1197
-    def push_mode::Orgmode::OutputBuffer#push_mode
48,1286
-    def pop_mode::Orgmode::OutputBuffer#pop_mode
53,1421
-    def prepare::Orgmode::OutputBuffer#prepare
61,1729
-    def enter_table?::Orgmode::OutputBuffer#enter_table?
73,2129
-    def exit_table?::Orgmode::OutputBuffer#exit_table?
79,2314
-    def <<::Orgmode::OutputBuffer#<<
85,2480
-    def list_indent_level::Orgmode::OutputBuffer#list_indent_level
90,2585
-    def preserve_whitespace?::Orgmode::OutputBuffer#preserve_whitespace?
95,2729
-    def maintain_list_indent_stack::Orgmode::OutputBuffer#maintain_list_indent_stack
102,2866
-    def should_accumulate_output?::Orgmode::OutputBuffer#should_accumulate_output?
127,3724
-
-./lib/org-ruby/headline.rb,619
-module Orgmode::Orgmode
3,45
-  class Headline::Orgmode::Headline
6,109
-    attr_reader :level::Orgmode::Headline#level
9,178
-    attr_reader :headline_text::Orgmode::Headline#headline_text
13,325
-    attr_reader :body_lines::Orgmode::Headline#body_lines
16,418
-    attr_reader :tags::Orgmode::Headline#tags
19,481
-    attr_reader :keyword::Orgmode::Headline#keyword
22,567
-    def initialize::Orgmode::Headline#Orgmode::Headline.new
35,896
-    def self.headline?::Orgmode::Headline.headline?
58,1687
-    def to_textile::Orgmode::Headline#to_textile
63,1818
-    def to_html::Orgmode::Headline#to_html
69,1950
-
-./lib/org-ruby/regexp_helper.rb,1014
-module Orgmode::Orgmode
3,18
-  class RegexpHelper::Orgmode::RegexpHelper
17,456
-    attr_reader   :pre_emphasis::Orgmode::RegexpHelper#pre_emphasis
42,1785
-    attr_reader   :post_emphasis::Orgmode::RegexpHelper#post_emphasis
43,1817
-    attr_reader   :border_forbidden::Orgmode::RegexpHelper#border_forbidden
44,1850
-    attr_reader   :body_regexp::Orgmode::RegexpHelper#body_regexp
45,1886
-    attr_reader   :markers::Orgmode::RegexpHelper#markers
46,1917
-    attr_reader   :org_emphasis_regexp::Orgmode::RegexpHelper#org_emphasis_regexp
48,1945
-    def initialize::Orgmode::RegexpHelper#Orgmode::RegexpHelper.new
50,1999
-    def match_all::Orgmode::RegexpHelper#match_all
65,2476
-    def rewrite_emphasis::Orgmode::RegexpHelper#rewrite_emphasis
92,3413
-    def rewrite_links::Orgmode::RegexpHelper#rewrite_links
124,4523
-    def build_org_emphasis_regexp::Orgmode::RegexpHelper#build_org_emphasis_regexp
135,4759
-    def build_org_link_regexp::Orgmode::RegexpHelper#build_org_link_regexp
145,5326
-
-./lib/org-ruby/textile_output_buffer.rb,454
-module Orgmode::Orgmode
3,20
-  class TextileOutputBuffer::Orgmode::TextileOutputBuffer
5,38
-    def initialize::Orgmode::TextileOutputBuffer#Orgmode::TextileOutputBuffer.new
7,84
-    def push_mode::Orgmode::TextileOutputBuffer#push_mode
12,169
-    def pop_mode::Orgmode::TextileOutputBuffer#pop_mode
17,262
-    def inline_formatting::Orgmode::TextileOutputBuffer#inline_formatting
34,585
-    def flush!::Orgmode::TextileOutputBuffer#flush!
48,973
-
-./lib/org-ruby/parser.rb,471
-module Orgmode::Orgmode
5,61
-  class Parser::Orgmode::Parser
7,79
-    attr_reader :lines::Orgmode::Parser#lines
10,140
-    attr_reader :headlines::Orgmode::Parser#headlines
13,207
-    attr_reader :header_lines::Orgmode::Parser#header_lines
16,287
-    def initialize::Orgmode::Parser#Orgmode::Parser.new
20,459
-    def self.load::Orgmode::Parser.load
48,1267
-    def to_textile::Orgmode::Parser#to_textile
54,1433
-    def to_html::Orgmode::Parser#to_html
63,1620
-
-./lib/org-ruby/line.rb,1430
-module Orgmode::Orgmode
1,0
-  class Line::Orgmode::Line
4,67
-    attr_reader :line::Orgmode::Line#line
7,114
-    attr_reader :indent::Orgmode::Line#indent
12,300
-    def initialize::Orgmode::Line#Orgmode::Line.new
14,325
-    def to_s::Orgmode::Line#to_s
21,465
-    def comment?::Orgmode::Line#comment?
26,546
-    def metadata?::Orgmode::Line#metadata?
31,663
-    def nonprinting?::Orgmode::Line#nonprinting?
35,755
-    def blank?::Orgmode::Line#blank?
39,807
-    def plain_list?::Orgmode::Line#plain_list?
43,859
-    def unordered_list?::Orgmode::Line#unordered_list?
49,974
-    def strip_unordered_list_tag::Orgmode::Line#strip_unordered_list_tag
53,1051
-    def ordered_list?::Orgmode::Line#ordered_list?
59,1168
-    def strip_ordered_list_tag::Orgmode::Line#strip_ordered_list_tag
63,1241
-    def plain_text?::Orgmode::Line#plain_text?
67,1309
-    def table_row?::Orgmode::Line#table_row?
71,1392
-    def table_separator?::Orgmode::Line#table_separator?
77,1539
-    def table?::Orgmode::Line#table?
85,1775
-    def begin_block?::Orgmode::Line#begin_block?
91,1888
-    def end_block?::Orgmode::Line#end_block?
95,1960
-    def block_type::Orgmode::Line#block_type
99,2030
-    def paragraph_type::Orgmode::Line#paragraph_type
104,2152
-    def self.to_textile::Orgmode::Line.to_textile
115,2470
-    def self.to_html::Orgmode::Line.to_html
121,2620
-    def self.translate::Orgmode::Line.translate
128,2816
-
-./bin/org-ruby,0
-
-./test/test_orgmode_parser.rb,0
+
+./bin/org-ruby,0
+
+./lib/org-ruby/headline.rb,619
+module Orgmode::Orgmode
3,45
+  class Headline::Orgmode::Headline
6,109
+    attr_reader :level::Orgmode::Headline#level
9,178
+    attr_reader :headline_text::Orgmode::Headline#headline_text
13,325
+    attr_reader :body_lines::Orgmode::Headline#body_lines
16,418
+    attr_reader :tags::Orgmode::Headline#tags
19,481
+    attr_reader :keyword::Orgmode::Headline#keyword
22,567
+    def initialize::Orgmode::Headline#Orgmode::Headline.new
35,896
+    def self.headline?::Orgmode::Headline.headline?
58,1687
+    def to_textile::Orgmode::Headline#to_textile
63,1818
+    def to_html::Orgmode::Headline#to_html
69,1939
+
+./lib/org-ruby/html_output_buffer.rb,591
+module Orgmode::Orgmode
3,54
+  class HtmlOutputBuffer::Orgmode::HtmlOutputBuffer
5,72
+    def initialize::Orgmode::HtmlOutputBuffer#Orgmode::HtmlOutputBuffer.new
22,417
+    def push_mode::Orgmode::HtmlOutputBuffer#push_mode
31,619
+    def pop_mode::Orgmode::HtmlOutputBuffer#pop_mode
42,918
+    def flush!::Orgmode::HtmlOutputBuffer#flush!
51,1133
+    def escape_buffer!::Orgmode::HtmlOutputBuffer#escape_buffer!
78,2163
+    def output_indentation::Orgmode::HtmlOutputBuffer#output_indentation
84,2299
+    def inline_formatting::Orgmode::HtmlOutputBuffer#inline_formatting
100,2827
+
+./lib/org-ruby/line.rb,1527
+module Orgmode::Orgmode
1,0
+  class Line::Orgmode::Line
4,67
+    attr_reader :line::Orgmode::Line#line
7,114
+    attr_reader :indent::Orgmode::Line#indent
12,300
+    attr_accessor :assigned_paragraph_type::Orgmode::Line#assigned_paragraph_type
19,664
+    def initialize::Orgmode::Line#Orgmode::Line.new
21,708
+    def to_s::Orgmode::Line#to_s
29,885
+    def comment?::Orgmode::Line#comment?
34,966
+    def metadata?::Orgmode::Line#metadata?
39,1083
+    def nonprinting?::Orgmode::Line#nonprinting?
43,1175
+    def blank?::Orgmode::Line#blank?
47,1227
+    def plain_list?::Orgmode::Line#plain_list?
51,1279
+    def unordered_list?::Orgmode::Line#unordered_list?
57,1394
+    def strip_unordered_list_tag::Orgmode::Line#strip_unordered_list_tag
61,1471
+    def ordered_list?::Orgmode::Line#ordered_list?
67,1588
+    def strip_ordered_list_tag::Orgmode::Line#strip_ordered_list_tag
71,1661
+    def plain_text?::Orgmode::Line#plain_text?
75,1729
+    def table_row?::Orgmode::Line#table_row?
79,1812
+    def table_separator?::Orgmode::Line#table_separator?
85,1959
+    def table?::Orgmode::Line#table?
93,2195
+    def begin_block?::Orgmode::Line#begin_block?
99,2308
+    def end_block?::Orgmode::Line#end_block?
103,2380
+    def block_type::Orgmode::Line#block_type
107,2450
+    def paragraph_type::Orgmode::Line#paragraph_type
112,2572
+    def self.to_textile::Orgmode::Line.to_textile
124,2956
+    def self.to_html::Orgmode::Line.to_html
130,3106
+    def self.translate::Orgmode::Line.translate
137,3320
+
+./lib/org-ruby/output_buffer.rb,1282
+module Orgmode::Orgmode
3,18
+  class OutputBuffer::Orgmode::OutputBuffer
9,297
+    attr_reader :buffer::Orgmode::OutputBuffer#buffer
12,381
+    attr_reader :output::Orgmode::OutputBuffer#output
15,446
+    attr_accessor :output_type::Orgmode::OutputBuffer#output_type
18,532
+    def initialize::Orgmode::OutputBuffer#Orgmode::OutputBuffer.new
22,686
+    def current_mode::Orgmode::OutputBuffer#current_mode
40,1138
+    def current_mode_list?::Orgmode::OutputBuffer#current_mode_list?
44,1197
+    def push_mode::Orgmode::OutputBuffer#push_mode
48,1286
+    def pop_mode::Orgmode::OutputBuffer#pop_mode
53,1421
+    def prepare::Orgmode::OutputBuffer#prepare
61,1729
+    def enter_table?::Orgmode::OutputBuffer#enter_table?
73,2129
+    def exit_table?::Orgmode::OutputBuffer#exit_table?
79,2314
+    def <<::Orgmode::OutputBuffer#<<
85,2480
+    def list_indent_level::Orgmode::OutputBuffer#list_indent_level
90,2585
+    def preserve_whitespace?::Orgmode::OutputBuffer#preserve_whitespace?
95,2729
+    def continue_current_list?::Orgmode::OutputBuffer#continue_current_list?
106,2991
+    def maintain_list_indent_stack::Orgmode::OutputBuffer#maintain_list_indent_stack
109,3037
+    def should_accumulate_output?::Orgmode::OutputBuffer#should_accumulate_output?
145,4184
+
+./lib/org-ruby/parser.rb,473
+module Orgmode::Orgmode
4,40
+  class Parser::Orgmode::Parser
10,125
+    attr_reader :lines::Orgmode::Parser#lines
13,186
+    attr_reader :headlines::Orgmode::Parser#headlines
16,253
+    attr_reader :header_lines::Orgmode::Parser#header_lines
19,333
+    def initialize::Orgmode::Parser#Orgmode::Parser.new
23,505
+    def self.load::Orgmode::Parser.load
73,2075
+    def to_textile::Orgmode::Parser#to_textile
79,2241
+    def to_html::Orgmode::Parser#to_html
89,2477
+
+./lib/org-ruby/regexp_helper.rb,1014
+module Orgmode::Orgmode
3,18
+  class RegexpHelper::Orgmode::RegexpHelper
17,456
+    attr_reader   :pre_emphasis::Orgmode::RegexpHelper#pre_emphasis
42,1785
+    attr_reader   :post_emphasis::Orgmode::RegexpHelper#post_emphasis
43,1817
+    attr_reader   :border_forbidden::Orgmode::RegexpHelper#border_forbidden
44,1850
+    attr_reader   :body_regexp::Orgmode::RegexpHelper#body_regexp
45,1886
+    attr_reader   :markers::Orgmode::RegexpHelper#markers
46,1917
+    attr_reader   :org_emphasis_regexp::Orgmode::RegexpHelper#org_emphasis_regexp
48,1945
+    def initialize::Orgmode::RegexpHelper#Orgmode::RegexpHelper.new
50,1999
+    def match_all::Orgmode::RegexpHelper#match_all
65,2476
+    def rewrite_emphasis::Orgmode::RegexpHelper#rewrite_emphasis
92,3413
+    def rewrite_links::Orgmode::RegexpHelper#rewrite_links
124,4523
+    def build_org_emphasis_regexp::Orgmode::RegexpHelper#build_org_emphasis_regexp
135,4759
+    def build_org_link_regexp::Orgmode::RegexpHelper#build_org_link_regexp
145,5326
+
+./lib/org-ruby/textile_output_buffer.rb,454
+module Orgmode::Orgmode
3,20
+  class TextileOutputBuffer::Orgmode::TextileOutputBuffer
5,38
+    def initialize::Orgmode::TextileOutputBuffer#Orgmode::TextileOutputBuffer.new
7,84
+    def push_mode::Orgmode::TextileOutputBuffer#push_mode
12,169
+    def pop_mode::Orgmode::TextileOutputBuffer#pop_mode
17,262
+    def inline_formatting::Orgmode::TextileOutputBuffer#inline_formatting
34,585
+    def flush!::Orgmode::TextileOutputBuffer#flush!
48,973
+
+./lib/org-ruby.rb,243
+module OrgRuby::OrgRuby
3,27
+  def self.version::OrgRuby.version
13,277
+  def self.libpath::OrgRuby.libpath
21,476
+  def self.path::OrgRuby.path
29,721
+  def self.require_all_libs_relative_to::OrgRuby.require_all_libs_relative_to
38,1108
+
+./spec/headline_spec.rb,0
+
+./spec/line_spec.rb,0
+
+./spec/parser_spec.rb,0
+
+./spec/regexp_helper_spec.rb,0
+
+./spec/spec_helper.rb,0
+
+./spec/textile_output_buffer_spec.rb,0
+
+./test/test_orgmode_parser.rb,0

data/lib/org-ruby.rb

@@ -3,7 +3,7 @@ unless defined? ::OrgRuby
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/org-ruby/html_output_buffer.rb

@@ -1,5 +1,4 @@
 require OrgRuby.libpath(*%w[org-ruby output_buffer])
-require 'cgi'
 
 module Orgmode
 
@@ -51,7 +50,7 @@ module Orgmode
 
     def flush!
       escape_buffer!
-      if current_mode == :code then
+      if @buffer_mode == :code then
         # Whitespace is significant in :code mode. Always output the buffer
         # and do not do any additional translation.
         # 
@@ -70,6 +69,7 @@ module Orgmode
         end
       end
       @buffer = ""
+      @buffer_mode = nil
     end
 
     ######################################################################
@@ -77,7 +77,9 @@ module Orgmode
 
     # Escapes any HTML content in the output accumulation buffer @buffer.
     def escape_buffer!
-      @buffer = CGI.escapeHTML(@buffer)
+      @buffer.gsub!(/&/, "&")
+      @buffer.gsub!(/</, "&lt;")
+      @buffer.gsub!(/>/, "&gt;")
     end
 
     def output_indentation

data/lib/org-ruby/line.rb

@@ -11,10 +11,18 @@ module Orgmode
     # TODO 2009-12-20 bdewey: Handle tabs
     attr_reader :indent
 
+    # A line can have its type assigned instead of inferred from its
+    # content. For example, something that parses as a "table" on its
+    # own ("| one | two|\n") may just be a paragraph if it's inside
+    # #+BEGIN_EXAMPLE. Set this property on the line to assign its
+    # type. This will then affect the value of +paragraph_type+.
+    attr_accessor :assigned_paragraph_type
+
     def initialize(line)
       @line = line
       @indent = 0
       @line =~ /\s*/
+      @assigned_paragraph_type = nil
       @indent = $&.length unless blank?
     end
 
@@ -24,12 +32,12 @@ module Orgmode
 
     # Tests if a line is a comment.
     def comment?
-      @line =~ /^\s*#/
+      check_assignment_or_regexp(:comment, /^\s*#/)
     end
 
     # Tests if a line contains metadata instead of actual content.
     def metadata?
-      @line =~ /^\s*(CLOCK|DEADLINE|START|CLOSED|SCHEDULED):/
+      check_assignment_or_regexp(:metadata, /^\s*(CLOCK|DEADLINE|START|CLOSED|SCHEDULED):/)
     end
 
     def nonprinting?
@@ -37,7 +45,7 @@ module Orgmode
     end
 
     def blank?
-      @line =~ /^\s*$/
+      check_assignment_or_regexp(:blank, /^\s*$/)
     end
 
     def plain_list?
@@ -47,7 +55,7 @@ module Orgmode
     UnorderedListRegexp = /^\s*(-|\+)\s*/
 
     def unordered_list?
-      @line =~ UnorderedListRegexp
+      check_assignment_or_regexp(:unordered_list, UnorderedListRegexp)
     end
 
     def strip_unordered_list_tag
@@ -57,7 +65,7 @@ module Orgmode
     OrderedListRegexp = /^\s*\d+(\.|\))\s*/
 
     def ordered_list?
-      @line =~ OrderedListRegexp
+      check_assignment_or_regexp(:ordered_list, OrderedListRegexp)
     end
 
     def strip_ordered_list_tag
@@ -71,7 +79,7 @@ module Orgmode
     def table_row?
       # for an org-mode table, the first non-whitespace character is a
       # | (pipe).
-      @line =~ /^\s*\|/
+      check_assignment_or_regexp(:table_row, /^\s*\|/)
     end
 
     def table_separator?
@@ -79,7 +87,7 @@ module Orgmode
       # character as a | (pipe), then consists of nothing else other
       # than pipes, hyphens, and pluses.
 
-      @line =~ /^\s*\|[-\|\+]*\s*$/
+      check_assignment_or_regexp(:table_separator, /^\s*\|[-\|\+]*\s*$/)
     end
 
     def table?
@@ -174,5 +182,29 @@ module Orgmode
       output_buffer.pop_mode until output_buffer.current_mode == :normal
       output_buffer.output
     end
+
+    ######################################################################
+    private
+
+    # This function is an internal helper for determining the paragraph
+    # type of a line... for instance, if the line is a comment or contains
+    # metadata. It's used in routines like blank?, plain_list?, etc.
+    #
+    # What's tricky is lines can have assigned types, so you need to check
+    # the assigned type, if present, or see if the characteristic regexp
+    # for the paragraph type matches if not present.
+    # 
+    # call-seq:
+    #     check_assignment_or_regexp(assignment, regexp) => boolean
+    #
+    # assignment:: if the paragraph has an assigned type, it will be
+    #              checked to see if it equals +assignment+.
+    # regexp::     If the paragraph does not have an assigned type,
+    #              the contents of the paragraph will be checked against
+    #              this regexp.
+    def check_assignment_or_regexp(assignment, regexp)
+      return @assigned_paragraph_type == assignment if @assigned_paragraph_type
+      return @line =~ regexp
+    end
   end                           # class Line
 end                             # module Orgmode

data/lib/org-ruby/output_buffer.rb

@@ -8,9 +8,14 @@ module Orgmode
   # add a newline character prior emitting the output.
   class OutputBuffer
 
-    # This is the temporary buffer that we accumulate into.
+    # This is the accumulation buffer. It's a holding pen so
+    # consecutive lines of the right type can get stuck together
+    # without intervening newlines.
     attr_reader :buffer
 
+    # This is the output mode of the accumulation buffer.
+    attr_reader :buffer_mode
+
     # This is the overall output buffer
     attr_reader :output
 
@@ -22,17 +27,22 @@ module Orgmode
     def initialize(output)
       @output = output
       @buffer = ""
+      @buffer_mode = nil
       @output_type = :start
       @list_indent_stack = []
       @paragraph_modifier = nil
       @cancel_modifier = false
       @mode_stack = []
-      push_mode(:normal)
 
       @logger = Logger.new(STDERR)
-      @logger.level = Logger::WARN
+      if ENV['DEBUG']
+        @logger.level = Logger::DEBUG
+      else
+        @logger.level = Logger::WARN
+      end
 
       @re_help = RegexpHelper.new
+      push_mode(:normal)
     end
 
     Modes = [:normal, :ordered_list, :unordered_list, :blockquote, :code, :table]
@@ -83,6 +93,11 @@ module Orgmode
 
     # Accumulate the string @str@.
     def << (str)
+      if @buffer_mode && @buffer_mode != current_mode then
+        raise "Accumulation buffer is mixing modes: @buffer_mode == #{@buffer_mode}, current_mode == #{current_mode}"
+      else
+        @buffer_mode = current_mode
+      end
       @buffer << str
     end
 

data/lib/org-ruby/parser.rb

@@ -32,20 +32,42 @@ module Orgmode
       @headlines = Array.new
       @current_headline = nil
       @header_lines = []
+      mode = :normal
       @lines.each do |line|
-        if (Headline.headline? line) then
-          @current_headline = Headline.new line
-          @headlines << @current_headline
-        else
+        case mode
+        when :normal
+
+          if (Headline.headline? line) then
+            @current_headline = Headline.new line
+            @headlines << @current_headline
+          else
+            line = Line.new line
+            mode = :code if line.begin_block? and line.block_type == "EXAMPLE"
+            if (@current_headline) then
+              @current_headline.body_lines << line
+            else
+              @header_lines << line
+            end
+          end
+
+        when :code
+
+          # As long as we stay in code mode, force lines to be either blank or paragraphs.
+          # Don't try to interpret structural items, like headings and tables.
           line = Line.new line
+          if line.end_block? and line.block_type == "EXAMPLE"
+            mode = :normal
+          else
+            line.assigned_paragraph_type = :paragraph unless line.blank?
+          end
           if (@current_headline) then
             @current_headline.body_lines << line
           else
             @header_lines << line
           end
-        end
+        end                     # case
       end
-    end                           # initialize
+    end                         # initialize
 
     # Creates a new parser from the data in a given file
     def self.load(fname)

data/lib/org-ruby/textile_output_buffer.rb

@@ -60,6 +60,7 @@ module Orgmode
         @output << inline_formatting(@buffer) << "\n"
       end
       @buffer = ""
+      @buffer_mode = nil
     end
 
 

data/spec/html_examples/block_code.html

@@ -2,10 +2,9 @@
 <p>I need to get block code examples working. In <code>orgmode</code>, they look like this:</p>
 <pre>
 
-
     def initialize(output)
       @output = output
-      @buffer = &quot;&quot;
+      @buffer = ""
       @output_type = :start
       @list_indent_stack = []
       @paragraph_modifier = nil
@@ -19,7 +18,6 @@
 <p>Putting in another paragraph for good measure.</p>
 <p>Code should also get cancelled by a list, thus:</p>
 <pre>
-
 This is my code!
 
 Another line!

data/spec/html_examples/code-comment.html

@@ -1,7 +1,6 @@
 <h1 class="title">Code Comment</h1>
 <p>I need to be able to export things that look like org-mode comments inside of code blocks, like this:</p>
 <pre>
-
 #+TITLE:     orgmode_parser.org
 #+AUTHOR:    
 #+EMAIL:     brian@BRIAN-DESK

data/spec/html_examples/entities.html

@@ -0,0 +1,3 @@
+<p class="title">ENTITIES</p>
+<p><code>Org-ruby</code> supports &#8220;smart double quotes,&#8221; &#8216;smart single quotes,&#8217; apostrophes for contractions like won&#8217;t and can&#8217;t, and other things&#8230; like elipses. Oh &#8211; and dashes.</p>
+<p>Question: What does org-mode do for ampersands, like R&amp;R? or &amp;lt;? Answer: Those get escaped, too.</p>

data/spec/html_examples/entities.org

@@ -0,0 +1,8 @@
+ENTITIES
+
+=Org-ruby= supports "smart double quotes," 'smart single quotes,'
+apostrophes for contractions like won't and can't, and other
+things... like elipses. Oh -- and dashes.
+
+Question: What does org-mode do for ampersands, like R&R? or <?
+Answer: Those get escaped, too.

data/spec/html_examples/escape-pre.html

@@ -1,5 +1,4 @@
 <pre>
-
 &lt;li&gt;[ ] &amp;#8220;smart quotes&amp;#8221;&lt;/li&gt; 
 &lt;li&gt;[ ] I think I need this for &amp;#8216;single quotes&amp;#8217; too. Don&amp;#8217;t I?&lt;/li&gt; 
 &lt;li&gt;[ ] Em dashes would be great &amp;#8212; wouldn&amp;#8217;t they?&lt;/li&gt; 

data/spec/html_examples/metadata-comment.html

@@ -0,0 +1,27 @@
+<h1 class="title">Metadata, etc.</h1>
+<p>I normally filter out things that look like metadata. Can&#8217;t do it any more. I need to see all of the following:</p>
+<pre>
+* DONE Handle inline formatting
+  CLOSED: [2009-12-26 Sat 21:41]
+  :PROPERTIES:
+  :ARCHIVE_TIME: 2009-12-26 Sat 22:16
+  :ARCHIVE_FILE: ~/brians-brain/content/projects/orgmode_parser.org
+  :ARCHIVE_OLPATH: &lt;%= @page.title %&gt;/Future Development
+  :ARCHIVE_CATEGORY: orgmode_parser
+  :ARCHIVE_TODO: DONE
+  :END:
+
+  I still need to handle:
+
+  - [ ] =Inline code=
+
+  How does the =emacs= HTML parser handle *inline* formatting? Ah,
+  it looks like it defines everything in =org-emphasis-alist= (line
+  2855 of =org.el=).
+
+  And then look at =org-emphasis-regexp-components=, line 2828 of
+  =org.el=. It looks like they just use a crazy regexp for inline
+  formatting. Which is good, because it means I can copy!
+
+
+</pre>

data/spec/line_spec.rb

@@ -86,4 +86,24 @@ describe Orgmode::Line do
       line.block_type.should eql(end_examples[str])
     end
   end
+
+  it "should accept assigned types" do
+    cases = {
+      "# this looks like a comment" => :comment,
+      "  1. This looks like an ordered list" => :ordered_list,
+      "       - this looks like an # unordered list" => :unordered_list,
+      " | one | two | table! |  \n" => :table_row,
+      "\n" => :blank,
+      " |-----+-----+--------|  \n" => :table_separator
+    }
+
+    cases.each_pair do |key, value|
+      l = Orgmode::Line.new key
+      l.paragraph_type.should eql(value)
+      l.assigned_paragraph_type = :paragraph
+      l.paragraph_type.should eql(:paragraph) 
+      l.assigned_paragraph_type = nil
+      l.paragraph_type.should eql(value)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: org-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Brian Dewey
@@ -72,6 +72,8 @@ files:
 - spec/html_examples/blockquote.org
 - spec/html_examples/code-comment.html
 - spec/html_examples/code-comment.org
+- spec/html_examples/entities.html
+- spec/html_examples/entities.org
 - spec/html_examples/escape-pre.html
 - spec/html_examples/escape-pre.org
 - spec/html_examples/html-literal.html
@@ -80,7 +82,8 @@ files:
 - spec/html_examples/inline-formatting.org
 - spec/html_examples/lists.html
 - spec/html_examples/lists.org
-- spec/html_examples/metadata-comment.org-fail
+- spec/html_examples/metadata-comment.html
+- spec/html_examples/metadata-comment.org
 - spec/html_examples/only-list.html
 - spec/html_examples/only-list.org
 - spec/html_examples/only-table.html