# HG changeset patch
# User haftmann
# Date 1119952999 -7200
# Node ID b434de7940922e755dc4613fb27a1aba615e2ab4
# Parent  19eff9bc7eee28a379b1ce3b092dc17999f38e2b
some minor improvements

diff -r 19eff9bc7eee -r b434de794092 Admin/website/build/pypager.py
--- a/Admin/website/build/pypager.py	Tue Jun 28 11:59:38 2005 +0200
+++ b/Admin/website/build/pypager.py	Tue Jun 28 12:03:19 2005 +0200
@@ -283,7 +283,10 @@
 
     def flushCharacterBuffer(self):
 
-        self._out.write(escape(u"".join(self._characterBuffer)).replace(u"@", u"@"))
+        content = escape(u"".join(self._characterBuffer))
+        if self._currentXPath and self._currentXPath[-1] == u"a":
+            content = content.replace(u"@", u"@")
+        self._out.write(content)
         self._characterBuffer = []
 
     def transformAbsPath(self, attrs, attrname):
@@ -339,7 +342,7 @@
                 attrs[u"href"] = "".join([ ("&#%i;" % ord(c)) for c in value ])
         for (key, value) in attrs.items():
             self._out.write(u' %s=%s' % (key, quoteattr(value)))
-        self._currentXPath.append(key)
+        self._currentXPath.append(name)
         self._lastStart = True
 
     def endElement(self, name):