Merge pull request #1239 from tarleb/org-linebreak

Org linebreaks

5 files changed, 14 insertions, 2 deletions

diff --git a/.editorconfig b/.editorconfig
index 9c562bd1f..5f40572b0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,7 @@ trim_trailing_whitespace = true
 
 [*.{markdown,md}]
 trim_trailing_whitespace = false
+
+[tests/*]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/src/Text/Pandoc/Readers/Org.hs b/src/Text/Pandoc/Readers/Org.hs
index 901a49fc8..bda0b0262 100644
--- a/src/Text/Pandoc/Readers/Org.hs
+++ b/src/Text/Pandoc/Readers/Org.hs
@@ -539,6 +539,7 @@ anyLineNewline = (++ "\n") <$> anyLine
 inline :: OrgParser Inlines
 inline =
   choice [ whitespace
+         , linebreak
          , link
          , str
          , endline
@@ -570,6 +571,9 @@ whitespace = B.space <$ skipMany1 spaceChar
                      <* updateLastForbiddenCharPos
              <?> "whitespace"
 
+linebreak :: OrgParser Inlines
+linebreak = try $ B.linebreak <$ string "\\\\" <* skipSpaces <* newline
+
 str :: OrgParser Inlines
 str = B.str <$> many1 (noneOf $ specialChars ++ "\n\r ")
             <* updateLastStrPos
diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs
index d318c5f6a..58a5729e7 100644
--- a/src/Text/Pandoc/Writers/Org.hs
+++ b/src/Text/Pandoc/Writers/Org.hs
@@ -271,7 +271,7 @@ inlineToOrg (Math t str) = do
               else "$$" <> text str <> "$$"
 inlineToOrg (RawInline f str) | f == "tex" || f == "latex" = return $ text str
 inlineToOrg (RawInline _ _) = return empty
-inlineToOrg (LineBreak) = return cr -- there's no line break in Org
+inlineToOrg (LineBreak) = return (text "\\\\" <> cr)
 inlineToOrg Space = return space
 inlineToOrg (Link txt (src, _)) = do
   case txt of
diff --git a/tests/Tests/Readers/Org.hs b/tests/Tests/Readers/Org.hs
index 99dadc0ac..f39bd7992 100644
--- a/tests/Tests/Readers/Org.hs
+++ b/tests/Tests/Readers/Org.hs
@@ -94,6 +94,10 @@ tests =
           "a_{n+1}" =?>
           para (str "a" <> subscript "n+1")
 
+      , "Linebreak" =:
+          "line \\\\ \nbreak" =?>
+          para ("line" <> linebreak <> "break")
+
       , "Markup-chars not occuring on word break are symbols" =:
           unlines [ "this+that+ +so+on"
                   , "seven*eight* nine*"
diff --git a/tests/writer.org b/tests/writer.org
index 85016f352..524d49305 100644
--- a/tests/writer.org
+++ b/tests/writer.org
@@ -42,7 +42,7 @@ item.
 
 Here's one with a bullet. * criminey.
 
-There should be a hard line break
+There should be a hard line break\\
 here.
 
 --------------