--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -72,8 +72,10 @@ module BrowseHelper
     end
   end
   
+  #diff = Diff::Display::Unified.new(load_diff("simple"))
+  #diff.render(Diff::Renderer::Base.new)
   def render_inline_diff(udiff, src_sha, dst_sha)
-    callback = Gitorious::Diff::InlineTableCallback.new
+    differ = Diff::Display::Unified.new(udiff)
     out = %Q{<table class="codediff inline">\n}
     out << "<thead>\n"
     out << "<tr>"
@@ -81,19 +83,19 @@ module BrowseHelper
     out << %Q{<td class="line-numbers">#{dst_sha}</td>}
     out << "<td>&nbsp</td></tr>\n"
     out << "</thead>\n"
-    out << Diff::Display::Unified::HTMLRenderer.run(udiff, callback)
+    out << differ.render(Gitorious::Diff::InlineTableCallback.new)
     out << "</table>"
     out
   end
   
   def render_sidebyside_diff(udiff, src_sha, dst_sha)
-    callback = Gitorious::Diff::SidebysideTableCallback.new
+    differ = Diff::Display::Unified.new(udiff)
     out = %Q{<table class="codediff sidebyside">\n}
     out << %Q{<colgroup class="left"><col class="lines"/><col class="code"/></colgroup>}
     out << %Q{<colgroup class="right"><col class="lines"/><col class="code"/></colgroup>}
     out << %Q{<thead><th colspan="2">#{src_sha}</th>}
     out << %Q{<th colspan="2">#{dst_sha}</th></thead>}
-    out << Diff::Display::Unified::HTMLRenderer.run(udiff, callback)
+    out << differ.render(Gitorious::Diff::SidebysideTableCallback.new)
     out << "</table>"
     out
   end

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -97,7 +97,7 @@ class Repository < ActiveRecord::Base
   
   def create_delete_repos_task
     Task.create!(:target_class => self.class.name, 
-      :command => "delete_git_repository", :arguments => [gitdir])
+      :command => "delete_git_repository", :arguments => [gitdir]) # fixme: gitdir is probably gone in after_destroy
   end
     
   protected

--- a/config/initializers/requires.rb
+++ b/config/initializers/requires.rb
@@ -1,4 +1,4 @@
 require "core_ext"
 require "fileutils"
 require "ruby-git/lib/git"
-require "diff-display/lib/diff/display/unified"
+require "diff-display/lib/diff-display"

--- /dev/null
+++ b/lib/gitorious/diff/base_callback.rb
@@ -0,0 +1,16 @@
+module Gitorious
+  module Diff
+    class BaseCallback < ::Diff::Renderer::Base
+      def headerline(line); end
+      def new_line; end
+      
+      protected
+        def escape(text)
+          text.gsub('&', '&amp;').
+            gsub('<', '&lt;').
+            gsub('>', '&gt;').
+            gsub('"', '&#34;')
+        end
+    end
+  end
+end
\ No newline at end of file

--- a/lib/gitorious/diff/inline_table_callback.rb
+++ b/lib/gitorious/diff/inline_table_callback.rb
@@ -1,97 +1,39 @@
 module Gitorious
   module Diff
-    class InlineTableCallback
-      
-      # Before blocks
-      def before_addblock(block)
-      end
-      
-      def before_remblock(block) 
-      end
-      
-      def before_modblock(block)
-      end
-      
-      def before_unmodblock(block)
-      end
-      
-      def before_sepblock(block)
-      end
-      
-      # After blocks
-      def after_addblock(block)
-      end
-      
-      def after_remblock(block)
-      end
-      
-      def after_modblock(block)
-      end
-      
-      def after_unmodblock(block)
-      end
-      
-      def after_sepblock(block)
-      end
-      
-      # Before lines
-      def before_addline(line)
+    class InlineTableCallback < BaseCallback
+      def addline(line)
         %Q{<tr class="changes">} + 
         %Q{<td class="line-numbers">&nbsp;</td>} + 
         %Q{<td class="line-numbers">#{line.number}</td>} + 
-        %Q{<td class="code ins"><ins>}
+        %Q{<td class="code ins"><ins>#{escape(line)}</ins></td></tr>}
       end
       
-      def before_remline(line)
+      def remline(line)
         %Q{<tr class="changes">} + 
         %Q{<td class="line-numbers">#{line.number}</td>} + 
         %Q{<td class="line-numbers">&nbsp;</td>} + 
-        %Q{<td class="code del"><del>}
+        %Q{<td class="code del"><del>#{escape(line)}</del></td></tr>}
       end
       
-      def before_modline(line)
+      def modline(line)
         %Q{<tr class="changes">} + 
         %Q{<td class="line-numbers">&nbsp;</td>} + 
         %Q{<td class="line-numbers">#{line.number}</td>} + 
-        %Q{<td class="code unchanged mod">}
+        %Q{<td class="code unchanged mod">#{escape(line)}</td></tr>}
       end
       
-      def before_unmodline(line)
+      def unmodline(line)
         %Q{<tr class="changes">} + 
         %Q{<td class="line-numbers">&nbsp;</td>} + 
         %Q{<td class="line-numbers">#{line.number}</td>} + 
-        %Q{<td class="code unchanged unmod">}
+        %Q{<td class="code unchanged unmod">#{escape(line)}</td></tr>}
       end
       
-      def before_sepline(line)
+      def sepline(line)
         %Q{<tr class="changes">} + 
-        %Q{<td class="line-numbers line-num-cut">...</td>} + 
-        %Q{<td class="line-numbers line-num-cut">...</td>} + 
-        %Q{<td class="code cut-line">}
-      end
-      
-      # After lines
-      def after_addline(line)
-       "</ins></td></tr>"
-      end
-      
-      def after_remline(line)
-       "</del></td></tr>"
-      end
-      
-      def after_modline(line)
-       "</td></tr>"
-      end
-      
-      def after_unmodline(line)
-       "</td></tr>"
-      end
-      
-      def after_sepline(line)
-       "</td></tr>"
-      end
-      
-      def new_line
+        %Q{<td class="line-numbers line-num-cut">&hellip;</td>} + 
+        %Q{<td class="line-numbers line-num-cut">&hellip;</td>} + 
+        %Q{<td class="code cut-line"></td></tr>}
       end
     end
   end

--- a/lib/gitorious/diff/sidebyside_table_callback.rb
+++ b/lib/gitorious/diff/sidebyside_table_callback.rb
@@ -1,6 +1,6 @@
 module Gitorious
   module Diff
-    class SidebysideTableCallback
+    class SidebysideTableCallback < BaseCallback
       
       # Before blocks
       def before_addblock(block)
@@ -45,67 +45,43 @@ module Gitorious
       end
       
       # Before lines
-      def before_addline(line)
+      def addline(line)
         # adds go on the right
         %Q{<th class="line-numbers">#{line.number}</th>} + 
         %Q{<td class="code ins"></td>} + 
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code ins"><ins>}
+        %Q{<td class="code ins"><ins>#{escape(line)}</ins></td></tr>}
       end
       
-      def before_remline(line)
+      def remline(line)
         # rems go on the left (hide the right side)
         %Q{<th class="line-numbers">#{line.number}</th>} + 
         %Q{<td class="code del"><del>#{CGI.escapeHTML(line)}</del></td>} + 
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code del hidden"><del>}
+        %Q{<td class="code del hidden"><del>#{escape(line)}</del></td></tr>}
       end
       
-      def before_modline(line)
+      def modline(line)
         # TODO: figure how we best display these
         # %Q{<th class="line-numbers">#{line.number}</th>} + 
         # %Q{<td class="code changed mod">#{CGI.escapeHTML(line)}</td>} + 
         # %Q{<th class="line-numbers">#{line.number}</th>} + 
-        # %Q{<td class="code changed mod">}
+        # %Q{<td class="code changed mod">#{escape(line)}</td></tr>}
       end
       
-      def before_unmodline(line)
+      def unmodline(line)
         # unmods goes on both sides
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code unchanged unmod">#{CGI.escapeHTML(line)}</td>} + 
+        %Q{<td class="code unchanged unmod">#{escape(line)}</td>} + 
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code unchanged unmod">}
+        %Q{<td class="code unchanged unmod">#{escape(line)}</td></tr>}
       end
       
-      def before_sepline(line)
-        %Q{<th class="line-numbers line-num-cut">...</th>} + 
-        %Q{<td class="code cut-line">...</td>} + 
-        %Q{<th class="line-numbers line-num-cut">...</th>} + 
-        %Q{<td class="code cut-line">}
-      end
-      
-      # After lines
-      def after_addline(line)
-        "</ins></td></tr>"
-      end
-      
-      def after_remline(line)
-        "</del></td></tr>"
-      end
-      
-      def after_modline(line)
-        "</td></tr>"
-      end
-      
-      def after_unmodline(line)
-        "</td></tr>"
-      end
-      
-      def after_sepline(line)
-        "</td></tr>"
-      end
-      
-      def new_line
+      def sepline(line)
+        %Q{<th class="line-numbers line-num-cut">&hellip;</th>} + 
+        %Q{<td class="code cut-line"></td>} + 
+        %Q{<th class="line-numbers line-num-cut">&hellip;</th>} + 
+        %Q{<td class="code cut-line"></td></tr>}
       end
     end
   end

--- /dev/null
+++ b/vendor/diff-display/History.txt
@@ -0,0 +1,4 @@
+== 0.0.1 2008-01-28
+
+* 1 major enhancement:
+  * Initial release

--- a/vendor/diff-display/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2003 Marcel Molina Jr.
-
-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.

--- /dev/null
+++ b/vendor/diff-display/License.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2008 Johan Sørensen
+Copyright (c) 2003 Marcel Molina Jr.
+
+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.
\ No newline at end of file

--- /dev/null
+++ b/vendor/diff-display/Manifest.txt
@@ -0,0 +1,26 @@
+History.txt
+License.txt
+Manifest.txt
+README.txt
+Rakefile
+config/hoe.rb
+config/requirements.rb
+lib/diff-display.rb
+lib/diff-display/version.rb
+log/debug.log
+script/destroy
+script/generate
+script/txt2html
+setup.rb
+spec/diff-display_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
+tasks/deployment.rake
+tasks/environment.rake
+tasks/rspec.rake
+tasks/website.rake
+website/index.html
+website/index.txt
+website/javascripts/rounded_corners_lite.inc.js
+website/stylesheets/screen.css
+website/template.rhtml

--- a/vendor/diff-display/README
+++ /dev/null
@@ -1 +0,0 @@
-Marcel Molina Jr. wrote this library probably back in 2004 or so.
\ No newline at end of file

--- /dev/null
+++ b/vendor/diff-display/README.txt
@@ -0,0 +1,2 @@
+Rewrite of an (unreleased) library by Marcel Molina Jr., who wrote this it 
+probably back in 2004 or so.
\ No newline at end of file

--- a/vendor/diff-display/Rakefile
+++ b/vendor/diff-display/Rakefile
@@ -1,13 +1,4 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the resource_paths plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
\ No newline at end of file
+require 'config/requirements'
+require 'config/hoe' # setup Hoe + all gem configuration
+
+Dir['tasks/**/*.rake'].each { |rake| load rake }
\ No newline at end of file

--- /dev/null
+++ b/vendor/diff-display/config/hoe.rb
@@ -0,0 +1,71 @@
+require 'diff/display/version'
+
+AUTHOR = ['Johan Sørensen', 'Marcel Molina Jr.']  # can also be an array of Authors
+EMAIL = "johan@johansorensen.com"
+DESCRIPTION = "Displays a unified diffs in various (user-definable) ways"
+GEM_NAME = 'diff-display' # what ppl will type to install your gem
+RUBYFORGE_PROJECT = 'diff-display' # The unix name for your project
+HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
+DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
+
+@config_file = "~/.rubyforge/user-config.yml"
+@config = nil
+RUBYFORGE_USERNAME = "unknown"
+def rubyforge_username
+  unless @config
+    begin
+      @config = YAML.load(File.read(File.expand_path(@config_file)))
+    rescue
+      puts <<-EOS
+ERROR: No rubyforge config file found: #{@config_file}
+Run 'rubyforge setup' to prepare your env for access to Rubyforge
+ - See http://newgem.rubyforge.org/rubyforge.html for more details
+      EOS
+      exit
+    end
+  end
+  RUBYFORGE_USERNAME.replace @config["username"]
+end
+
+
+REV = nil 
+# UNCOMMENT IF REQUIRED: 
+# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
+VERS = Diff::Display::VERSION::STRING + (REV ? ".#{REV}" : "")
+RDOC_OPTS = ['--quiet', '--title', 'diff-display documentation',
+    "--opname", "index.html",
+    "--line-numbers", 
+    "--main", "README",
+    "--inline-source"]
+
+class Hoe
+  def extra_deps 
+    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
+    @extra_deps
+  end 
+end
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+hoe = Hoe.new(GEM_NAME, VERS) do |p|
+  p.author = AUTHOR 
+  p.description = DESCRIPTION
+  p.email = EMAIL
+  p.summary = DESCRIPTION
+  p.url = HOMEPATH
+  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
+  p.test_globs = ["test/**/test_*.rb"]
+  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  
+  # == Optional
+  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  
+end
+
+CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
+PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
+hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
+hoe.rsync_args = '-av --delete --ignore-errors'
\ No newline at end of file

--- /dev/null
+++ b/vendor/diff-display/config/requirements.rb
@@ -0,0 +1,17 @@
+require 'fileutils'
+include FileUtils
+
+require 'rubygems'
+%w[rake hoe newgem rubigen].each do |req_gem|
+  begin
+    require req_gem
+  rescue LoadError
+    puts "This Rakefile requires the '#{req_gem}' RubyGem."
+    puts "Installation: gem install #{req_gem} -y"
+    exit
+  end
+end
+
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
+
+require 'diff-display'
\ No newline at end of file

--- /dev/null
+++ b/vendor/diff-display/lib/diff-display.rb
@@ -0,0 +1,14 @@
+$:.unshift File.dirname(__FILE__)
+
+module Diff
+  module Display
+  end
+end
+
+require "diff/display/version"
+require "diff/display/data_structure"
+require "diff/display/unified"
+require "diff/display/unified/generator"
+
+require "diff/renderer/base"
+require "diff/renderer/diff"
\ No newline at end of file