diff options
| -rw-r--r-- | src/compiler/GF/Command/Commands.hs | 9 | ||||
| -rw-r--r-- | src/compiler/GF/Infra/Option.hs | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index 2f8fba75c..22485e94b 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -548,11 +548,12 @@ allCommands env@(pgf, mos) = Map.fromList [ "N.B.2 Another way to produce different formats is to use 'gf -make',", "the batch compiler. The following values are available both for", "the batch compiler (flag -output-format) and the print_grammar", - "command (flag -printer) ; * = not supported at the moment:", + "command (flag -printer):", "" - ] ++ unlines [ - " " ++ opt ++ "\t\t" ++ expl | ((opt,_),expl) <- outputFormatsExpl - ], + ] ++ unlines (sort [ + " " ++ opt ++ "\t\t" ++ expl | + ((opt,_),expl) <- outputFormatsExpl, take 1 expl /= "*" + ]), exec = \opts _ -> prGrammar opts, flags = [ --"cat", diff --git a/src/compiler/GF/Infra/Option.hs b/src/compiler/GF/Infra/Option.hs index 95e9b40fd..fecfa273f 100644 --- a/src/compiler/GF/Infra/Option.hs +++ b/src/compiler/GF/Infra/Option.hs @@ -451,16 +451,16 @@ outputFormatsExpl = (("ebnf", FmtEBNF),"Extended BNF"), (("regular", FmtRegular),"* regular grammar"), (("nolr", FmtNoLR),"* context-free with no left recursion"), - (("srgs_xml", FmtSRGS_XML),"* SRGS XML speech recognition format"), - (("srgs_xml_nonrec", FmtSRGS_XML_NonRec),"* SRGS XML, recursion eliminated"), - (("srgs_abnf", FmtSRGS_ABNF),"* ABNF speech recognition format"), - (("srgs_abnf_nonrec", FmtSRGS_ABNF_NonRec),"* ABNF, recursion eliminated"), - (("jsgf", FmtJSGF),"* JSGF speech recognition format"), + (("srgs_xml", FmtSRGS_XML),"SRGS speech recognition format in XML"), + (("srgs_xml_nonrec", FmtSRGS_XML_NonRec),"SRGS XML, recursion eliminated"), + (("srgs_abnf", FmtSRGS_ABNF),"SRGS speech recognition format in ABNF"), + (("srgs_abnf_nonrec", FmtSRGS_ABNF_NonRec),"SRGS ABNF, recursion eliminated"), + (("jsgf", FmtJSGF),"JSGF speech recognition format"), (("gsl", FmtGSL),"Nuance speech recognition format"), (("vxml", FmtVoiceXML),"Voice XML based on abstract syntax"), - (("slf", FmtSLF),"* SLF speech recognition format"), - (("regexp", FmtRegExp),"* regular expression"), - (("fa", FmtFA),"* finite automaton in graphviz format") + (("slf", FmtSLF),"SLF speech recognition format"), + (("regexp", FmtRegExp),"regular expression"), + (("fa", FmtFA),"finite automaton in graphviz format") ] instance Show OutputFormat where |