coderay 1.0.0.778.pre → 1.0.0.788.pre

data/bin/coderay

@@ -1,99 +1,156 @@
 #!/usr/bin/env ruby
-# CodeRay Executable
-#
-# Version: 0.2
-# Author: murphy
+require 'coderay'
 
-def err msg
-  $stderr.puts msg
+$options, args = ARGV.partition { |arg| arg[/^-[hv]$|--\w+/] }
+subcommand = args.detect { |arg| arg[/^\w/] }
+subcommand = nil if subcommand && File.exist?(subcommand)
+args.delete subcommand
+
+def option? *options
+  !($options & options).empty?
 end
 
-def read
-  if file = ARGV[2]
-    File.read file
-  else
-    $stdin.read
-  end
+def tty?
+  $stdout.tty? || option?('--tty')
 end
 
-begin
-  require 'coderay'
+def version
+  puts <<-USAGE
+CodeRay #{CodeRay::VERSION}
+  USAGE
+end
 
-  if ARGV.empty?
-    puts <<-USAGE
-CodeRay #{CodeRay::VERSION} (http://coderay.rubychan.de)
+def help
+  puts <<-HELP
+This is CodeRay #{CodeRay::VERSION}, a syntax highlighting tool for selected languages.
 
-Usage:
-  coderay -<lang> [-<format>] < file > output
-  coderay file [-<format>]
+usage:
+  coderay [-language] [input] [-format] [output]
+  
+defaults:
+  language   detect from input file name or shebang; fall back to plain text
+  input      STDIN
+  format     detect from output file name or use terminal; fall back to HTML page
+  output     STDOUT
 
-Examples:
-  coderay -ruby -statistic < foo.rb
-  coderay -ruby < foo.rb  # colorized output to terminal
-  coderay -ruby -page foo.rb  # HTML page output to terminal
-  coderay -ruby -page foo.rb > foo.html  # HTML page output to file
-  coderay codegen.c  # generates codegen.c.html
-    USAGE
-  end
+common:
+  coderay file.rb                      # highlight file to terminal
+  coderay file.rb > file.html          # highlight file to HTML page
+  coderay file.rb -div > file.html     # highlight file to HTML snippet
+
+configure output:
+  coderay file.py output.json          # output tokens as JSON
+  coderay file.py -loc                 # count lines of code in Python file
+
+configure input:
+  coderay -python file                 # specify the input language
+  coderay -ruby                        # take input from STDIN
 
-  first, second = ARGV
+more:
+  coderay stylesheet [style]           # print CSS stylesheet
+  HELP
+end
+
+def commands
+  puts <<-COMMANDS
+  general:
+    highlight   code highlighting (default command)
+    stylesheet  print the CSS stylesheet with the given name
+  
+  about:
+    list [of]   list all available plugins (or just the scanners|encoders)
+    commands    print this list
+    help        show some help
+    version     print CodeRay version
+  COMMANDS
+end
+
+if option? '-v', '--version'
+  version
+end
+
+if option? '-h', '--help'
+  help
+end
 
-  if first
-    if first[/-(\w+)/] == first
-      lang = $1
-      input = read
-      tokens = :scan
-    elsif first == '-'
-      lang = $1
-      input = read
-      tokens = :scan
+case subcommand
+when 'highlight', nil
+  if ARGV.empty?
+    version
+    help
+  else
+    signature = args.map { |arg| arg[/^-/] ? '-' : 'f' }.join
+    names     = args.map { |arg| arg.sub(/^-/, '') }
+    case signature
+    when /^$/
+      exit
+    when /^ff?$/
+      input_file, output_file, = *names
+    when /^f-f?$/
+      input_file, output_filetype, output_file, = *names
+    when /^-ff?$/
+      input_filetype, input_file, output_file, = *names
+    when /^-f-f?$/
+      input_filetype, input_file, output_filetype, output_file, = *names
+    when /^--?f?$/
+      input_filetype, output_filetype, output_file, = *names
     else
-      file = first
-      tokens = CodeRay.scan_file file
-      output_filename, output_ext = file, /#{Regexp.escape(File.extname(file))}$/
+      raise signature
     end
-  else
-    puts 'No lang/file given.'
-    exit 1
-  end
-
-  if second
-    if second[/-(\w+)/] == second
-      format = $1
+    
+    if input_file
+      input_filetype ||= CodeRay::FileType.fetch input_file, :text, true
+    end
+    
+    if output_file
+      output_filetype ||= CodeRay::FileType[output_file]
     else
