From 9ecea0bc623d6a5b90c25f9428e3a8d2352a5ee8 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 18 Oct 2020 22:14:09 -0700 Subject: Modify --version output. Use space more efficiently and report the citeproc version along with skylighting, texmath, and pandoc-types. --- src/Text/Pandoc/App/CommandLineOptions.hs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Text') 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" = -- cgit v1.2.3