More refinements to --version output.

Add ipynb version.  Put user data directory on same line as
heading "User data directory" (dropping "default").
This commit is contained in:
John MacFarlane 2020-10-19 17:12:36 -07:00
parent 1a2f8733b6
commit 76315d99ca

View file

@ -914,7 +914,7 @@ options =
defaultDatadirs <- defaultUserDataDirs
UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++
compileInfo ++
"\nDefault user data directory:\n " ++
"\nUser data directory: " ++
intercalate " or " defaultDatadirs ++
('\n':copyrightMessage))
exitSuccess ))
@ -951,9 +951,10 @@ copyrightMessage = intercalate "\n" [
compileInfo :: String
compileInfo =
"\nCompiled with:\n pandoc-types " ++ VERSION_pandoc_types ++
"\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++
", texmath " ++ VERSION_texmath ++ ", skylighting " ++
VERSION_skylighting ++ ", citeproc " ++ VERSION_citeproc
VERSION_skylighting ++ ",\nciteproc " ++ VERSION_citeproc ++
", ipynb " ++ VERSION_ipynb
handleUnrecognizedOption :: String -> [String] -> [String]
handleUnrecognizedOption "--smart" =