0
@@ -13,7 +13,6 @@ module YARD
0
           :format => :html, 
0
           :template => :default, 
0
           :serializer => YARD::Serializers::FileSystemSerializer.new, 
0
-          :readme => ['README', 'README.txt'],
0
           :verifier => lambda do |gen, obj| 
0
             return false if gen.respond_to?(:visibility) && !visibilities.include?(gen.visibility) 
0
           end

0
@@ -2,6 +2,7 @@ module YARD
0
   module Generators
0
     class FullDocGenerator < Base
0
       before_generate :is_namespace?
0
+      before_list :setup_options
0
       before_list :generate_assets
0
       before_list :generate_index
0
       before_list :generate_readme
0
@@ -16,6 +17,10 @@ module YARD
0
       end
0
       
0
       protected
0
+      
0
+      def setup_options
0
+        options[:readme] ||= Dir['{README,README.*}']
0
+      end
0
     
0
       def css_file;         'style.css'             end
0
       def css_syntax_file;  'syntax_highlight.css'  end
0
@@ -58,7 +63,7 @@ module YARD
0
       end
0
       
0
       def readme_markup
0
-        if File.extname(readme_file) == /^\.(?:mdown|markdown|markdn|md)$/
0
+        if File.extname(readme_file) =~ /^\.(?:mdown|markdown|markdn|md)$/
0
           :markdown
0
         elsif File.extname(readme_file) == ".textile"
0
           :textile

0
@@ -24,14 +24,14 @@ module YARD
0
         case markup
0
         when :markdown
0
           begin
0
-            BlueCloth.new(text).to_html
0
+            html = BlueCloth.new(text).to_html
0
           rescue NameError
0
             STDERR.puts "Missing BlueCloth gem for Markdown formatting. Install it with `gem install BlueCloth`"
0
             exit
0
           end
0
         when :textile
0
           begin
0
-            RedCloth.new(text).to_html
0
+            html = RedCloth.new(text).to_html
0
           rescue NameError
0
             STDERR.puts "Missing RedCloth gem for Textile formatting. Install it with `gem install RedCloth`"
0
             exit
0
@@ -40,10 +40,11 @@ module YARD
0
           html = SimpleMarkup.convert(text, SimpleMarkupHtml)
0
           html = fix_dash_dash(html)
0
           html = fix_typewriter(html)
0
-          html = resolve_links(html)
0
-          html = html.gsub(/<pre>(.+?)<\/pre>/m) { '<pre class="code">' + html_syntax_highlight(CGI.unescapeHTML($1)) + '</pre>' }
0
-          html
0
         end
0
+
0
+        html = resolve_links(html)
0
+        html = html.gsub(/<pre>(?:\s*<code>)?(.+?)(?:<\/code>\s*)?<\/pre>/m) { '<pre class="code">' + html_syntax_highlight(CGI.unescapeHTML($1)) + '</pre>' }
0
+        html
0
       end
0
       
0
       # @todo Refactor into own SimpleMarkup subclass

0
@@ -7,7 +7,7 @@ SPEC = Gem::Specification.new do |s|
0
   s.homepage      = "http://yard.soen.ca"
0
   s.platform      = Gem::Platform::RUBY
0
   s.summary       = "Documentation tool for consistent and usable documentation in Ruby." 
0
-  s.files         = Dir.glob("{bin,lib,spec,templates,benchmarks}/**/*") + ['LICENSE', 'README', 'Rakefile']
0
+  s.files         = Dir.glob("{bin,lib,spec,templates,benchmarks}/**/*") + ['LICENSE', 'README.markdown', 'Rakefile']
0
   s.require_paths = ['lib']
0
   s.executables   = [ 'yardoc', 'yri', 'yard-graph' ]
0
   s.has_rdoc      = false