From 125b0c73598ea40c271fa0c33c713a21a4f6d812 Mon Sep 17 00:00:00 2001
From: Michael Chladek <mchladek@gmail.com>
Date: Wed, 1 Jul 2015 09:43:36 -0500
Subject: [PATCH] Do not add a carriage return after a hard line break in
OpenDocument writer and reflect change in tests.
---
src/Text/Pandoc/Writers/OpenDocument.hs | 2 +-
tests/writer.opendocument | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs
index 59ac4e526..83e17c943 100644
--- a/src/Text/Pandoc/Writers/OpenDocument.hs
+++ b/src/Text/Pandoc/Writers/OpenDocument.hs
@@ -378,7 +378,7 @@ inlineToOpenDocument :: WriterOptions -> Inline -> State WriterState Doc
inlineToOpenDocument o ils
| Space <- ils = inTextStyle space
| Span _ xs <- ils = inlinesToOpenDocument o xs
- | LineBreak <- ils = return $ selfClosingTag "text:line-break" [] <> cr
+ | LineBreak <- ils = return $ selfClosingTag "text:line-break" []
| Str s <- ils = inTextStyle $ handleSpaces $ escapeStringForXML s
| Emph l <- ils = withTextStyle Italic $ inlinesToOpenDocument o l
| Strong l <- ils = withTextStyle Bold $ inlinesToOpenDocument o l
diff --git a/tests/writer.opendocument b/tests/writer.opendocument
index 944dc12f3..5007c5635 100644
--- a/tests/writer.opendocument
+++ b/tests/writer.opendocument
@@ -896,8 +896,7 @@ of a paragraph looked like a list item.</text:p>
<text:p text:style-name="Text_20_body">Here’s one with a bullet. *
criminey.</text:p>
<text:p text:style-name="Text_20_body">There should be a hard line
-break<text:line-break />
-here.</text:p>
+break<text:line-break />here.</text:p>
<text:p text:style-name="Horizontal_20_Line" />
<text:h text:style-name="Heading_20_1" text:outline-level="1">Block
Quotes</text:h>