5317: Multi-line photo captions are not rendered correctly in output reports

patch from Adam Stein <adam@csh.rit.edu>


svn: r18760

src/plugins/docgen/HtmlDoc.py

@@ -546,6 +546,9 @@ class HtmlDoc(BaseDoc, TextDoc):
                         {'name' : name})
             return
 
+        if len(alt):
+            alt = '<br />'.join(alt)
+
         if pos not in ["right", "left"] :
             if len(alt):
                 self.htmllist[-1] += Html('div') + (

src/plugins/docgen/ODFDoc.py

@@ -1064,7 +1064,7 @@ class ODFDoc(BaseDoc, TextDoc, DrawDoc):
 
         if len(alt):
             self.cntnt.write(
-                '%s' % alt +
+                '%s' % '<text:line-break/>'.join(alt) +
                 '</text:p>' +
                 '</draw:text-box>' +
                 '</draw:frame>'

src/plugins/docgen/RTFDoc.py

@@ -409,7 +409,7 @@ class RTFDoc(BaseDoc,TextDoc):
         self.f.write('}}\\par\n')
 
         if len(alt):
-            self.f.write('%s\n\\par\n' % alt)
+            self.f.write('%s\n\\par\n' % '\\par'.join(alt))
 
     def write_styled_note(self, styledtext, format, style_name,
                           contains_html=False, links=False):

src/plugins/lib/libcairodoc.py

@@ -1413,7 +1413,7 @@ links (like ODF) and write PDF from that format.
             else:
                 style.set_right_margin(self.get_usable_width() - new_image._width)
             new_paragraph = GtkDocParagraph(style)
-            new_paragraph.add_text(alt)
+            new_paragraph.add_text('\n'.join(alt))
             self._active_element.add_child(new_paragraph)
 
     # DrawDoc implementation