2 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c8748f86c1..9a399950cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep  7 20:03:01 2008  Tanaka Akira  <akr@fsij.org>
+
+	* enc/trans/escape.trans (hexstr): renamed from str1.
+
 Sun Sep  7 19:45:31 2008  Tanaka Akira  <akr@fsij.org>
 
 	* enc/trans/escape.trans: use transcode_tblgen.
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index 95977bde61..cc1513724b 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -1,28 +1,28 @@
 #include "transcode_data.h"
 
 <%
-  def str1(str)
+  def hexstr(str)
     str.unpack("H*")[0]
   end
 
   transcode_tblgen("", "amp-escaped", [
     ["{00-25,27-FF}", :nomap], 
-    ["26", str1("&amp;")]
+    ["26", hexstr("&amp;")]
   ])
 
   transcode_tblgen("", "xml-text-escaped", [
     ["{00-25,27-3B,3D,3F-FF}", :nomap], 
-    ["26", str1("&amp;")],
-    ["3C", str1("&lt;")],
-    ["3E", str1("&gt;")]
+    ["26", hexstr("&amp;")],
+    ["3C", hexstr("&lt;")],
+    ["3E", hexstr("&gt;")]
   ])
 
   transcode_tblgen("", "xml-attr-content-escaped", [
     ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], 
-    ["22", str1("&quot;")],
-    ["26", str1("&amp;")],
-    ["3C", str1("&lt;")],
-    ["3E", str1("&gt;")]
+    ["22", hexstr("&quot;")],
+    ["26", hexstr("&amp;")],
+    ["3C", hexstr("&lt;")],
+    ["3E", hexstr("&gt;")]
   ])
 
   map_xml_attr_quote = {}