Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
sp
/
util.py
diff --git
a/wrw/sp/util.py
b/wrw/sp/util.py
index
5138f17
..
931cbdb
100644
(file)
--- 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.inline = False
self.stack = []
self.last = None, None
+ self.lastendbr = True
def write(self, text):
lines = text.split("\n")
def write(self, text):
lines = text.split("\n")
@@
-262,7
+263,7
@@
class indenter(formatter):
def starttag(self, el):
if not self.inline:
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()
pass
else:
self.br()
@@
-279,8
+280,11
@@
class indenter(formatter):
def endtag(self, el):
il = self.inline
self.pop()
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.br()
+ self.lastendbr = True
super().endtag(el)
def start(self, el):
super().endtag(el)
def start(self, el):