From 5c4c0065784c6420224516e13a0c50d86e792363 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Tue, 27 Dec 2011 02:39:02 +0100 Subject: Bug #6: merge ConradIrwin's approach with korny's --- lib/coderay/encoders/html.rb | 6 +++--- lib/coderay/scanners/java.rb | 2 +- lib/coderay/scanners/ruby.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/coderay') diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb index c5d680c..c32dbd1 100644 --- a/lib/coderay/encoders/html.rb +++ b/lib/coderay/encoders/html.rb @@ -109,9 +109,9 @@ module Encoders :hint => false, } - autoload :Output, CodeRay.abs_path('coderay/encoders/html/output') - autoload :CSS, CodeRay.abs_path('coderay/encoders/html/css') - autoload :Numbering, CodeRay.abs_path('coderay/encoders/html/numbering') + autoload :Output, CodeRay.coderay_path('encoders', 'html', 'output') + autoload :CSS, CodeRay.coderay_path('encoders', 'html', 'css') + autoload :Numbering, CodeRay.coderay_path('encoders', 'html', 'numbering') attr_reader :css diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index 50c82c2..c1490ac 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -6,7 +6,7 @@ module Scanners register_for :java - autoload :BuiltinTypes, CodeRay.abs_path('coderay/scanners/java/builtin_types') + autoload :BuiltinTypes, CodeRay.coderay_path('scanners', 'java', 'builtin_types') # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html KEYWORDS = %w[ diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb index e2e3d1b..2be98a6 100644 --- a/lib/coderay/scanners/ruby.rb +++ b/lib/coderay/scanners/ruby.rb @@ -13,8 +13,8 @@ module Scanners register_for :ruby file_extension 'rb' - autoload :Patterns, CodeRay.abs_path('coderay/scanners/ruby/patterns') - autoload :StringState, CodeRay.abs_path('coderay/scanners/ruby/string_state') + autoload :Patterns, CodeRay.coderay_path('scanners', 'ruby', 'patterns') + autoload :StringState, CodeRay.coderay_path('scanners', 'ruby', 'string_state') def interpreted_string_state StringState.new :string, true, '"' -- cgit v1.2.1