github-migration/rocco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging in XML, extending to HTML.

Browse Source
This commit is contained in:
Mike West 2011-04-19 20:02:00 +02:00
commit b0582c9deb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/rocco.rb
View File

@ -171,7 +171,7 @@ class Rocco
def detect_language def detect_language
@_language ||= @_language ||=
if pygmentize? if pygmentize?
%x[pygmentize -N #{@file}].strip! %x[pygmentize -N #{@file}].strip.split('+').first
else else
"text" "text"
end end
@ -235,6 +235,11 @@ class Rocco
:multi => { :start => "/**", :middle => "*", :end => "*/" }, :multi => { :start => "/**", :middle => "*", :end => "*/" },
:heredoc => nil :heredoc => nil
}, },
"html" => {
:single => nil,
:multi => { :start => '<!--', :middle => nil, :end => '-->' },
:heredoc => nil
},
"java" => { "java" => {
:single => "//", :single => "//",
:multi => { :start => "/**", :middle => "*", :end => "*/" }, :multi => { :start => "/**", :middle => "*", :end => "*/" },
@ -261,6 +266,11 @@ class Rocco
:heredoc => "<<-" :heredoc => "<<-"
}, },
"scheme" => { :single => ";;", :multi => nil, :heredoc => nil }, "scheme" => { :single => ";;", :multi => nil, :heredoc => nil },
"xml" => {
:single => nil,
:multi => { :start => '<!--', :middle => nil, :end => '-->' },
:heredoc => nil
},
} }
def generate_comment_chars def generate_comment_chars
@ -419,7 +429,7 @@ class Rocco
divider_output = Regexp.new( divider_output = Regexp.new(
[ "\\n*", [ "\\n*",
span, span,
Regexp.escape(front), Regexp.escape(CGI.escapeHTML(front)),
' DIVIDER', ' DIVIDER',
espan, espan,
"\\n*" "\\n*"
@ -431,11 +441,11 @@ class Rocco
divider_input = "\n\n#{front}\nDIVIDER\n#{back}\n\n" divider_input = "\n\n#{front}\nDIVIDER\n#{back}\n\n"
divider_output = Regexp.new( divider_output = Regexp.new(
[ "\\n*", [ "\\n*",
span, Regexp.escape(front), espan, span, Regexp.escape(CGI.escapeHTML(front)), espan,
"\\n", "\\n",
span, "DIVIDER", espan, span, "DIVIDER", espan,
"\\n", "\\n",
span, Regexp.escape(back), espan, span, Regexp.escape(CGI.escapeHTML(back)), espan,
"\\n*" "\\n*"
].join, Regexp::MULTILINE ].join, Regexp::MULTILINE
) )