From f01eb0a3f306496ccfe8a86b7f79678d2498a606 Mon Sep 17 00:00:00 2001 From: Pelle Nilsson Date: Wed, 29 May 2013 00:00:30 +0200 Subject: [PATCH] Fixed bugs in DOT and RTF output. --- output.py | 13 +++++++++---- output_formats/dot/paragraph.dot | 1 + output_formats/dot/text.dot | 0 output_formats/rtf/paragraph.rtf | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 output_formats/dot/text.dot diff --git a/output.py b/output.py index 6f220ff..7d2f07c 100644 --- a/output.py +++ b/output.py @@ -28,15 +28,20 @@ class OutputFormat (object): self.write_paragraph(p, shuffled_paragraphs, output) def write_paragraph(self, paragraph, shuffled_paragraphs, output): + refs = [] def paragraph_link_render(to_paragraph, shuffled_paragraphs): - return self.load_template("paragraph_ref") % { + s = self.load_template("paragraph_ref") % { 'nr' : shuffled_paragraphs.to_nr[to_paragraph], 'from_nr' : shuffled_paragraphs.to_nr[paragraph] - }; + } + refs.append(s) + return s + formatted_text = paragraph.format(shuffled_paragraphs, + paragraph_link_render) print >> output, self.load_template("paragraph") % { 'nr' : shuffled_paragraphs.to_nr[paragraph], - 'text' : paragraph.format(shuffled_paragraphs, - paragraph_link_render) + 'text' : formatted_text, + 'refs' : '\n'.join(refs) # hack for DOT output reallyn }, def write_end(self, book, output): diff --git a/output_formats/dot/paragraph.dot b/output_formats/dot/paragraph.dot index e69de29..62a50a1 100644 --- a/output_formats/dot/paragraph.dot +++ b/output_formats/dot/paragraph.dot @@ -0,0 +1 @@ +%(refs)s \ No newline at end of file diff --git a/output_formats/dot/text.dot b/output_formats/dot/text.dot new file mode 100644 index 0000000..e69de29 diff --git a/output_formats/rtf/paragraph.rtf b/output_formats/rtf/paragraph.rtf index 542abcd..ea8f2f3 100644 --- a/output_formats/rtf/paragraph.rtf +++ b/output_formats/rtf/paragraph.rtf @@ -1,4 +1,4 @@ \b %(nr)d -\b0 - %(text)s -\\ -\\ +\b0 - %(text)s \ +\ +