Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging in XML, extending to HTML.

  • Loading branch information...
commit b0582c9deb5d11d7804412e0dea06a44b2b3bce3 2 parents c5d0f3b + 6c96fcb
@mikewest mikewest authored
Showing with 14 additions and 4 deletions.
  1. +14 −4 lib/rocco.rb
View
18 lib/rocco.rb
@@ -171,7 +171,7 @@ def pygmentize?
def detect_language
@_language ||=
if pygmentize?
- %x[pygmentize -N #{@file}].strip!
+ %x[pygmentize -N #{@file}].strip.split('+').first
else
"text"
end
@@ -235,6 +235,11 @@ def detect_language
:multi => { :start => "/**", :middle => "*", :end => "*/" },
:heredoc => nil
},
+ "html" => {
+ :single => nil,
+ :multi => { :start => '<!--', :middle => nil, :end => '-->' },
+ :heredoc => nil
+ },
"java" => {
:single => "//",
:multi => { :start => "/**", :middle => "*", :end => "*/" },
@@ -261,6 +266,11 @@ def detect_language
:heredoc => "<<-"
},
"scheme" => { :single => ";;", :multi => nil, :heredoc => nil },
+ "xml" => {
+ :single => nil,
+ :multi => { :start => '<!--', :middle => nil, :end => '-->' },
+ :heredoc => nil
+ },
}
def generate_comment_chars
@@ -419,7 +429,7 @@ def highlight(blocks)
divider_output = Regexp.new(
[ "\\n*",
span,
- Regexp.escape(front),
+ Regexp.escape(CGI.escapeHTML(front)),
' DIVIDER',
espan,
"\\n*"
@@ -431,11 +441,11 @@ def highlight(blocks)
divider_input = "\n\n#{front}\nDIVIDER\n#{back}\n\n"
divider_output = Regexp.new(
[ "\\n*",
- span, Regexp.escape(front), espan,
+ span, Regexp.escape(CGI.escapeHTML(front)), espan,
"\\n",
span, "DIVIDER", espan,
"\\n",
- span, Regexp.escape(back), espan,
+ span, Regexp.escape(CGI.escapeHTML(back)), espan,
"\\n*"
].join, Regexp::MULTILINE
)
Please sign in to comment.
Something went wrong with that request. Please try again.