diff options
| -rw-r--r-- | lib/redmine/wiki_formatting/markdown/html_parser.rb | 8 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/html_parser.rb | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb index e2dd1a78c..f81e389fb 100644 --- a/lib/redmine/wiki_formatting/markdown/html_parser.rb +++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb @@ -20,21 +20,19 @@ module Redmine module Markdown class HtmlParser < Redmine::WikiFormatting::HtmlParser - self.tags = { + self.tags = tags.merge( 'b' => {:pre => '**', :post => '**'}, 'strong' => {:pre => '**', :post => '**'}, 'i' => {:pre => '_', :post => '_'}, 'em' => {:pre => '_', :post => '_'}, 'strike' => {:pre => '~~', :post => '~~'}, - 'br' => {:post => "\n"}, 'h1' => {:pre => "\n\n# ", :post => "\n\n"}, 'h2' => {:pre => "\n\n## ", :post => "\n\n"}, 'h3' => {:pre => "\n\n### ", :post => "\n\n"}, 'h4' => {:pre => "\n\n#### ", :post => "\n\n"}, 'h5' => {:pre => "\n\n##### ", :post => "\n\n"}, - 'h6' => {:pre => "\n\n###### ", :post => "\n\n"}, - 'style' => '' - } + 'h6' => {:pre => "\n\n###### ", :post => "\n\n"} + ) end end end diff --git a/lib/redmine/wiki_formatting/textile/html_parser.rb b/lib/redmine/wiki_formatting/textile/html_parser.rb index fba6b1d17..5e4ca763c 100644 --- a/lib/redmine/wiki_formatting/textile/html_parser.rb +++ b/lib/redmine/wiki_formatting/textile/html_parser.rb @@ -20,22 +20,20 @@ module Redmine module Textile class HtmlParser < Redmine::WikiFormatting::HtmlParser - self.tags = { + self.tags = tags.merge( 'b' => {:pre => '*', :post => '*'}, 'strong' => {:pre => '*', :post => '*'}, 'i' => {:pre => '_', :post => '_'}, 'em' => {:pre => '_', :post => '_'}, 'u' => {:pre => '+', :post => '+'}, 'strike' => {:pre => '-', :post => '-'}, - 'br' => {:post => "\n"}, 'h1' => {:pre => "\n\nh1. ", :post => "\n\n"}, 'h2' => {:pre => "\n\nh2. ", :post => "\n\n"}, 'h3' => {:pre => "\n\nh3. ", :post => "\n\n"}, 'h4' => {:pre => "\n\nh4. ", :post => "\n\n"}, 'h5' => {:pre => "\n\nh5. ", :post => "\n\n"}, - 'h6' => {:pre => "\n\nh6. ", :post => "\n\n"}, - 'style' => '' - } + 'h6' => {:pre => "\n\nh6. ", :post => "\n\n"} + ) end end end |