deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2011-08-22 10:26:46 -05:00
parent 03fc0324db 6f18c90a50
commit 2d21eabee8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vendor/plugins/maruku/lib/maruku/input/parse_block.rb vendored
View file

@ -122,7 +122,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
if c.children.all? {|li| !li.want_my_paragraph} then
c.children.each do |d|
d.node_type = :li_span
d.children = d.children[0].children
d.children = d.children[0].children if d.children[0]
end
end
end
@ -130,7 +130,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
if c.children.all?{|defi| !defi.want_my_paragraph} then
c.children.each do |definition|
definition.definitions.each do |dd|
dd.children = dd.children[0].children
dd.children = dd.children[0].children if dd.children[0]
end
end
end

4
vendor/plugins/maruku/lib/maruku/output/to_html.rb vendored
View file

@ -637,7 +637,9 @@ of the form `#ff00ff`.
code['lang'] = lang
code['class'] = lang
end
pre << (code << text)
code << text
pre << code
pre
end
def to_html_inline_code;