New helper module scheme, step 3

7 files changed, 5 insertions, 5 deletions

diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 22738d8..986bf00 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -80,9 +80,9 @@ module Encoders
 			:hint => false,

 		}

 		

-		require 'coderay/encoders/helpers/html_helper'

-		require 'coderay/encoders/helpers/html_output'

-		require 'coderay/encoders/helpers/html_css'

+		require 'coderay/encoders/html/classes'

+		require 'coderay/encoders/html/output'

+		require 'coderay/encoders/html/css'

 

 		def initialize(*)

 			super

diff --git a/lib/coderay/encoders/html/html_helper.rb b/lib/coderay/encoders/html/classes.rb
index 6a2938e..6a2938e 100644
--- a/lib/coderay/encoders/html/html_helper.rb
+++ b/lib/coderay/encoders/html/classes.rb
diff --git a/lib/coderay/encoders/html/html_css.rb b/lib/coderay/encoders/html/css.rb
index 80ccab4..80ccab4 100644
--- a/lib/coderay/encoders/html/html_css.rb
+++ b/lib/coderay/encoders/html/css.rb
diff --git a/lib/coderay/encoders/html/html_numerization.rb b/lib/coderay/encoders/html/numerization.rb
index f51b5d3..f51b5d3 100644
--- a/lib/coderay/encoders/html/html_numerization.rb
+++ b/lib/coderay/encoders/html/numerization.rb
diff --git a/lib/coderay/encoders/html/html_output.rb b/lib/coderay/encoders/html/output.rb
index f17965d..c8985da 100644
--- a/lib/coderay/encoders/html/html_output.rb
+++ b/lib/coderay/encoders/html/output.rb
@@ -13,7 +13,7 @@ module CodeRay
 		# TODO: more doc.

 		module Output

 

-			require 'coderay/encoders/helpers/html_numerization.rb'

+			require 'coderay/encoders/html/numerization.rb'

 

 			attr_accessor :wrapped_in

 			

diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb
index bca0759..a4d042f 100644
--- a/lib/coderay/scanners/ruby.rb
+++ b/lib/coderay/scanners/ruby.rb
@@ -18,7 +18,7 @@ module CodeRay module Scanners
 

 		register_for :ruby

 

-		require 'coderay/scanners/helpers/ruby_helper'

+		require 'coderay/scanners/ruby/helper'

 		

 		DEFAULT_OPTIONS = {

 			:parse_regexps => true,

diff --git a/lib/coderay/scanners/ruby/ruby_helper.rb b/lib/coderay/scanners/ruby/helper.rb
index ad649da..ad649da 100644
--- a/lib/coderay/scanners/ruby/ruby_helper.rb
+++ b/lib/coderay/scanners/ruby/helper.rb