76315d9 · typeable/pandoc

git.iko.soy/typeable/pandoc

More refinements to --version output.

Add ipynb version. Put user data directory on same line as heading "User data directory" (dropping "default").

commit76315d99caabf39c9d6e743da844327e1b3a018a authorJohn MacFarlane <jgm@berkeley.edu> dateMon 19 Oct 2020, 17:12 (6 years ago) parent1a2f873

1 file changed+4−3

unifiedsplit

src/Text/Pandoc/App/CommandLineOptions.hs+4−3

@@ -914,7 +914,7 @@ options =

914914 defaultDatadirs <- defaultUserDataDirs

915915 UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++

916916 compileInfo ++

917− "\nDefault user data directory:\n " ++

917+ "\nUser data directory: " ++

918918 intercalate " or " defaultDatadirs ++

919919 ('\n':copyrightMessage))

920920 exitSuccess ))

@@ -951,9 +951,10 @@ copyrightMessage = intercalate "\n" [

951951

952952compileInfo :: String

953953compileInfo =

954− "\nCompiled with:\n pandoc-types " ++ VERSION_pandoc_types ++

954+ "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++

955955 ", texmath " ++ VERSION_texmath ++ ", skylighting " ++

956− VERSION_skylighting ++ ", citeproc " ++ VERSION_citeproc

956+ VERSION_skylighting ++ ",\nciteproc " ++ VERSION_citeproc ++

957+ ", ipynb " ++ VERSION_ipynb

957958

958959handleUnrecognizedOption :: String -> [String] -> [String]

959960handleUnrecognizedOption "--smart" =