Commit d256b929 by Mike Chen

'\n' in XML text is meaningless.

parent adde79f2
...@@ -210,7 +210,7 @@ class CapaXMLConverter(object): ...@@ -210,7 +210,7 @@ class CapaXMLConverter(object):
continue continue
if img_el != None: if img_el != None:
img = self.build_from_element(img_el) img = self.build_from_element(img_el)
img['title'] = el img['title'] = el.replace('\n', '')
ret.append(img) ret.append(img)
img_el = None img_el = None
else: else:
...@@ -254,13 +254,13 @@ class CapaXMLConverter(object): ...@@ -254,13 +254,13 @@ class CapaXMLConverter(object):
# e.g. [x] = ['See the diagram below. \n', <center><img src="" /></center>, 'What's .. ?'] # e.g. [x] = ['See the diagram below. \n', <center><img src="" /></center>, 'What's .. ?']
for x in self.split_element_on_tag(element, 'center'): for x in self.split_element_on_tag(element, 'center'):
if isinstance(x, basestring): if isinstance(x, basestring):
out["contents"].append({'type': 'text', 'text': x}) out["contents"].append({'type': 'text', 'text': x.replace('\n', '')})
else: else:
# self.picky_center_element_format returns a list of {'type': 'image', ...} if # self.picky_center_element_format returns a list of {'type': 'image', ...} if
# #
ret = self.picky_center_element_format(x) ret = self.picky_center_element_format(x)
if ret is None: if ret is None:
out["contents"].append({'type': 'text', 'text': etree.tostring(x)}) out["contents"].append({'type': 'text', 'text': etree.tostring(x).replace('\n', '')})
else: else:
for el in ret: for el in ret:
out["contents"].append(el) out["contents"].append(el)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment