From 32fd906da9a14bf3bb155642f3da73f7beba6cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20=C5=A0egan?= Date: Fri, 31 Mar 2006 21:20:46 +0000 Subject: Fix handling of adjacent entities in --keep-entities mode. --- xml2po/ChangeLog | 7 +++++++ xml2po/xml2po.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'xml2po') diff --git a/xml2po/ChangeLog b/xml2po/ChangeLog index 3a24a71..efcf568 100644 --- a/xml2po/ChangeLog +++ b/xml2po/ChangeLog @@ -1,3 +1,10 @@ +2006-03-31 Danilo Šegan + + Fixes bug #317502. + + * xml2po.py (normalizeNode): don't remove blank nodes followed by + entities. + 2006-03-31 Danilo Šegan Fixes bug #336765. diff --git a/xml2po/xml2po.py b/xml2po/xml2po.py index 9461f21..61835cc 100755 --- a/xml2po/xml2po.py +++ b/xml2po/xml2po.py @@ -121,7 +121,7 @@ def normalizeNode(node): elif isSpacePreserveNode(node): return elif node.isText(): - if node.isBlankNode(): + if node.isBlankNode() and (not expand_entities and (not node.next or node.next.type!='entity_ref')): node.setContent('') else: node.setContent(re.sub('\s+',' ', node.content)) -- cgit v1.2.1