--- a/app/helpers/wikis_helper.rb
+++ b/app/helpers/wikis_helper.rb
@@ -1,9 +1,12 @@
 #
-# Wiki parsing is handled by the Mediacloth - http://mediacloth.rubyforge.org/
-# Use the trunk version
+# Wiki parsing is handled by the Bluecloth - http://www.deveiate.org/projects/BlueCloth
+# Bluecloth uses Markdown syntax - http://daringfireball.net/projects/markdown/syntax
+#
+# Syntax highlighting from CodeRay - http://nullcreations.net/entry/coderay-helper-for-rails
 #
 
 require 'bluecloth'
+require 'coderay'
 
 module WikisHelper
 
@@ -12,15 +15,20 @@ module WikisHelper
   
   def render_wiki
     out = ""
+    #TODO include this in header
+    out << "<style>#{CodeRay::Encoders[:html]::CSS.new(:appcast).stylesheet}</style>"
     out << "<h1 class='pagetitle'>" << @wiki.title << "</h1>\n"
-
-#    out << MediaCloth::wiki_to_html()    
-    
-    bc = BlueCloth::new(@wiki.page)
-    out << bc.to_html    
-    
+    bc = BlueCloth::new(parse_coderay(@wiki.page))
+    out << bc.to_html
     out
   end
+
+  def parse_coderay(text)
+    text.scan(/(<code\:([a-z].+?)>(.+?)<\/code>)/m).each do |match|
+      text.gsub!(match[0],CodeRay.scan(match[2], match[1].to_sym).div( :line_numbers => :table,:css => :class))
+    end
+    return text
+  end
   
   def breadcrumb_wiki
     if @extrabreadcrumb then

--- a/app/views/articles/ac_new.html.erb
+++ b/app/views/articles/ac_new.html.erb
@@ -1,8 +1,8 @@
-<h1>Create a new project</h1>
+<h1>Create a new article</h1>
 
-<%= error_messages_for :project -%>
+<%= error_messages_for :article -%>
 
-<% form_for :project, :url => projects_path do |f| -%>
+<% form_for :article, :url => projects_path do |f| -%>
   <%= render :partial => "form", :locals => {:form => f} -%>
   
   <p class="hint">

