dd3ec34 · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed bug: when target is PDF, writer extensions were being ignored.

E.g. `-t latex-smart -o file.pdf` would produce a different latex intermediate than `-t latex-smart -o file.tex`. Thanks to Bernhard Fisseni for pointing this out. This is a regression since pandoc 2.0 (introduced in commit c7e3c1ec).

commitdd3ec34a3452ebc159ab201c643ad6d4738733ec authorJohn MacFarlane <jgm@berkeley.edu> dateSat 23 Dec 2017, 21:07 (9 years ago) parent59a4745

1 file changed+3−3

compare with master

unifiedsplit

src/Text/Pandoc/App.hs+3−3

src/Text/Pandoc/App.hs+3−3

@@ -143,7 +143,7 @@ pdfWriterAndProg :: Maybe String -- ^ user-specified writer name

143143 -> IO (String, Maybe String) -- ^ IO (writerName, maybePdfEngineProg)

144144pdfWriterAndProg mWriter mEngine = do

145145 let panErr msg = liftIO $ E.throwIO $ PandocAppError msg

146− case go (baseWriterName <$> mWriter) mEngine of

146+ case go mWriter mEngine of

147147 Right (writ, prog) -> return (writ, Just prog)

148148 Left err -> panErr err

149149 where

@@ -151,7 +151,7 @@ pdfWriterAndProg mWriter mEngine = do

151151 go (Just writer) Nothing = (writer,) <$> engineForWriter writer

152152 go Nothing (Just engine) = (,engine) <$> writerForEngine engine

153153 go (Just writer) (Just engine) =

154− case find (== (writer, engine)) engines of

154+ case find (== (baseWriterName writer, engine)) engines of

155155 Just _ -> Right (writer, engine)

156156 Nothing -> Left $ "pdf-engine " ++ engine ++

157157 " is not compatible with output format " ++ writer

@@ -161,7 +161,7 @@ pdfWriterAndProg mWriter mEngine = do

161161 [] -> Left $

162162 "pdf-engine " ++ eng ++ " not known"

163163

164− engineForWriter w = case [e | (f,e) <- engines, f == w] of

164+ engineForWriter w = case [e | (f,e) <- engines, f == baseWriterName w] of

165165 eng : _ -> Right eng

166166 [] -> Left $

167167 "cannot produce pdf output from " ++ w