@@ -913,7 +913,8 @@ options =
913 prg <- getProgName
913 prg <- getProgName
914 defaultDatadirs <- defaultUserDataDirs
914 defaultDatadirs <- defaultUserDataDirs
915 UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++
915 UTF8.hPutStrLn stdout (prg ++ " " ++ T.unpack pandocVersion ++
916− compileInfo ++ "\nDefault user data directory: " ++
917+ "\nDefault user data directory:\n " ++
917 intercalate " or " defaultDatadirs ++
918 intercalate " or " defaultDatadirs ++
918 ('\n':copyrightMessage))
919 ('\n':copyrightMessage))
919 exitSuccess ))
920 exitSuccess ))
@@ -944,16 +945,15 @@ usageMessage programName = usageInfo (programName ++ " [OPTIONS] [FILES]")
945copyrightMessage :: String
946copyrightMessage :: String
946copyrightMessage = intercalate "\n" [
947copyrightMessage = intercalate "\n" [
947− "Copyright (C) 2006-2020 John MacFarlane",
948+ "Copyright (C) 2006-2020 John MacFarlane. Web: https://pandoc.org",
948− "Web: https://pandoc.org",
949− "This is free software; see the source for copying conditions.",
949+ "This is free software; see the source for copying conditions. There is no",
950− "There is no warranty, not even for merchantability or fitness",
950+ "warranty, not even for merchantability or fitness for a particular purpose." ]
951− "for a particular purpose." ]
953compileInfo :: String
952compileInfo :: String
954compileInfo =
953compileInfo =
955− "\nCompiled with pandoc-types " ++ VERSION_pandoc_types ++ ", texmath " ++
954+ "\nCompiled with:\n pandoc-types " ++ VERSION_pandoc_types ++
956− VERSION_texmath ++ ", skylighting " ++ VERSION_skylighting
955+ ", texmath " ++ VERSION_texmath ++ ", skylighting " ++
956+ VERSION_skylighting ++ ", citeproc " ++ VERSION_citeproc
958handleUnrecognizedOption :: String -> [String] -> [String]
958handleUnrecognizedOption :: String -> [String] -> [String]
959handleUnrecognizedOption "--smart" =
959handleUnrecognizedOption "--smart" =