X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=blobdiff_plain;f=wrw%2Fsp%2Futil.py;h=2599206ddcc94ba0ca20f74e31291ce39446a74f;hp=02f61f083f45a69be32a77e31e068b269e111f2f;hb=8437855e8e2e18058681a1b63c77d0ec970535cb;hpb=7e9080af248b38edec371f117eb4749b09a3caca diff --git a/wrw/sp/util.py b/wrw/sp/util.py index 02f61f0..2599206 100644 --- a/wrw/sp/util.py +++ b/wrw/sp/util.py @@ -229,6 +229,7 @@ class indenter(formatter): self.inline = False self.stack = [] self.last = None, None + self.lastendbr = True def write(self, text): lines = text.split(u"\n") @@ -262,7 +263,7 @@ class indenter(formatter): def starttag(self, el): if not self.inline: - if self.last[0] == "<" and self.last[1].name == el.name: + if self.last[0] == "<" and self.last[1].name == el.name and self.lastendbr: pass else: self.br() @@ -279,8 +280,11 @@ class indenter(formatter): def endtag(self, el): il = self.inline self.pop() - if not il: + if il or (self.last[0] == ">" and self.last[1] == el): + self.lastendbr = False + else: self.br() + self.lastendbr = True super(indenter, self).endtag(el) def start(self, el):