X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fxhtml.py;h=a2c1eb1160ae9daa1ee737b9fe1b22796d24c9d0;hb=d9ce65914152036450263d9b0103c0b81f35e052;hp=f10d3158fe53fdc2eb8e5c6140b8e9feb53fef72;hpb=4c4dcf7a020ed52ea9d8d9048dbd62ffa3a7d54d;p=wrw.git

diff --git a/wrw/sp/xhtml.py b/wrw/sp/xhtml.py
index f10d315..a2c1eb1 100644
--- a/wrw/sp/xhtml.py
+++ b/wrw/sp/xhtml.py
@@ -39,13 +39,14 @@ def head(title=None, css=None):
 
 class htmlformatter(util.formatter):
     allowshort = set([u"br", u"hr", u"img", u"input", u"meta", u"link"])
-    def element(self, el, **extra):
+    def shorttag(self, el):
         if el.name in self.allowshort:
-            super(htmlformatter, self).element(el, **extra)
+            super(htmlformatter, self).shorttag(el)
         else:
-            self.longtag(el, **extra)
+            self.handle(">", el)
+            self.handle("<", el)
 
-class htmlindenter(util.indenter, htmlformatter):
+class htmlindenter(util.textindenter, htmlformatter):
     pass
 
 def forreq(req, tree):