Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1976 from wcaleb/json-help-message

Browse source 
Clarify JSON input and output in usage message
This commit is contained in:
John MacFarlane 2015-03-07 10:08:13 -08:00
commit 62e802ae1e
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pandoc.hs
View file

@ -49,7 +49,7 @@ import System.Exit ( exitWith, ExitCode (..) )
import System.FilePath import System.FilePath
import System.Console.GetOpt import System.Console.GetOpt
import Data.Char ( toLower ) import Data.Char ( toLower )
import Data.List ( intercalate, isPrefixOf, isSuffixOf, sort ) import Data.List ( delete, intercalate, isPrefixOf, isSuffixOf, sort )
import System.Directory ( getAppUserDataDirectory, findExecutable, import System.Directory ( getAppUserDataDirectory, findExecutable,
doesFileExist, Permissions(..), getPermissions ) doesFileExist, Permissions(..), getPermissions )
import System.IO ( stdout, stderr ) import System.IO ( stdout, stderr )
@ -915,13 +915,15 @@ readMetaValue s = case decode (UTF8.fromString s) of
usageMessage :: String -> [OptDescr (Opt -> IO Opt)] -> String usageMessage :: String -> [OptDescr (Opt -> IO Opt)] -> String
usageMessage programName = usageInfo usageMessage programName = usageInfo
(programName ++ " [OPTIONS] [FILES]" ++ "\nInput formats: " ++ (programName ++ " [OPTIONS] [FILES]" ++ "\nInput formats: " ++
(wrapWords 16 78 $ readers'names) ++ "\nOutput formats: " ++ (wrapWords 16 78 $ readers'names) ++
'\n' : replicate 16 ' ' ++
"[ *only Pandoc's JSON version of native AST]" ++ "\nOutput formats: " ++
(wrapWords 16 78 $ writers'names) ++ (wrapWords 16 78 $ writers'names) ++
'\n' : replicate 16 ' ' ++ '\n' : replicate 16 ' ' ++
"[*for pdf output, use latex or beamer and -o FILENAME.pdf]\nOptions:") "[**for pdf output, use latex or beamer and -o FILENAME.pdf]\nOptions:")
where where
writers'names = sort $ "pdf*" : map fst writers writers'names = sort $ "json*" : "pdf**" : delete "json" (map fst writers)
readers'names = sort $ map fst readers readers'names = sort $ "json*" : delete "json" (map fst readers)
-- Determine default reader based on source file extensions -- Determine default reader based on source file extensions
defaultReaderName :: String -> [FilePath] -> String defaultReaderName :: String -> [FilePath] -> String