diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-16 20:28:43 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-16 20:28:43 +0000 |
| commit | 8295c244e514042d38fc08eeb4798a8f53ad1162 (patch) | |
| tree | efc6d6af53bf2c885101444068ca902df42d685a | |
| parent | 543a0622b03083fa424d55938ee987759fa002c4 (diff) | |
| download | ruby-8295c244e514042d38fc08eeb4798a8f53ad1162.tar.gz ruby-8295c244e514042d38fc08eeb4798a8f53ad1162.tar.xz ruby-8295c244e514042d38fc08eeb4798a8f53ad1162.zip | |
Incorporate Micheal Neumanns client-side imagemap patch
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/diagram.rb | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/diagram.rb: Incorporate Micheal Neumann's + client-side imagemao patch + Fri Jul 16 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * error.c (exit_initialize): use EXIT_SUCCESS instead of 0. diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb index 3ff36c1d0..40335e854 100644 --- a/lib/rdoc/diagram.rb +++ b/lib/rdoc/diagram.rb @@ -309,7 +309,7 @@ module RDoc # the page def wrap_in_image_map(src, dot, name) - res = %{<map name="map">\n} + res = %{<map id="map" name="map">\n} dot_map = `dot -Tismap #{src}` dot_map.each do |area| unless area =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) ([\/\w.]+)\s*(.*)/ @@ -317,10 +317,10 @@ module RDoc return nil end - blx = $1; bly = $2 - trx = $3; try = $4 - url = $5; area_name = $6 - res << %{ <area shape="RECT" coords="#{blx},#{try},#{trx},#{bly}" } + xs, ys = [$1.to_i, $3.to_i], [$2.to_i, $4.to_i] + url, area_name = $5, $6 + + res << %{ <area shape="RECT" coords="#{xs.min},#{ys.min},#{xs.max},#{ys.max}" } res << %{ href="#{url}" alt="#{area_name}">\n} end res << "</map>\n" |