SRGS generation: don't include debug script stuff if debugging is disabled. Place category comments better.

src/GF/Speech/GrammarToVoiceXML.hs

@@ -110,7 +110,7 @@ skel2vxml name language start skel qs =
     vxml language (prelude ++ [startForm] ++ concatMap (uncurry (catForms gr qs)) skel)
   where 
   gr = grammarURI name
-  prelude = (if debug then [var "debug" (Just "0")] else []) ++ scriptLib
+  prelude = if debug then [var "debug" (Just "0")] ++ scriptLib else []
   startForm = Tag "form" [] [subdialog "sub" [("src", "#"++start)] []]
 
 grammarURI :: String -> String

src/GF/Speech/PrSRGS.hs

@@ -56,9 +56,9 @@ prSrgsXml sisr (SRG{grammarName=name,startCat=start,
                meta "generator" ("Grammatical Framework " ++ version 
                                  ++ " (compiled " ++ today ++ ")")]
             ++ topCatRules
-	    ++ map ruleToXML rs
+	    ++ concatMap ruleToXML rs
     ruleToXML (SRGRule cat origCat alts) = 
-	rule (prCat cat) (comments ["Category " ++ origCat] ++ prRhs isList alts)
+        comments ["Category " ++ origCat] ++ [rule (prCat cat) (prRhs isList alts)]
       where isList = False 
                      -- Disabled list build since OptimTalk can't handle it ATM
                      {- "List" `isPrefixOf` origCat && length cs == 2