c5572fc · typeable/pandoc

git.iko.soy/typeable/pandoc

hlint some writers

commitc5572fc07e13b978acae53cd2af066d9b365993e authorAlexander Krotov <ilabdsf@gmail.com> dateTue 4 Sep 2018, 11:21 (8 years ago) parentbec2023

9 files changed+21−25

compare with master

unifiedsplit

src/Text/Pandoc/Writers/AsciiDoc.hs+2−2 src/Text/Pandoc/Writers/ConTeXt.hs+1−2 src/Text/Pandoc/Writers/EPUB.hs+1−1 src/Text/Pandoc/Writers/FB2.hs+1−1 src/Text/Pandoc/Writers/Haddock.hs+2−2 src/Text/Pandoc/Writers/Man.hs+2−2 src/Text/Pandoc/Writers/Ms.hs+1−1 src/Text/Pandoc/Writers/Texinfo.hs+7−10 src/Text/Pandoc/Writers/Textile.hs+4−4

src/Text/Pandoc/Writers/AsciiDoc.hs+2−2

@@ -285,7 +285,7 @@ blockToAsciiDoc opts (DefinitionList items) = do

285285 contents <- mapM (definitionListItemToAsciiDoc opts) items

286286 return $ cat contents <> blankline

287287blockToAsciiDoc opts (Div (ident,_,_) bs) = do

288− let identifier = if null ident then empty else ("[[" <> text ident <> "]]")

288+ let identifier = if null ident then empty else "[[" <> text ident <> "]]"

289289 contents <- blockListToAsciiDoc opts bs

290290 return $ identifier $$ contents

291291

@@ -492,6 +492,6 @@ inlineToAsciiDoc opts (Note [Plain inlines]) = do

492492-- asciidoc can't handle blank lines in notes

493493inlineToAsciiDoc _ (Note _) = return "[multiblock footnote omitted]"

494494inlineToAsciiDoc opts (Span (ident,_,_) ils) = do

495− let identifier = if null ident then empty else ("[[" <> text ident <> "]]")

495+ let identifier = if null ident then empty else "[[" <> text ident <> "]]"

496496 contents <- inlineListToAsciiDoc opts ils

497497 return $ identifier <> contents

src/Text/Pandoc/Writers/ConTeXt.hs+1−2

@@ -329,8 +329,7 @@ alignToConTeXt align = case align of

329329 AlignDefault -> empty

330330

331331listItemToConTeXt :: PandocMonad m => [Block] -> WM m Doc

332−listItemToConTeXt list = blockListToConTeXt list >>=

333− return . ("\\item" $$) . nest 2

332+listItemToConTeXt list = (("\\item" $$) . nest 2) <$> blockListToConTeXt list

334333

335334defListItemToConTeXt :: PandocMonad m => ([Inline], [[Block]]) -> WM m Doc

336335defListItemToConTeXt (term, defs) = do

src/Text/Pandoc/Writers/EPUB.hs+1−1

@@ -801,7 +801,7 @@ pandocToEPUB version opts doc@(Pandoc meta _) = do

801801 [ unode "a" ! [("href", "text/cover.xhtml")

802802 ,("epub:type", "cover")] $

803803 "Cover"] |

804− epubCoverImage metadata /= Nothing

804+ isJust (epubCoverImage metadata)

805805 ] ++

