diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-09-19 15:58:28 -0700 | 
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-09-19 16:00:22 -0700 | 
| commit | d5a7abd47f0862c51bc7ce8349e4290ad1c24546 (patch) | |
| tree | c51cff5dc705b74975dae7877ab1fc5193821d90 /src/Text/Pandoc | |
| parent | 277ea0df3db147c5253e74abb12a913be10c9937 (diff) | |
| download | pandoc-d5a7abd47f0862c51bc7ce8349e4290ad1c24546.tar.gz | |
Change deprecated Builder.isNull to null.
Diffstat (limited to 'src/Text/Pandoc')
| -rw-r--r-- | src/Text/Pandoc/Readers/DocBook.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Docx.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/HTML.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/LaTeX.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 4 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/MediaWiki.hs | 2 | 
6 files changed, 9 insertions, 9 deletions
diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs index 084c2788f..5c9687f94 100644 --- a/src/Text/Pandoc/Readers/DocBook.hs +++ b/src/Text/Pandoc/Readers/DocBook.hs @@ -758,7 +758,7 @@ getMediaobject e = do                          Nothing -> return mempty                          Just z  -> mconcat <$>                                           mapM parseInline (elContent z) -  let (capt, title) = if isNull figTitle +  let (capt, title) = if null figTitle                           then (getCaption e, "")                           else (return figTitle, "fig:")    fmap (imageWith attr imageUrl title) capt diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs index 9c2f58342..4bfea6534 100644 --- a/src/Text/Pandoc/Readers/Docx.hs +++ b/src/Text/Pandoc/Readers/Docx.hs @@ -576,7 +576,7 @@ bodyPartToBlocks (Paragraph pPr parparts)        then do modify $ \s -> s { docxDropCap = ils' }                return mempty        else do modify $ \s -> s { docxDropCap = mempty } -              let ils'' = (if isNull prevParaIls then mempty +              let ils'' = (if null prevParaIls then mempty                            else prevParaIls <> space) <> ils'                    handleInsertion = do                      modify $ \s -> s {docxPrevPara = mempty} @@ -584,7 +584,7 @@ bodyPartToBlocks (Paragraph pPr parparts)                      return $ transform $ paraOrPlain ils''                opts <- asks docxOptions                case (pChange pPr', readerTrackChanges opts) of -                  _ | isNull ils'', not (isEnabled Ext_empty_paragraphs opts) -> +                  _ | null ils'', not (isEnabled Ext_empty_paragraphs opts) ->                      return mempty                    (Just (TrackedChange Insertion _), AcceptChanges) ->                        handleInsertion diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs index 761c4cabe..11b8516ea 100644 --- a/src/Text/Pandoc/Readers/HTML.hs +++ b/src/Text/Pandoc/Readers/HTML.hs @@ -585,7 +585,7 @@ pBlockQuote = do  pPlain :: PandocMonad m => TagParser m Blocks  pPlain = do    contents <- setInPlain $ trimInlines . mconcat <$> many1 inline -  if B.isNull contents +  if null contents       then return mempty       else return $ B.plain contents @@ -593,7 +593,7 @@ pPara :: PandocMonad m => TagParser m Blocks  pPara = do    contents <- trimInlines <$> pInTags "p" inline    (do guardDisabled Ext_empty_paragraphs -      guard (B.isNull contents) +      guard (null contents)        return mempty)      <|> return (B.para contents) diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 73dd8fd1f..4805bcdde 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -200,7 +200,7 @@ regularSymbol = str . untoken <$> satisfyTok isRegularSymbol  inlineGroup :: PandocMonad m => LP m Inlines  inlineGroup = do    ils <- grouped inline -  if isNull ils +  if null ils       then return mempty       else return $ spanWith nullAttr ils            -- we need the span so we can detitlecase bibtex entries; diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 866b074c7..083131a05 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -222,9 +222,9 @@ pandocTitleBlock = try $ do                   author' <- author                   date' <- date                   return $ -                     (if B.isNull title' then id else B.setMeta "title" title') +                     (if null title' then id else B.setMeta "title" title')                     . (if null author' then id else B.setMeta "author" author') -                   . (if B.isNull date' then id else B.setMeta "date" date') +                   . (if null date' then id else B.setMeta "date" date')                     $ nullMeta    updateState $ \st -> st{ stateMeta' = stateMeta' st <> meta' } diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index 6e7dc3110..e8985ab2c 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -434,7 +434,7 @@ defListItem :: PandocMonad m => MWParser m (Inlines, [Blocks])  defListItem = try $ do    terms <- mconcat . intersperse B.linebreak <$> many defListTerm    -- we allow dd with no dt, or dt with no dd -  defs  <- if B.isNull terms +  defs  <- if null terms                then notFollowedBy                      (try $ skipMany1 (char ':') >> string "<math>") *>                         many1 (listItem ':')  | 
