diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-16 18:28:28 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-16 18:28:28 +0000 |
commit | 0a8e4b162878ca5210e18cfedd5bb0e8486f83dd (patch) | |
tree | fac06a8ad766c400cca8d57e34fd1cb13f872c53 /lib/redmine/wiki_formatting/textile | |
parent | e911ce7cb41c3fce7d78f7032f2772b7061446bf (diff) | |
download | redmine-0a8e4b162878ca5210e18cfedd5bb0e8486f83dd.tar.gz redmine-0a8e4b162878ca5210e18cfedd5bb0e8486f83dd.zip |
Don't duplicate tags.
git-svn-id: http://svn.redmine.org/redmine/trunk@14316 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/wiki_formatting/textile')
-rw-r--r-- | lib/redmine/wiki_formatting/textile/html_parser.rb | 8 |
1 files changed, 3 insertions, 5 deletions
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 |