CodeRay HTML Encoder Example

 8  require 'coderay'
- 9  
-10  # scan this file
-11  tokens = CodeRay.scan(File.read($0) * 1, :ruby)
-12  
-13  # output it with two styles of line numbers
-14  out = tokens.div(:line_numbers => :table)
-15  out << '<hr />'
-16  out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
-17  
-18  puts out.page
+	 8 require 'coderay'
+ 9 
+10 # scan this file
+11 tokens = CodeRay.scan(File.read($0) * 1, :ruby)
+12 
+13 # output it with two styles of line numbers
+14 out = tokens.div(:line_numbers => :table)
+15 out << '<hr />'
+16 out << tokens.div(:line_numbers => :inline, :line_number_start => 8)
+17 
+18 puts out.page

diff --git a/demo/demo_html_list.out b/demo/demo_html_list.out new file mode 100644 index 0000000..e9c99b2 --- /dev/null +++ b/demo/demo_html_list.out @@ -0,0 +1,128 @@ + + + + + CodeRay HTML Encoder Example + + + + +

-1 $: << '..'
+ 0 require 'coderay'
+ 1 
+ 2 tokens = CodeRay.scan File.read(__FILE__), :ruby
+ 3 html = tokens.html(:tab_width => 2, :line_numbers => :inline, :line_number_start => -1)
+ 4 
+ 5 puts html.page
+ 6 
+ 7 commment = <<_
+ 8 This code must be > 10 lines
+ 9 because I want to test the correct adjustment of the line numbers.
+10 _
+

+ + + diff --git a/demo/demo_html_list.rb b/demo/demo_html_list.rb new file mode 100644 index 0000000..97724f2 --- /dev/null +++ b/demo/demo_html_list.rb @@ -0,0 +1,12 @@ +$: << '..' +require 'coderay' + +tokens = CodeRay.scan File.read(__FILE__), :ruby +html = tokens.html(:tab_width => 2, :line_numbers => :inline, :line_number_start => -1) + +puts html.page + +commment = <<_ +This code must be > 10 lines +because I want to test the correct adjustment of the line numbers. +_ diff --git a/demo/demo_more.out b/demo/demo_more.out index 10f4ec6..f945854 100644 --- a/demo/demo_more.out +++ b/demo/demo_more.out @@ -1,2 +1,2 @@ -Input: 4983B, Output: 22388B +Input: 4983B, Output: 22382B Take a look with your browser. diff --git a/lib/coderay/duo.rb b/lib/coderay/duo.rb index 8187277..1957c95 100644 --- a/lib/coderay/duo.rb +++ b/lib/coderay/duo.rb @@ -1,5 +1,10 @@ module CodeRay + # = Duo + # + # $Id: scanner.rb 123 2006-03-21 14:46:34Z murphy $ + # + # TODO: Doc. class Duo attr_accessor :scanner, :encoder diff --git a/lib/coderay/encoders/html/numerization.rb b/lib/coderay/encoders/html/numerization.rb index c5d96f3..19c760e 100644 --- a/lib/coderay/encoders/html/numerization.rb +++ b/lib/coderay/encoders/html/numerization.rb @@ -57,8 +57,10 @@ module Encoders line = start gsub!(/^/) do line_number = bolding.call line + indent = ' ' * (max_width - line.to_s.size) + res = "#{indent}#{line_number} " line += 1 - "#{ line_number.rjust(max_width) } " + res end when :table diff --git a/lib/coderay/scanner.rb b/lib/coderay/scanner.rb index 5ff07a0..16998f2 100644 --- a/lib/coderay/scanner.rb +++ b/lib/coderay/scanner.rb @@ -91,14 +91,15 @@ module CodeRay # TokenStream with the +block+ as callback to handle the tokens. # # Else, a Tokens object is used. - def initialize code, options = {}, &block + def initialize code='', options = {}, &block @options = self.class::DEFAULT_OPTIONS.merge options raise "I am only the basic Scanner class. I can't scan "\ "anything. :( Use my subclasses." if self.class == Scanner # I love this hack. It seems to silence # all dos/unix/mac newline problems. - super code.gsub(/\r\n?/, "\n") + code = code.gsub(/\r\n?/, "\n") if code.index ?\r + super code if @options[:stream] warn "warning in CodeRay::Scanner.new: :stream is set, "\ @@ -117,12 +118,13 @@ module CodeRay def reset super - reset_tokens + reset_instance end - def string= str - super - reset_tokens + def string= code + code = code.gsub(/\r\n?/, "\n") if code.index ?\r + super code + reset_instance end # Scans the code and returns all tokens in a Tokens object. @@ -168,10 +170,10 @@ module CodeRay "#{self.class}#scan_tokens not implemented." end - def reset_tokens + def reset_instance @tokens.clear @cached_tokens = nil - end + end # Scanner error with additional status information def raise_inspect msg, tokens, ambit = 30 diff --git a/lib/coderay/scanners/c.rb b/lib/coderay/scanners/c.rb index 8fae829..5764254 100644 --- a/lib/coderay/scanners/c.rb +++ b/lib/coderay/scanners/c.rb @@ -110,7 +110,7 @@ module CodeRay module Scanners kind = :error state = :initial else - raise "else case \" reached; %p not handled." % peek(1), tokens + raise_inspect "else case \" reached; %p not handled." % peek(1), tokens end elsif state == :include_expected @@ -128,12 +128,12 @@ module CodeRay module Scanners end else - raise 'else-case reached', tokens + raise_inspect 'else-case reached', tokens end match ||= matched - raise [match, kind], tokens if kind == :error + raise_inspect [match, kind], tokens if kind == :error tokens << [match, kind] diff --git a/test/suite.rb b/test/suite.rb index ef3e2fb..fb50532 100644 --- a/test/suite.rb +++ b/test/suite.rb @@ -36,7 +36,7 @@ class CodeRaySuite < TestCase puts puts " >> Running #{self.class.name} <<" puts - CodeRay::Scanners.load lang + scanner = CodeRay::Scanners[lang].new tokenizer = CodeRay::Encoders[:debug].new highlighter = CodeRay::Encoders[:html].new( :tab_width => 2, @@ -52,7 +52,8 @@ class CodeRaySuite < TestCase output = name + '.out.' + tokenizer.file_extension code = File.open(input, 'rb') { |f| break f.read } - tokens = CodeRay.scan code, lang + scanner.string = code + tokens = scanner.tokens result = tokenizer.encode_tokens tokens highlighted = highlighter.encode_tokens tokens -- cgit v1.2.1