0782d58 · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Undo the "Use fromRight" hlint hint.

0782d58John MacFarlane6 years ago

.hlint.yaml+4

@@ -104,5 +104,9 @@

104 - Text.Pandoc.Readers.Markdown

105 - Text.Pandoc.Readers.RST

106

107+# fromRight is only in base >= 4.10

108+- ignore:

109+ name: "Use fromRight"

110+

107# Define some custom infix operators

111# Define some custom infix operators

108# - fixity: infixr 3 ~^#^~

112# - fixity: infixr 3 ~^#^~

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

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

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

29import Data.String (fromString)

30import qualified Data.Map as M

31−import Data.Either (fromRight)

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

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

33import qualified Data.Set as Set

32import qualified Data.Set as Set

34import qualified Data.Text as T

33import qualified Data.Text as T

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

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

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

1404 let

1403 let

1405 (xpt,ypt) = desiredSizeInPoints opts attr

1404 (xpt,ypt) = desiredSizeInPoints opts attr

1406− (fromRight def (imageSize opts img))

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

1407 -- 12700 emu = 1 pt

1406 -- 12700 emu = 1 pt

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

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

1409 (pageWidth * 12700)

1408 (pageWidth * 12700)