-      raise 'invalid format (must be -xxx)'
+      output_filetype ||= tty? ? :term : :page
     end
-  else
-    if $stdout.tty?
-      format = :term
+    
+    if input_file
+      input = File.read input_file
     else
-      $stderr.puts 'No format given; setting to default (HTML Page).'
-      format = :page
+      input = $stdin.read
+    end
+    
+    output = CodeRay.scan(input, input_filetype).encode(output_filetype)
+    
+    if output_file
+      File.open output_file, 'w' do |file|
+        file.puts output
+      end
+    else
+      puts output
     end
   end
-  
-  if tokens == :scan
-    output = CodeRay.encoder(format).encode(input, lang)
-  else
-    output = tokens.encode format
+when 'list'
+  arg = args.first && args.first.downcase
+  if [nil, 's', 'sc', 'scanner', 'scanners'].include? arg
+    puts 'input languages (Scanners):'
+    scanners = CodeRay::Scanners.all_plugins.map do |plugin|
+      aliases = (plugin.aliases - [nil]).map { |key| "-#{key}" }.sort_by { |key| key.size }
+      "  #{plugin.lang}: #{plugin.title}#{" (.#{plugin.file_extension}; #{aliases.join(', ')})" unless aliases.empty?}"
+    end
+    puts scanners.sort
+    puts
   end
-  out = $stdout
-  if output_filename
-    output_filename += '.' + CodeRay::Encoders[format]::FILE_EXTENSION.to_s
-    if File.exist? output_filename
-      err 'File %s already exists.' % output_filename
-      exit
-    else
-      out = File.open output_filename, 'w'
-      puts "Writing to #{output_filename}..."
+  
+  if [nil, 'e', 'en', 'enc', 'encoder', 'encoders'].include? arg
+    puts 'output formats (Encoders):'
+    encoders = CodeRay::Encoders.all_plugins.map do |plugin|
+      aliases = (plugin.aliases - [nil]).map { |key| "-#{key}" }.sort_by { |key| key.size }
+      "  #{plugin.plugin_id}: #{plugin.title}#{" (.#{plugin.file_extension}; #{aliases.join(', ')})" unless aliases.empty?}"
     end
+    puts encoders.sort
   end
-  out.puts output
-
-rescue => boom
-  err "Error: #{boom.message}\n"
-  err boom.backtrace
-  err '-' * 50
-  err ARGV
-  exit 1
+when 'stylesheet'
+  puts CodeRay::Encoders[:html]::CSS.new(args.first).stylesheet
+when 'commands'
+  commands
+when 'help'
+  help
+else
+  puts "Unknown command: #{subcommand}"
+  help
 end

data/lib/coderay.rb

@@ -134,6 +134,9 @@ module CodeRay
   # Revision: Subversion Revision number (generated on rake gem:make)
   VERSION = '1.0.0'
   
+  # helpers
+  autoload :FileType, 'coderay/helpers/file_type'
+  
   # Tokens
   autoload :Tokens, 'coderay/tokens'
   autoload :TokenKinds, 'coderay/token_kinds'
@@ -178,7 +181,6 @@ module CodeRay
     def scan_file filename, lang = :auto, options = {}, &block
       file = IO.read filename
       if lang == :auto
-        require 'coderay/helpers/file_type'
         lang = FileType.fetch filename, :text, true
       end
       scan file, lang, options = {}, &block

data/lib/coderay/encoder.rb

@@ -34,12 +34,17 @@ module CodeRay
         # downcase class name instead.
         def const_missing sym
           if sym == :FILE_EXTENSION
-            plugin_id.to_s
+            (@plugin_id || name[/\w+$/].downcase).to_s
           else
             super
           end
         end
         
+        # The default file extension for output file of this encoder class.
+        def file_extension
+          self::FILE_EXTENSION
+        end
+        
       end
       
       # Subclasses are to store their default options in this constant.
@@ -85,9 +90,9 @@ module CodeRay
       # more clear to you.
       alias highlight encode
       
-      # Return the default file extension for outputs of this encoder.
+      # The default file extension for this encoder.
       def file_extension
-        self.class::FILE_EXTENSION
+        self.class.file_extension
       end
       
       def << token

data/lib/coderay/encoders/_map.rb

@@ -8,8 +8,7 @@ module Encoders
     :plain => :text,
     :plaintext => :text,
     :remove_comments => :comment_filter,
-    :stats => :statistic,
-    :tex => :latex
+    :stats => :statistic
   
   # No default because Tokens#nonsense would not raise NoMethodError.
   

data/lib/coderay/encoders/html.rb

@@ -96,16 +96,16 @@ module Encoders
     DEFAULT_OPTIONS = {
       :tab_width => 8,
       
-      :css => :class,
+      :css   => :class,
       :style => :alpha,
-      :wrap => nil,
+      :wrap  => nil,
       :title => 'CodeRay output',
       
-      :line_numbers => nil,
+      :line_numbers        => nil,
       :line_number_anchors => 'n',
-      :line_number_start => 1,
-      :bold_every => 10,
-      :highlight_lines => nil,
+      :line_number_start   => 1,
+      :bold_every          => 10,
+      :highlight_lines     => nil,
       
       :hint => false,
     }

data/lib/coderay/encoders/page.rb

@@ -1,6 +1,6 @@
 module CodeRay
 module Encoders
-
+  
   load :html
   
   # Wraps the output into a HTML page, using CSS classes and
@@ -8,17 +8,17 @@ module Encoders
   # 
   # See Encoders::HTML for available options.
   class Page < HTML
-
+    
     FILE_EXTENSION = 'html'
-
+    
     register_for :page
-
+    
     DEFAULT_OPTIONS = HTML::DEFAULT_OPTIONS.merge \
       :css => :class,
       :wrap => :page,
       :line_numbers => :table
-
+    
   end
-
+  
 end
 end

data/lib/coderay/for_redcloth.rb

@@ -45,7 +45,7 @@ module CodeRay
           if !opts[:lang] && RedCloth::VERSION.to_s >= '4.2.0'
             # simulating pre-4.2 behavior
             if opts[:text].sub!(/\A\[(\w+)\]/, '')
-              if CodeRay::Scanners[$1].plugin_id == :text
+              if CodeRay::Scanners[$1].lang == :text
                 opts[:text] = $& + opts[:text]
               else
                 opts[:lang] = $1

data/lib/coderay/helpers/plugin.rb

@@ -152,11 +152,25 @@ module CodeRay
       plugin_hash.values.grep(Class)
     end
     
+    # Loads the map file (see map).
+    #
+    # This is done automatically when plugin_path is called.
+    def load_plugin_map
+      mapfile = path_to '_map'
+      @plugin_map_loaded = true
+      if File.exist? mapfile
+        require mapfile
+        true
+      else
+        false
+      end
+    end
+    
   protected
     
     # Return a plugin hash that automatically loads plugins.
     def make_plugin_hash
-      map_loaded = false
+      @plugin_map_loaded ||= false
       Hash.new do |h, plugin_id|
         id = validate_id(plugin_id)
         path = path_to id
@@ -164,15 +178,14 @@ module CodeRay
           raise LoadError, "#{path} not found" unless File.exist? path
           require path
         rescue LoadError => boom
-          if map_loaded
+          if @plugin_map_loaded
             if h.has_key?(nil)  # default plugin
               h[nil]
             else
               raise PluginNotFound, 'Could not load plugin %p: %s' % [id, boom]
             end
           else
-            load_map
-            map_loaded = true
+            load_plugin_map
             h[plugin_id]
           end
         else
@@ -186,14 +199,6 @@ module CodeRay
       end
     end
     
-    # Loads the map file (see map).
-    #
-    # This is done automatically when plugin_path is called.
-    def load_map
-      mapfile = path_to '_map'
-      require mapfile if File.exist? mapfile
-    end
-    
     # Returns the expected path to the plugin file for the given id.
     def path_to plugin_id
       File.join plugin_path, "#{plugin_id}.rb"
@@ -230,6 +235,8 @@ module CodeRay
   #  See CodeRay::PluginHost for examples.
   module Plugin
     
+    attr_reader :plugin_id
+    
     # Register this class for the given +id+.
     # 
     # Example:
@@ -262,9 +269,12 @@ module CodeRay
       self::PLUGIN_HOST
     end
     
-    # Returns the plugin id used by the engine.
-    def plugin_id
-      @plugin_id ||= name[/\w+$/].downcase
+    def aliases
+      plugin_host.load_plugin_map
+      plugin_host.plugin_hash.inject [] do |aliases, (key, value)|
+        aliases << key if plugin_host[key] == self
+        aliases
+      end
     end
     
   end

data/lib/coderay/scanner.rb

@@ -61,6 +61,8 @@ module CodeRay
       
       KINDS_NOT_LOC = [:comment, :doctype, :docstring]
       
+      attr_accessor :state
+      
       class << self
         
         # Normalizes the given code into a string with UNIX newlines, in the
@@ -79,7 +81,7 @@ module CodeRay
         end
         
         # The typical filename suffix for this scanner's language.
-        def file_extension extension = plugin_id
+        def file_extension extension = lang
           @file_extension ||= extension.to_s
         end
         
@@ -89,7 +91,9 @@ module CodeRay
         end
         
         # The lang of this Scanner class, which is equal to its Plugin ID.
-        alias lang plugin_id
+        def lang
+          @plugin_id
+        end
         
       protected
         
@@ -190,7 +194,14 @@ module CodeRay
         else
           raise ArgumentError, 'expected String, Array, or nil'
         end
-        scan_tokens @tokens, options
+        
+        begin
+          scan_tokens @tokens, options
+        rescue => e
+          message = "Error in %s#scan_tokens, initial state was: %p" % [self.class, defined?(state) && state]
+          raise_inspect e.message, @tokens, message, 30, e.backtrace
+        end
+        
         @cached_tokens = @tokens
         if source.is_a? Array
           @tokens.split_into_parts(*source.map { |part| part.size })
@@ -260,7 +271,7 @@ module CodeRay
       end
       
       # Scanner error with additional status information
-      def raise_inspect msg, tokens, state = 'No state given!', ambit = 30
+      def raise_inspect msg, tokens, state = self.state || 'No state given!', ambit = 30, backtrace = caller
         raise ScanError, <<-EOE % [
 
 
@@ -288,7 +299,7 @@ surrounding code:
           matched, state, bol?, eos?,
           string[pos - ambit, ambit],
           string[pos, ambit],
-        ]
+        ], backtrace
       end
       
       # Shorthand for scan_until(/\z/).

data/lib/coderay/scanners/clojure.rb

@@ -83,8 +83,8 @@ module CodeRay
       ]  # :nodoc:
       
       IDENT_KIND = WordList.new(:ident).
