4191902 · typeable/pandoc

git.iko.soy/typeable/pandoc

Hlint fixes

commit419190213a7e6b07e2ac66f47d53e9f023af757d authorJohn MacFarlane <jgm@berkeley.edu> dateWed 30 Dec 2020, 15:38 (6 years ago) parentee7cef7

2 files changed+3−2

unifiedsplit

src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

@@ -564,7 +564,7 @@ getTarget = do

564564 _ -> "html"

565565

566566atStart :: T2T ()

567−atStart = (sourceColumn <$> getPosition) >>= guard . (== 1)

567+atStart = getPosition >>= guard . (== 1) . sourceColumn

568568

569569ignoreSpacesCap :: T2T Text -> T2T Text

570570ignoreSpacesCap p = T.toLower <$> (spaces *> p <* spaces)

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

@@ -28,6 +28,7 @@ import Data.Char (isSpace, isLetter)

2828import Data.List (intercalate, isPrefixOf, isSuffixOf)

2929import Data.String (fromString)

3030import qualified Data.Map as M

31+import Data.Either (fromRight)

3132import Data.Maybe (fromMaybe, isNothing, mapMaybe, maybeToList)

3233import qualified Data.Set as Set

3334import qualified Data.Text as T

@@ -1402,7 +1403,7 @@ inlineToOpenXML' opts (Image attr@(imgident, _, _) alt (src, title)) = do

14021403 generateImgElt (ident, _, _, img) =

14031404 let

14041405 (xpt,ypt) = desiredSizeInPoints opts attr

1405− (either (const def) id (imageSize opts img))

1406+ (fromRight def (imageSize opts img))

14061407 -- 12700 emu = 1 pt

14071408 (xemu,yemu) = fitToPage (xpt * 12700, ypt * 12700)

14081409 (pageWidth * 12700)