Merge branch 'master' into go-scanner

Conflicts:
	lib/coderay/helpers/file_type.rb

1 files changed, 0 insertions, 40 deletions

diff --git a/rake_helpers/ca.rb b/rake_helpers/ca.rb
deleted file mode 100644
index ba6fe1e..0000000
--- a/rake_helpers/ca.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#!c:/ruby/bin/rubyw

-# Hy-Ca 0.2 by murphy

-

-module Hy

-  def self.ca str

-    str.gsub! %r-^(\s*)(?://)(.*)?-, '\1/*\2*/'

-    str.gsub! %r-\s*/\*.*?\*/\n?-m, ''

-    str.gsub!(/<<(.*?)>>/m) do

-      begin

-        eval $1

-        ''

-      rescue Exception => boom

-        "<<\n#{boom}\n>>"

-      end

-    end

-    

-    str.gsub!(/\$([\w_]+)/m) do

-      begin

-        eval $1

-      rescue

-        ''

-      end

-    end

-

-    str

-  end

-end

-

-begin

-  if file = ENV['PATH_TRANSLATED']

-    puts "Content-Type: text/css"

-    puts

-    ca = File.read file

-  else

-    ca = ARGF.read

-  end

-  print Hy.ca(ca)

-rescue => boom

-  p boom

-end if __FILE__ == $0