diff options
| author | Danilo Šegan <danilo@src.gnome.org> | 2006-03-31 21:20:46 +0000 |
|---|---|---|
| committer | Danilo Šegan <danilo@src.gnome.org> | 2006-03-31 21:20:46 +0000 |
| commit | 32fd906da9a14bf3bb155642f3da73f7beba6cee (patch) | |
| tree | 89a13f178947a0a016d868503d8499142abc1f47 | |
| parent | 0cea51c4199783c4221f43e3cc537638579e664f (diff) | |
| download | gnome-doc-utils-32fd906da9a14bf3bb155642f3da73f7beba6cee.tar.gz | |
Fix handling of adjacent entities in --keep-entities mode.
| -rw-r--r-- | xml2po/ChangeLog | 7 | ||||
| -rwxr-xr-x | xml2po/xml2po.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/xml2po/ChangeLog b/xml2po/ChangeLog index 3a24a71..efcf568 100644 --- a/xml2po/ChangeLog +++ b/xml2po/ChangeLog @@ -1,5 +1,12 @@ 2006-03-31 Danilo Šegan <danilo@gnome.org> + Fixes bug #317502. + + * xml2po.py (normalizeNode): don't remove blank nodes followed by + entities. + +2006-03-31 Danilo Šegan <danilo@gnome.org> + Fixes bug #336765. * xml2po.py (replaceNodeContentsWithText): integrate DTD when 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)) |