GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Set xml:lang in SRGS grammars to the value of the language flag.

Browse Source
This commit is contained in:
bringert
2006-02-01 10:16:40 +00:00
parent 477abbd5ed
commit cf61a92bc8
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/GF/Speech/PrSRGS.hs
View File

@@ -43,12 +43,13 @@ srgsXmlPrinter name opts probs cfg = prSrgsXml srg ""
where srg = makeSRG name opts probs cfg where srg = makeSRG name opts probs cfg
prSrgsXml :: SRG -> ShowS prSrgsXml :: SRG -> ShowS
prSrgsXml (SRG{grammarName=name,startCat=start,origStartCat=origStart,rules=rs}) prSrgsXml (SRG{grammarName=name,startCat=start,
origStartCat=origStart,grammarLanguage=l,rules=rs})
= header . showsXML xmlGr = header . showsXML xmlGr
where where
header = showString "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" header = showString "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
root = prCat start root = prCat start
xmlGr = grammar root (comments xmlGr = grammar root l (comments
["SRGS XML speech recognition grammar for " ++ name, ["SRGS XML speech recognition grammar for " ++ name,
"Generated by GF", "Generated by GF",
"Original start category: " ++ origStart] "Original start category: " ++ origStart]
@@ -78,16 +79,14 @@ oneOf :: [XML] -> XML
oneOf [x] = x oneOf [x] = x
oneOf xs = Tag "one-of" [] xs oneOf xs = Tag "one-of" [] xs
-- FIXME: what about xml:lang?
grammar :: String -- ^ root grammar :: String -- ^ root
-> String -- ^languageq
-> [XML] -> XML -> [XML] -> XML
grammar root = Tag "grammar" [("xmlns","http://www.w3.org/2001/06/grammar"), grammar root l = Tag "grammar" [("xml:lang", l),
("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance"), ("xmlns","http://www.w3.org/2001/06/grammar"),
("xsi:schemaLocation", ("version","1.0"),
"http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"), ("mode","voice"),
("version","1.0"), ("root",root)]
("mode","voice"),
("root",root)]
comments :: [String] -> [XML] comments :: [String] -> [XML]
comments = map Comment comments = map Comment

4
src/GF/Speech/SRG.hs
View File

@@ -38,6 +38,8 @@ import Data.FiniteMap
data SRG = SRG { grammarName :: String -- ^ grammar name data SRG = SRG { grammarName :: String -- ^ grammar name
, startCat :: String -- ^ start category name , startCat :: String -- ^ start category name
, origStartCat :: String -- ^ original start category name , origStartCat :: String -- ^ original start category name
, grammarLanguage :: String -- ^ The language for which the grammar
-- is intended, e.g. en_UK
, rules :: [SRGRule] , rules :: [SRGRule]
} }
deriving (Eq,Show) deriving (Eq,Show)
@@ -64,10 +66,12 @@ makeSRG i opts probs gr
= SRG { grammarName = name, = SRG { grammarName = name,
startCat = lookupFM_ names origStart, startCat = lookupFM_ names origStart,
origStartCat = origStart, origStartCat = origStart,
grammarLanguage = l,
rules = rs } rules = rs }
where where
name = prIdent i name = prIdent i
origStart = getStartCat opts origStart = getStartCat opts
l = fromMaybe "en_UK" (getOptVal opts speechLanguage)
gr' = removeLeftRecursion $ removeIdenticalRules $ removeEmptyCats $ cfgToCFRules gr gr' = removeLeftRecursion $ removeIdenticalRules $ removeEmptyCats $ cfgToCFRules gr
(cats,cfgRules) = unzip gr' (cats,cfgRules) = unzip gr'
names = mkCatNames name cats names = mkCatNames name cats