Don't duplicate tags.

git-svn-id: http://svn.redmine.org/redmine/trunk@14316 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb
index e2dd1a78c17613676e1dc4f350a448818b27a56e..f81e389fb7985434d3a0863d5cdbd313ba042020 100644 (file)
--- 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 fba6b1d17cb568f61ddfc18eff29d67bf7a7e30c..5e4ca763c5b77aaef8c4bdd4045d28a02fe59574 100644 (file)
--- 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