806806 [ unode "li"

807807 [ unode "a" ! [("href", "#toc")

src/Text/Pandoc/Writers/FB2.hs+1−1

@@ -119,7 +119,7 @@ description meta' = do

119119 let as = authors meta'

120120 dd <- docdate meta'

121121 annotation <- case lookupMeta "abstract" meta' of

122− Just (MetaBlocks bs) -> (list . el "annotation") <$> (cMapM blockToXml $ map unPlain bs)

122+ Just (MetaBlocks bs) -> (list . el "annotation") <$> cMapM blockToXml (map unPlain bs)

123123 _ -> pure mempty

124124 let lang = case lookupMeta "lang" meta' of

125125 Just (MetaInlines [Str s]) -> [el "lang" $ iso639 s]

src/Text/Pandoc/Writers/Haddock.hs+2−2

@@ -207,13 +207,13 @@ blockListToHaddock :: PandocMonad m

207207 -> [Block] -- ^ List of block elements

208208 -> StateT WriterState m Doc

209209blockListToHaddock opts blocks =

210− mapM (blockToHaddock opts) blocks >>= return . cat

210+ cat <$> mapM (blockToHaddock opts) blocks

211211

212212-- | Convert list of Pandoc inline elements to haddock.

213213inlineListToHaddock :: PandocMonad m

214214 => WriterOptions -> [Inline] -> StateT WriterState m Doc

215215inlineListToHaddock opts lst =

216− mapM (inlineToHaddock opts) lst >>= return . cat

216+ cat <$> mapM (inlineToHaddock opts) lst

217217

218218-- | Convert Pandoc inline element to haddock.

219219inlineToHaddock :: PandocMonad m

src/Text/Pandoc/Writers/Man.hs+2−2

@@ -325,11 +325,11 @@ blockListToMan :: PandocMonad m

325325 -> [Block] -- ^ List of block elements

326326 -> StateT WriterState m Doc

327327blockListToMan opts blocks =

328− mapM (blockToMan opts) blocks >>= (return . vcat)

328+ vcat <$> mapM (blockToMan opts) blocks

329329

330330-- | Convert list of Pandoc inline elements to man.

331331inlineListToMan :: PandocMonad m => WriterOptions -> [Inline] -> StateT WriterState m Doc

332−inlineListToMan opts lst = mapM (inlineToMan opts) lst >>= (return . hcat)

332+inlineListToMan opts lst = hcat <$> mapM (inlineToMan opts) lst

333333

334334-- | Convert Pandoc inline element to man.

335335inlineToMan :: PandocMonad m => WriterOptions -> Inline -> StateT WriterState m Doc

src/Text/Pandoc/Writers/Ms.hs+1−1

@@ -434,7 +434,7 @@ blockListToMs :: PandocMonad m

434434 -> [Block] -- ^ List of block elements

435435 -> MS m Doc

436436blockListToMs opts blocks =

437− mapM (blockToMs opts) blocks >>= (return . vcat)

437+ vcat <$> mapM (blockToMs opts) blocks

438438

439439-- | Convert list of Pandoc inline elements to ms.

440440inlineListToMs :: PandocMonad m => WriterOptions -> [Inline] -> MS m Doc

src/Text/Pandoc/Writers/Texinfo.hs+7−10

@@ -346,12 +346,9 @@ collectNodes :: Int -> [Block] -> [Block]

346346collectNodes _ [] = []

347347collectNodes level (x:xs) =

348348 case x of

349− (Header hl _ _) ->

350− if hl < level

351− then []

352− else if hl == level

353− then x : collectNodes level xs

354− else collectNodes level xs

349+ (Header hl _ _) | hl < level -> []

350+ | hl == level -> x : collectNodes level xs

351+ | otherwise -> collectNodes level xs

355352 _ ->

356353 collectNodes level xs

357354

@@ -389,7 +386,7 @@ defListItemToTexinfo (term, defs) = do

389386inlineListToTexinfo :: PandocMonad m

390387 => [Inline] -- ^ Inlines to convert

391388 -> TI m Doc

392−inlineListToTexinfo lst = mapM inlineToTexinfo lst >>= return . hcat

389+inlineListToTexinfo lst = hcat <$> mapM inlineToTexinfo lst

393390

394391-- | Convert list of inline elements to Texinfo acceptable for a node name.

395392inlineListForNode :: PandocMonad m

@@ -411,10 +408,10 @@ inlineToTexinfo (Span _ lst) =

411408 inlineListToTexinfo lst

412409

413410inlineToTexinfo (Emph lst) =

414− inlineListToTexinfo lst >>= return . inCmd "emph"

411+ inCmd "emph" <$> inlineListToTexinfo lst

415412

416413inlineToTexinfo (Strong lst) =

417− inlineListToTexinfo lst >>= return . inCmd "strong"

414+ inCmd "strong" <$> inlineListToTexinfo lst

418415

419416inlineToTexinfo (Strikeout lst) = do

420417 modify $ \st -> st{ stStrikeout = True }

@@ -430,7 +427,7 @@ inlineToTexinfo (Subscript lst) = do

430427 return $ text "@sub{" <> contents <> char '}'

431428

432429inlineToTexinfo (SmallCaps lst) =

433− inlineListToTexinfo lst >>= return . inCmd "sc"

430+ inCmd "sc" <$> inlineListToTexinfo lst

434431

435432inlineToTexinfo (Code _ str) =

436433 return $ text $ "@code{" ++ stringToTexinfo str ++ "}"

src/Text/Pandoc/Writers/Textile.hs+4−4

@@ -73,7 +73,7 @@ pandocToTextile opts (Pandoc meta blocks) = do

7373 (inlineListToTextile opts) meta

7474 body <- blockListToTextile opts blocks

7575 notes <- gets $ unlines . reverse . stNotes

76− let main = pack $ body ++ if null notes then "" else ("\n\n" ++ notes)

76+ let main = pack $ body ++ if null notes then "" else "\n\n" ++ notes

7777 let context = defField "body" main metadata

7878 case writerTemplate opts of

7979 Nothing -> return main

@@ -154,7 +154,7 @@ blockToTextile _ HorizontalRule = return "<hr />\n"

154154

155155blockToTextile opts (Header level (ident,classes,keyvals) inlines) = do

156156 contents <- inlineListToTextile opts inlines

157− let identAttr = if null ident then "" else ('#':ident)

157+ let identAttr = if null ident then "" else '#':ident

158158 let attribs = if null identAttr && null classes

159159 then ""

160160 else "(" ++ unwords classes ++ identAttr ++ ")"

@@ -382,13 +382,13 @@ blockListToTextile :: PandocMonad m

382382 -> [Block] -- ^ List of block elements

383383 -> TW m String

384384blockListToTextile opts blocks =

385− mapM (blockToTextile opts) blocks >>= return . vcat

385+ vcat <$> mapM (blockToTextile opts) blocks

386386

387387-- | Convert list of Pandoc inline elements to Textile.

388388inlineListToTextile :: PandocMonad m

389389 => WriterOptions -> [Inline] -> TW m String

390390inlineListToTextile opts lst =

391− mapM (inlineToTextile opts) lst >>= return . concat

391+ concat <$> mapM (inlineToTextile opts) lst

392392

393393-- | Convert Pandoc inline element to Textile.

394394inlineToTextile :: PandocMonad m => WriterOptions -> Inline -> TW m String