wallyqs-org-ruby 0.6.1 → 0.8.0

data/History.txt

@@ -1,17 +1,47 @@
-== 0.6.1 / 2012-02-25
+== 0.8.0 / 2013-02-10
 
- * Major Enhancements
-  * Added encoding directive to support Ruby 1.9.2
-  * Included .org support for Tilt templates (thanks to crnixon)
-  * #+BEGIN/END_SRC lang code blocks are embedded in code tags with class that specifies the coding language
-  * CodeRay is used to give code syntax highlight support to #+BEGIN/END_SRC blocks 
+* A lot of refactoring work and bugfixes contributed by vonavi (many thanks!)
+* Raw HTML is supported with #+html 
+* Code indentation for code blocks is fixed now
+* Support for definition lists is improved
+* Bugfix for when including headlines in center and quote blocks.
+* Indentation of HTML output improved
+* Improvements to entities support for Textile and HTML outputs
 
- * Minor Enhancements
-  * Angle links in org-mode are embedded in anchor tags on html output
-  * Headlines with the COMMENT keyword, and the PROPERTIES drawer are not exported
+== 0.7.2 / 2012-10-07
 
- * Bug fixes
-  * Fixed bug with InlineExampleRegexp when a colon is at the beginning of a block
+* Many fixes to the regular expressions used for emphasis, contributed by [[http://github.com/vonavi][vonavi]]
+* Bug fix for when a table starts with a headline, thanks to [[http://github/til][til]]
+* Asterisk can be used for definition lists too
+* Use text lexer as default option for Pygments and Coderay when no language is specified
+
+== 0.7.1 / 2012-08-04
+
+* Make source code blocks from lisp dialects use Pygments scheme lexer
+* Bugfix: Make Coderay fallback to text lexer when unsupported lang is set
+
+== 0.7.0 / 2012-07-08
+
+* Highlight source code blocks using Pygments or CodeRay when available
+
+== 0.6.4 / 2012-07-08
+
+* Fixed lists behavior when code fragments, tables and examples were present
+* Remove code tags with lang class and use instead src-:lang like org-exporter
+* Fixed property drawers to consider properties with hyphens like :noweb-ref:
+
+== 0.6.3 / 2012-05-22
+
+* Minor enhancement: Correct handling of .org URIs in HTML markup routine (thanks, rayl)
+
+== 0.6.1 / 2012-04-14
+
+* Added encoding directive to support Ruby 1.9.2
+* Headlines with the COMMENT keyword, and the PROPERTIES drawer are not exported
+* Angle links in org-mode are embedded in anchor tags on html output
+* #+BEGIN/END_SRC lang code blocks are embedded in code tags with class that specifies the coding language
+* Fixed bug in code blocks when a colon was at the beginning
+* More than five dashes create an horizontal rule in html output
 
 == 0.6.0 / 2011-09-03
 

data/README.rdoc

@@ -1,67 +1,72 @@
-org-ruby
-    by Brian Dewey
-    http://github.com/bdewey/org-ruby
+= org-ruby
+<em>Originally by Brian Dewey</em> (http://github.com/bdewey/org-ruby)
 
-== DESCRIPTION:
+{<img src="https://secure.travis-ci.org/wallyqs/org-ruby.png?branch=master" alt="Build Status" />}[http://travis-ci.org/wallyqs/org-ruby]
 
-This gem contains Ruby routines for parsing org-mode files.The most
-significant thing this library does today is convert org-mode files to
-HTML or textile. Currently, you cannot do much to customize the
-conversion. The supplied textile conversion is optimized for
-extracting "content" from the orgfile as opposed to "metadata." 
+An {org-mode}[http://orgmode.org] parser written in Ruby. The most significant thing this library does today is convert org-mode files to HTML or Textile.
+Currently, you cannot do much to customize the conversion. The supplied textile conversion is optimized for extracting 
+“content” from the orgfile as opposed to “metadata.”
 
-== FEATURES/PROBLEMS:
+== Installation
 
-* Converts org-mode files to HTML or Textile
-* Supports tables, block quotes, and block code
-* Supports bold, italic, underline, strikethrough, and code inline formatting.
-* Supports hyperlinks that are in double-brackets
-* Supports +.org+ views in Rails through Tilt.
-* Upcoming: Handle export options specified in the org buffer.
-
-== SYNOPSIS:
+     gem install org-ruby
 
-From the command line:
-
-     org-ruby sample.org
-
-...will output a HTML version of sample.org.
-
-     org-ruby --translate textile sample.org
-
-...will output a textile version of sample.org.
+== Usage
 
 From Ruby code:
 
-     Orgmode::Parser.new(data)
+     require 'org-ruby'
 
-...will construct a new +Parser+ object.
+     # Renders HTML
+     Orgmode::Parser.new("* Hello world!).to_html
+     # => "<h1>Hello world!</h1>\n"
 
-== INSTALL:
+     # Renders Textile
+     Orgmode::Parser.new("* Hello world!).to_textile
+     # => "h1. Hello world!\n" 
 
-sudo gem install org-ruby
+It can also be used from the command line:
 
-== LICENSE:
+     org-ruby sample.org --translate html
 
-(The MIT License)
+...will output a HTML version of sample.org.
 
-Copyright (c) 2009 Brian Dewey
+     org-ruby --translate textile sample.org
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+...will output a textile version of sample.org.
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+== Features
 
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+* Converts org-mode files to HTML or Textile
+* Supports tables, block quotes, code blocks, and html blocks
+* Supports bold, italic, underline, strikethrough, and code inline formatting.
+* Supports hyperlinks that are in double-brackets
+* Supports definition lists
+* Supports footnotes
+* Supports +.org+ views in Rails through Tilt.
+* Code syntax highlight of code blocks using Pygments.rb or Coderay when available
+
+== License
+
+ (The MIT License)
+
+ Copyright (c) 2009 Brian Dewey
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ 'Software'), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/org-ruby

@@ -1,11 +1,7 @@
 #!/usr/bin/env ruby
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib org-ruby]))
+require 'org-ruby'
 require 'optparse'
 
-# Put your code here
-
 options = {}
 options_parser = OptionParser.new do |opts|
   options[:help] = false
@@ -25,10 +21,20 @@ options_parser = OptionParser.new do |opts|
           "Translate the ORG file to the specified format.") do |v|
     options[:format] = v
   end
+
+  opts.on("-v", "--version", "Print version") do |v|
+    options[:version] = true
+  end
 end
 
 begin
   options_parser.parse!
+
+  if options[:version]
+    puts OrgRuby::VERSION
+    exit
+  end
+
   if (ARGV.length == 0) then
     puts options_parser
   else

data/lib/org-ruby.rb

@@ -1,14 +1,27 @@
-unless defined? ::OrgRuby
+$:.unshift File.dirname(__FILE__) # For use/testing when no gem is installed
 
-# Default to UTF-8 in Ruby 1.9 rather than ASCII
-if defined? Encoding and Encoding.respond_to? 'default_external='
-  Encoding.default_external = Encoding.default_internal = Encoding::UTF_8
-end
+# internal requires
+require 'org-ruby/parser'
+require 'org-ruby/regexp_helper'
+require 'org-ruby/line'
+require 'org-ruby/headline'
+require 'org-ruby/output_buffer'
+
+# HTML exporter
+require 'org-ruby/html_output_buffer'
+require 'org-ruby/html_symbol_replace'
+
+# Textile exporter
+require 'org-ruby/textile_output_buffer'
+require 'org-ruby/textile_symbol_replace'
+
+# Tilt support
+require 'org-ruby/tilt'
 
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.6.1'
+  VERSION = '0.8.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -19,22 +32,6 @@ module OrgRuby
     VERSION
   end
 
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
   # Utility method used to require all files ending in .rb that lie in the
   # directory below this file that has the same name as the filename passed
   # in. Optionally, a specific _directory_ name can be passed in such that
@@ -48,8 +45,4 @@ module OrgRuby
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
 
-end  # module OrgmodeParser
-
-OrgRuby.require_all_libs_relative_to(__FILE__)
-
-end                             # unless defined?
+end

data/lib/org-ruby/headline.rb

@@ -1,5 +1,3 @@
-require OrgRuby.libpath(*%w[org-ruby line])
-
 module Orgmode
 
   # Represents a headline in an orgmode file.
@@ -47,7 +45,6 @@ module Orgmode
     def initialize(line, parser = nil, offset=0)
       super(line, parser)
       @body_lines = []
-      @body_lines << self       # Make @body_lines contain the headline?
       @tags = []
       @export_state = :exclude
       if (@line =~ LineRegexp) then
@@ -87,13 +84,6 @@ module Orgmode
       :"heading#{@level}"
     end
 
-    # Converts this headline and its body to textile.
-    def to_textile
-      output = "h#{@level}. #{@headline_text}\n"
-      output << Line.to_textile(@body_lines[1..-1])
-      output
-    end
-
     ######################################################################
     private
 

data/lib/org-ruby/html_output_buffer.rb

@@ -1,10 +1,12 @@
-require OrgRuby.libpath(*%w[org-ruby html_symbol_replace])
-require OrgRuby.libpath(*%w[org-ruby output_buffer])
-
 begin
-  require 'coderay'
+  require 'pygments'
 rescue LoadError
-  # CodeRay is not supported
+  # Pygments is not supported so we try instead with CodeRay
+  begin
+    require 'coderay'
+  rescue LoadError
+    # No code syntax highlighting
+  end
 end
 
 module Orgmode
@@ -13,12 +15,19 @@ module Orgmode
 
     HtmlBlockTag = {
       :paragraph => "p",
-      :ordered_list => "li",
-      :unordered_list => "li",
+      :ordered_list => "ol",
+      :unordered_list => "ul",
+      :list_item => "li",
+      :definition_list => "dl",
       :definition_term => "dt",
       :definition_descr => "dd",
+      :table => "table",
       :table_row => "tr",
-      :table_header => "tr",
+      :quote => "blockquote",
+      :example => "pre",
+      :src => "pre",
+      :inline_example => "pre",
+      :center => "div",
       :heading1 => "h1",
       :heading2 => "h2",
       :heading3 => "h3",
@@ -27,18 +36,6 @@ module Orgmode
       :heading6 => "h6"
     }
 
-    ModeTag = {
-      :unordered_list => "ul",
-      :ordered_list => "ol",
-      :definition_list => "dl",
-      :table => "table",
-      :blockquote => "blockquote",
-      :example => "pre",
-      :src => "pre",
-      :inline_example => "pre",
-      :center => "div"
-    }
-
     attr_reader :options
 
     def initialize(output, opts = {})
@@ -48,118 +45,160 @@ module Orgmode
       else
         @title_decoration = ""
       end
+      @buffer_tag = "HTML"
       @options = opts
+      @new_paragraph = :start
       @footnotes = {}
+      @unclosed_tags = []
       @logger.debug "HTML export options: #{@options.inspect}"
     end
 
     # Output buffer is entering a new mode. Use this opportunity to
-    # write out one of the block tags in the ModeTag constant to put
-    # this information in the HTML stream.
-    def push_mode(mode)
-      if ModeTag[mode] then
-        output_indentation
-        css_class = ""
-        css_class = " class=\"src\"" if mode == :src
-        css_class = " class=\"example\"" if (mode == :example || mode == :inline_example)
-        css_class = " style=\"text-align: center\"" if mode == :center
-        @logger.debug "#{mode}: <#{ModeTag[mode]}#{css_class}>\n" 
-        @output << "<#{ModeTag[mode]}#{css_class}>\n" unless mode == :table and skip_tables?
-        # Special case to add code tags to src blogs and specify language
-        if mode == :src
-          @logger.debug "<code class=\"#{@block_lang}\">\n"
-          @output << "<code class=\"#{@block_lang}\">\n"
+    # write out one of the block tags in the HtmlBlockTag constant to
+    # put this information in the HTML stream.
+    def push_mode(mode, indent)
+      super(mode)
+      @list_indent_stack.push(indent)
+
+      if HtmlBlockTag[mode]
+        unless ((mode_is_table?(mode) and skip_tables?) or
+                (mode == :src and defined? Pygments))
+          css_class = case
+                      when (mode == :src and @block_lang.empty?)
+                        " class=\"src\""
+                      when (mode == :src and not @block_lang.empty?)
+                        " class=\"src src-#{@block_lang}\""
+                      when (mode == :example || mode == :inline_example)
+                        " class=\"example\""
+                      when mode == :center
+                        " style=\"text-align: center\""
+                      else
+                        @title_decoration
+                      end
+
+          add_paragraph unless @new_paragraph == :start
+          @new_paragraph = true
+
+          @logger.debug "#{mode}: <#{HtmlBlockTag[mode]}#{css_class}>"
+          @output << "<#{HtmlBlockTag[mode]}#{css_class}>"
+          # Entering a new mode obliterates the title decoration
+          @title_decoration = ""
         end
-        # Entering a new mode obliterates the title decoration
-        @title_decoration = ""
       end
-      super(mode)
     end
 
     # We are leaving a mode. Close any tags that were opened when
     # entering this mode.
     def pop_mode(mode = nil)
       m = super(mode)
-      if ModeTag[m] then
-        output_indentation
-        if mode == :src
-          @logger.debug "</code>\n"
-          @output << "</code>\n"
+      if HtmlBlockTag[m]
+        unless ((mode_is_table?(m) and skip_tables?) or
+                (m == :src and defined? Pygments))
+          add_paragraph if @new_paragraph
+          @new_paragraph = true
+          @logger.debug "</#{HtmlBlockTag[m]}>"
+          @output << "</#{HtmlBlockTag[m]}>"
         end
-        @logger.debug "</#{ModeTag[m]}>\n"
-        @output << "</#{ModeTag[m]}>\n" unless mode == :table and skip_tables?
       end
+      @list_indent_stack.pop
     end
 
     def flush!
-      if mode_is_code(@buffer_mode) then
-        # Only colorize #+BEGIN_SRC blocks with a specified language,
-        # CodeRay already escapes the html once
-        if @buffer_mode == :src and @block_lang != "" and defined?(CodeRay)
-          @logger.debug "Applying syntax coloring for: #{@block_lang}"
+      return false if @buffer.empty?
+      case
+      when preserve_whitespace?
+        strip_code_block! if mode_is_code? current_mode
 
-          # Also suppress CodeRay warning message when it cannot find the language alias
+        # NOTE: CodeRay and Pygments already escape the html once, so
+        # no need to escape_string!(@buffer)
+        case
+        when (current_mode == :src and defined? Pygments)
+          lang = normalize_lang @block_lang
+          @output << "\n" unless @new_paragraph == :start
+
+          begin
+            @buffer = Pygments.highlight(@buffer, :lexer => lang)
+          rescue
+            # Not supported lexer from Pygments, we fallback on using the text lexer
+            @buffer = Pygments.highlight(@buffer, :lexer => 'text')
+          end
+        when (current_mode == :src and defined? CodeRay)
+          lang = normalize_lang @block_lang
+
+          # CodeRay might throw a warning when unsupported lang is set,
+          # then fallback to using the text lexer
           silence_warnings do
-            @buffer = CodeRay.scan(@buffer, @block_lang.to_s).html(:wrap => nil, :css => :style)
+            begin
+              @buffer = CodeRay.scan(@buffer, lang).html(:wrap => nil, :css => :style)
+            rescue ArgumentError
+              @buffer = CodeRay.scan(@buffer, 'text').html(:wrap => nil, :css => :style)
+            end
           end
+        when (current_mode == :html or current_mode == :raw_text)
+          @buffer.gsub!(/\A\n/, "") if @new_paragraph == :start
+          @new_paragraph = true
         else
-          escape_buffer!
+          escape_string! @buffer
         end
 
-        # Whitespace is significant in :code mode. Always output the buffer
-        # and do not do any additional translation.
+        # Whitespace is significant in :code mode. Always output the
+        # buffer and do not do any additional translation.
         @logger.debug "FLUSH CODE ==========> #{@buffer.inspect}"
+        @output << @buffer
+
+      when (mode_is_table? current_mode and skip_tables?)
+        @logger.debug "SKIP       ==========> #{current_mode}"
 
-        @output << @buffer << "\n"
       else
-        escape_buffer!
-        if @buffer.length > 0 and @output_type == :definition_list then
-          unless buffer_mode_is_table? and skip_tables?
-            output_indentation
-            d = @buffer.split("::", 2)
-            @output << "<#{HtmlBlockTag[:definition_term]}#{@title_decoration}>" << inline_formatting(d[0].strip) \
-                    << "</#{HtmlBlockTag[:definition_term]}>"
-            if d.length > 1 then
-              @output << "<#{HtmlBlockTag[:definition_descr]}#{@title_decoration}>" << inline_formatting(d[1].strip) \
-                      << "</#{HtmlBlockTag[:definition_descr]}>\n"
-            else
-              @output << "\n"
-            end
-            @title_decoration = ""
-          end
-        elsif @buffer.length > 0 then
-          unless buffer_mode_is_table? and skip_tables?
-            @logger.debug "FLUSH      ==========> #{@buffer_mode}"
-            output_indentation
-            @output << "<#{HtmlBlockTag[@output_type]}#{@title_decoration}>"
-            if (@buffered_lines[0].kind_of?(Headline)) then
-              headline = @buffered_lines[0]
-              raise "Cannot be more than one headline!" if @buffered_lines.length > 1
-              if @options[:export_heading_number] then
-                level = headline.level
-                heading_number = get_next_headline_number(level)
-                output << "<span class=\"heading-number heading-number-#{level}\">#{heading_number} </span>"
-              end
-              if @options[:export_todo] and headline.keyword then
-                keyword = headline.keyword
-                output << "<span class=\"todo-keyword #{keyword}\">#{keyword} </span>"
-              end
-            end
-            @output << inline_formatting(@buffer) 
-            @output << "</#{HtmlBlockTag[@output_type]}>\n"
-            @title_decoration = ""
+        @buffer.lstrip!
+        @new_paragraph = nil
+        @logger.debug "FLUSH      ==========> #{current_mode}"
+
+        case current_mode
+        when :definition_term
+          d = @buffer.split(/\A(.*[ \t]+|)::(|[ \t]+.*?)$/, 4)
+          d[1] = d[1].strip
+          unless d[1].empty?
+            @output << inline_formatting(d[1])
           else
-            @logger.debug "SKIP       ==========> #{@buffer_mode}"
+            @output << "???"
           end
+          indent = @list_indent_stack.last
+          pop_mode
+
+          @new_paragraph = :start
+          push_mode(:definition_descr, indent)
+          @output << inline_formatting(d[2].strip + d[3])
+          @new_paragraph = nil
+
+        when :horizontal_rule
+          add_paragraph unless @new_paragraph == :start
+          @new_paragraph = true
+          @output << "<hr />"
+
+        else
+          @output << inline_formatting(@buffer)
         end
       end
-      clear_accumulation_buffer!
+      @buffer = ""
+    end
+
+    def add_line_attributes headline
+      if @options[:export_heading_number] then
+        level = headline.level
+        heading_number = get_next_headline_number(level)
+        @output << "<span class=\"heading-number heading-number-#{level}\">#{heading_number}</span> "
+      end
+      if @options[:export_todo] and headline.keyword then
+        keyword = headline.keyword
+        @output << "<span class=\"todo-keyword #{keyword}\">#{keyword}</span> "
+      end
     end
 
     def output_footnotes!
       return false unless @options[:export_footnotes] and not @footnotes.empty?
 
-      @output << "<div id=\"footnotes\">\n<h2 class=\"footnotes\">Footnotes: </h2>\n<div id=\"text-footnotes\">\n"
+      @output << "\n<div id=\"footnotes\">\n<h2 class=\"footnotes\">Footnotes:</h2>\n<div id=\"text-footnotes\">\n"
 
       @footnotes.each do |name, defi|
         @output << "<p class=\"footnote\"><sup><a class=\"footnum\" name=\"fn.#{name}\" href=\"#fnr.#{name}\">#{name}</a></sup>" \
@@ -167,11 +206,15 @@ module Orgmode
                 << "</p>\n"
       end
 
-      @output << "</div>\n</div>\n"
+      @output << "</div>\n</div>"
 
       return true
     end
 
+    # Test if we're in an output mode in which whitespace is significant.
+    def preserve_whitespace?
+      super or current_mode == :html
+    end
 
     ######################################################################
     private
@@ -180,84 +223,116 @@ module Orgmode
       @options[:skip_tables]
     end
 
-    def buffer_mode_is_table?
-      @buffer_mode == :table
+    def mode_is_table?(mode)
+      (mode == :table or mode == :table_row or
+       mode == :table_separator or mode == :table_header)
     end
 
     # Escapes any HTML content in the output accumulation buffer @buffer.
-    def escape_buffer!
-      @buffer.gsub!(/&/, "&amp;")
-      @buffer.gsub!(/</, "&lt;")
-      @buffer.gsub!(/>/, "&gt;")
+    def escape_string! str
+      str.gsub!(/&/, "&amp;")
+      # Escapes the left and right angular brackets but construction
+      # @<text> which is formatted to <text>
+      str.gsub! /<([^<>\n]*)/ do |match|
+        if $`[-1..-1] == "@" and $'[0..0] == ">" then $&
+        else "&lt;#{$1}"
+        end
+      end
+      str.gsub! /([^<>\n]*)>/ do |match|
+        if $`[-2..-1] == "@<" then $&
+        else "#{$1}&gt;"
+        end
+      end
+      str.gsub!(/@(<[^<>\n]*>)/, "\\1")
     end
 
-    def output_indentation
-      indent = "  " * (@mode_stack.length - 1)
-      @output << indent
+    def buffer_indentation
+      indent = "  " * @list_indent_stack.length
+      @buffer << indent
+    end
+
+    def add_paragraph
+      indent = "  " * (@list_indent_stack.length - 1)
+      @output << "\n" << indent
     end
 
     Tags = {
-      "*" => { :open => "<b>", :close => "</b>" },
-      "/" => { :open => "<i>", :close => "</i>" },
-      "_" => { :open => "<span style=\"text-decoration:underline;\">",
-        :close => "</span>" },
-      "=" => { :open => "<code>", :close => "</code>" },
-      "~" => { :open => "<code>", :close => "</code>" },
-      "+" => { :open => "<del>", :close => "</del>" }
+      "*" => { :open => "b", :close => "b" },
+      "/" => { :open => "i", :close => "i" },
+      "_" => { :open => "span style=\"text-decoration:underline;\"",
+        :close => "span" },
+      "=" => { :open => "code", :close => "code" },
+      "~" => { :open => "code", :close => "code" },
+      "+" => { :open => "del", :close => "del" }
     }
 
     # Applies inline formatting rules to a string.
     def inline_formatting(str)
-      str.rstrip!
-      str = @re_help.rewrite_emphasis(str) do |marker, s|
-        "#{Tags[marker][:open]}#{s}#{Tags[marker][:close]}"
+      @re_help.rewrite_emphasis str do |marker, s|
+        "@<#{Tags[marker][:open]}>#{s}@</#{Tags[marker][:close]}>"
       end
       if @options[:use_sub_superscripts] then
-        str = @re_help.rewrite_subp(str) do |type, text|
+        @re_help.rewrite_subp str do |type, text|
           if type == "_" then
-            "<sub>#{text}</sub>"
+            "@<sub>#{text}@</sub>"
           elsif type == "^" then
-            "<sup>#{text}</sup>"
+            "@<sup>#{text}@</sup>"
           end
         end
       end
-      str = @re_help.rewrite_images(str) do |link|
-        "<a href=\"#{link}\"><img src=\"#{link}\" /></a>"
-      end
-      str = @re_help.rewrite_links(str) do |link, text|
-        text ||= link
-        link = link.sub(/^file:(.*)::(.*?)$/) do
-
+      @re_help.rewrite_links str do |link, defi|
+        [link, defi].compact.each do |text|
           # We don't support search links right now. Get rid of it.
+          text.sub!(/\A(file:[^\s]+)::[^\s]*?\Z/, "\\1")
+          text.sub!(/\A(file:[^\s]+)\.org\Z/i, "\\1.html")
+          text.sub!(/\Afile:(?=[^\s]+\Z)/, "")
+        end
+
+        # We don't add a description for images in links, because its
+        # empty value forces the image to be inlined.
+        defi ||= link unless link =~ @re_help.org_image_file_regexp
 
-          "file:#{$1}"
+        if defi =~ @re_help.org_image_file_regexp
+          defi = "@<img src=\"#{defi}\" alt=\"#{defi}\" />"
         end
-        link = link.sub(/^file:/i, "") # will default to HTTP
-        link = link.sub(/\.org$/i, ".html")
-        text = text.gsub(/([^\]]*\.(jpg|jpeg|gif|png))/xi) do |img_link|
-          "<img src=\"#{img_link}\" />"
+
+        if defi
+          "@<a href=\"#{link}\">#{defi}@</a>"
+        else
+          "@<img src=\"#{link}\" alt=\"#{link}\" />"
         end
-        "<a href=\"#{link}\">#{text}</a>"
       end
-      if (@output_type == :table_row) then
-        str.gsub!(/^\|\s*/, "<td>")
-        str.gsub!(/\s*\|$/, "</td>")
-        str.gsub!(/\s*\|\s*/, "</td><td>")
+      if @output_type == :table_row
+        str.gsub!(/^\|\s*/, "@<td>")
+        str.gsub!(/\s*\|$/, "@</td>")
+        str.gsub!(/\s*\|\s*/, "@</td>@<td>")
       end
-      if (@output_type == :table_header) then
-        str.gsub!(/^\|\s*/, "<th>")
-        str.gsub!(/\s*\|$/, "</th>")
-        str.gsub!(/\s*\|\s*/, "</th><th>")
+      if @output_type == :table_header
+        str.gsub!(/^\|\s*/, "@<th>")
+        str.gsub!(/\s*\|$/, "@</th>")
+        str.gsub!(/\s*\|\s*/, "@</th>@<th>")
       end
       if @options[:export_footnotes] then
-        str = @re_help.rewrite_footnote(str) do |name, defi|
+        @re_help.rewrite_footnote str do |name, defi|
           # TODO escape name for url?
           @footnotes[name] = defi if defi
-          "<sup><a class=\"footref\" name=\"fnr.#{name}\" href=\"#fn.#{name}\">#{name}</a></sup>"
+          "@<sup>@<a class=\"footref\" name=\"fnr.#{name}\" href=\"#fn.#{name}\">#{name}@</a>@</sup>"
         end
       end
-      Orgmode.special_symbols_to_html(str)
-      str
+      escape_string! str
+      Orgmode.special_symbols_to_html str
+      str = @re_help.restore_code_snippets str
+    end
+
+    def normalize_lang(lang)
+      case lang
+      when 'emacs-lisp', 'common-lisp', 'lisp'
+        'scheme'
+      when ''
+        'text'
+      else
+        lang
+      end
     end
 
     # Helper method taken from Rails
@@ -269,5 +344,11 @@ module Orgmode
     ensure
       $VERBOSE = warn_level
     end
+
+    def strip_code_block!
+      strip_regexp = Regexp.new("^" + " " * @code_block_indent)
+      @buffer.gsub!(strip_regexp, "")
+      @code_block_indent = nil
+    end
   end                           # class HtmlOutputBuffer
 end                             # module Orgmode