9ecea0b · typeable/pandoc

git.iko.soy/typeable/pandoc

Modify --version output.

Use space more efficiently and report the citeproc version along with skylighting, texmath, and pandoc-types.

commit9ecea0bc623d6a5b90c25f9428e3a8d2352a5ee8 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 18 Oct 2020, 22:14 (6 years ago) parentf72a3f9

1 file changed+8−8

unifiedsplit

src/Text/Pandoc/App/CommandLineOptions.hs+8−8

@@ -913,7 +913,8 @@ options =

913913 prg <- getProgName

914914 defaultDatadirs <- defaultUserDataDirs

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

916− compileInfo ++ "\nDefault user data directory: " ++

916+ compileInfo ++

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

917918 intercalate " or " defaultDatadirs ++

918919 ('\n':copyrightMessage))

919920 exitSuccess ))

@@ -944,16 +945,15 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]")

944945

945946copyrightMessage :: String

946947copyrightMessage = intercalate "\n" [

948− "Web: https://pandoc.org",

949− "This is free software; see the source for copying conditions.",

950− "There is no warranty, not even for merchantability or fitness",

951− "for a particular purpose." ]

949+ "This is free software; see the source for copying conditions. There is no",

950+ "warranty, not even for merchantability or fitness for a particular purpose." ]

952951

953952compileInfo :: String

954953compileInfo =

955− "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++

956− VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting

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

955+ ", texmath " ++ VERSION_texmath ++ ", skylighting " ++

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

957957

958958handleUnrecognizedOption :: String -> [String] -> [String]

959959handleUnrecognizedOption "--smart" =