Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape still wasn't right in ODFDoc.py. Ancestor and descendant charts were displaying wrong.

Browse Source 
svn: r8418
This commit is contained in:
Brian Matherly
2007-04-22 13:29:05 +00:00
parent c36c05775e
commit 4708a791a4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2007-04-22 Brian Matherly <brian@gramps-project.org>
* src/docgen/ODFDoc.py: escape still wasn't right. ancestor and descendant
charts were wrong.
2007-04-21 Brian Matherly <brian@gramps-project.org> 2007-04-21 Brian Matherly <brian@gramps-project.org>
* src/Filters/Rules/Person/_IsBookmarked.py: * src/Filters/Rules/Person/_IsBookmarked.py:
0000970: _IsBookmarked.py causes crash 0000970: _IsBookmarked.py causes crash

10
src/docgen/ODFDoc.py
View File

@@ -64,7 +64,7 @@ _esc_map = {
'\x0c' : '', '\x0c' : '',
'\n' : '<text:line-break/>', '\n' : '<text:line-break/>',
'\t' : '<text:tab-stop/>', '\t' : '<text:tab-stop/>',
'&lt;super&gt;' : '<text:span text:style-name="GSuper">', '&lt;super&gt;' : '<text:span text:style-name="GSuper">',
'&lt;/super&gt;' : '</text:span>', '&lt;/super&gt;' : '</text:span>',
} }
@@ -854,7 +854,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.start_paragraph(style_name) self.start_paragraph(style_name)
self.cntnt.write('<text:span text:style-name="GRAMPS-preformat">') self.cntnt.write('<text:span text:style-name="GRAMPS-preformat">')
self.cntnt.write(escape(text)) self.cntnt.write(escape(text,_esc_map))
self.cntnt.write('</text:span>') self.cntnt.write('</text:span>')
self.end_paragraph() self.end_paragraph()
elif format == 0: elif format == 0:
@@ -998,7 +998,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<text:p text:style-name="X%s"> ' % pname) self.cntnt.write('<text:p text:style-name="X%s"> ' % pname)
self.cntnt.write('<text:span text:style-name="F%s">\n' % pname) self.cntnt.write('<text:span text:style-name="F%s">\n' % pname)
self.write_text(escape('\n'.join(text))) self.write_text('\n'.join(text)) # No escape(): write_text does that.
self.cntnt.write('</text:span>\n</text:p>\n</draw:text-box>\n') self.cntnt.write('</text:span>\n</text:p>\n</draw:text-box>\n')
self.cntnt.write('</draw:frame>\n') self.cntnt.write('</draw:frame>\n')
@@ -1067,7 +1067,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<text:p text:style-name="F%s">' % para_name) self.cntnt.write('<text:p text:style-name="F%s">' % para_name)
self.cntnt.write('<text:span text:style-name="F%s"' % para_name) self.cntnt.write('<text:span text:style-name="F%s"' % para_name)
self.cntnt.write(' fo:max-height="%.2f">' % font.get_size() ) self.cntnt.write(' fo:max-height="%.2f">' % font.get_size() )
self.cntnt.write(escape(text)) self.cntnt.write(escape(text,_esc_map))
self.cntnt.write('</text:span></text:p>') self.cntnt.write('</text:span></text:p>')
self.cntnt.write('</draw:text-box>\n') self.cntnt.write('</draw:text-box>\n')
self.cntnt.write('</draw:frame>\n') self.cntnt.write('</draw:frame>\n')
@@ -1125,7 +1125,7 @@ class ODFDoc(BaseDoc.BaseDoc):
self.cntnt.write('<draw:text-box>') self.cntnt.write('<draw:text-box>')
self.cntnt.write('<text:p text:style-name="X%s">' % para_name) self.cntnt.write('<text:p text:style-name="X%s">' % para_name)
self.cntnt.write('<text:span text:style-name="F%s">' % para_name) self.cntnt.write('<text:span text:style-name="F%s">' % para_name)
self.cntnt.write(escape(text)) self.cntnt.write(escape(text,_esc_map))
self.cntnt.write('</text:span>\n') self.cntnt.write('</text:span>\n')
self.cntnt.write('</text:p>\n') self.cntnt.write('</text:p>\n')
self.cntnt.write('</draw:text-box>') self.cntnt.write('</draw:text-box>')