From a4b04963782448e477e2ef54640ee5739c97f17a Mon Sep 17 00:00:00 2001 From: bringert Date: Fri, 8 Dec 2006 19:53:44 +0000 Subject: Changed SRGS SISR printing to be closer to the current working draft standard, as supported by the WebSphere implementation (and thus Opera). --- src/GF/UseGrammar/Custom.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/GF/UseGrammar/Custom.hs') diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs index 4aef4e33c..7e76688d9 100644 --- a/src/GF/UseGrammar/Custom.hs +++ b/src/GF/UseGrammar/Custom.hs @@ -61,7 +61,7 @@ import GF.Canon.MkGFC import GF.CF.CFtoSRG import GF.Speech.PrGSL (gslPrinter) import GF.Speech.PrJSGF (jsgfPrinter) -import GF.Speech.PrSRGS (srgsXmlPrinter) +import qualified GF.Speech.PrSRGS as SRGS import GF.Speech.PrSLF import GF.Speech.PrFA (faGraphvizPrinter,regularPrinter,faCPrinter) import GF.Speech.GrammarToVoiceXML (grammar2vxml) @@ -254,16 +254,16 @@ customGrammarPrinter = in jsgfPrinter name start opts Nothing $ stateCFG s) ,(strCI "srgs_xml", \opts s -> let name = cncId s start = getStartCatCF opts s - in srgsXmlPrinter name start opts False Nothing $ stateCFG s) + in SRGS.srgsXmlPrinter name start opts Nothing Nothing $ stateCFG s) ,(strCI "srgs_xml_prob", \opts s -> let name = cncId s probs = stateProbs s start = getStartCatCF opts s - in srgsXmlPrinter name start opts False (Just probs) $ stateCFG s) - ,(strCI "srgs_xml_ms_sem", + in SRGS.srgsXmlPrinter name start opts Nothing (Just probs) $ stateCFG s) + ,(strCI "srgs_xml_sisr_old", \opts s -> let name = cncId s start = getStartCatCF opts s - in srgsXmlPrinter name start opts True Nothing $ stateCFG s) + in SRGS.srgsXmlPrinter name start opts (Just SRGS.SISROld) Nothing $ stateCFG s) ,(strCI "vxml", \opts s -> let start = getStartCat opts s in grammar2vxml start s) ,(strCI "slf", \opts s -> let start = getStartCatCF opts s -- cgit v1.2.3