Cleanups in Encoders::HTML::Output.

4 files changed, 5 insertions, 10 deletions

diff --git a/Changes.textile b/Changes.textile
index 99ba2a9..feefb2d 100644
--- a/Changes.textile
+++ b/Changes.textile
@@ -63,6 +63,7 @@ The HTML encoder was cleaned up and simplified.
 * *REMOVED* support for @:line_numbers => :list@.
 * *FIXED* splitting of lines for @:line_numbers => :inline@, so that the line
   numbers don't get colored, too.
+* *RENAMED* @Output#numerize@ to @#number@, which is an actual English word.
 
 h3. @Encoders::LinesOfCode@
  
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index f14c1cc..eed4dfe 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -111,7 +111,7 @@ module Encoders
       :hint => false,
     }
 
-    helper :output, :css
+    helper :output, :numbering, :css
 
     attr_reader :css
 
@@ -233,7 +233,7 @@ module Encoders
       
       @out.extend Output
       @out.css = @css
-      @out.numerize! options[:line_numbers], options
+      @out.number! options[:line_numbers], options
       @out.wrap! options[:wrap]
       @out.apply_title! options[:title]
       
diff --git a/lib/coderay/encoders/html/numerization.rb b/lib/coderay/encoders/html/numbering.rb
index 1590ad0..3a7edce 100644
--- a/lib/coderay/encoders/html/numerization.rb
+++ b/lib/coderay/encoders/html/numbering.rb
@@ -3,13 +3,9 @@ module Encoders
 
   class HTML
 
-    module Output
+    module Output  # :nodoc:
 
-      def numerize *args
-        clone.numerize!(*args)
-      end
-
-      def numerize! mode = :table, options = {}
+      def number! mode = :table, options = {}
         return self unless mode
 
         options = DEFAULT_OPTIONS.merge options
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb
index 533235d..dec1d7c 100644
--- a/lib/coderay/encoders/html/output.rb
+++ b/lib/coderay/encoders/html/output.rb
@@ -13,8 +13,6 @@ module Encoders
     # TODO: more doc.
     module Output
 
-      require 'coderay/encoders/html/numerization.rb'
-
       attr_accessor :css
 
       class << self