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

Merge remote branch 'mikewest/master'

Browse Source
This commit is contained in:
Ryan Tomayko 2010-10-19 03:35:13 -07:00
commit 6266408828
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/rocco.rb
View File

@ -85,7 +85,7 @@ class Rocco
} }
@options = defaults.merge(options) @options = defaults.merge(options)
@sources = sources @sources = sources
@comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars]}") @comment_pattern = Regexp.new("^\\s*#{@options[:comment_chars]}\s?")
@sections = highlight(split(parse(@data))) @sections = highlight(split(parse(@data)))
end end
@ -176,7 +176,7 @@ class Rocco
# Do some post-processing on the pygments output to split things back # Do some post-processing on the pygments output to split things back
# into sections and remove partial `<pre>` blocks. # into sections and remove partial `<pre>` blocks.
code_html = code_html. code_html = code_html.
split(/\n*<span class="c.">#{@options[:comment_chars]} DIVIDER<\/span>\n*/m). split(/\n*<span class="c.?">#{@options[:comment_chars]} DIVIDER<\/span>\n*/m).
map { |code| code.sub(/\n?<div class="highlight"><pre>/m, '') }. map { |code| code.sub(/\n?<div class="highlight"><pre>/m, '') }.
map { |code| code.sub(/\n?<\/pre><\/div>\n/m, '') } map { |code| code.sub(/\n?<\/pre><\/div>\n/m, '') }

4
lib/rocco/layout.mustache
View File

@ -31,8 +31,8 @@
{{#sections}} {{#sections}}
<tr id='section-{{ num }}'> <tr id='section-{{ num }}'>
<td class=docs> <td class=docs>
<div class="octowrap"> <div class="pilwrap">
<a class="octothorpe" href="#section-{{ num }}">#</a> <a class="pilcrow" href="#section-{{ num }}">&#182;</a>
</div> </div>
{{{ docs }}} {{{ docs }}}
</td> </td>