@@ -44,11 +44,14 @@ import Data.List (foldl', isPrefixOf, isSuffixOf)
4444import Data.Maybe (listToMaybe, fromMaybe)
4545import Data.Monoid (mconcat, mempty, mappend)
4646
47+-- Ignore HLint warnings to use String instead of [Char]
48+{-# ANN module ("HLint: ignore Use String" :: String) #-}
49+
4750-- | Parse org-mode string and return a Pandoc document.
4851readOrg :: ReaderOptions -- ^ Reader options
4952 -> String -- ^ String to parse (assuming @'\n'@ line endings)
5053 -> Pandoc
51−readOrg opts s = (readWith parseOrg) def{ orgStateOptions = opts } (s ++ "\n\n")
54+readOrg opts s = readWith parseOrg def{ orgStateOptions = opts } (s ++ "\n\n")
5255
5356type OrgParser = Parser [Char] OrgParserState
5457
@@ -111,7 +114,7 @@ updateLastPreCharPos = getPosition >>= \p ->
111114
112115pushToInlineCharStack :: Char -> OrgParser ()
113116pushToInlineCharStack c = updateState $ \st ->
114− st { orgStateEmphasisCharStack = c:(orgStateEmphasisCharStack st) }
117+ st { orgStateEmphasisCharStack = c:orgStateEmphasisCharStack st }
115118
116119popInlineCharStack :: OrgParser ()
117120popInlineCharStack = updateState $ \st ->
@@ -176,7 +179,7 @@ orgBlock = try $ do
176179 "comment" -> return mempty
177180 "src" -> return $ B.codeBlockWith ("", classArgs, []) blockStr
178181 _ -> B.divWith ("", [blockType], [])
179− <$> (parseFromString parseBlocks blockStr)
182+ <$> parseFromString parseBlocks blockStr
180183
181184blockHeader :: OrgParser (Int, String, [String])
182185blockHeader = (,,) <$> blockIndent
@@ -199,7 +202,7 @@ rawBlockContent indent blockType =
199202indentWith :: Int -> OrgParser String
200203indentWith num = do
201204 tabStop <- getOption readerTabStop
202− if (num < tabStop)
205+ if num < tabStop
203206 then count num (char ' ')
204207 else choice [ try (count num (char ' '))
205208 , try (char '\t' >> count (num - tabStop) (char ' ')) ]
@@ -242,7 +245,7 @@ drawerStart = try $
242245 <|> stringAnyCase "LOGBOOK"
243246
244247drawerLine :: OrgParser String
245−drawerLine = try $ anyLine
248+drawerLine = try anyLine
246249
247250drawerEnd :: OrgParser String
248251drawerEnd = try $
@@ -276,7 +279,7 @@ declarationLine = try $ do
276279metaValue :: OrgParser MetaValue
277280metaValue = MetaInlines . B.toList . trimInlines <$> restOfLine
278281
279−metaKey :: OrgParser [Char]
282+metaKey :: OrgParser String
280283metaKey = map toLower <$> many1 (noneOf ": \n\r")
281284 <* char ':'
282285 <* skipSpaces
@@ -350,7 +353,7 @@ tableAlignRow = try $
350353
351354tableAlignCell :: OrgParser Alignment
352355tableAlignCell =
353− choice [ try $ emptyCell *> return (AlignDefault)
356+ choice [ try $ emptyCell *> return AlignDefault
354357 , try $ skipSpaces
355358 *> char '<'
356359 *> tableAlignFromChar
@@ -381,8 +384,8 @@ normalizeTable (OrgTable cols aligns heads lns) =
381384 let aligns' = fillColumns aligns AlignDefault
382385 heads' = if heads == mempty
383386 then mempty
384− else fillColumns heads (B.plain mempty)
385− lns' = map (flip fillColumns (B.plain mempty)) lns
387+ else fillColumns heads (B.plain mempty)
388+ lns' = map (`fillColumns` B.plain mempty) lns
386389 fillColumns base padding = take cols $ base ++ repeat padding
387390 in OrgTable cols aligns' heads' lns'
388391
@@ -565,13 +568,14 @@ explicitOrImageLink = try $ do
565568 title <- enclosedRaw (char '[') (char ']')
566569 title' <- parseFromString (mconcat <$> many inline) title
567570 char ']'
568− return $ if (isImageFilename src) && (isImageFilename title)
569− then B.link src "" (B.image title "" "")
570− else B.link src "" title'
571+ return . B.link src ""
572+ $ if isImageFilename src && isImageFilename title
573+ then B.image title "" ""
574+ else title'
571575
572576selflinkOrImage :: OrgParser Inlines
573577selflinkOrImage = try $ do
574− src <- (char '[') *> linkTarget <* char ']'
578+ src <- char '[' *> linkTarget <* char ']'
575579 return $ if isImageFilename src
576580 then B.image src "" ""
577581 else B.link src "" (B.str src)
@@ -619,10 +623,10 @@ displayMath = B.displayMath <$> choice [ rawMathBetween "\\[" "\\]"
619623 ]
620624
621625subscript :: OrgParser Inlines
622−subscript = B.subscript <$> (try $ char '_' *> maybeGroupedByBraces)
626+subscript = B.subscript <$> try (char '_' *> maybeGroupedByBraces)
623627
624628superscript :: OrgParser Inlines
625−superscript = B.superscript <$> (try $ char '^' *> maybeGroupedByBraces)
629+superscript = B.superscript <$> try (char '^' *> maybeGroupedByBraces)
626630
627631maybeGroupedByBraces :: OrgParser Inlines
628632maybeGroupedByBraces = try $
@@ -702,14 +706,14 @@ emphasisEnd c = try $ do
702706 return c
703707
704708mathStart :: Char -> OrgParser Char
705−mathStart c = try $ do
709+mathStart c = try $
706710 char c <* notFollowedBy' (oneOf (c:mathForbiddenBorderChars))
707711
708712mathEnd :: Char -> OrgParser Char
709713mathEnd c = try $ do
710714 res <- noneOf (c:mathForbiddenBorderChars)
711715 char c
712− eof <|> (lookAhead $ oneOf mathPostChars *> pure ())
716+ eof <|> lookAhead (oneOf mathPostChars *> pure ())
713717 return res
714718
715719
@@ -741,8 +745,8 @@ many1TillNOrLessNewlines n p end = try $
741745 nMoreLines (Just 0) cs = try $ (cs ++) <$> finalLine
742746 nMoreLines k cs = try $ (final k cs <|> rest k cs)
743747 >>= uncurry nMoreLines
744− final _ cs = (\x -> (Nothing, cs ++ x)) <$> (try finalLine)
745− rest m cs = (\x -> (minus1 <$> m, cs ++ x ++ "\n")) <$> (try $ manyTill p P.newline)
748+ final _ cs = (\x -> (Nothing, cs ++ x)) <$> try finalLine
749+ rest m cs = (\x -> (minus1 <$> m, cs ++ x ++ "\n")) <$> try (manyTill p P.newline)
746750 finalLine = try $ manyTill p end
747751 minus1 k = k - 1
748752 oneOrMore cs = guard (not $ null cs) *> return cs
@@ -786,7 +790,7 @@ afterEmphasisPreChar :: OrgParser Bool
786790afterEmphasisPreChar = do
787791 pos <- getPosition
788792 lastPrePos <- orgStateLastPreCharPos <$> getState
789− return $ lastPrePos == Nothing || lastPrePos == Just pos
793+ return . fromMaybe True $ (== pos) <$> lastPrePos
790794
791795-- | Whether we are right after the end of a string
792796notAfterString :: OrgParser Bool