diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-10-18 22:14:09 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-10-19 16:32:39 -0700 |
| commit | 9ecea0bc623d6a5b90c25f9428e3a8d2352a5ee8 (patch) | |
| tree | f60357f7a632e0e81431a7eda0580cc7559a7401 /src/Text/Pandoc/App | |
| parent | f72a3f9e37c48f7d67cd7da1a66863d7b7647e07 (diff) | |
| download | pandoc-9ecea0bc623d6a5b90c25f9428e3a8d2352a5ee8.tar.gz | |
Modify --version output.
Use space more efficiently and report the citeproc version along
with skylighting, texmath, and pandoc-types.
Diffstat (limited to 'src/Text/Pandoc/App')
| -rw-r--r-- | src/Text/Pandoc/App/CommandLineOptions.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs index cccfa764b..ef046cf00 100644 --- a/src/Text/Pandoc/App/CommandLineOptions.hs +++ b/src/Text/Pandoc/App/CommandLineOptions.hs @@ -913,7 +913,8 @@ options = prg <- getProgName defaultDatadirs <- defaultUserDataDirs UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++ - compileInfo ++ "\nDefault user data directory: " ++ + compileInfo ++ + "\nDefault user data directory:\n " ++ intercalate " or " defaultDatadirs ++ ('\n':copyrightMessage)) exitSuccess )) @@ -944,16 +945,15 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]") copyrightMessage :: String copyrightMessage = intercalate "\n" [ - "Copyright (C) 2006-2020 John MacFarlane", - "Web: https://pandoc.org", - "This is free software; see the source for copying conditions.", - "There is no warranty, not even for merchantability or fitness", - "for a particular purpose." ] + "Copyright (C) 2006-2020 John MacFarlane. Web: https://pandoc.org", + "This is free software; see the source for copying conditions. There is no", + "warranty, not even for merchantability or fitness for a particular purpose." ] compileInfo :: String compileInfo = - "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++ - VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting + "\nCompiled with:\n pandoc-types " ++ VERSION_pandoc_types ++ + ", texmath " ++ VERSION_texmath ++ ", skylighting " ++ + VERSION_skylighting ++ ", citeproc " ++ VERSION_citeproc handleUnrecognizedOption :: String -> [String] -> [String] handleUnrecognizedOption "--smart" = |