--- rd2html.rb.orig	2013-04-24 07:44:07.000000000 +0900
+++ rd2html.rb	2013-11-06 20:45:57.000000000 +0900
@@ -177,7 +177,7 @@
       else
         label[0].gsub!(ESC_WORD_RE, "")
       end
-      %Q[<a name="#{anchor}" href="##{anchor}" title="#{h(unescape(anchor))}">#{label}</a>]
+      %Q[<a name="#{anchor.gsub(/^%/, '').gsub(/%/, '-')}" href="##{anchor.gsub(/^%/, '').gsub(/%/, '-')}" title="#{h(unescape(anchor))}">#{label}</a>]
     end
 
     def apply_to_Headline(element, title)
@@ -229,6 +229,13 @@
       url = element.label.url
       if /\.(jpg|jpeg|png|gif)\z/ =~ url
         %Q[<img src="#{meta_char_escape(url)}" title="#{content.join("")}" alt="#{content.join("")}" />]
+      elsif /^(.*?)\#(.*?)$/ =~ url
+        url = $1 + '#' + $2.escape.gsub(/^%/, '').gsub(/%/, '-')
+        content_join = content.join("")
+        if content_join =~ /^\&lt;URL:\#(.*?)\&gt;$/
+          content_join = $1
+        end
+        %Q[<a href="#{meta_char_escape(url)}" class="external">#{content_join}</a>]
       else
         %Q[<a href="#{meta_char_escape(url)}" class="external">#{content.join("")}</a>]
       end
@@ -252,7 +259,9 @@
           escaped += '#' + escape(option.join.gsub(@regex_modulenames, "\\&#{ESC_WORD}")) if option and option.size > 0
         end
         @references << key
-        @plugin.hiki_anchor(escaped, content)
+        internal_link = ''
+        internal_link << '#' + option[0].escape.gsub(/^%/, '').gsub(/%/, '-') if option.size > 0
+        @plugin.hiki_anchor(escaped + internal_link, content)
       else
         key, option, name = @anchorlist.separate(label)
         if @anchorlist.has_key?(key)
@@ -275,7 +284,9 @@
         if /\A#\s*RT\s*/ =~ content[0]
           content.shift
           rt_visitor = ::RT::RT2HTMLVisitor.new
-          return rt_visitor.visit(::RT::RTParser.parse(content.join))
+          htm = rt_visitor.visit(::RT::RTParser.parse(content.join))
+          htm = "<div class=\"rt2html\">" + htm + "</div>"
+          return htm
         end
       rescue LoadError
         $stderr.puts "RTtool cannot be load"
