From 7f4e1075be9ab08e71f357515a8240316ddc39e9 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 7 Feb 2013 19:58:28 -0800 Subject: [PATCH] Changes to --version. Print default user data directory. Put language names in lowercase and omit 'alert' and 'alert_indent'. --- pandoc.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandoc.hs b/pandoc.hs index dc7de52a8..f3d493e13 100644 --- a/pandoc.hs +++ b/pandoc.hs @@ -69,7 +69,8 @@ compileInfo = "\nCompiled with citeproc-hs " ++ VERSION_citeproc_hs ++ ", texmath " ++ VERSION_texmath ++ ", highlighting-kate " ++ VERSION_highlighting_kate ++ ".\nSyntax highlighting is supported for the following languages:\n " ++ - wrapWords 4 78 languages + wrapWords 4 78 + [map toLower l | l <- languages, l /= "Alert" && l /= "Alert_indent"] -- | Converts a list of strings into a single string with the items printed as -- comma separated words in lines with a maximum line length. @@ -704,8 +705,10 @@ options = (NoArg (\_ -> do prg <- getProgName - UTF8.hPutStrLn stdout (prg ++ " " ++ pandocVersion ++ compileInfo ++ - copyrightMessage) + defaultDatadir <- getAppUserDataDirectory "pandoc" + UTF8.hPutStrLn stdout (prg ++ " " ++ pandocVersion ++ + compileInfo ++ "\nDefault data directory: " ++ + defaultDatadir ++ copyrightMessage) exitWith ExitSuccess )) "" -- "Print version"