diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-04-13 14:04:48 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-04-13 14:04:48 -0700 |
| commit | 86b4da9dec0f42f2571bb249a082f9ac41fe568d (patch) | |
| tree | 630e9c83e3c2cc7d4492bdae40b5c792373e2897 /src | |
| parent | d5d4227ea5144d7c9da2ffdd44fbbd8131d4d86d (diff) | |
| parent | 67051b6e5d07f30b1a3c60231fc8561ec6a1bc86 (diff) | |
| download | pandoc-86b4da9dec0f42f2571bb249a082f9ac41fe568d.tar.gz | |
Merge pull request #1239 from tarleb/org-linebreak
Org linebreaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/Text/Pandoc/Readers/Org.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Writers/Org.hs | 2 |
2 files changed, 5 insertions, 1 deletions
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 |