Merge branch 'master' into lua-scanner

Conflicts:
	lib/coderay/styles/alpha.rb
	lib/coderay/token_kinds.rb

1 files changed, 0 insertions, 25 deletions

diff --git a/sample/load_scanner.rb b/sample/load_scanner.rb
deleted file mode 100644
index 23be8a2..0000000
--- a/sample/load_scanner.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'coderay'

-

-begin

-	CodeRay::Scanners::Ruby

-rescue

-	puts 'CodeRay::Encoders::Ruby is not defined; you must load it first.'

-end

-

-ruby_scanner = CodeRay::Scanners[:ruby]

-print 'Now it is loaded: '

-p ruby_scanner

-puts 'See?'

-

-c_scanner = CodeRay.require_plugin 'CodeRay::Scanners/c'

-print 'Require is also possible: '

-p c_scanner

-puts 'See?'

-

-puts 'Now load some mapped scanners: cpp and plain.'

-CodeRay.require_plugin 'CodeRay::Scanners/cpp'

-CodeRay.require_plugin 'CodeRay::Scanners/plain'

-

-puts 'Require all Scanners:'

-CodeRay::Scanners.load_all

-p CodeRay::Scanners.plugin_hash.sort_by { |k,v| k.to_s }