From 76315d99caabf39c9d6e743da844327e1b3a018a Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 19 Oct 2020 17:12:36 -0700
Subject: [PATCH] More refinements to --version output.
Add ipynb version. Put user data directory on same line as
heading "User data directory" (dropping "default").
---
src/Text/Pandoc/App/CommandLineOptions.hs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/Text/Pandoc/App/CommandLineOptions.hs b/src/Text/Pandoc/App/CommandLineOptions.hs
index ef046cf00..a82d8380e 100644
--- a/src/Text/Pandoc/App/CommandLineOptions.hs
+++ b/src/Text/Pandoc/App/CommandLineOptions.hs
@@ -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" =