--- a/test/fixtures/wiki_pages/_appcast_contents.txt
+++ b/test/fixtures/wiki_pages/_appcast_contents.txt
@@ -1,13 +1,10 @@
-[[appcast_credits|Appcast Project Credits]]
+[Appcast Project Credits](/projects/appcast/wikis/appcast_credits)
 
 
-[http://localhost:3001/projects/appcast/wikis/appcast_installation_guide Appcast Installation Guide]
+[Appcast Installation Guide](/projects/appcast/wikis/appcast_installation_guide)
 
 
-[http://localhost:3001/projects/appcast/wikis/gitorious-merge-notes Appcast/Gitorious Merge Notes]
-
-
-[http://localhost:3001/projects/appcast/wikis/appcast-dev-notes Appcast Developer Notes]
-
+[Appcast/Gitorious Merge Notes](/projects/appcast/wikis/gitorious-merge-notes)
 
 
+[Appcast Developer Notes](/projects/appcast/wikis/appcast-dev-notes)

--- a/test/fixtures/wiki_pages/_test_wiki_page.txt
+++ b/test/fixtures/wiki_pages/_test_wiki_page.txt
@@ -1,83 +1,26 @@
-''italic''
 
+Syntax Here:
 
-'''bold'''
 
+http://daringfireball.net/projects/markdown/syntax
 
-'''''bold and italic'''''
 
 
-:Indent
+### Code Test
 
 
-==heading==
+<code:ruby>
 
-===level 2===
+case variable
 
-====level 3====
+  when x
 
-=====level 4=====
+  when y
 
-[[Link to another page]]
+end
 
 
-[[Link|different title]]
-
-
-[http://www.example.org Text]
-
-
-[[fr:Page en français]]
-
-
-[[Category:Example]]
-
-----
-
-* one
-
-** one.a
-
-** one.b
-
-* two
-
-* three
-
-
-#one
-
-#two
-
-#three
-
-
-[[Image:File.jpg|Text]]
-
-
-[[Image:File.jpg|frame|Text]]
-
-
-[[Image:File.jpg|thumb|Text]]
-
-
-[[Media:File.ogg]]
-
-
-{{Name}}
-
-
---~~~
-
-
---~~~~
-
-
---~~~~~
-
-
-#REDIRECT [[Other article]]
-
+</code>
 
 
 

--- a/test/fixtures/wiki_pages/_wiki_contents.txt
+++ b/test/fixtures/wiki_pages/_wiki_contents.txt
@@ -1,38 +1,29 @@
-[http://localhost:3001/wikis/wiki_contents Wiki Contents]
+[Test Wiki Page](/wikis/test_wiki_page)
 
 
-[http://localhost:3001/wikis/test_wiki_page Test Wiki Page]
+[Wiki Todo List](/wikis/wiki_todo_list)
 
 
-[http://localhost:3001/wikis/wiki_todo_list Wiki Todo List]
+[Ubuntu Crib Sheet](/wikis/ubuntu_crib_sheet)
 
 
-[http://localhost:3001/wikis/appcast_contents Appcast Contents]
+[Ruby Crib Sheet](/wikis/ruby_crib_sheet)
 
 
-[http://localhost:3001/wikis/appcast_credits Appcast Project Credits]
+[Rails Crib Sheet](/wikis/rails_crib_sheet)
 
 
-[http://localhost:3001/wikis/appcast_installation_guide Appcast Installation Guide]
+[Git Crib Sheet](/wikis/git_crib_sheet)
 
 
-[http://localhost:3001/wikis/ubuntu_crib_sheet Ubuntu Crib Sheet]
+### Projects
 
 
-[http://localhost:3001/wikis/ruby_crib_sheet Ruby Crib Sheet]
+* [Appcast](/projects/appcast/wikis/appcast_contents)
 
 
-[http://localhost:3001/wikis/rails_crib_sheet Rails Crib Sheet]
 
 
-[http://localhost:3001/wikis/git_crib_sheet Git Crib Sheet]
-
-
-[http://localhost:3001/wikis/gitorious-merge-notes Appcast/Gitorious Merge Notes]
-
-
-[http://localhost:3001/wikis/appcast-dev-notes Appcast Developer Notes]
-
 
 
 

--- /dev/null
+++ b/vendor/coderay.rb
@@ -0,0 +1,319 @@
+# = CodeRay Library
+#
+# $Id: coderay.rb 70 2006-07-11 13:42:07Z murphy $
+#
+# CodeRay is a Ruby library for syntax highlighting.
+#
+# I try to make CodeRay easy to use and intuitive, but at the same time fully featured, complete,
+# fast and efficient.
+# 
+# See README.
+# 
+# It consists mainly of
+# * the main engine: CodeRay (Scanners::Scanner, Tokens/TokenStream, Encoders::Encoder), PluginHost
+# * the scanners in CodeRay::Scanners
+# * the encoders in CodeRay::Encoders
+# 
+# Here's a fancy graphic to light up this gray docu:
+# 
+# http://rd.cYcnus.de/coderay/scheme.png
+# 
+# == Documentation
+#
+# See CodeRay, Encoders, Scanners, Tokens.
+#
+# == Usage
+#
+# Remember you need RubyGems to use CodeRay. Run Ruby with -rubygems option
+# if required.
+#
+# === Highlight Ruby code in a string as html
+# 
+#   require 'coderay'
+#   print CodeRay.scan('puts "Hello, world!"', :ruby).html
+#
+#   # prints something like this:
+#   puts <span class="s">&quot;Hello, world!&quot;</span>
+# 
+# 
+# === Highlight C code from a file in a html div
+# 
+#   require 'coderay'
+#   print CodeRay.scan(File.read('ruby.h'), :c).div
+#   print CodeRay.scan_file('ruby.h').html.div
+# 
+# You can include this div in your page. The used CSS styles can be printed with
+# 
+#   % ruby -rcoderay -e "print CodeRay::Encoders[:html]::CSS"
+# 
+# === Highlight without typing too much
+#
+# If you are one of the hasty (or lazy, or extremely curious) people, just run this file:
+#
+#   % ruby -rubygems coderay.rb
+# 
+# If the output was to fast for you, try
+# 
+#   % ruby -rubygems coderay.rb > example.html
+#
+# and look at the file it created.
+# 
+# = CodeRay Module
+#
+# The CodeRay module provides convenience methods for the engine.
+#
+# * The +lang+ and +format+ arguments select Scanner and Encoder to use. These are
+#   simply lower-case symbols, like <tt>:python</tt> or <tt>:html</tt>.
+# * All methods take an optional hash as last parameter, +options+, that is send to
+#   the Encoder / Scanner.
+# * Input and language are always sorted in this order: +code+, +lang+.
+#   (This is in alphabetical order, if you need a mnemonic ;)
+# 
+# You should be able to highlight everything you want just using these methods;
+# so there is no need to dive into CodeRay's deep class hierarchy.
+#
+# The examples in the demo directory demonstrate common cases using this interface.
+#  
+# = Basic Access Ways
+#
+# Read this to get a general view what CodeRay provides.
+# 
+# == Scanning
+#  
+#  Scanning means analysing an input string, splitting it up into Tokens.
+#  Each Token knows about what type it is: string, comment, class name, etc.
+#
+#  Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is
+#  handled by CodeRay::Scanners::Ruby.
+# 
+# CodeRay.scan:: Scan a string in a given language into Tokens.
+#                This is the most common method to use.
+# CodeRay.scan_file:: Scan a file and guess the language using FileType.
+# 
+# The Tokens object you get from these methods can encode itself; see Tokens.
+# 
+# == Encoding
+#
+# Encoding means compiling Tokens into an output. This can be colored HTML or
+# LaTeX, a textual statistic or just the number of non-whitespace tokens.
+# 
+# Each Encoder provides output in a specific +format+, so you select Encoders via
+# formats like <tt>:html</tt> or <tt>:statistic</tt>.
+# 
+# CodeRay.encode:: Scan and encode a string in a given language.
+# CodeRay.encode_tokens:: Encode the given tokens.
+# CodeRay.encode_file:: Scan a file, guess the language using FileType and encode it.
+#
+# == Streaming
+#
+# Streaming saves RAM by running Scanner and Encoder in some sort of
+# pipe mode; see TokenStream.
+#
+# CodeRay.scan_stream:: Scan in stream mode.
+#
+#  == All-in-One Encoding
+#
+# CodeRay.encode:: Highlight a string with a given input and output format.
+#
+# == Instanciating
+#
+# You can use an Encoder instance to highlight multiple inputs. This way, the setup
+# for this Encoder must only be done once.
+#
+# CodeRay.encoder:: Create an Encoder instance with format and options.
+#
+# There is no CodeRay.scanner method because Scanners are bound to an input string
+# on creation; you can't re-use them with another string.
+#
+#  The scanning methods provide more flexibility; we recommend to use these.
+module CodeRay
+
+  # Version: Major.Minor.Teeny[.Revision]
+  # Major: 0 for pre-release
+  # Minor: odd for beta, even for stable
+  # Teeny: development state
+  # Revision: Subversion Revision number (generated on rake)
+  Version = '0.7.2'
+
+  require 'coderay/tokens'
+  require 'coderay/scanner'
+  require 'coderay/encoder'
+  require 'coderay/duo'
+  require 'coderay/style'
+
+
+  class << self
+
+    # Scans the given +code+ (a String) with the Scanner for +lang+.
+    #
+    # This is a simple way to use CodeRay. Example:
+    #  require 'coderay'
+    #  page = CodeRay.scan("puts 'Hello, world!'", :ruby).html
+    #
+    # See also demo/demo_simple.
+    def scan code, lang, options = {}, &block
+      scanner = Scanners[lang].new code, options, &block
+      scanner.tokenize
+    end
+
+    # Scans +filename+ (a path to a code file) with the Scanner for +lang+.
+    #
+    # If +lang+ is :auto or omitted, the CodeRay::FileType module is used to
+    # determine it. If it cannot find out what type it is, it uses
+    # CodeRay::Scanners::Plaintext.
+    #
+    # Calls CodeRay.scan.
+    #
+    # Example:
+    #  require 'coderay'
+    #  page = CodeRay.scan_file('some_c_code.c').html
+    def scan_file filename, lang = :auto, options = {}, &block
+      file = IO.read filename
+      if lang == :auto
+        require 'coderay/helpers/filetype'
+        lang = FileType.fetch filename, :plaintext, true
+      end
+      scan file, lang, options = {}, &block
+    end
+
+    # Scan the +code+ (a string) with the scanner for +lang+.
+    #
+    # Calls scan.
+    #
+    # See CodeRay.scan.
+    def scan_stream code, lang, options = {}, &block
+      options[:stream] = true
+      scan code, lang, options, &block
+    end
+
+    # Encode a string in Streaming mode.
+    #
+    # This starts scanning +code+ with the the Scanner for +lang+
+    # while encodes the output with the Encoder for +format+.
+    # +options+ will be passed to the Encoder.
+    #
+    # See CodeRay::Encoder.encode_stream
+    def encode_stream code, lang, format, options = {}
+      encoder(format, options).encode_stream code, lang, options
+    end
+
+    # Encode a string.
+    #
+    # This scans +code+ with the the Scanner for +lang+ and then
+    # encodes it with the Encoder for +format+.
+    # +options+ will be passed to the Encoder.
+    #
+    # See CodeRay::Encoder.encode
+    def encode code, lang, format, options = {}
+      encoder(format, options).encode code, lang, options
+    end
+
+    # Highlight a string into a HTML <div>.
+    #
+    # CSS styles use classes, so you have to include a stylesheet
+    # in your output.
+    #
+    # See encode.
+    def highlight code, lang, options = { :css => :class }, format = :div
+      encode code, lang, format, options
+    end
+
+    # Encode pre-scanned Tokens.
+    # Use this together with CodeRay.scan:
+    #
+    #  require 'coderay'
+    #  
+    #  # Highlight a short Ruby code example in a HTML span
+    #  tokens = CodeRay.scan '1 + 2', :ruby
+    #  puts CodeRay.encode_tokens(tokens, :span)
+    #
+    def encode_tokens tokens, format, options = {}
+      encoder(format, options).encode_tokens tokens, options
+    end
+
+    # Encodes +filename+ (a path to a code file) with the Scanner for +lang+.
+    #
+    # See CodeRay.scan_file.
+    # Notice that the second argument is the output +format+, not the input language.
+    #
+    # Example:
+    #  require 'coderay'
+    #  page = CodeRay.encode_file 'some_c_code.c', :html
+    def encode_file filename, format, options = {}
+      tokens = scan_file filename, :auto, get_scanner_options(options)
+      encode_tokens tokens, format, options
+    end
+
+    # Highlight a file into a HTML <div>.
+    #
+    # CSS styles use classes, so you have to include a stylesheet
+    # in your output.
+    #
+    # See encode.
+    def highlight_file filename, options = { :css => :class }, format = :div
+      encode_file filename, format, options
+    end
+
+    # Finds the Encoder class for +format+ and creates an instance, passing
+    # +options+ to it.
+    #
+    # Example:
+    #  require 'coderay'
+    #  
+    #  stats = CodeRay.encoder(:statistic)
+    #  stats.encode("puts 17 + 4\n", :ruby)
+    #  
+    #  puts '%d out of %d tokens have the kind :integer.' % [
+    #    stats.type_stats[:integer].count,
+    #    stats.real_token_count
+    #  ]
+    #  #-> 2 out of 4 tokens have the kind :integer.
+    def encoder format, options = {}
+      Encoders[format].new options
+    end
+
+    # Finds the Scanner class for +lang+ and creates an instance, passing
+    # +options+ to it.
+    #
+    # See Scanner.new.
+    def scanner lang, options = {}
+      Scanners[lang].new '', options
+    end
+
+    # Extract the options for the scanner from the +options+ hash.
+    #
+    # Returns an empty Hash if <tt>:scanner_options</tt> is not set.
+    #
+    # This is used if a method like CodeRay.encode has to provide options
+    # for Encoder _and_ scanner.
+    def get_scanner_options options
+      options.fetch :scanner_options, {}
+    end
+
+  end
+
+  # This Exception is raised when you try to stream with something that is not
+  # capable of streaming.
+  class NotStreamableError < Exception
+    def initialize obj
+      @obj = obj
+    end
+
+    def to_s
+      '%s is not Streamable!' % @obj.class
+    end
+  end
+
+  # A dummy module that is included by subclasses of CodeRay::Scanner an CodeRay::Encoder
+  # to show that they are able to handle streams.
+  module Streamable
+  end
+
+end
+
+# Run a test script.
+if $0 == __FILE__
+  $stderr.print 'Press key to print demo.'; gets
+  code = File.read($0)[/module CodeRay.*/m]
+  print CodeRay.scan(code, :ruby).html
+end

--- /dev/null
+++ b/vendor/coderay/duo.rb
@@ -0,0 +1,29 @@
+module CodeRay
+  
+  # = Duo
+  #
+  # $Id: scanner.rb 123 2006-03-21 14:46:34Z murphy $
+  #
+  # TODO: Doc.
+  class Duo
+
+    attr_accessor :scanner, :encoder
+
+    def initialize lang, format, options = {}
+      @scanner = CodeRay.scanner lang, CodeRay.get_scanner_options(options)
+      @encoder = CodeRay.encoder format, options
+    end
+
+    class << self
+      alias [] new
+    end
+
+    def encode code
+      @scanner.string = code
+      @encoder.encode_tokens(scanner.tokenize)
+    end
+    alias highlight encode
+
+  end
+
+end