summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/diagram.rb10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bcc57b6623..f635e533d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
+ client-side imagemao patch
+
Fri Jul 16 15:23:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (return_jump, break_jump): raise unexpceted local jump
diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb
index 94ab17bb35..62e2f2e164 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"