regression: path to --pdf-engine works again #4682
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jgm
reviewed
Jun 1, 2018
src/Text/Pandoc/App.hs
Outdated
| @@ -155,7 +155,7 @@ pdfWriterAndProg mWriter mEngine = do | |||
| where | |||
| go Nothing Nothing = Right ("latex", "pdflatex") | |||
| go (Just writer) Nothing = (writer,) <$> engineForWriter writer | |||
| go Nothing (Just engine) = (,engine) <$> writerForEngine engine | |||
| go Nothing (Just engine) = (,engine) <$> writerForEngine (takeBaseName engine) | |||
| go (Just writer) (Just engine) = | |||
| case find (== (baseWriterName writer, engine)) engines of | |||
There was a problem hiding this comment.
I think we also need
find (== (baseWriterName writer, takeBaseName engine)) engines
here, right? For the case where they specify the writer format explicitly.
There was a problem hiding this comment.
good point, I updated the pull...
|
I also noticed that makePDF (in Text.Pandoc.PDF) pattern matches
on the engine passed in. So, if an engine with a full path
is passed in, it won't match. This probably needs to be fixed
too. (You wouldn't notice it for latex, since the fallthrough
case does take the base name, but you should see an issue with
wkhtmltopdf or another program if a full path is specified.)
|
|
Indeed, I tested only with |
|
Thanks. Some nice types would probably make this more solid, but this is good for now! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #4681