hlint some writers
This commit is contained in:
Alexander Krotov
parent
bec2023265
commit
c5572fc07e
9 changed files with 21 additions and 25 deletions
|
|
@ -285,7 +285,7 @@ blockToAsciiDoc opts (DefinitionList items) = do
|
|||
contents <- mapM (definitionListItemToAsciiDoc opts) items
|
||||
return $ cat contents <> blankline
|
||||
blockToAsciiDoc opts (Div (ident,_,_) bs) = do
|
||||
let identifier = if null ident then empty else ("[[" <> text ident <> "]]")
|
||||
let identifier = if null ident then empty else "[[" <> text ident <> "]]"
|
||||
contents <- blockListToAsciiDoc opts bs
|
||||
return $ identifier $$ contents
|
||||
|
||||
|
|
@ -492,6 +492,6 @@ inlineToAsciiDoc opts (Note [Plain inlines]) = do
|
|||
-- asciidoc can't handle blank lines in notes
|
||||
inlineToAsciiDoc _ (Note _) = return "[multiblock footnote omitted]"
|
||||
inlineToAsciiDoc opts (Span (ident,_,_) ils) = do
|
||||
let identifier = if null ident then empty else ("[[" <> text ident <> "]]")
|
||||
let identifier = if null ident then empty else "[[" <> text ident <> "]]"
|
||||
contents <- inlineListToAsciiDoc opts ils
|
||||
return $ identifier <> contents
|
||||
|
|
|
|||
|
|
@ -329,8 +329,7 @@ alignToConTeXt align = case align of
|
|||
AlignDefault -> empty
|
||||
|
||||
listItemToConTeXt :: PandocMonad m => [Block] -> WM m Doc
|
||||
listItemToConTeXt list = blockListToConTeXt list >>=
|
||||
return . ("\\item" $$) . nest 2
|
||||
listItemToConTeXt list = (("\\item" $$) . nest 2) <$> blockListToConTeXt list
|
||||
|
||||
defListItemToConTeXt :: PandocMonad m => ([Inline], [[Block]]) -> WM m Doc
|
||||
defListItemToConTeXt (term, defs) = do
|
||||
|
|
|
|||
|
|
@ -801,7 +801,7 @@ pandocToEPUB version opts doc@(Pandoc meta _) = do
|
|||
[ unode "a" ! [("href", "text/cover.xhtml")
|
||||
,("epub:type", "cover")] $
|
||||
"Cover"] |
|
||||
epubCoverImage metadata /= Nothing
|
||||
isJust (epubCoverImage metadata)
|
||||
] ++
|
||||
[ unode "li"
|
||||
[ unode "a" ! [("href", "#toc")
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ description meta' = do
|
|||
let as = authors meta'
|
||||
dd <- docdate meta'
|
||||
annotation <- case lookupMeta "abstract" meta' of
|
||||
Just (MetaBlocks bs) -> (list . el "annotation") <$> (cMapM blockToXml $ map unPlain bs)
|
||||
Just (MetaBlocks bs) -> (list . el "annotation") <$> cMapM blockToXml (map unPlain bs)
|
||||
_ -> pure mempty
|
||||
let lang = case lookupMeta "lang" meta' of
|
||||
Just (MetaInlines [Str s]) -> [el "lang" $ iso639 s]
|
||||
|
|
|
|||
|
|
@ -207,13 +207,13 @@ blockListToHaddock :: PandocMonad m
|
|||
-> [Block] -- ^ List of block elements
|
||||
-> StateT WriterState m Doc
|
||||
blockListToHaddock opts blocks =
|
||||
mapM (blockToHaddock opts) blocks >>= return . cat
|
||||
cat <$> mapM (blockToHaddock opts) blocks
|
||||
|
||||
-- | Convert list of Pandoc inline elements to haddock.
|
||||
inlineListToHaddock :: PandocMonad m
|
||||
=> WriterOptions -> [Inline] -> StateT WriterState m Doc
|
||||
inlineListToHaddock opts lst =
|
||||
mapM (inlineToHaddock opts) lst >>= return . cat
|
||||
cat <$> mapM (inlineToHaddock opts) lst
|
||||
|
||||
-- | Convert Pandoc inline element to haddock.
|
||||
inlineToHaddock :: PandocMonad m
|
||||
|
|
|
|||
|
|
@ -325,11 +325,11 @@ blockListToMan :: PandocMonad m
|
|||
-> [Block] -- ^ List of block elements
|
||||
-> StateT WriterState m Doc
|
||||
blockListToMan opts blocks =
|
||||
mapM (blockToMan opts) blocks >>= (return . vcat)
|
||||
vcat <$> mapM (blockToMan opts) blocks
|
||||
|
||||
-- | Convert list of Pandoc inline elements to man.
|
||||
inlineListToMan :: PandocMonad m => WriterOptions -> [Inline] -> StateT WriterState m Doc
|
||||
inlineListToMan opts lst = mapM (inlineToMan opts) lst >>= (return . hcat)
|
||||
inlineListToMan opts lst = hcat <$> mapM (inlineToMan opts) lst
|
||||
|
||||
-- | Convert Pandoc inline element to man.
|
||||
inlineToMan :: PandocMonad m => WriterOptions -> Inline -> StateT WriterState m Doc
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ blockListToMs :: PandocMonad m
|
|||
-> [Block] -- ^ List of block elements
|
||||
-> MS m Doc
|
||||
blockListToMs opts blocks =
|
||||
mapM (blockToMs opts) blocks >>= (return . vcat)
|
||||
vcat <$> mapM (blockToMs opts) blocks
|
||||
|
||||
-- | Convert list of Pandoc inline elements to ms.
|
||||
inlineListToMs :: PandocMonad m => WriterOptions -> [Inline] -> MS m Doc
|
||||
|
|
|
|||
|
|
@ -346,12 +346,9 @@ collectNodes :: Int -> [Block] -> [Block]
|
|||
collectNodes _ [] = []
|
||||
collectNodes level (x:xs) =
|
||||
case x of
|
||||
(Header hl _ _) ->
|
||||
if hl < level
|
||||
then []
|
||||
else if hl == level
|
||||
then x : collectNodes level xs
|
||||
else collectNodes level xs
|
||||
(Header hl _ _) | hl < level -> []
|
||||
| hl == level -> x : collectNodes level xs
|
||||
| otherwise -> collectNodes level xs
|
||||
_ ->
|
||||
collectNodes level xs
|
||||
|
||||
|
|
@ -389,7 +386,7 @@ defListItemToTexinfo (term, defs) = do
|
|||
inlineListToTexinfo :: PandocMonad m
|
||||
=> [Inline] -- ^ Inlines to convert
|
||||
-> TI m Doc
|
||||
inlineListToTexinfo lst = mapM inlineToTexinfo lst >>= return . hcat
|
||||
inlineListToTexinfo lst = hcat <$> mapM inlineToTexinfo lst
|
||||
|
||||
-- | Convert list of inline elements to Texinfo acceptable for a node name.
|
||||
inlineListForNode :: PandocMonad m
|
||||
|
|
@ -411,10 +408,10 @@ inlineToTexinfo (Span _ lst) =
|
|||
inlineListToTexinfo lst
|
||||
|
||||
inlineToTexinfo (Emph lst) =
|
||||
inlineListToTexinfo lst >>= return . inCmd "emph"
|
||||
inCmd "emph" <$> inlineListToTexinfo lst
|
||||
|
||||
inlineToTexinfo (Strong lst) =
|
||||
inlineListToTexinfo lst >>= return . inCmd "strong"
|
||||
inCmd "strong" <$> inlineListToTexinfo lst
|
||||
|
||||
inlineToTexinfo (Strikeout lst) = do
|
||||
modify $ \st -> st{ stStrikeout = True }
|
||||
|
|
@ -430,7 +427,7 @@ inlineToTexinfo (Subscript lst) = do
|
|||
return $ text "@sub{" <> contents <> char '}'
|
||||
|
||||
inlineToTexinfo (SmallCaps lst) =
|
||||
inlineListToTexinfo lst >>= return . inCmd "sc"
|
||||
inCmd "sc" <$> inlineListToTexinfo lst
|
||||
|
||||
inlineToTexinfo (Code _ str) =
|
||||
return $ text $ "@code{" ++ stringToTexinfo str ++ "}"
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ pandocToTextile opts (Pandoc meta blocks) = do
|
|||
(inlineListToTextile opts) meta
|
||||
body <- blockListToTextile opts blocks
|
||||
notes <- gets $ unlines . reverse . stNotes
|
||||
let main = pack $ body ++ if null notes then "" else ("\n\n" ++ notes)
|
||||
let main = pack $ body ++ if null notes then "" else "\n\n" ++ notes
|
||||
let context = defField "body" main metadata
|
||||
case writerTemplate opts of
|
||||
Nothing -> return main
|
||||
|
|
@ -154,7 +154,7 @@ blockToTextile _ HorizontalRule = return "<hr />\n"
|
|||
|
||||
blockToTextile opts (Header level (ident,classes,keyvals) inlines) = do
|
||||
contents <- inlineListToTextile opts inlines
|
||||
let identAttr = if null ident then "" else ('#':ident)
|
||||
let identAttr = if null ident then "" else '#':ident
|
||||
let attribs = if null identAttr && null classes
|
||||
then ""
|
||||
else "(" ++ unwords classes ++ identAttr ++ ")"
|
||||
|
|
@ -382,13 +382,13 @@ blockListToTextile :: PandocMonad m
|
|||
-> [Block] -- ^ List of block elements
|
||||
-> TW m String
|
||||
blockListToTextile opts blocks =
|
||||
mapM (blockToTextile opts) blocks >>= return . vcat
|
||||
vcat <$> mapM (blockToTextile opts) blocks
|
||||
|
||||
-- | Convert list of Pandoc inline elements to Textile.
|
||||
inlineListToTextile :: PandocMonad m
|
||||
=> WriterOptions -> [Inline] -> TW m String
|
||||
inlineListToTextile opts lst =
|
||||
mapM (inlineToTextile opts) lst >>= return . concat
|
||||
concat <$> mapM (inlineToTextile opts) lst
|
||||
|
||||
-- | Convert Pandoc inline element to Textile.
|
||||
inlineToTextile :: PandocMonad m => WriterOptions -> Inline -> TW m String
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue