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_encoder.rb b/sample/load_encoder.rb
deleted file mode 100644
index 9594bfa..0000000
--- a/sample/load_encoder.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'coderay'

-

-begin

-	CodeRay::Encoders::YAML

-rescue

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

-end

-

-yaml_encoder = CodeRay::Encoders[:yaml] 

-print 'Now it is loaded: '

-p yaml_encoder

-puts 'See?'

-

-tokens_encoder = CodeRay.require_plugin 'CodeRay::Encoders/tokens'

-print 'Require is also possible: '

-p tokens_encoder

-puts 'See?'

-

-puts 'Now load some mapped encoders: stats and plain.'

-CodeRay.require_plugin 'CodeRay::Encoders/stats'

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

-

-puts 'Require all Encoders:'

-CodeRay::Encoders.load_all

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