rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Bigfixees in cleaning of XHTML fields.

Browse source
This commit is contained in:
Gaetan Delannay 2013-01-10 15:59:01 +01:00
parent f4e40caf5c
commit 90e46f11e7
4 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shared/xml_parser.py
View file

@ -1085,10 +1085,12 @@ class XhtmlCleaner(XmlParser):
# This is the end of a sub-tag within a region that we must ignore.
pass
else:
self.res.append(self.env.currentContent)
if self.env.currentContent:
self.res.append(self.env.currentContent)
# Add a line break after the end tag if required (ie: xhtml differ
# needs to get paragraphs and other elements on separate lines).
if elem in self.lineBreakTags:
if (elem in self.lineBreakTags) and self.res and \
(self.res[-1][-1] != '\n'):
suffix = '\n'
else:
suffix = ''
@ -1098,10 +1100,11 @@ class XhtmlCleaner(XmlParser):
def characters(self, content):
if self.env.ignoreContent: return
# Remove blanks that ckeditor may add just after a start tag
if not self.env.currentContent or (self.env.currentContent == ' '):
toAdd = ' ' + content.lstrip()
if not self.env.currentContent or \
self.env.currentContent[-1] in ('\n', ' '):
toAdd = content.lstrip()
else:
toAdd = content
# Re-transform XML special chars to entities.
self.env.currentContent += cgi.escape(content)
self.env.currentContent += cgi.escape(toAdd)
# ------------------------------------------------------------------------------