Escape characters in image names for ODF output.

svn: r9961
This commit is contained in:
Brian Matherly 2008-01-30 05:11:44 +00:00
parent 3bd5ea1f35
commit bccd2fc07d
2 changed files with 5 additions and 2 deletions

View File

@ -1,3 +1,6 @@
2008-01-29 Brian Matherly <brian@gramps-project.org>
* src/docgen.ODFDoc.py: escape characters in image names for ODF output.
2008-01-29 Raphael Ackermann <raphael.ackermann@gmail.com> 2008-01-29 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/ViewManager.py: 0001641: add ... ellipsis to menu items. * src/ViewManager.py: 0001641: add ... ellipsis to menu items.
* src/plugins/Calendar.py: 0001641: add ... ellipsis to menu items. * src/plugins/Calendar.py: 0001641: add ... ellipsis to menu items.

View File

@ -454,7 +454,7 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
if not media_list_item in self.media_list: if not media_list_item in self.media_list:
self.media_list.append(media_list_item) self.media_list.append(media_list_item)
base = os.path.basename(name) base = escape(os.path.basename(name))
tag = base.replace('.', '_') tag = base.replace('.', '_')
if self.new_cell: if self.new_cell:
@ -904,7 +904,7 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
self.mfile.write('manifest:full-path="/"/>') self.mfile.write('manifest:full-path="/"/>')
for image in self.media_list: for image in self.media_list:
i = image[0] i = image[0]
base = os.path.basename(i) base = escape(os.path.basename(i))
self.mfile.write('<manifest:file-entry manifest:media-type="" ') self.mfile.write('<manifest:file-entry manifest:media-type="" ')
self.mfile.write('manifest:full-path="Pictures/') self.mfile.write('manifest:full-path="Pictures/')
self.mfile.write(base) self.mfile.write(base)