From 08a9717b3a3dbe94c9528421dc176edd6aff2ffd Mon Sep 17 00:00:00 2001 From: Tissevert Date: Fri, 29 Nov 2019 11:48:28 +0100 Subject: [PATCH] Get rid of wrapper PageContents structure returned by PageContent in the PDF.Text module (and return directly [ByteString] instead) --- src/PDF/Text.hs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/PDF/Text.hs b/src/PDF/Text.hs index 24ae953..a9ffcab 100644 --- a/src/PDF/Text.hs +++ b/src/PDF/Text.hs @@ -1,8 +1,7 @@ {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} module PDF.Text ( - PageContents(..) - , pageContents + pageContents ) where import Control.Applicative ((<|>)) @@ -76,15 +75,11 @@ nameArg = Typed . NameObject <$> name <* blank stringArg :: MonadParser m => m Argument stringArg = Typed . StringObject <$> stringObject <* blank -data PageContents = PageContents { - chunks :: [ByteString] - } - type ParserWithFont = ReaderT CMappers (Parser CMap) -pageContents :: CMappers -> ByteString -> Either String PageContents +pageContents :: CMappers -> ByteString -> Either String [ByteString] pageContents font input = - evalParser (runReaderT (PageContents <$> page) font) emptyCMap input + evalParser (runReaderT page font) emptyCMap input page :: ParserWithFont [ByteString] page = graphicState <|> text "Text page contents"