Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure that options imply --standalone even in defaults file.

Browse source 
Certain options (`--self-contained`, `--include-in-header`, etc.)
imply `--standalone`.  We now handle this after option parsing
so that it affects options specified in defaults files too.

Behavior change: `--title-prefix` no longer implies `--standalone`.
This commit is contained in:
John MacFarlane 2019-11-17 17:21:55 -08:00
parent 7969d09866
commit 147ef90fde
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MANUAL.txt
View file

@ -1032,8 +1032,8 @@ header when requesting a document from a URL:
: Specify *STRING* as a prefix at the beginning of the title
that appears in the HTML header (but not in the title as it
appears at the beginning of the HTML body). Implies
`--standalone`.
appears at the beginning of the HTML body). This option
should normally be used with `--standalone`.
`-c` *URL*, `--css=`*URL*

29
src/Text/Pandoc/App/CommandLineOptions.hs
View file

@ -34,7 +34,7 @@ import Data.List (intercalate, sort)
import Data.List (isPrefixOf)
#endif
#endif
import Data.Maybe (fromMaybe)
import Data.Maybe (fromMaybe, isJust)
import Skylighting (Style, Syntax (..), defaultSyntaxMap, parseTheme)
import System.Console.GetOpt
import System.Environment (getArgs, getProgName)
@ -89,7 +89,14 @@ parseOptions options' defaults = do
[] -> Nothing
xs -> Just xs
return $ opts{ optInputFiles =
map normalizePath <$> (optInputFiles opts <> mbArgs) }
map normalizePath <$> (optInputFiles opts <> mbArgs)
, optStandalone = -- certain other options imply standalone
optStandalone opts ||
isJust (optTemplate opts) ||
optSelfContained opts ||
not (null (optIncludeInHeader opts)) ||
not (null (optIncludeBeforeBody opts)) ||
not (null (optIncludeAfterBody opts)) }
latexEngines :: [String]
latexEngines = ["pdflatex", "lualatex", "xelatex", "latexmk", "tectonic"]
@ -184,8 +191,7 @@ options =
, Option "" ["template"]
(ReqArg
(\arg opt ->
return opt{ optTemplate = Just (normalizePath arg),
optStandalone = True })
return opt{ optTemplate = Just (normalizePath arg) })
"FILE")
"" -- "Use custom template"
@ -283,24 +289,21 @@ options =
, Option "H" ["include-in-header"]
(ReqArg
(\arg opt -> return opt{ optIncludeInHeader =
optIncludeInHeader opt ++ [arg],
optStandalone = True })
optIncludeInHeader opt ++ [arg] })
"FILE")
"" -- "File to include at end of header (implies -s)"
, Option "B" ["include-before-body"]
(ReqArg
(\arg opt -> return opt{ optIncludeBeforeBody =
optIncludeBeforeBody opt ++ [arg],
optStandalone = True })
optIncludeBeforeBody opt ++ [arg] })
"FILE")
"" -- "File to include before document body"
, Option "A" ["include-after-body"]
(ReqArg
(\arg opt -> return opt{ optIncludeAfterBody =
optIncludeAfterBody opt ++ [arg],
optStandalone = True })
optIncludeAfterBody opt ++ [arg] })
"FILE")
"" -- "File to include after document body"
@ -406,8 +409,7 @@ options =
, Option "" ["self-contained"]
(NoArg
(\opt -> return opt { optSelfContained = True,
optStandalone = True }))
(\opt -> return opt { optSelfContained = True }))
"" -- "Make slide shows include all the needed js and css"
, Option "" ["request-header"]
@ -582,8 +584,7 @@ options =
(\arg opt ->
return opt {
optVariables =
setVariable "title-prefix" arg $ optVariables opt,
optStandalone = True })
setVariable "title-prefix" arg $ optVariables opt })
"STRING")
"" -- "String to prefix to HTML window title"