Changeset 2150

Timestamp:

Mar 25, 2011 3:44:28 PM (13 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/lang/tcl/scripts/library.tcl (modified) (1 diff)

branches/blt4/lang/tcl/scripts/library.tcl

@@ -503 +503 @@
         return ""
     }
+    # Expat (via tDOM) will always produce utf-8 output, regardless of the
+    # encoding of the tool.xml.  We need to convert utf-8 to unicode for
+    # Tcl/Tk.  This shouldn't affect ASCII tool.xml files.
+    set string [encoding convertfrom utf-8 [$node text]]
     if {$params(-decode) == "yes"} {
-        return [Rappture::encoding::decode -- [string trim [$node text]]]
-    } else {
-        return [string trim [$node text]]
-    }
+        set string [Rappture::encoding::decode -- $string]
+    }
+    return [string trim $string]
 }