-        add(SPECIAL_FORMS, :reserved).
-        add(CORE_FORMS, :reserved).
+        add(SPECIAL_FORMS, :keyword).
+        add(CORE_FORMS, :keyword).
         add(PREDEFINED_CONSTANTS, :predefined_constant)
       
       KEYWORD_NEXT_TOKEN_KIND = WordList.new(nil).
@@ -164,7 +164,7 @@ module CodeRay
             elsif match = scan(/#{IDENTIFIER}/o)
               kind = IDENT_KIND[match]
               encoder.text_token match, kind
-              if rest? && kind == :reserved
+              if rest? && kind == :keyword
                 if kind = KEYWORD_NEXT_TOKEN_KIND[match]
                   encoder.text_token match, :space if match = scan(/\s+/o)
                   encoder.text_token match, kind if match = scan(/#{IDENTIFIER}/o)

data/lib/coderay/scanners/delphi.rb

@@ -9,7 +9,7 @@ module Scanners
     register_for :delphi
     file_extension 'pas'
     
-    RESERVED_WORDS = [
+    KEYWORDS = [
       'and', 'array', 'as', 'at', 'asm', 'at', 'begin', 'case', 'class',
       'const', 'constructor', 'destructor', 'dispinterface', 'div', 'do',
       'downto', 'else', 'end', 'except', 'exports', 'file', 'finalization',
@@ -34,7 +34,7 @@ module Scanners
     ]  # :nodoc:
     
     IDENT_KIND = CaseIgnoringWordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
+      add(KEYWORDS, :keyword).
       add(DIRECTIVES, :directive)  # :nodoc:
     
     NAME_FOLLOWS = CaseIgnoringWordList.new(false).

data/lib/coderay/scanners/diff.rb

@@ -11,7 +11,7 @@ module Scanners
     
     DEFAULT_OPTIONS = {
       :highlight_code => true,
-      :inline_diff => true,
+      :inline_diff    => true,
     }
     
   protected
@@ -73,7 +73,7 @@ module Scanners
             next unless match = scan(/.+/)
             encoder.text_token match, :plain
           elsif match = scan(/@@(?>[^@\n]*)@@/)
-            content_scanner.instance_variable_set(:@state, :initial) unless match?(/\n\+/)
+            content_scanner.state = :initial unless match?(/\n\+/)
             content_scanner_entry_state = nil
             if check(/\n|$/)
               encoder.begin_line line_kind = :change
@@ -106,37 +106,39 @@ module Scanners
             encoder.begin_line line_kind = :delete
             encoder.text_token match, :delete
             if options[:inline_diff] && deleted_lines == 1 && check(/(?>.*)\n\+(?>.*)$(?!\n\+)/)
-              if content_scanner.instance_variable_defined?(:@state)
-                content_scanner_entry_state = content_scanner.instance_variable_get(:@state)
-              end
+              content_scanner_entry_state = content_scanner.state
               skip(/(.*)\n\+(.*)$/)
               head, deletion, insertion, tail = diff self[1], self[2]
               pre, deleted, post = content_scanner.tokenize [head, deletion, tail], :tokens => Tokens.new
               encoder.tokens pre
-              encoder.begin_group :eyecatcher
-              encoder.tokens deleted
-              encoder.end_group :eyecatcher
+              unless deleted.empty?
+                encoder.begin_group :eyecatcher
+                encoder.tokens deleted
+                encoder.end_group :eyecatcher
+              end
               encoder.tokens post
               encoder.end_line line_kind
               encoder.text_token "\n", :space
               encoder.begin_line line_kind = :insert
               encoder.text_token '+', :insert
-              content_scanner.instance_variable_set(:@state, content_scanner_entry_state || :initial)
+              content_scanner.state = content_scanner_entry_state || :initial
               pre, inserted, post = content_scanner.tokenize [head, insertion, tail], :tokens => Tokens.new
               encoder.tokens pre
-              encoder.begin_group :eyecatcher
-              encoder.tokens inserted
-              encoder.end_group :eyecatcher
+              unless inserted.empty?
+                encoder.begin_group :eyecatcher
+                encoder.tokens inserted
+                encoder.end_group :eyecatcher
+              end
               encoder.tokens post
             elsif match = scan(/.*/)
               if options[:highlight_code]
-                if deleted_lines == 1 && content_scanner.instance_variable_defined?(:@state)
-                  content_scanner_entry_state = content_scanner.instance_variable_get(:@state)
+                if deleted_lines == 1
+                  content_scanner_entry_state = content_scanner.state
                 end
                 content_scanner.tokenize match, :tokens => encoder unless match.empty?
                 if !match?(/\n-/)
                   if match?(/\n\+/)
-                    content_scanner.instance_variable_set(:@state, content_scanner_entry_state || :initial)
+                    content_scanner.state = content_scanner_entry_state || :initial
                   end
                   content_scanner_entry_state = nil
                 end

data/lib/coderay/scanners/php.rb

@@ -182,9 +182,9 @@ module Scanners
       ]
       
       IDENT_KIND = CaseIgnoringWordList.new(:ident).
-        add(KEYWORDS, :reserved).
+        add(KEYWORDS, :keyword).
         add(TYPES, :predefined_type).
-        add(LANGUAGE_CONSTRUCTS, :reserved).
+        add(LANGUAGE_CONSTRUCTS, :keyword).
         add(BUILTIN_FUNCTIONS, :predefined).
         add(CLASSES, :predefined_constant).
         add(EXCEPTIONS, :exception).
@@ -281,7 +281,7 @@ module Scanners
               label_expected = false
               if kind == :ident && match =~ /^[A-Z]/
                 kind = :constant
-              elsif kind == :reserved
+              elsif kind == :keyword
                 case match
                 when 'class'
                   states << :class_expected

data/lib/coderay/scanners/ruby.rb

@@ -23,8 +23,9 @@ module Scanners
     end
     
     def scan_tokens encoder, options
+      state, heredocs = @state
+      heredocs = heredocs.dup if heredocs.is_a?(Array)
       
-      state = @state
       if state && state.instance_of?(self.class::StringState)
         encoder.begin_group state.type
       end
@@ -34,10 +35,15 @@ module Scanners
       method_call_expected = false
       value_expected = true
       
-      heredocs = nil
       inline_block_stack = nil
       inline_block_curly_depth = 0
       
+      if heredocs
+        state = heredocs.shift
+        encoder.begin_group state.type
+        heredocs = nil if heredocs.empty?
+      end
+      
       # def_object_stack = nil
       # def_object_paren_depth = 0
       
@@ -90,7 +96,7 @@ module Scanners
                 if match[/\A[A-Z]/] && !(match[/[!?]$/] || match?(/\(/))
                   kind = :constant
                 end
-              elsif kind == :reserved
+              elsif kind == :keyword
                 state = patterns::KEYWORD_NEW_STATE[match]
                 value_expected = true if patterns::KEYWORDS_EXPECTING_VALUE[match]
               end
@@ -421,11 +427,14 @@ module Scanners
       
       # cleaning up
       if options[:keep_state]
-        @state = state
+        heredocs = nil if heredocs && heredocs.empty?
+        @state = state, heredocs
       end
+      
       if state.is_a? self.class::StringState
         encoder.end_group state.type
       end
+      
       if inline_block_stack
         until inline_block_stack.empty?
           state, = *inline_block_stack.pop

data/lib/coderay/scanners/ruby/patterns.rb

@@ -4,7 +4,7 @@ module Scanners
 
   module Ruby::Patterns  # :nodoc: all
 
-    RESERVED_WORDS = %w[
+    KEYWORDS = %w[
       and def end in or unless begin
       defined? ensure module redo super until
       BEGIN break do next rescue then
@@ -26,7 +26,7 @@ module Scanners
     ]
 
     IDENT_KIND = WordList.new(:ident).
-      add(RESERVED_WORDS, :reserved).
+      add(KEYWORDS, :keyword).
       add(PREDEFINED_CONSTANTS, :predefined_constant)
 
     KEYWORD_NEW_STATE = WordList.new(:initial).

data/lib/coderay/scanners/ruby/string_state.rb

@@ -55,7 +55,7 @@ module Scanners
       def heredoc_pattern delim, interpreted, indented
         # delim = delim.dup  # workaround for old Ruby
         delim_pattern = Regexp.escape(delim)
-        delim_pattern = / \n #{ '(?>[ \t]*)' if indented } #{ Regexp.new delim_pattern } $ /x
+        delim_pattern = / (?:\A|\n) #{ '(?>[ \t]*)' if indented } #{ Regexp.new delim_pattern } $ /x
         if interpreted
           / (?= #{delim_pattern}() | \\ | \# [{$@] ) /mx  # $1 set == end of heredoc
         else

data/lib/coderay/scanners/scheme.rb

@@ -19,7 +19,7 @@ module CodeRay
       ]  # :nodoc:
       
       IDENT_KIND = CaseIgnoringWordList.new(:ident).
-        add(CORE_FORMS, :reserved)  # :nodoc:
+        add(CORE_FORMS, :keyword)  # :nodoc:
       
       #IDENTIFIER_INITIAL = /[a-z!@\$%&\*\/\:<=>\?~_\^]/i
       #IDENTIFIER_SUBSEQUENT = /#{IDENTIFIER_INITIAL}|\d|\.|\+|-/

data/lib/coderay/styles/alpha.rb

@@ -141,8 +141,8 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .head { color: #f8f; background: #505 }
 .head .filename { color: white; }
 
-.ins .eye { background-color: hsla(120,100%,50%,0.2) }
-.del .eye { background-color: hsla(0,100%,50%,0.2) }
+.del .eye { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
+.ins .eye { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
 
 .ins .ins { color: #080; background:transparent; font-weight:bold }
 .del .del { color: #800; background:transparent; font-weight:bold }

data/lib/coderay/tokens.rb

@@ -223,12 +223,15 @@ module CodeRay
                 content_or_kind
               end
             end
-            parts << part.concat(closing)
-            part = Tokens.new
+            part.concat closing
+            begin
+              parts << part
+              part = Tokens.new
+              size = sizes[i += 1]
+            end until size.nil? || size > 0
             # ...and open them again.
             part.concat opened.flatten
             part_size = 0
-            size = sizes[i += 1]
             redo unless content.empty?
           else
             part << content << item

metadata

@@ -2,7 +2,7 @@
 name: coderay
 version: !ruby/object:Gem::Version 
   prerelease: 10
-  version: 1.0.0.778.pre
+  version: 1.0.0.788.pre
 platform: ruby
 authors: 
 - murphy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 Z
+date: 2011-06-25 00:00:00 Z
 dependencies: []
 
 description: Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.
@@ -18,7 +18,6 @@ email:
 - murphy@rubychan.de
 executables: 
 - coderay
-- coderay_stylesheet
 extensions: []
 
 extra_rdoc_files: 
@@ -97,7 +96,6 @@ files:
 - test/functional/for_redcloth.rb
 - test/functional/suite.rb
 - bin/coderay
-- bin/coderay_stylesheet
 - FOLDERS
 homepage: http://coderay.rubychan.de
 licenses: []

data/bin/coderay_stylesheet

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require 'coderay'
-
-puts CodeRay::Encoders[:html]::CSS.new.stylesheet