aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc/Readers/Org/Blocks.hs
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-22 12:51:37 -0700
committerGitHub <noreply@github.com>2016-06-22 12:51:37 -0700
commit319a56aefcb58bf2b1f702367205f1df0b88ee5e (patch)
tree9a7c540ea6c8eed7124c836822c118a09e59788f /src/Text/Pandoc/Readers/Org/Blocks.hs
parentba7868765acae0071f684797771d83f9cc31b402 (diff)
parent7df656089f960b5c0f329776d6ebc0094b0fef30 (diff)
downloadpandoc-319a56aefcb58bf2b1f702367205f1df0b88ee5e.tar.gz
Merge pull request #2992 from tarleb/org-partial-functions
Org reader: remove partial functions
Diffstat (limited to 'src/Text/Pandoc/Readers/Org/Blocks.hs')
-rw-r--r--src/Text/Pandoc/Readers/Org/Blocks.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs
index 75e564f2f..f8ff3f928 100644
--- a/src/Text/Pandoc/Readers/Org/Blocks.hs
+++ b/src/Text/Pandoc/Readers/Org/Blocks.hs
@@ -219,7 +219,7 @@ rawBlockContent blockType = try $ do
stripIndent strs = map (drop (shortestIndent strs)) strs
shortestIndent :: [String] -> Int
- shortestIndent = minimum
+ shortestIndent = foldr min maxBound
. map (length . takeWhile isSpace)
. filter (not . null)
@@ -727,7 +727,9 @@ normalizeTable (OrgTable aligns heads rows) = OrgTable aligns' heads rows
where
refRow = if heads /= mempty
then heads
- else if rows == mempty then mempty else head rows
+ else case rows of
+ (r:_) -> r
+ _ -> mempty
cols = length refRow
fillColumns base padding = take cols $ base ++ repeat padding
aligns' = fillColumns aligns AlignDefault