Skip to content

Commit

Permalink
More refinements to --version output.
Browse files Browse the repository at this point in the history
Add ipynb version.  Put user data directory on same line as
heading "User data directory" (dropping "default").
  • Loading branch information
jgm committed Oct 20, 2020
1 parent 1a2f873 commit 76315d9
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/Text/Pandoc/App/CommandLineOptions.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 ))
Expand Down Expand Up @@ -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" =
Expand Down

0 comments on commit 76315d9

Please sign in to comment.