Remove the grammars directory. It was full of old grammars that don't compile these days. See the old source distributions if you want them.

122 files changed, 0 insertions, 5207 deletions

diff --git a/grammars/TALK/GF_GoDiS/Core/GenResEng.gf b/grammars/TALK/GF_GoDiS/Core/GenResEng.gf
deleted file mode 100644
index 3dfc330a6..000000000
--- a/grammars/TALK/GF_GoDiS/Core/GenResEng.gf
+++ /dev/null
@@ -1,26 +0,0 @@
--- A file with PreReq and PostReq etc... 

-

-resource GenResEng = {

-

-param Form = Ques | Req | ReqNeg ;

-

-

-oper choosePre : Form => Str 

-   = table {

-		Ques => ["can i"];

-		Req => variants{ ["i want to"] ; ["i would like to"] };

-		ReqNeg => variants{ ["i do not want to"] ; ["i would not like to"] }

-		

-	};

-	

-

-oper choosePost : Form => Str

-	= table {

-		Ques => "";

-		Req => "please";

-		ReqNeg => "please"

-	};

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/GenResSwe.gf b/grammars/TALK/GF_GoDiS/Core/GenResSwe.gf
deleted file mode 100644
index 515cbc8df..000000000
--- a/grammars/TALK/GF_GoDiS/Core/GenResSwe.gf
+++ /dev/null
@@ -1,26 +0,0 @@
--- A file with PreReq and PostReq etc... 

-

-resource GenResSwe = {

-

-param Form = Ques | Req | ReqNeg;

-

-

-oper choosePre : Form => Str 

-   = table {

-		Ques => ["kan jag"];

-		Req => variants{ ["jag vill"] ; ["jag skulle vilja"] };

-		ReqNeg => variants{ ["jag vill inte"] ; ["jag skulle inte vilja"] }

-		

-	};

-	

-

-oper choosePost : Form => Str

-	= table {

-		Ques => "";

-		Req => "tack";

-		ReqNeg => "tack"

-	};

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCore.gf b/grammars/TALK/GF_GoDiS/Core/Shared/sharedCore.gf
deleted file mode 100644
index 59c6e4de5..000000000
--- a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCore.gf
+++ /dev/null
@@ -1,133 +0,0 @@
--- general grammar

---# -path=.:../

-

-abstract sharedCore = {

-

-cat

-

-	-- Nuance needs a S category, easiest fix.

-	S;

-

-	-- Simple Dialogue Moves

-	DMove;

-

-

-

--- Basic forms

-

-	Action Task;

-	SingleAction;

-	Proposition Task;

-

-	Task;

-

-

--- Dialogue moves (DMove) are: ask, answer, greet, quit, request, confirm, report

-

-

--- Greet

-	-- Simple greet move... 

-	Greet ;

-

--- Quit

--- Simple quit move...

-	Quit;

-

--- Answer

--- Answers are moves that answer questions, posed or not.

-	Answer Task;

-	NegAnswer Task;

-

--- Ask

--- Ask moves are those moves that ask for plans.

--- "vad vill du göra?" "vad kan jag göra" "hjälp"(?)

--- Hur är det med ja/nej frågor?

-	Ask Task;

-	SingleAsk;

-

-

--- Request

--- Requests are those moves that have no arguments and 

--- generate no specific informationfilled answers.

-	Request;

-

-

--- ICM

-

-	ICM;

-	Per_ICM;

-	Per_ICM_Followed;

-	Acc_ICM;

-	Acc_ICM_Followed;

-

-

-

-fun

-

-	makeS : DMove -> S;

-

--- Greet

-	makeGreetMove : Greet -> DMove;

-

--- Quit

-	makeQuitMove : Quit -> DMove;

-

--- Answer

-	makeAnswer : (t : Task) -> Proposition t -> Answer t;

-	makeAnswerMove : (t : Task) -> Answer t -> DMove;

-

-

-	makeNegAnswer : (t : Task) -> Proposition t -> NegAnswer t;	

-	makeNegAnswerMove : (t : Task) -> NegAnswer t -> DMove;

-

--- Ask

-	singleAsk : (t : Task) -> Ask t -> SingleAsk;

-	makeYesNoAsk : (t : Task) -> Action t -> SingleAsk;

-	makeAsk : SingleAsk -> DMove;

-

-

--- Request

-	makeRequest : SingleAction -> Request;

-	makeRequestMove : Request -> DMove;

-	makeNegRequestMove : Request -> DMove;

-

-

--- ICM

-

-	makeICMPer : Per_ICM -> ICM;

-	makeICMAcc : Acc_ICM -> ICM;

-

-

-

-	makeICMMove : ICM -> DMove;

-

-

--- LEXICON

-

-	shortAnswer : Task;

-

-	top_command : SingleAction;

-

-	help_command : SingleAction;

-

-	yes : Answer shortAnswer;

-	no : Answer shortAnswer;

-

-	greet_command : Greet;

-	bye_command : Quit;

-

-

-	-- ICMs

-	per_pos : Per_ICM_Followed;

-	per_neg : Per_ICM;

-	per_int : Per_ICM;

-

-	acc_pos : Acc_ICM;

-	acc_neg_alone : Acc_ICM;

-	acc_neg : Acc_ICM_Followed;

-	--acc_int : Acc_ICM;

-

-}

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreEng.gf b/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreEng.gf
deleted file mode 100644
index cc7b739ec..000000000
--- a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreEng.gf
+++ /dev/null
@@ -1,55 +0,0 @@
-concrete sharedCoreEng of sharedCore = open GenResEng in {

-

---flags lexer=codelit ; unlexer=codelit ; startcat=DMoveList ;

-flags conversion=finite;

-

-

---# -path=.:../

-

-lin

-	makeS s = {s = s.s};

-

-

-

--- Linearization of Greet, Quit, Answer, Ask and Request are moved to 

--- System and User respectively because of differing linearizations

-

-

--- ICM

-

-	makeICMPer perI = {s = perI.s};

-

-	makeICMAcc accI = {s = accI.s};

-

-	makeICMMove icm = {s = icm.s};

-

-

-

-

--- LEXICON

-

-pattern

-

-	top_command = (variants {["top"] ; ["forget everything"] ; ["start over"]});

-	-- end_command = "quit";

-

-	help_command = variants {"get" ; ""} ++ "help" ;

-

-	yes = variants {"yes" ; "yup" ; "yeppers"};

-	no = variants {"no" ; "nope" };

-

-	greet_command = variants { "hello" ; "hi" ; "yo"};

-	bye_command = variants { ["goodbye"] ; "bye" ; "end" };

-

--- ICMs

--- Moved to User and System respectively because of differing linearisations

--- for user and system.

-

-

-}

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCorePro.gf b/grammars/TALK/GF_GoDiS/Core/Shared/sharedCorePro.gf
deleted file mode 100644
index 72295478e..000000000
--- a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCorePro.gf
+++ /dev/null
@@ -1,92 +0,0 @@
---# -path=.:../

-

-concrete sharedCorePro of sharedCore = {

-

-

-flags lexer=code ; unlexer=concat ;

-flags conversion=finite;

-

-lin

-

-	-- Borde inte request, question, etc.. ligga i en 

-	-- generell resursfil så att man kan komma åt dem.

-	-- Det är inte speciellt snyggt att skriva ut det 

-	-- ibland här och ibland i den specifika filen..

-	-- Det känns som om det borde vara en "resurs"fråga. 

-

-	-- Det ÄR en resursgrej... titta i video grammatiken:

-	-- prologResource.gf och generalProlog.gf 

-	-- som Aarne fixade till från Karins pyssel. 

-	-- Hakparanteserna borde också fixas till på samma sätt... 

-

-	makeS s = {s = "[" ++ s.s ++ "]"};

-

--- Greet

-	makeGreetMove gre = {s = gre.s };

-

--- Quit

-	makeQuitMove qui = {s = qui.s };

-

--- Answer

-	makeAnswer _ ans = {s = "answer" ++ "(" ++ ans.s ++ ")"};

-	makeNegAnswer _ ans = {s =  "answer" ++ "(" ++ "not" ++ "(" ++ ans.s ++ ")" ++ ")"};

-	makeAnswerMove _ sha = {s = sha.s };

-	makeNegAnswerMove _ sha = {s = sha.s};

-

--- Ask

-	singleAsk _ ask = {s = "X" ++ "^" ++ ask.s ++ "(" ++ "X" ++ ")"};

-	makeYesNoAsk _ action = {s = action.s};

-	makeAsk ask = {s = "ask" ++ "(" ++ ask.s ++ ")"};

-

--- Request

-	makeRequest req   = {s = "request" ++ "(" ++ req.s ++ ")" };

-	makeRequestMove reqM = {s = reqM.s};

-	makeNegRequestMove reqM = {s = "not" ++ "(" ++ reqM.s ++ ")"};

-

-

--- ICM

-

-	makeICMPer perI = {s = perI.s};

-

-	makeICMAcc accI = {s = accI.s};

---	makeICMAccProp accI prop = {s = accI.s ++ ":" ++ prop.s};

-

-

-	makeICMMove icm = {s = "icm" ++ ":" ++ icm.s};

-

--- LEXICON

-

-pattern

-	top_command = "top";

-	-- end_command = "quit";

-

-	help_command = "help";

-

-	yes = "yes";

-	no = "no";

-

-	greet_command = "greet";

-	bye_command = "quit";

-

-	-- ICMs

-	per_pos = ["per * pos"];

-	per_neg = ["per * neg"];

-	per_int = ["per * int"];

-

-

-	acc_pos = ["acc * pos"];

-	acc_neg = ["acc * neg"];

-	acc_neg_alone = ["acc * neg"];

-	--acc_int = "acc*int";

-

-

-}

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreSwe.gf b/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreSwe.gf
deleted file mode 100644
index 12dd7abf1..000000000
--- a/grammars/TALK/GF_GoDiS/Core/Shared/sharedCoreSwe.gf
+++ /dev/null
@@ -1,54 +0,0 @@
-concrete sharedCoreSwe of sharedCore = open GenResSwe in {

-

---flags lexer=codelit ; unlexer=codelit ;

-flags conversion=finite;

-

---# -path=.:../

-

-lin

-	makeS s = {s = s.s};

-

--- Linearizations of Greet, Quit, Answer, Ask and Request 

--- are moved to User and System respectively because of punctuation.

-

--- ICM

-

-	makeICMPer perI = {s = perI.s};

-

-	makeICMAcc accI = {s = accI.s};

-

-

-	makeICMMove icm = {s = icm.s};

-

-

-

-

--- LEXICON

-

-pattern

-

-	top_command = (variants {["glömma allt"] ; ["börja om"]});

-	-- end_command = "avsluta";

-

-	help_command = variants {"få" ; "ha"} ++ "hjälp" ;

-

-	yes = variants {"ja" ; "japp" ; "jajamen"};

-	no = variants {"nej" ; "nepp" };

-

-	greet_command = variants { "hej" ; "tjena" ; "hallå"};

-	bye_command = variants { ["hejdå"] ; "sluta" ; "avbryt" };

-

-

--- ICMs

--- Linearization of ICMs are moved to User and System 

--- respectively because of differing linearizations.

-

-

-}

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/System/systemCore.gf b/grammars/TALK/GF_GoDiS/Core/System/systemCore.gf
deleted file mode 100644
index e2cc71ab5..000000000
--- a/grammars/TALK/GF_GoDiS/Core/System/systemCore.gf
+++ /dev/null
@@ -1,158 +0,0 @@
--- general grammar

---# -path=.:../Shared

-

-abstract systemCore = sharedCore ** {

-

-cat

-

-	DMoves;

-

-

--- internal forms

-

-	--Proposition;

-	Other_ICM;

-	Other_ICM_Followed;

-	Sem_ICM;

-	Sem_ICM_Followed;

-	Und_ICM;

-	Und_ICM_Followed;

-	

-

-

--- Confirm

--- This is where the system confirms that the action has been taken.

-	Confirm;

-

-

--- Report

--- This is where the system reports on the actions taken

--- i.e. "The song Leviathan was added to the playlist"

-

--- The report consists of a Request. 

-	Report;

-	Status;

-

--- Asks specific for the System 

-	SystemAsk;

-

-

--- Issues 

-

-	Issue;

-	PropIssue;

-	AskIssue;

-	ListIssue;

-	IssueList;

-	ListItem;

-

-

-fun

-

--- BASICS

-

-	makeSofDMoves : DMoves -> S;

-	makeDMPair : DMove -> DMove -> DMoves;

-	makeDMList : DMove -> DMoves -> DMoves;

-

-

--- ICM

-

-	-- Plus en som tar en strang... oj oj for genereringen.

---	makeICMPerString : Per_ICM_Followed -> String -> ICM;

-	makeICMPerString : Per_ICM_Followed -> ICM;

-

-	makeICMSem : Sem_ICM -> ICM;

-	makeICMSemMoveReq : Sem_ICM_Followed -> Request -> ICM;

-	makeICMSemMoveAnswer : (t : Task) -> Sem_ICM_Followed -> Answer t -> ICM;

-	makeICMSemMoveAsk : (t : Task) -> Sem_ICM_Followed -> Ask t -> ICM;

-

-	makeICMUnd : Und_ICM -> ICM;

-	makeICMUndProp : (t : Task) -> Und_ICM_Followed -> Proposition t -> ICM;

-

-	makeICMOther : Other_ICM -> ICM;

-	makeICMOtherIssue : Other_ICM_Followed -> ListItem -> ICM;

-	makeICMOtherReq : (t : Task) -> Other_ICM_Followed -> Action t -> ICM;

-

-	makeICMAccIssue : Acc_ICM_Followed -> Issue -> ICM;

-

--- !!! Väldigt rekursivt!!!!

-

-

-

-

--- Confirm

-	--makeConfirm : SingleAction -> Confirm;

-	makeConfirmMove : Confirm -> DMove;

-

-

--- Report

-

-	-- Behöver en till kategori, en Status... 

-	-- Hmm... undrar hur jag ska gora det här snyggt. 

-

-

-	makeReport : SingleAction -> Status -> Report;

-	makeReportMove : Report -> DMove;

-

--- Ask

-	makeSystemAsk : SystemAsk -> DMove;

-	makeAskSet : IssueList -> SystemAsk;

-	makeInstantiatedAsk : (t : Task) -> Action t -> SystemAsk;

-	makeInstantiatedAskSingle : SingleAction -> SystemAsk;

-

-

--- Issues

-

-	makePropIssue : (t : Task) -> Proposition t -> PropIssue;

-

-	makeIssueProp : PropIssue -> Issue;

-	makeIssueAsk : AskIssue -> Issue;

-	makeIssueList : ListIssue -> Issue;

-

-	makePropIssue : (t : Task) -> Proposition t -> PropIssue;

-	makeAskIssue : (t : Task) -> Ask t -> AskIssue;

-

-	--makeListItemProp : PropIssue -> ListItem;

-	makeListItemAsk : AskIssue -> ListItem;

-	makeListItemAction : (t : Task) -> Action t  -> ListItem;

-	makeListItemSingleAction : SingleAction -> ListItem;

-

-	makeListIssue : ListItem -> ListItem -> ListIssue;

-	makeListIssue2 : ListItem -> ListIssue ->ListIssue;

-	

-	makeActualListIssue : ListIssue -> IssueList;

-

--- Lexicon

-	makeBasicAsk : SystemAsk;	

-

-	sem_pos : Sem_ICM;

-	sem_pos_followed : Sem_ICM_Followed;

-	sem_neg : Sem_ICM;

-	--sem_int : Sem_ICM;

-

-	und_pos : Und_ICM;

-	und_pos_followed : Und_ICM_Followed;

-	und_neg : Und_ICM;

-	und_int : Und_ICM_Followed;

-

-	reraise : Other_ICM;

-	reraise_followed : Other_ICM_Followed;

-	loadplan : Other_ICM;

-	accomodate : Other_ICM_Followed;

-	reaccomodate : Other_ICM_Followed;

-

-	a_String : String;

-

-	status_done : Status;

-	status_initiated : Status;

-	status_pending : Status;

-	status_failed : Status;

-

-}

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/System/systemCoreEng.gf b/grammars/TALK/GF_GoDiS/Core/System/systemCoreEng.gf
deleted file mode 100644
index b0cd17c2e..000000000
--- a/grammars/TALK/GF_GoDiS/Core/System/systemCoreEng.gf
+++ /dev/null
@@ -1,146 +0,0 @@
-concrete systemCoreEng of systemCore = sharedCoreEng ** {

-

---flags lexer=text ; unlexer=text ; startcat=DMoveList ;

---# -path=.:../:../Shared

-flags conversion=finite;

-

-

-lin

-

--- Greet

-	makeGreetMove gre = {s = gre.s ++ "!"};

-

--- Quit

-	makeQuitMove qui = {s = qui.s ++ "!"};

-

--- Answer

-	makeAnswer _ ans = {s = ans.s};

-	makeNegAnswer _ ans = {s = "not" ++ ans.s};

-	makeAnswerMove _ sha = {s = sha.s ++ "."};

-	makeNegAnswerMove  _ sha = {s = sha.s ++ "."};

-

--- Ask

-	singleAsk _ ask = {s = ask.s};

-	makeYesNoAsk _ action = {s = action.s};

-	makeAsk ask = {s = ask.s ++ "."};

-

-

--- Request

-

-	-- makeRequestMove moved to System and User respectively 

-	-- because of differing linearizations

-

-	makeRequest req = {s = req.s ++ "."};

-	makeRequestMove req = {s =  req.s };

-	makeNegRequestMove req = {s = req.s};

-

--- BASICS

-

-	makeSofDMoves dms = {s = dms.s};

-	makeDMPair dm1 dm2 = {s = dm1.s ++ dm2.s};

-	makeDMList dm dms = {s = dm.s ++ dms.s};

-

-

--- Confirm

-

-	--makeConfirm req = {s = ["managed to"] ++ req.s ++ "."};

-	makeConfirmMove conM = {s = conM.s ++ "."};

-

--- Report 

-	makeReport req status =  {s = status.s ++ req.s ++ "." };

-	makeReportMove repM = {s = repM.s};

-

-

--- ICM

-

-	-- makeICMPerString perI string = {s = perI.s ++ string.s ++ "."};

-	makeICMPerString perI = {s = perI.s};

-	

-	makeICMSem semI = {s = semI.s};

-	makeICMSemMoveReq semI req = {s = semI.s ++ req.s ++ "."};

-	makeICMSemMoveAnswer _ semI ans = {s = semI.s ++ ans.s ++ "."};

-	makeICMSemMoveAsk _ semI ask = {s = semI.s ++ ask.s ++ "."};

-

-

-	makeICMUnd undI = {s = undI.s};

-	makeICMUndProp _ undI prop = {s = prop.s ++ undI.s };

-

-	makeICMAccIssue accI issue = {s = accI.s ++ [", i cannot answer questions about"] ++ issue.s ++ "."};

-

-	makeICMOther otherI = {s = otherI.s };

-	makeICMOtherIssue otherI issue = {s = otherI.s ++ issue.s ++ "."};

-	makeICMOtherReq _ other req  = {s = other.s ++ req.s ++ "."};

-

-

--- Ask

-

-	makeSystemAsk sysA = {s = sysA.s ++ "?"};

-	makeAskSet set = {s = ["do you want to"] ++ set.s};

-	makeInstantiatedAsk _ insA = {s = ["do you want to"] ++ insA.s };

-	makeInstantiatedAskSingle insA = {s = ["do you want to"] ++ insA.s};

-

--- Isues

-

-	makePropIssue _ prop = {s = prop.s};

-

-	makeIssueProp pi = {s = pi.s};

-	makeIssueAsk ai = {s = ai.s};

-	makeIssueList li = {s = li.s};

-

-	--makePropIssue _ prop = {s = prop.s};

-	makeAskIssue _ ask = {s = ask.s};

-

-	-- makeListItemProp propI = {s = propI.s};

-	makeListItemAsk askI = {s = "ask" ++ "about" ++ askI.s};

-	makeListItemAction _ action = {s = action.s};

-	makeListItemSingleAction action = {s = action.s};

-

-	makeListIssue prop1 prop2 = {s = prop1.s ++ "or" ++ prop2.s};

-	makeListIssue2 prop list = {s = prop.s ++ "," ++ list.s};

-

-	makeActualListIssue list = {s = list.s};	

-

-

-pattern

-

-	makeBasicAsk = ["what can i do for you"];

-

-	sem_pos = "okay";

-	sem_pos_followed = [""];

-	sem_neg = ["i am sorry i do not understand ."];

-	-- sem_int = ["what do you mean with"];

-

-	und_pos = ["okay ."];

-	und_pos_followed = ["."];

-	und_neg = ["i do not understand what you mean ."];

-	und_int = [", is this correct ?"]; -- följer yttrandet!!!

-

-	per_pos = ["i thought you said"]; -- följs av en sträng

-

-	reraise = ["so ,"];

-	reraise_followed = ["so ,"];

-	loadplan = ["lets see ."];

-	accomodate = ["i assume you mean"];

-	reaccomodate =  ["returning to "];

-

-

-	-- ICMs

-	-- Moved from General because of differing linearisations user and system.

-

-	per_neg = variants {["pardon i did not hear what you said ."] ; ["pardon ?"]; ["sorry ?"]};

-	per_int = variants { ["pardon ?"] ; ["what did you say ?"] };

-

-	acc_pos = "okay";

-	acc_neg = "sorry"; 

-	acc_neg_alone = "sorry";

-

-

-	status_done = ["managed to"];

-	status_initiated = ["started to"];

-	status_pending = ["waiting to"];

-	status_failed = ["failed to"];

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/System/systemCorePro.gf b/grammars/TALK/GF_GoDiS/Core/System/systemCorePro.gf
deleted file mode 100644
index 6b037b967..000000000
--- a/grammars/TALK/GF_GoDiS/Core/System/systemCorePro.gf
+++ /dev/null
@@ -1,128 +0,0 @@
-

-

-concrete systemCorePro of systemCore = sharedCorePro ** {

-

-

-flags lexer=codelit ; unlexer=concat ;

-flags conversion=finite;

-

-

-lincat

-

-

--- Confirm

--- This is where the system confirms that the action has been taken.

-	Confirm = {s : Str};

-

-

--- Report

--- This is where the system reports on the actions taken

--- i.e. "The song Leviathan was added to the playlist"

-

--- The report consists of a Request. 

-	Report = {s : Str};

-

-lin

-

--- BASICS

-

-	makeSofDMoves dms = {s = "[" ++ dms.s ++ "]"};

-	makeDMPair dm1 dm2 = {s = dm1.s ++ "," ++ dm2.s};

-	makeDMList dm dms = {s = dm.s ++ "," ++ dms.s};

-

-

-

--- Confirm

-	--makeConfirm req = { s = "confirm" ++ "(" ++ req.s ++ ")"};

-	makeConfirmMove conM = {s = "confirm" ++ "(" ++ conM.s ++ ")"};

-

-

--- Report

-	makeReport req status = { s = "report" ++ "(" ++ req.s ++ "," ++ status.s ++ ")"};

-	makeReportMove repM = {s = repM.s};

-

--- Ask

-

-	makeSystemAsk sysA = {s = "ask" ++ "(" ++ sysA.s ++ ")"};

-	makeAskSet set = {s = set.s};

-	makeInstantiatedAsk _ insA = {s = "action" ++ "(" ++ insA.s ++ ")"};

-	makeInstantiatedAskSingle insA = {s = "action" ++ "(" ++ insA.s ++ ")"};

-

-

--- ICM

-	-- Plus en som tar en strang... oj oj for genereringen.

-	-- makeICMPerString perI string = {s = perI.s ++ string.s};

-	makeICMPerString perI = {s = perI.s };

-	

-	makeICMSem semI = {s = semI.s};

-	makeICMSemMoveReq semI req = {s = semI.s ++ ":" ++ req.s};

-	makeICMSemMoveAnswer _ semI ans = {s = semI.s ++ ":" ++ ans.s};

-	makeICMSemMoveAsk _ semI ask = {s = semI.s ++ ":" ++ ask.s};

-

-	makeICMUnd undI = {s = undI.s};

-	makeICMUndProp _ undI prop = {s = undI.s ++ ":" ++ "usr" ++ "*" ++ prop.s};

-

-

-	makeICMOther otherI = {s = otherI.s};

-	makeICMOtherIssue otherI issue = {s = otherI.s ++ ":" ++ issue.s};

-	makeICMOtherReq _ other req = {s = other.s ++ ":" ++ req.s};

-

-	makeICMAccIssue otherI issue = {s = otherI.s ++ ":" ++ issue.s};

-

--- !!! Väldigt rekursivt!!!!

-

--- Isues

-

-	makePropIssue _ prop = {s = prop.s};

-

-	makeIssueProp pi = {s = pi.s};

-	makeIssueAsk ai = {s = ai.s};

-	makeIssueList li = {s = li.s};

-

-	makePropIssue _ prop = {s = prop.s};

-	makeAskIssue _ ask = {s = "X" ++ "^" ++ ask.s ++ "(" ++ "X" ++ ")"};

-

-	--makeListItemProp propI = {s = propI.s};

-	makeListItemAsk askI = {s = "issue" ++ "(" ++ askI.s ++ ")"};

-	makeListItemAction _ action = {s = variants {("action" ++ "(" ++ action.s ++ ")") ;

-							action.s }};

-	makeListItemSingleAction action = {s = variants { ("action" ++ "(" ++ action.s ++ ")") ;

-							action.s }};

-

-	makeListIssue prop1 prop2 = {s = prop1.s ++ "," ++ prop2.s};

-	makeListIssue2 prop list = {s = prop.s ++ "," ++ list.s};

-

-	makeActualListIssue list = {s = "set" ++ "(" ++ "[" ++ list.s ++ "]" ++ ")"};	

-

-

-pattern

-

--- LEXICON

-

-	makeBasicAsk = ["x ^ action ( x )"];  -- OBS OBS!!!

-

-	sem_pos = ["sem * pos"];

-	sem_pos_followed = ["sem * pos"];

-	sem_neg = ["sem * neg"];

-	--sem_int = ["sem * int"];

-

-	und_pos = ["und * pos"];

-	und_pos_followed = ["und * pos"];

-	und_neg = ["und * neg"];

-	und_int = ["und * int"];

-

-	reraise = "reraise";

-	reraise_followed = "reraise";

-	loadplan = "loadplan";

-	accomodate = "accomodate";

-	reaccomodate = "reaccomodate"; 

-

-	status_done = "done";

-	status_initiated = "initiated";

-	status_pending = "pending";

-	status_failed = "failed";

-

-

-

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Core/System/systemCoreSwe.gf b/grammars/TALK/GF_GoDiS/Core/System/systemCoreSwe.gf
deleted file mode 100644
index 67e60a59b..000000000
--- a/grammars/TALK/GF_GoDiS/Core/System/systemCoreSwe.gf
+++ /dev/null
@@ -1,141 +0,0 @@
-concrete systemCoreSwe of systemCore = sharedCoreSwe ** {

-

---flags lexer=codelit ; unlexer=codelit ; startcat=DMoveList ;

---# -path=.:../:../Shared

-flags conversion=finite;

-

-lin

-

--- Greet

-	makeGreetMove gre = {s = gre.s ++ "!"};

-

--- Quit

-	makeQuitMove qui = {s = qui.s ++ "!"};

-

--- Answer

-	makeAnswer _ ans = {s = ans.s};

-	makeNegAnswer _ ans = {s = "inte" ++ ans.s};

-	makeAnswerMove _ sha = {s = sha.s ++ "."};

-	makeNegAnswerMove  _ sha = {s = sha.s ++ "."};

-

--- Ask

-	singleAsk _ ask = {s = ask.s};

-	makeYesNoAsk _ action = {s = action.s};

-	makeAsk ask = {s = ask.s ++ "."};

-

-	

--- Request

-

-	-- makeRequestMove moved to System and User respectively 

-	-- because of differing linearizations

-

-	makeRequest req = {s = req.s ++ "."};

-

-	makeRequestMove req = {s =  req.s };

-	makeNegRequestMove req = {s = req.s};

-

-

-

--- BASICS

-

-	makeSofDMoves dms = {s = dms.s};

-	makeDMPair dm1 dm2 = {s = dm1.s ++ dm2.s};

-	makeDMList dm dms = {s = dm.s ++ dms.s};

-

-

--- Confirm

-

-	--makeConfirm req = {s = ["lyckades med att"] ++ req.s ++ "."};

-	makeConfirmMove conM = {s = conM.s};

-

--- Report 

-	makeReport req status= {s = status.s ++ req.s ++ "."};

-	makeReportMove repM = {s = repM.s};

-

-

--- ICM

-

-	--makeICMPerString perI string = {s = perI.s ++ string.s ++ "."};

-	makeICMPerString perI = {s = perI.s};

-

-	makeICMSem semI = {s = semI.s};

-	makeICMSemMoveReq semI req = {s = semI.s ++ req.s ++ "."};

-	makeICMSemMoveAnswer _ semI ans = {s = semI.s ++ "med" ++ ans.s ++ "."};

-	makeICMSemMoveAsk _ semI ask = {s = semI.s ++ ask.s ++ "."};

-

-

-	makeICMUnd undI = {s = undI.s};

-	makeICMUndProp _ undI prop = {s = prop.s ++ "," ++ undI.s};

-

-	makeICMAccIssue accI issue = {s = accI.s ++ issue.s};

-

-	makeICMOther otherI = {s = otherI.s ++ "."};

-	makeICMOtherIssue otherI issue = {s = otherI.s ++ issue.s ++ "."};

-

--- Ask

-

-	makeSystemAsk sysA = {s = sysA.s ++ "?"};

-	makeAskSet set = {s = ["vill du"] ++ set.s};

-	makeInstantiatedAsk _ insA = {s = ["vill du"] ++ insA.s};

-	makeInstantiatedAskSingle insA = {s = ["vill du"] ++ insA.s};

-

--- Isues

-

-	makePropIssue _ prop = {s = prop.s};

-

-	makeIssueProp pi = {s = pi.s};

-	makeIssueAsk ai = {s = ai.s};

-	makeIssueList li = {s = li.s};

-

-	--makePropIssue prop = {s = prop.s};

-	makeAskIssue _ ask = {s = ask.s};

-

-	-- makeListItemProp propI = {s = propI.s};

-	makeListItemAsk askI = {s = "fråga" ++ "om" ++ askI.s};

-	makeListItemAction _ action = {s = action.s};

-	makeListItemSingleAction action = {s = action.s};

-

-	makeListIssue prop1 prop2 = {s = prop1.s ++ "eller" ++ prop2.s};

-	

-

-

-pattern

-

-	makeBasicAsk = ["vad kan jag göra för dig"];

-

-	sem_pos = "okej";

-	sem_neg = ["förlåt jag förstår inte vad du menar."];

-	-- sem_int = ["vad menar du med"];

-

-	und_pos = "okej.";

-	und_neg = ["jag förstår inte vad du menar."];

-	und_int = ["är det korrekt?"]; -- följer yttrandet!!!

-

-	per_pos = ["jag tyckte du sa"]; -- följs av en sträng

-

-	reraise = ["så ,"];

-	reraise_followed = ["så ,"];

-	loadplan = ["låt oss se ."];

-	accomodate = ["jag antar att du menar"];

-	reaccomodate =  ["gå tillbaks till"];

-

-

-	-- ICMs

-	-- Moved from General because of differing linearisations user and system.

-

-	per_neg = variants {"ursäkta"; "förlåt" ; ["ursäkta jag hörde inte vad du sa"]};

-	per_int = variants { "ursäkta" ; ["vad sa du"] };

-

-	acc_pos = "okej";

-	acc_neg = ["ledsen jag kan inte svara på frågor om"]; 

-	acc_neg_alone = "ledsen";

-

-	status_done = ["lyckades med att"];

-	status_initiated = ["började med att"];

-	status_pending = ["avvaktar med att"];

-	status_failed = ["misslyckades med att"];

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/User/userCore.gf b/grammars/TALK/GF_GoDiS/Core/User/userCore.gf
deleted file mode 100644
index 1864c7967..000000000
--- a/grammars/TALK/GF_GoDiS/Core/User/userCore.gf
+++ /dev/null
@@ -1,27 +0,0 @@
--- general grammar

-

-abstract userCore = sharedCore ** {

-

-cat

-	-- A Dialogue Move that consists of a Request and arguments.

-	CompoundedRequest;

-	CompoundedAsk;

-	AnswerList Task;

-

-

-fun

-

-	makeAnswerListS : (t : Task) -> AnswerList t -> DMove;

-

-	makeCompoundedRequest : CompoundedRequest -> DMove;

-	makeNegCompoundedRequest : CompoundedRequest -> DMove;

-	makeCompoundedAsk : CompoundedAsk -> DMove;

-

-

-	requestCompounded : (t : Task) -> Action t -> Answer t  -> CompoundedRequest ;

-	requestCompoundedMulti : (t : Task) -> Action t -> AnswerList t -> CompoundedRequest;

-

-	makeAskMove : (t : Task) -> Ask t -> Answer t -> CompoundedAsk;

-

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Core/User/userCoreEng.gf b/grammars/TALK/GF_GoDiS/Core/User/userCoreEng.gf
deleted file mode 100644
index 8f02dde07..000000000
--- a/grammars/TALK/GF_GoDiS/Core/User/userCoreEng.gf
+++ /dev/null
@@ -1,93 +0,0 @@
-concrete userCoreEng of userCore = sharedCoreEng ** open GenResEng in {

-

-flags conversion=finite;

-

-

-lin

-

--- Greet

-	makeGreetMove gre = {s = gre.s};

-

--- Quit

-	makeQuitMove qui = {s = qui.s};

-

--- Answer

-	makeAnswer _ ans = {s = ans.s};

-	makeNegAnswer _ ans = {s = "not" ++ ans.s};

-	makeAnswerMove _ sha = {s = sha.s};

-	makeNegAnswerMove _ sha = {s = sha.s};

-

--- Ask

-	singleAsk _ ask = {s = ask.s};

-	makeYesNoAsk _ action = {s = action.s};

-	makeAsk ask = {s = ask.s};

-

-

-

-

--- Requests

-

-

-	makeAnswerListS _ alist = {s = alist.s};

-	requestCompounded _ req obj = {s = req.s ++ obj.s};

-	requestCompoundedMulti _ req obj = {s = req.s ++ obj.s };

-

-	makeRequest req = {s = req.s};	

-

-	makeCompoundedRequest crq = {s = variants { 

-					( (choosePre ! Req) ++ crq.s ++ (choosePost ! Req) );

-					( (choosePre ! Req) ++ crq.s                       );

-					(                      crq.s ++ (choosePost ! Req) );

-					(                      crq.s                       )

-				    }

-		      };

-

-      	makeNegCompoundedRequest crq = {s = variants { 

-					( (choosePre ! ReqNeg) ++ crq.s ++ (choosePost ! Req) );

-					( (choosePre ! ReqNeg) ++ crq.s                       );

-					(                "not" ++ crq.s ++ (choosePost ! Req) );

-					(                "not" ++ crq.s                       )

-				    }

-		      };

-

-

-	makeRequestMove req = {s = variants { 

-					(                      req.s                       );

-					( (choosePre ! Req) ++ req.s ++ (choosePost ! Req) );

-					( (choosePre ! Req) ++ req.s                       );

-					(                      req.s ++ (choosePost ! Req) )

-

-				    }

-		      };

-

-	makeNegRequestMove req = {s = variants { 

-					(                "not" ++ req.s                       );

-					( (choosePre ! ReqNeg) ++ req.s ++ (choosePost ! Req) );

-					( (choosePre ! ReqNeg) ++ req.s                       );

-					(                "not" ++ req.s ++ (choosePost ! Req) )

-

-				    }

-		      };

-

-

-

--- Asks

-	makeCompoundedAsk ask = {s = ask.s};

-

-	makeAskMove _ ques answer = {s = ques.s ++ answer.s};

-

-pattern

-	-- ICMs

-	-- Moved from General because of differing linearisations for user and system.

-

-	per_neg = variants {"what" ; "pardon"; ["pardon i did not hear what you said"]};

-	per_int = variants { "pardon" ; ["what did you say"] };

-

-	acc_pos = variants { "okay" ; "ok" ; "sure" ; "yup" ; "right" };

-	acc_neg = ["i do not know"]; 

-	acc_neg_alone = ["i do not know"];

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Core/User/userCorePro.gf b/grammars/TALK/GF_GoDiS/Core/User/userCorePro.gf
deleted file mode 100644
index 0c28fe9d7..000000000
--- a/grammars/TALK/GF_GoDiS/Core/User/userCorePro.gf
+++ /dev/null
@@ -1,22 +0,0 @@
-concrete userCorePro of userCore = sharedCorePro ** {

-

-flags lexer=code ; unlexer=concat ;

-flags conversion=finite;

-

-

-lin

-	makeAnswerListS _ alist = {s = alist.s};	

-

-	makeCompoundedRequest crq = {s = crq.s};

-	makeNegCompoundedRequest crq = { s = "~" ++ crq.s};

-	makeCompoundedAsk ask = {s = ask.s};

-

-

-	requestCompounded _ req obj = {s = "request(" ++ req.s ++ ")," ++ obj.s };

-	requestCompoundedMulti _ req obj = {s = "request(" ++ req.s ++ ")," ++ obj.s };

-

-	makeAskMove _ ques answer = {s = "ask" ++ "(" ++ "X" ++ "^" ++ ques.s ++ 

-					"(" ++ "X" ++ ")" ++ ")," ++ answer.s};

-	

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Core/User/userCoreSwe.gf b/grammars/TALK/GF_GoDiS/Core/User/userCoreSwe.gf
deleted file mode 100644
index a90dbed0f..000000000
--- a/grammars/TALK/GF_GoDiS/Core/User/userCoreSwe.gf
+++ /dev/null
@@ -1,98 +0,0 @@
-concrete userCoreSwe of userCore = sharedCoreSwe ** open GenResSwe in {

-

-flags conversion=finite;

-

-

-lin

-

--- Greet

-	makeGreetMove gre = {s = gre.s};

-

--- Quit

-	makeQuitMove qui = {s = qui.s};

-

--- Answer

-	makeAnswer _ ans = {s = ans.s};

-	makeNegAnswer _ ans = {s = "inte" ++ ans.s};

-	makeAnswerMove _ sha = {s = sha.s};

-	makeNegAnswerMove _ sha = {s = sha.s};

-

--- Ask

-	singleAsk _ ask = {s = ask.s};

-	makeYesNoAsk _ action = {s = action.s};

-	makeAsk ask = {s = ask.s };

-

-	

--- Request

-

-	-- makeRequestMove moved to System and User respectively 

-	-- because of differing linearizations

-

-	makeRequest req = {s = req.s};

-

-

-

--- Requests

-

-

-	makeAnswerListS _ alist = {s = alist.s};

-	requestCompounded _ req obj = {s = req.s ++ obj.s};

-	requestCompoundedMulti _ req obj = {s = req.s ++ obj.s };

-

-

-	makeRequestMove req = {s = variants { 

-					(                      req.s                       );

-					( (choosePre ! Req) ++ req.s ++ (choosePost ! Req) );

-					( (choosePre ! Req) ++ req.s                       );

-					(                      req.s ++ (choosePost ! Req) )

-

-				    }

-		      };

-

-      	makeNegCompoundedRequest crq = {s = variants { 

-					( (choosePre ! ReqNeg) ++ crq.s ++ (choosePost ! Req) );

-					( (choosePre ! ReqNeg) ++ crq.s                       );

-					(                "inte" ++ crq.s ++ (choosePost ! Req) );

-					(                "inte" ++ crq.s                       )

-				    }

-		      };

-

-

-

-	makeCompoundedRequest crq = {s = variants { 

-					( (choosePre ! Req) ++ crq.s ++ (choosePost ! Req) );

-					( (choosePre ! Req) ++ crq.s                       );

-					(                      crq.s ++ (choosePost ! Req) );

-					(                      crq.s                       )

-				    }

-		      };

-

-	makeNegRequestMove req = {s = variants { 

-					(                "inte" ++ req.s                       );

-					( (choosePre ! ReqNeg) ++ req.s ++ (choosePost ! Req) );

-					( (choosePre ! ReqNeg) ++ req.s                       );

-					(                "inte" ++ req.s ++ (choosePost ! Req) )

-

-				    }

-		      };

-

-

--- Asks

-	makeCompoundedAsk ask = {s = ask.s};

-

-	makeAskMove _ ques answer = {s = ques.s ++ answer.s};

-

-pattern

-	-- ICMs

-	-- Moved from General because of differing linearisations for user and system.

-

-	per_neg = variants {"va" ; "ursäkta"; "förlåt" ; ["ursäkta jag hörde inte vad du sa"]};

-	per_int = variants { "ursäkta" ; ["vad sa du"] };

-

-	acc_pos = variants { "okej" ; "ok" ; "visst" ; "japp" ; "jaha" };

-	acc_neg = ["vet inte"]; 

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DB.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DB.gf
deleted file mode 100644
index e642d671d..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DB.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Media:../../Resource/Time:

-

-abstract DB = TVStations, Time, Weekday ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBEng.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBEng.gf
deleted file mode 100644
index 27053c2eb..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBEng.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Media:../../Resource/Time:

-

-concrete DBEng of DB = TVStationsEng, TimeEng, WeekdayEng ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBPro.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBPro.gf
deleted file mode 100644
index f7b96247f..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBPro.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Media:../../Resource/Time:

-

-concrete DBPro of DB = TVStationsPro, TimeProlog, WeekdayProlog ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBSwe.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBSwe.gf
deleted file mode 100644
index ab7e984d2..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/DBSwe.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Media:../../Resource/Time:

-

-concrete DBSwe of DB = TVStationsSwe, TimeSwe, WeekdaySwe ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomain.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomain.gf
deleted file mode 100644
index db2f40c51..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomain.gf
+++ /dev/null
@@ -1,64 +0,0 @@
---# -path=.:../:../../../Resource/Time:../Shared:../../../Core:../../../Core/Shared:

-

-abstract sharedDomain = sharedCore, DB, Time, Weekday ** {

-

-fun

-

--- ANSWERS

-

-	--makeAddLocAnswer : Location -> Proposition addTask;

-	--makeRemLocAnswer : Location -> Proposition removeTask;

-

-	makeAddEventAnswer : Event -> Proposition addTask;

-	makeRemEventAnswer : Event -> Proposition removeTask;

-	makeCheckupAnswer : Event -> Proposition checkupTask;

-	makeCheckTimeAnswer : Event -> Proposition checkTimeTask;

-	makeAddInfoAnswer : Event -> Proposition addInfoTask;

-

-	makeAddEventTimeAnswer : Time -> Proposition addTask;

-	makeRemEventTimeAnswer : Time -> Proposition removeTask;

-	makeCheckupTimeAnswer : Time -> Proposition checkupTask;

-	makeCheckTimeTimeAnswer : Time -> Proposition checkTimeTask;

-	makeAddInfoTimeAnswer : Time -> Proposition addInfoTask;

-

-	makeAddEventDayAnswer : Weekday -> Proposition addTask;

-	makeRemEventDayAnswer : Weekday -> Proposition removeTask;

-	makeCheckupDayAnswer : Weekday -> Proposition checkupTask;

-	makeCheckTimeDayAnswer : Weekday -> Proposition checkTimeTask;

-	makeAddInfoDayAnswer : Weekday -> Proposition addInfoTask;

-

-	makeCheckAnswer : Location -> Proposition checkupTask;

-	makeAddInfoLocAnswer : Location -> Proposition addInfoTask;

-	makeCheckTimeLocAnswer : Location -> Proposition checkTimeTask;

-

-

-

--- LEXICON

-

-	addTask : Task;  

-	removeTask : Task;

-	changeTask : Task;

-	addInfoTask : Task;

-	checkupTask : Task; -- "har jag"

-	checkTimeTask : Task;

-

-	addEntry : Action addTask; -- "lägga till", "anteckna", "göra en anteckning", "boka", "boka in"

-	removeEntry : Action removeTask; -- "ta bort", "radera", "ta bort en anteckning", "ta bort anteckningen"

-	changeEntry : Action changeTask; -- "ändra anteckningen" - "request(change_info)"

-	augmentEntry : Action addInfoTask; -- "lägga till mer information"  - "request(more_info)

-	checkupEntry : Action checkTimeTask;

-

-	checkup : Ask	checkupTask; -- "vad har jag"

-	

-}

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainEng.gf
deleted file mode 100644
index f4952f1d5..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainEng.gf
+++ /dev/null
@@ -1,148 +0,0 @@
---# -path=.:../:../Artist:../Numbers

-

-

-concrete sharedDomainEng of sharedDomain = sharedCoreEng, numbersEng, orderNumEng, englishDBEng ** 

-		open SpecResEng in {

-

-

-

-

-

-lin

-	-- ANSWERS

-	answerSongPlay song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongAdd song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongRemove song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	questionSong song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-

-

-

-	answerArtistPlay artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistAdd artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistRemove artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	questionArtist artist = { s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-

-

-

-	answerStationPlay station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-	answerStationAdd station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-	answerStationRemove station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-

-

-	

-	-- LIST RELATED ANSWERS

-

-	-- nummer fem

-	-- fem

-	answerNumberInListPlay numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-	answerNumberInListRemove numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-

-	-- den femte låten

-	-- den femte

-	answerOrderInListPlay ordNum = 

-		{s = variants {

-				("the" ++ ordNum.s ++ (itemForm ! Post));

-				("the" ++ ordNum.s)

-			      }

-		};

-	answerOrderInListRemove ordNum = 

-		{s = variants {

-				("the" ++ ordNum.s ++ (itemForm ! Post));

-				("the" ++ ordNum.s)

-			      }

-		};

-

-

--- LEXICON

-

-pattern

-	

-	play_spec = (variants {["play"] ; ["listen to"] ; "hear"});

-	play_spec_alone = variants {["play a specific"] ; ["play a specific song"] ; ["listen to a specific song"] ; ["hear a specific song"]};

-	play = (variants {["start from the beginning"] ; ["play"] ; ["start"]});

-	stop = (variants {["stop"]});

-	pause = ["pause"];

-	resume = (variants {["resume"] ; ["resume playing"]});

-

-	next = "next";

-	previous = "previous";

-

-	raise_volume	= ["raise the volume"] ;

-	lower_volume	= ["lower the volume"]; 

-

-	shift = "shift" ++ variants{ ["the balance"] ; ""};

-	right = variants{"" ; ["to the"]} ++ "right";

-	left = variants{"" ; ["to the"]} ++ "left";

-	center = variants{"" ; ["to the"]} ++ "middle";

-

-	show_list = ["show the list"];

-

-	add = ["add"];

-	remove = ["remove"];

-

-	handle_list 		= ["manage the playlist"];

-	handle_player 		= ["talk to the player"];

-	handle_stations 	= ["choose a station"];

-}

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainPro.gf
deleted file mode 100644
index b6c74a297..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainPro.gf
+++ /dev/null
@@ -1,77 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT AS NEEDED

---# -path=.:../:../DBase/Swedish:../DBase:../Shared:../System:../Numbers

-concrete sharedDomainPro of sharedDomain = sharedCorePro, numbersEng, orderNumEng, swedishDBPro ** {

-

--- ENGLISH VERSION, UNCOMMENT AS NEEDED

--- --# -path=.:../:../DBase/English:../DBase:../Shared:../System:../Numbers

-

-

--- concrete sharedDomainPro of sharedDomain = sharedCorePro, numbersEng, orderNumEng, englishDBPro ** {

-

-flags lexer=code ; unlexer=code ;

-

-lin

-

--- ANSWERS

-

-	answerSongPlay song = { s = "item" ++ "(" ++ song.s ++ ")"};	

-	answerSongAdd song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	answerSongRemove song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	questionSong song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	

-

-	answerArtistPlay artist = { s = "group" ++ "(" ++ artist.s ++ ")"};

-	answerArtistAdd artist = { s = "group" ++ "(" ++ artist.s ++ ")"};

-	answerArtistRemove artist = { s = "group" ++ "(" ++ artist.s ++ ")"};

-	questionArtist artist = {s = "group" ++ "(" ++ artist.s ++ ")"};

-

-

-	answerStationPlay station = { s = "station" ++ "(" ++ station.s ++ ")"};

-	answerStationAdd station = { s = "station" ++ "(" ++ station.s ++ ")"};

-	answerStationRemove station = { s = "station" ++ "(" ++ station.s ++ ")"};

-

-

-	answerNumberInListPlay numb = {s = "index" ++ "(" ++ "[" ++  numb.s  ++ "]" ++ ")"};

-	answerNumberInListRemove numb = {s = "index" ++ "(" ++ "[" ++  numb.s  ++ "]" ++ ")"};

-

-	answerOrderInListPlay ordNum = {s = "index" ++ "(" ++ "[" ++ ordNum.s  ++ "]" ++ ")"};

-	answerOrderInListRemove ordNum = {s = "index" ++ "(" ++ "[" ++ ordNum.s  ++ "]" ++ ")"};

-

-

-

--- LEXICON

-pattern

-

-	play_spec = "start_specific";

-	play_spec_alone = "start_specific";

-	play = "start";

-	stop = "stop";

-	pause = "pause";

-	resume = "resume";

-

-	next = "next";

-	previous = "previous";

-

-	raise_volume	= "vol_up" ;

-	lower_volume	= "vol_down" ;

-

-	shift = "set_balance";

-	right = "1.0";

-	left = "-1.0";

-	center = "0.0";

-

-	show_list = "show_list";

-

-	add = "playlist_add";

-	remove = "playlist_del";

-

-	handle_list 	= "handle_playlist";

-	handle_player 	= "handle_player";

-	handle_stations = "handle_stations";

-	

-	askArtist = "songs_by_artist";

-	askSong = "artists_song";

-

-	askCurrent = "current_song";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainSwe.gf
deleted file mode 100644
index 5c37672d7..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/Shared/sharedDomainSwe.gf
+++ /dev/null
@@ -1,42 +0,0 @@
---# -path=.:../:../../../Resource/Time:../Shared:../../../Core:../../../Core/Shared:

-

-concrete sharedDomainSwe of sharedDomain = sharedCoreSwe, DBSwe, TimeSwe, WeekdaySwe ** open SpecResSwe in{

-

-lin

-	-- ANSWERS

-

-

-	makeAddEventAnswer event = {s = event.s};

-	makeRemEventAnswer event = {s = event.s};

-	makeCheckupAnswer event = {s = "om" ++ event.s};

-	makeCheckTimeAnswer event = {s = event.s};

-	makeAddInfoAnswer event = {s = "om" ++ event.s};

-

-	makeAddEventTimeAnswer time = {s = time.s};

-	makeRemEventTimeAnswer time = {s = time.s};

-	makeCheckupTimeAnswer time = {s = time.s};

-	makeCheckTimeTimeAnswer time = {s = time.s};

-	makeAddInfoTimeAnswer time = {s = time.s};

-

-	makeAddEventDayAnswer weekday = {s = "på" ++ weekday.s};

-	makeRemEventDayAnswer weekday = {s = "på" ++ weekday.s};

-	makeCheckupDayAnswer weekday = {s = "på" ++ weekday.s};

-	makeCheckTimeDayAnswer weekday = {s = "på" ++ weekday.s};

-	makeAddInfoDayAnswer weekday = {s = "på" ++ weekday.s};

-

-	makeCheckAnswer location = {s = location.s};

-	makeAddInfoLocAnswer location = {s = "om" ++ location.s};

-	makeCheckTimeLocAnswer location = {s = location.s};

-

--- LEXICON

-

-pattern

-	addEntry = varaints {["lägga till"] ; ["anteckna"] ; ["göra en anteckning om"]};

-	removeEntry = variants{ ["ta bort"] ; ["radera en anteckning"]};

-	changeEntry = ["ändra en anteckning om"];

-	augmentEntry = ["lägga till mer information"];

-	checkupEntry = ["kolla tiden för"];

-

-	checkup = ["vad har jag uppskrivet"];	

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomain.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomain.gf
deleted file mode 100644
index 1148b2811..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomain.gf
+++ /dev/null
@@ -1,53 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT AS NEEDED

---# -path=.:../:../DBase/Swedish:../DBase:../Shared:../System:../Numbers

-

--- ENGLISH VERSION, UNCOMMENT AS NEEDED

--- --# -path=.:../:../DBase/English:../DBase:../Shared:../System:../Numbers

-

-abstract systemDomain = sharedDomain, systemCore ** {

-

-

-cat

-

-	Proposition;

-

-

-fun

-

--- PROPOSITIONS. 

--- 

-

-	songProp : Song -> Proposition;

-	itemProp : Song -> Proposition;

-	currentSongProp : Song -> Proposition;

-

-	whatToPlayPropNum : Number -> Proposition;

-	whatToPlayPropOrd : Number -> Proposition;

-

-	itemRemPropNum : Number -> Proposition;

-	itemRemPropOrd : Number -> Proposition;

-	

-	groupToAddProp : Artist -> Proposition;

-	artistProp : Artist -> Proposition;

-	groupProp : Artist -> Proposition;

-	songArtistProp : Artist -> Proposition;

-	

-	albumProp : Album -> Proposition;

-

-	artistsSongProp : Artist -> Proposition;

-	artistsAlbumProp : Artist -> Proposition;

-

-	albumArtistProp : Album -> Proposition;

-

-	songsArtistProp : Song -> Proposition;

-

-	stationProp : Station -> Proposition;

-

-}

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainEng.gf
deleted file mode 100644
index 6aa8b72d2..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainEng.gf
+++ /dev/null
@@ -1,74 +0,0 @@
---# -path=.:../:../DBase/English:../DBase:../Shared:../System:../Numbers

-

-

-concrete systemDomainEng of systemDomain = sharedDomainEng, systemCoreEng ** {

-

-

-lin

-

--- PROPOSITIONS

-

-	songProp song = { s = song.s };

-	itemProp song =  { s = song.s };

-	currentSongProp song = { s = song.s };

-

-	whatToPlayPropNum number = { s = number.s };

-	whatToPlayPropOrd order = { s = order.s };

-

-	itemRemPropNum number = { s = number.s };

-	itemRemPropOrd order = { s =  order.s };

-	

-	groupToAddProp artist = { s = artist.s };

-	artistProp artist = { s = artist.s};

-	groupProp artist = { s = artist.s };

-	songArtistProp artist = { s = artist.s };

-	

-	albumProp album = { s = album.s };

-

-	artistsSongProp artist = { s = artist.s };

-	artistsAlbumProp artist = { s = artist.s };

-

-	albumArtistProp album = { s = album.s };

-

-	songsArtistProp song = { s = song.s };

-

-	stationProp station = { s = station.s };

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-

-pattern

-

-

--- Because of differing linearisations in User and System usage these functions are not linearized in Shared. 

-

-	askArtist = "songs" ; 

-		

-

-	askSong = "artist" ; 

-	askCurrent = ["the current song"];

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainPro.gf
deleted file mode 100644
index ce83f67f1..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainPro.gf
+++ /dev/null
@@ -1,65 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT AS NEEDED

---# -path=.:../:../DBase/Swedish:../DBase:../Shared:../System:../Numbers

-

--- ENGLISH VERSION, UNCOMMENT AS NEEDED

--- --# -path=.:../:../DBase/English:../DBase:../Shared:../System:../Numbers

-

-

-concrete systemDomainPro of systemDomain = sharedDomainPro, systemCorePro  ** {

-

-

-lin

--- PROPOSITIONS

-

-	-- Ok hur ska jag göra med propositions tro? Och vad menar David med song_to_add(Song). 

-	-- Hur blir de till? Skulle man kunna göra som nedan?

-

-	songProp song = { s = "song" ++ "(" ++ song.s ++ ")" };

-	itemProp song =  { s = "item" ++ "(" ++ song.s ++ ")" };

-	currentSongProp song = { s = "current_song" ++ "(" ++ song.s ++ ")" };

-

-	whatToPlayPropNum number = { s = "what_to_play" ++ "(" ++ number.s ++ ")" };

-	whatToPlayPropOrd order = { s = "what_to_play" ++ "(" ++ order.s ++ ")" };

-

-	itemRemPropNum number = { s = "itemRem" ++ "(" ++ number.s ++ ")" };

-	itemRemPropOrd order = { s = "itemRem" ++ "(" ++ order.s ++ ")" };

-	

-	groupToAddProp artist = { s = "groupToAdd" ++ "(" ++ artist.s ++ ")" };

-	artistProp artist = { s = "artist" ++ "(" ++ artist.s ++ ")"};

-	groupProp artist = { s = "group" ++ "(" ++ artist.s ++ ")" };

-	songArtistProp artist = { s = "song_artist" ++ "(" ++ artist.s ++ ")" };

-	

-	albumProp album = { s = "album" ++ "(" ++ album.s ++ ")" };

-

-	artistsSongProp artist = { s = "artist_song" ++ "(" ++ artist.s ++ ")" };

-	artistsAlbumProp artist = { s = "artists_album" ++ "(" ++ artist.s ++ ")" };

-

-	albumArtistProp album = { s = "albums_by_artist" ++ "(" ++ album.s ++ ")" };

-

-	songsArtistProp song = { s = "songs_by_artist" ++ "(" ++ song.s ++ ")" };

-

-	stationProp station = { s = "station" ++ "(" ++ station.s ++ ")" };

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainSwe.gf
deleted file mode 100644
index d26b0b1ee..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/System/systemDomainSwe.gf
+++ /dev/null
@@ -1,74 +0,0 @@
---# -path=.:../:../DBase/Swedish:../DBase:../Shared:../System:../Numbers

-

-

-concrete systemDomainSwe of systemDomain = sharedDomainSwe, systemCoreSwe ** {

-

-

-lin

-

--- PROPOSITIONS

-

-	songProp song = { s = song.s };

-	itemProp song =  { s = song.s };

-	currentSongProp song = { s = song.s };

-

-	whatToPlayPropNum number = { s = number.s };

-	whatToPlayPropOrd order = { s = order.s };

-

-	itemRemPropNum number = { s = number.s };

-	itemRemPropOrd order = { s =  order.s };

-	

-	groupToAddProp artist = { s = artist.s };

-	artistProp artist = { s = artist.s};

-	groupProp artist = { s = artist.s };

-	songArtistProp artist = { s = artist.s };

-	

-	albumProp album = { s = album.s };

-

-	artistsSongProp artist = { s = artist.s };

-	artistsAlbumProp artist = { s = artist.s };

-

-	albumArtistProp album = { s = album.s };

-

-	songsArtistProp song = { s = song.s };

-

-	stationProp station = { s = station.s };

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-

-pattern

-

-

--- Because of differing linearisations in User and System usage these functions are not linearized in Shared. 

-

-	askArtist = "låtar" ; 

-		

-

-	askSong = "artister" ; 

-	askCurrent = ["låten som spelas nu"];

-

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomain.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomain.gf
deleted file mode 100644
index 8cadb9084..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomain.gf
+++ /dev/null
@@ -1,13 +0,0 @@
---# -path=.:../:../../../Resource/Time:../../../Resource/Media:../Shared:../../../Core:../../../Core/Shared:../../../Core/User

-

-abstract userDomain = userCore, sharedDomain ** {

-

-

-fun

-	-- CompoundedAnswers

-

-	answerEventLocAdd : Event -> Location -> AnswerList addTask;

-	answerEventLocRem : Event -> Location -> AnswerList removeTask;

-

-	answerEventLocTimeDay : Event -> Location -> Time -> Weekday -> AnswerList removeTask;

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainEng.gf
deleted file mode 100644
index d38968a9b..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainEng.gf
+++ /dev/null
@@ -1,25 +0,0 @@
---# -path=.:../:../DBase/English:../DBase:../Numbers:../Shared

-

-concrete userDomainEng of userDomain = userCoreEng, sharedDomainEng ** { 

-

-lin

-

-	-- CompoundedAnswers

-	answerSongArtistPlay song artist = {s = variants {(song.s ++ "with" ++ artist.s)

-					; (artist.s ++ "with" ++ song.s)} };

-		

-	answerSongArtistAdd song artist = {s = variants {(song.s ++ "with" ++ artist.s)

-					; (artist.s ++ "with" ++ song.s)} };

-		

-

-pattern

-	askArtist = variants { ["what do i have"] ; ["what songs do i have"] ; ["do i have anything"]}

-					++ variants {"with" ; "by"};

-

-

-	askSong = ["who"] ++ variants {"made"; "wrote"};

-

-	askCurrent = ["what"] ++ variants {["song is this"] ; ["is this called"]};

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainPro.gf
deleted file mode 100644
index b6e5bff2b..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainPro.gf
+++ /dev/null
@@ -1,18 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT AS NEEDED

---# -path=.:../:../DBase/Swedish:../DBase:../Numbers:../Shared

-

--- ENGLISH VERSION, UNCOMMENT AS NEEDED

--- --# -path=.:../:../DBase/English/:../DBase/:../Numbers:../Shared

-

-

-concrete userDomainPro of userDomain = userCorePro, sharedDomainPro ** {

-

-lin

-	answerSongArtistPlay song artist = { s = "answer(item(" ++ song.s ++ ")," ++ 

-						"answer(group(" ++ artist.s ++ ")"};

-	answerSongArtistAdd song artist = { s = "answer(item(" ++ song.s ++ ")," ++ 

-						"answer(group(" ++ artist.s ++ ")"};

-

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainSwe.gf
deleted file mode 100644
index c22bb5dd5..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/AgendaTalk/User/userDomainSwe.gf
+++ /dev/null
@@ -1,24 +0,0 @@
---# -path=.:../:../../:../../../Resource/Time:../../../Resource/Media/:../Shared:../../../Core:../../../Core/Shared:../../../Core/User

-

-concrete userDomainSwe of userDomain = userCoreSwe, sharedDomainSwe ** { 

-

-lin

-

-	-- CompoundedAnswers

-	answerEventLocAdd event loc = {s = event.s ++ loc.s };

-		

-	answerEventLocRem event loc = {s = event.s ++ loc.s };

-

-	answerEventLocTimeDay event loc time day = {s = variants {

-							(event.s ++ loc.s ++ time.s ++ "på" ++ day.s);

-							(event.s ++ loc.s ++ "på" ++ day.s ++ time.s);

-						}

-					};

-

---							(event.s ++ "på" ++ day.s ++ time.s);

---							(loc.s ++ time.s ++ "på" ++ day.s);

-

-							  

-

-		

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DB.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DB.gf
deleted file mode 100644
index 9b0b17c33..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DB.gf
+++ /dev/null
@@ -1,6 +0,0 @@
---# -path=.:../../Resource/Media/English:../../Resource/Media/Swedish:../../../Resource/Numbers/

-

-abstract DB = SwedishAlbums, SwedishArtists, SwedishRadioStations, SwedishSongs, numbers, orderNum ** {

---abstract DB = EnglishAlbums, EnglishArtists, EnglishRadioStations, EnglishSongs, numbers, orderNum ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBEng.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBEng.gf
deleted file mode 100644
index 67428921c..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBEng.gf
+++ /dev/null
@@ -1,7 +0,0 @@
---# -path=.:../../Resource/Media/English:../../Resource/Media/Swedish:../../Resource/Numbers/

-

-concrete DBEng of DB = EnglishAlbumsEng, EnglishArtistsEng,

---EnglishSongsEng, 

-EnglishRadioStationsEng, SwedishSongsSwe, numbersEng, orderNumEng ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBPro.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBPro.gf
deleted file mode 100644
index 555b66cfa..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBPro.gf
+++ /dev/null
@@ -1,6 +0,0 @@
---# -path=.:../../Resource/Media/English:../../Resource/Media/Swedish

-

---concrete DBPro of DB = EnglishAlbumsPro, EnglishSongsPro, EnglishArtistsPro, EnglishRadioStationsPro, numbersPro, orderNumPro ** {

-concrete DBPro of DB = SwedishAlbumsPro, SwedishSongsPro, SwedishArtistsPro, SwedishRadioStationsPro, numbersPro, orderNumPro ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBSwe.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBSwe.gf
deleted file mode 100644
index c3f9bec42..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/DBSwe.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Media/English:../../Resource/Media/Swedish:../../Resource/Numbers/

-

-concrete DBSwe of DB = SwedishAlbumsSwe, SwedishArtistsSwe, SwedishSongsSwe, SwedishRadioStationsSwe, numbersSwe, orderNumSwe ** {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomain.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomain.gf
deleted file mode 100644
index bbf81bcc7..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomain.gf
+++ /dev/null
@@ -1,105 +0,0 @@
--- SWEDISH version, uncomment as needed.

--- --# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

--- abstract sharedDomain = sharedCore, numbers, orderNum, swedishDB ** {

-

-

--- ENGLISH version, uncomment as needed.

---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

-

-abstract sharedDomain = sharedCore, DB ** {

-

-fun

-

--- ANSWERS

-

-	-- Request Answers

-

-	answerSongPlay 		: Song 		-> Proposition playTask;

-	answerSongAdd		: Song 		-> Proposition addTask;

-	answerSongRemove 	: Song 		-> Proposition removeTask;

-

-	answerArtistPlay 	: Artist 	-> Proposition playTask;

-	answerArtistAdd 	: Artist 	-> Proposition addTask;

-	answerArtistRemove 	: Artist 	-> Proposition removeTask;

-

-	answerStationPlay 	: Station 	-> Proposition playTask;

-	answerStationAdd 	: Station 	-> Proposition addTask;

-	answerStationRemove 	: Station 	-> Proposition removeTask;

-

-	answerNumberInListPlay 	: Number 	-> Proposition playTask;

-	answerNumberInListRemove: Number 	-> Proposition removeTask;

-

-	answerOrderInListPlay 	: OrderNumber 	-> Proposition playTask;

-	answerOrderInListRemove	: OrderNumber 	-> Proposition removeTask;

-

-

-

-

-	-- Ask Answers

-	questionSong		: Song		-> Proposition songQuestion;

-	questionArtist		: Artist 	-> Proposition artistQuestion;

-

--- LEXICON

-

-	playTask	 	: Task;

-	addTask			: Task;

-	removeTask		: Task;

-	speakerTask 		: Task;

-

-	artistQuestion		: Task;

-	songQuestion		: Task;

-

-

-	play_spec		: Action 		playTask;

-

-	play_spec_alone		: SingleAction;

-	play			: SingleAction;

-	stop 			: SingleAction;

-	pause 			: SingleAction;

-	resume 			: SingleAction;

-

-	next 		: OrderNumber;

-	previous 	: OrderNumber;

-

-	raise_volume	: SingleAction;

-	lower_volume	: SingleAction;

-

-	fastforward	: SingleAction;

-	rewind		: SingleAction;

-

-	shift 		: Action 		speakerTask;

-	right 		: Proposition 		speakerTask;

-	left 		: Proposition 		speakerTask;

-	center 		: Proposition 		speakerTask;

-

-	show_list 	: SingleAction;

-

-	add 		: Action 		addTask;

-	add_alone	: SingleAction;

-	remove 		: Action 		removeTask;

-	remove_alone	: SingleAction;

-

-	remove_all	: SingleAction;

-	

-

-	handle_list	: SingleAction;

-	handle_player	: SingleAction;

-	handle_stations	: SingleAction;

-

-	askArtist	: Ask			artistQuestion;

-	askSong		: Ask			songQuestion;

-

-	askCurrent	: SingleAsk;

-

-}

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainEng.gf
deleted file mode 100644
index 52994585d..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainEng.gf
+++ /dev/null
@@ -1,154 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

-

-concrete sharedDomainEng of sharedDomain = sharedCoreEng, DBEng ** 

-		open SpecResEng in {

-

-flags conversion=finite;

-

-

-

-lin

-	-- ANSWERS

-	answerSongPlay song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongAdd song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongRemove song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	questionSong song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-

-

-

-	answerArtistPlay artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistAdd artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistRemove artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	questionArtist artist = { s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-

-

-

-	answerStationPlay station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-	answerStationAdd station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-	answerStationRemove station = {s = variants {

-					(			station.s);

-					( ["the station"] ++ station.s)

-						}

-		      };

-

-

-	

-	-- LIST RELATED ANSWERS

-

-	-- nummer fem

-	-- fem

-	answerNumberInListPlay numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-	answerNumberInListRemove numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-

-	-- den femte låten

-	-- den femte

-	answerOrderInListPlay ordNum = 

-		{s = variants {

-				("the" ++ ordNum.s ++ (itemForm ! Post));

-				("the" ++ ordNum.s)

-			      }

-		};

-	answerOrderInListRemove ordNum = 

-		{s = variants {

-				("the" ++ ordNum.s ++ (itemForm ! Post));

-				("the" ++ ordNum.s)

-			      }

-		};

-

-

--- LEXICON

-

-pattern

-	

-	play_spec = (variants {["play"] ; ["listen to"] ; "hear"});

-	play_spec_alone = variants {["play a specific song"] ; ["play a specific"] ; ["listen to a specific song"] ; ["hear a specific song"]};

-	play = (variants {["start from the beginning"] ; ["play"] ; ["start"]});

-	stop = (variants {["stop"]});

-	pause = ["pause"];

-	resume = (variants {["resume"] ; ["resume playing"]});

-

-	next = "next";

-	previous = "previous";

-

-	raise_volume	= ["raise the volume"] ;

-	lower_volume	= ["lower the volume"]; 

-

-	fastforward	= ["fast forward"];

-	rewind		= "rewind";

-

-	shift = "shift" ++ variants{ ["the balance"] ; ""};

-	right = variants{"" ; ["to the"]} ++ "right";

-	left = variants{"" ; ["to the"]} ++ "left";

-	center = variants{"" ; ["to the"]} ++ "middle";

-

-	show_list = ["show the list"];

-

-	add = ["add"];

-	add_alone = variants {["add a specific song"] ; ["add this"] ; ["add this one"]};

-	remove = ["remove"];

-	remove_alone = variants {["remove"] ; ["renmove this"] ; ["remove this one"]};

-

-	remove_all = ["clear the playlist"];

-

-	handle_list 		= ["manage the playlist"];

-	handle_player 		= ["talk to the player"];

-	handle_stations 	= ["choose a station"];

-}

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainPro.gf
deleted file mode 100644
index 8c3917a37..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainPro.gf
+++ /dev/null
@@ -1,87 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT AS NEEDED

--- --# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

---concrete sharedDomainPro of sharedDomain = sharedCorePro, numbersEng, orderNumEng, swedishDBPro ** {

-

-

--- ENGLISH VERSION, UNCOMMENT AS NEEDED

---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

-

-concrete sharedDomainPro of sharedDomain = sharedCorePro, DBPro ** {

-

-flags lexer=code ; unlexer=code ;

-flags conversion=finite;

-

-lin

-

--- ANSWERS

-

-	answerSongPlay song = { s = "item" ++ "(" ++ song.s ++ ")"};	

-	answerSongAdd song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	answerSongRemove song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	questionSong song = { s = "item" ++ "(" ++ song.s ++ ")"};

-	

-

-	answerArtistPlay artist = { s = "group" ++ "(" ++ artist.s ++ ")"};

-	answerArtistAdd artist = { s = "groupToAdd" ++ "(" ++ artist.s ++ ")"};

-	answerArtistRemove artist = { s = "group" ++ "(" ++ artist.s ++ ")"};

-	questionArtist artist = {s = "group" ++ "(" ++ artist.s ++ ")"};

-

-

-	answerStationPlay station = { s = "station" ++ "(" ++ station.s ++ ")"};

-	answerStationAdd station = { s = "station" ++ "(" ++ station.s ++ ")"};

-	answerStationRemove station = { s = "station" ++ "(" ++ station.s ++ ")"};

-

-

-	answerNumberInListPlay numb = {s = "index" ++ "(" ++ "[" ++  numb.s  ++ "]" ++ ")"};

-	answerNumberInListRemove numb = {s = "itemRem" ++ "(" ++ "[" ++  numb.s  ++ "]" ++ ")"};

-

-	answerOrderInListPlay ordNum = {s = "index" ++ "(" ++ "[" ++ ordNum.s  ++ "]" ++ ")"};

-	answerOrderInListRemove ordNum = {s = "itemRem" ++ "(" ++ "[" ++ ordNum.s  ++ "]" ++ ")"};

-

-

-

--- LEXICON

-pattern

-

-	play_spec = "start_specific";

-	play_spec_alone = "start_specific";

-	play = "start";

-	stop = "stop";

-	pause = "pause";

-	resume = "resume";

-

-	next = "next";

-	previous = "previous";

-

-	raise_volume	= "vol_up" ;

-	lower_volume	= "vol_down" ;

-

-

-	fastforward	= "fast_forward";

-	rewind		= "rewind";

-

-

-	shift = "set_balance";

-	right = "1.0";

-	left = "-1.0";

-	center = "0.0";

-

-	show_list = "show_list";

-

-	add = "playlist_add";

-	add_alone = "playlist_add";

-	remove = "playlist_del";

-	remove_alone = "playlist_del";

-

-	remove_all = "playlist_clear";

-

-	handle_list 	= "handle_playlist";

-	handle_player 	= "handle_player";

-	handle_stations = "handle_stations";

-	

-	askArtist = "songs_by_artist";

-	askSong = "artists_song";

-

-	askCurrent = "current_song";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainSwe.gf
deleted file mode 100644
index 13f04ec3f..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/Shared/sharedDomainSwe.gf
+++ /dev/null
@@ -1,170 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/

-

-concrete sharedDomainSwe of sharedDomain = sharedCoreSwe, DBSwe ** open SpecResSwe in{

-

-

-flags conversion=finite;

-

-

-lin

-	-- ANSWERS

-	answerSongPlay song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongAdd song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	answerSongRemove song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-	questionSong song = {s = variants { 

-					(                      song.s );

-					( (itemForm ! Song) ++ song.s )

-				}

-		  };

-

-

-

-	answerArtistPlay artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistAdd artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	answerArtistRemove artist = {s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-	questionArtist artist = { s = variants {

-				     (                        artist.s );

-				     ( (itemForm ! Artist) ++ artist.s )

-				    }

-		      };

-

-

-

-	answerStationPlay station = {s = variants {

-					(			station.s);

-					( "stationen" ++ station.s)

-						}

-		      };

-	answerStationAdd station = {s = variants {

-					(			station.s);

-					( "stationen" ++ station.s)

-						}

-		      };

-	answerStationRemove station = {s = variants {

-					(			station.s);

-					( "stationen" ++ station.s)

-						}

-		      };

-

-

-	

-	-- LIST RELATED ANSWERS

-

-	-- nummer fem

-	-- fem

-	answerNumberInListPlay numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-	answerNumberInListRemove numb = {s = variants {

-					( (listForm ! Numeric) ++ numb.s ); 

-					(                         numb.s )

-				     }

-			};

-

-

-	-- den femte låten

-	-- den femte

-	answerOrderInListPlay ordNum = 

-		{s = variants {

-				("den" ++ ordNum.s ++ (itemForm ! Post));

-				("den" ++ ordNum.s)

-			      }

-		};

-	answerOrderInListRemove ordNum = 

-		{s = variants {

-				("den" ++ ordNum.s ++ (itemForm ! Post));

-				("den" ++ ordNum.s)

-			      }

-		};

-

-

--- LEXICON

-

-pattern

-	

-	play_spec = (variants {["spela"] ; ["starta"] ; ["höra"] ; ["lyssna på"]});

-	play_spec_alone = variants {["spela"] ; ["spela den här"] ; ["spela den"] ; ["spela en speciell"] ; ["spela en speciell låt"]};

-	play = (variants {["spela från början"] ; ["spela"] ; ["starta"]});

-	stop = (variants {["stoppa"] ; ["avbryta"]});

-	pause = (variants {["pausa"] });

-	resume = (variants {["återuppta spelningen"] ; ["starta igen"]});

-

-	next = "nästa";

-	previous = "föregående";

-

-	raise_volume	= "höja" ++ variants { ("volymen") ; ("ljudet")};

-	lower_volume	= "sänka" ++ variants { ("volymen") ; ("ljudet")}; 

-

-	

-	fastforward	= ["spola framåt"];

-	rewind		= ["spola bakåt"];

-

-

-	shift = variants{ ["ändra balansen"] ; "skifta"};

-	right = variants{"" ; "till"} ++ "höger";

-	left = variants{"" ; "till"} ++ "vänster";

-	center = variants{"" ; "till"} ++ "mitten";

-

-	show_list = ["visa listan"];

-

-	add = ["lägga till"];

-	add_alone = variants {["lägga till"]; ["lägg till den här"] ; ["lägg till den"]};

-	remove = ["ta bort"];

-	remove_alone = variants { ["ta bort"] ; ["ta bort den"] ; ["ta bort den här"] };

-

-	remove_all = variants {["rensa listan"] ; ["ta bort allt"]};

-

-	handle_list 		= ["ändra i spellistan"];

-	handle_player 		= ["prata med spelaren"];

-	handle_stations 	= ["välja en radiostation"];

-

-

-

-	-- FLYTTAT TILL userSpecificSwe.gf och systemSpecificSwe.gf pga 

-	-- olika linearisering for system och användare.

-

-	--askArtist = variants { "låtar" ; 

-	--	variants { variants {"vad" ; ["vilka låtar"]} ++ ["har jag"] ; 

-	--		["har jag någonting"]} ++ variants {"med" ; "av"}};

-

-

-	--askSong = variants { "artister" ; (["vem har"] ++ variants {"skrivit"; "gjort"})};

-

-	--askCurrent = ["vad heter"] ++ variants {["den här"] ; ["låten som spelas nu"]};

-

-}

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomain.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomain.gf
deleted file mode 100644
index a323bbd25..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomain.gf
+++ /dev/null
@@ -1,75 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resorce/Media/English:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-abstract systemDomain = sharedDomain, systemCore ** {

-

-

-fun

-

--- PROPOSITIONS. 

-

-	songProp : Song -> Proposition;

-	itemProp : Song -> Proposition;

-	currentSongProp : Song -> Proposition;

-

-	whatToPlayPropNum : Number -> Proposition;

-	whatToPlayPropOrd : Number -> Proposition;

-

-	itemRemPropNum : Number -> Proposition;

-	itemRemPropOrd : Number -> Proposition;

-	

-	groupToAddProp : Artist -> Proposition;

-	artistProp : Artist -> Proposition;

-	groupProp : Artist -> Proposition;

-	songArtistProp : Artist -> Proposition;

-	

-	albumProp : Album -> Proposition;

-

-	artistsSongProp : Artist -> Proposition;

-	artistsAlbumProp : Artist -> Proposition;

-

-	albumArtistProp : Album -> Proposition;

-	songsArtistProp : Song -> Proposition;

-	stationProp : Station -> Proposition;

-

-	actionProp : (t: Task) -> Action (t) -> Proposition;

-

-

-

--- Asks

-	whatSongQuestion : SingleAsk;   -- "what song do you mean?"

-	whatArtistQuestion : SingleAsk;	-- "what artist do you mean?"

-	whatIndexQuestion : SingleAsk; -- "what index do you mean?"

-	whatToRemoveQuestion : SingleAsk;

-	whatStationQuestion : SingleAsk; -- "what station do you want?"

-	whatAlbumQuestion : SingleAsk; -- "what album do you mean?"

-	whatToPlayQuestion : SingleAsk; -- "which song in the playlist do you want to lay?"

-	whatToRemove : SingleAsk; -- "What number do you want to remove?"

-

-

--- Confirms

-

-	addedToPlaylist : Confirm;    -- "The playlist is increased"

-	removedFromPLaylist : Confirm; -- "The playlist is reduced"

-	clearedPlaylist : Confirm;  -- "The playlist is cleared"

-	turnedUpVolume : Confirm;  -- "Turning up the volume"

-	loweredVolume : Confirm;  -- "Lowering the volume"

-	startingThePlayer : Confirm; -- "Starting the music"

-	stoppingThePlayer : Confirm; -- "Stopping the music"

-	pausingThePlayer : Confirm; -- "Pausing the music"

-	resumingThePlayer : Confirm; -- "Resuming the music"

-	shuffleTheList : Confirm; -- "The list has been shuffled"

-	ffing : Confirm;

-	rewinding : Confirm;

-	handlingstations : Confirm;

-	handlingplayer : Confirm;

-	handlingplaylist : Confirm;

-	showedList : Confirm;

-

-}

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainEng.gf
deleted file mode 100644
index 54947de7e..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainEng.gf
+++ /dev/null
@@ -1,106 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resorce/Media/Swedish:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-concrete systemDomainEng of systemDomain = sharedDomainEng, systemCoreEng ** {

-

-

-flags conversion=finite;

-

-

-lin

-

--- PROPOSITIONS

-

-	songProp song = { s = song.s };

-	itemProp song =  { s = song.s };

-	currentSongProp song = { s = song.s };

-

-	whatToPlayPropNum number = { s = number.s };

-	whatToPlayPropOrd order = { s = order.s };

-

-	itemRemPropNum number = { s = number.s };

-	itemRemPropOrd order = { s =  order.s };

-	

-	groupToAddProp artist = { s = artist.s };

-	artistProp artist = { s = artist.s};

-	groupProp artist = { s = artist.s };

-	songArtistProp artist = { s = artist.s };

-	

-	albumProp album = { s = album.s };

-

-	artistsSongProp artist = { s = artist.s };

-	artistsAlbumProp artist = { s = artist.s };

-

-	albumArtistProp album = { s = album.s };

-

-	songsArtistProp song = { s = song.s };

-

-	stationProp station = { s = station.s };

-

-	actionProp _ action = {s = action.s };

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-

-pattern

-

-

--- Because of differing linearisations in User and System usage these functions are not linearized in Shared. 

-

-	askArtist = "song" ; 

-	askSong = "artist" ; 

-	askCurrent = ["the current song"];

-

-

--- Asks

-	whatSongQuestion = ["what song do you mean"];

-	whatArtistQuestion = ["what artist do you mean"];

-	whatIndexQuestion = ["what index number do you want to play"];

-	whatToRemoveQuestion = ["what song do you want to remove from the playlist"];

-	whatStationQuestion = ["what radio station do you want to listen to"];

-	whatAlbumQuestion = ["what album do you mean"];

-	whatToPlayQuestion = ["what song in the playlist do you want to play"];

-	whatToRemove = ["what song in the playlist do you want to remove"];

-

-

--- Confirms

-

-	addedToPlaylist = ["the playlist is increased"];

-	removedFromPLaylist = ["the playlist is reduced"];

-	clearedPlaylist = ["the playlist is cleared"];

-	turnedUpVolume = ["turning up the volume"];

-	loweredVolume = ["lowering the volume"];

-	startingThePlayer = ["starting the music"]; 

-	stoppingThePlayer = ["the player is stopped"];

-	pausingThePlayer = ["pausing the player"];

-	resumingThePlayer = ["resuming the music"];

-	shuffleTheList = ["the playlist has been shuffled"];

-	ffing = ["performing fast forward"];

-	rewinding = ["rewinding"];

-	handlingstations = ["done with choosing a station"];

-	handlingplayer = ["your wish is my command"];

-	handlingplaylist = ["done fiddling with the playlist"];

-	showedList = ["finished showing the list"];

-

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainPro.gf
deleted file mode 100644
index 932cc4f15..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainPro.gf
+++ /dev/null
@@ -1,98 +0,0 @@
--- --# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/System

---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resorce/Media/Swedish:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-

-

-concrete systemDomainPro of systemDomain = sharedDomainPro, systemCorePro  ** {

-

-flags conversion=finite;

-

-

-lin

--- PROPOSITIONS

-

-	songProp song = { s = "song" ++ "(" ++ song.s ++ ")" };

-	itemProp song =  { s = "item" ++ "(" ++ song.s ++ ")" };

-	currentSongProp song = { s = "current_song" ++ "(" ++ song.s ++ ")" };

-

-	whatToPlayPropNum number = { s = "what_to_play" ++ "(" ++ number.s ++ ")" };

-	whatToPlayPropOrd order = { s = "what_to_play" ++ "(" ++ order.s ++ ")" };

-

-	itemRemPropNum number = { s = "itemRem" ++ "(" ++ number.s ++ ")" };

-	itemRemPropOrd order = { s = "itemRem" ++ "(" ++ order.s ++ ")" };

-	

-	groupToAddProp artist = { s = "groupToAdd" ++ "(" ++ artist.s ++ ")" };

-	artistProp artist = { s = "artist" ++ "(" ++ artist.s ++ ")"};

-	groupProp artist = { s = "group" ++ "(" ++ artist.s ++ ")" };

-	songArtistProp artist = { s = "song_artist" ++ "(" ++ artist.s ++ ")" };

-	

-	albumProp album = { s = "album" ++ "(" ++ album.s ++ ")" };

-

-	artistsSongProp artist = { s = "artist_song" ++ "(" ++ artist.s ++ ")" };

-	artistsAlbumProp artist = { s = "artists_album" ++ "(" ++ artist.s ++ ")" };

-

-	albumArtistProp album = { s = "albums_by_artist" ++ "(" ++ album.s ++ ")" };

-

-	songsArtistProp song = { s = "songs_by_artist" ++ "(" ++ song.s ++ ")" };

-

-	stationProp station = { s = "station" ++ "(" ++ station.s ++ ")" };

-

-	actionProp _ action = {s = "action" ++ "(" ++ action.s ++ ")"};

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-pattern

--- Asks

-	whatSongQuestion = ["x ^ item ( x )"];

-	whatArtistQuestion = ["x ^ group ( x )"];

-	whatIndexQuestion = ["x ^ index ( x )"];

-	whatToRemoveQuestion = ["x ^ song_to_remove ( x )"];

-	whatStationQuestion = ["x ^ station ( x )"];

-	whatAlbumQuestion = ["x ^ album ( x )"];

-	whatToPlayQuestion = ["x ^ what_to_play ( x )"];

-	whatToRemove = ["x ^ itemRem ( x )"];

-

-	

-

-

--- Confirms

-

-	addedToPlaylist = "playlist_add";    -- "The playlist is increased"

-	removedFromPLaylist = "playlist_del"; -- "The playlist is reduced"

-	clearedPlaylist = "playlist_clear";  -- "The playlist is cleared"

-	turnedUpVolume = "vol_up";  -- "Turning up the volume"

-	loweredVolume = "vol_down";  -- "Lowering the volume"

-	startingThePlayer = variants {"start" ; "start_specific"}; 

-	stoppingThePlayer = "stop"; -- "Stopping the music"

-	pausingThePlayer = "pause"; -- "Pausing the music"

-	resumingThePlayer = "resume"; -- "Resuming the music"

-	shuffleTheList = "shuffle"; -- "The list has been shuffled"

-	ffing = "fast_fowrward";

-	rewinding = "rewind";

-	handlingstations = "handle_stations";

-	handlingplayer = "handle_player";

-	handlingplaylist = "handle_playlist";

-	showedList = "show_list";

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainSwe.gf
deleted file mode 100644
index bee23a751..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/System/systemDomainSwe.gf
+++ /dev/null
@@ -1,105 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resorce/Media/English:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-concrete systemDomainSwe of systemDomain = sharedDomainSwe, systemCoreSwe ** {

-

-flags conversion=finite;

-

-

-lin

-

--- PROPOSITIONS

-

-	songProp song = { s = song.s };

-	itemProp song =  { s = song.s };

-	currentSongProp song = { s = song.s };

-

-	whatToPlayPropNum number = { s = number.s };

-	whatToPlayPropOrd order = { s = order.s };

-

-	itemRemPropNum number = { s = number.s };

-	itemRemPropOrd order = { s =  order.s };

-	

-	groupToAddProp artist = { s = artist.s };

-	artistProp artist = { s = artist.s};

-	groupProp artist = { s = artist.s };

-	songArtistProp artist = { s = artist.s };

-	

-	albumProp album = { s = album.s };

-

-	artistsSongProp artist = { s = artist.s };

-	artistsAlbumProp artist = { s = artist.s };

-

-	albumArtistProp album = { s = album.s };

-

-	songsArtistProp song = { s = song.s };

-

-	stationProp station = { s = station.s };

-

--- sort_restr( song(X) ):-          sem_sort(X,item).

--- sort_restr( item(X) ):-          sem_sort(X,item).

--- sort_restr( current_song(X) ):-  sem_sort(X,song).

--- sort_restr( what_to_play(X) ):-  sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( itemRem(X) ):-       sem_sort(X,index).

--- sort_restr( groupToAdd(X) ):-    group( X ).

--- sort_restr( artist(X) ):-        group( X ).

--- sort_restr( group(X) ):-         group( X ).

--- sort_restr( song_artist(X) ):-   group( X ).

--- sort_restr( album(X) ):-         album( X ).

--- sort_restr( artists_song(X) ):-  group_atom( X ).

--- sort_restr( artists_album(X) ):- group_atom( X ).

--- sort_restr( albums_by_artist(X) ):- album_atom( X ).

--- sort_restr( songs_by_artist(X) ):-  song_atom( X ).

--- sort_restr( station(X) ):-	 radio_station( X ).

--- sort_restr( year(X) ):-          sem_sort( X, year ).

--- sort_restr( path(X) ):-          atomic( X ).%,format("hallå: ~w\n",[X]).

--- %sort_restr( X^path(X) ):-          atomic( X ),format("hallå: ~w\n",[X]).

--- sort_restr( not path(X) ):-     format("hallå: ~w\n",[X]), atomic( X ).

--- sort_restr( fail(Path^path(Path),no_matches) ).

-

-

-pattern

-

-

--- Because of differing linearisations in User and System usage these functions are not linearized in Shared. 

-

-	askArtist = "låtar" ; 

-		

-

-	askSong = "artister" ; 

-	askCurrent = ["låten som spelas nu"];

-

-

--- Asks

-	whatSongQuestion = ["vilken sång menar du"];

-	whatArtistQuestion = ["vilken artist menar du"];

-	whatIndexQuestion = ["vilket index nummer vill du spela"];

-	whatToRemoveQuestion = ["vilken sång vill du ta bort från spellistan"];

-	whatStationQuestion = ["vilken radiostation vill du lyssna på"];

-	whatAlbumQuestion = ["vilket album menar du"];

-	whatToPlayQuestion = ["vad i spellistan vill du spela"];

-	whatToRemove = ["vad i spellistan vill du ta bort"];

-

-

-

--- Confirms

-

-	addedToPlaylist = ["spellistan är utökad"];

-	removedFromPLaylist = ["spellistan är reducerad"];

-	clearedPlaylist = ["spellistan är rensad"];

-	turnedUpVolume = ["höjer volymen"];

-	loweredVolume = ["sänker volymen"];

-	startingThePlayer = ["startar uppspelningen"]; 

-	stoppingThePlayer = ["spelaren är stoppad"];

-	pausingThePlayer = ["pausar uppspelningen"];

-	resumingThePlayer = ["återupptar uppspelningen"];

-	shuffleTheList = ["spellistan har blandats"];

-	ffing = ["spolar frammåt"];

-	rewinding = ["spolar bakåt"];

-	handlingstations = ["klar med att välja radiostation"];

-	handlingplayer = ["jag fixar"];

-	handlingplaylist = ["klar med spellistan"];

-	showedList = ["spellistan är visad"];

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomain.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomain.gf
deleted file mode 100644
index 40d355a18..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomain.gf
+++ /dev/null
@@ -1,19 +0,0 @@
--- SWEDISH VERSION, UNCOMMENT WHEN NEEDED

-----# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-

--- ENGLISH VERSION, UNCOMMENT WHEN NEEDED

---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resorce/Media/Swedish:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-

-abstract userDomain = userCore, sharedDomain ** {

-

-

-fun

-	-- CompoundedAnswers

-

-	answerSongArtistPlay : Song -> Artist -> AnswerList playTask;

-	answerSongArtistAdd : Song -> Artist -> AnswerList addTask;

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainEng.gf
deleted file mode 100644
index d3732c3a0..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainEng.gf
+++ /dev/null
@@ -1,29 +0,0 @@
-

---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resource/Media/English:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-concrete userDomainEng of userDomain = userCoreEng, sharedDomainEng ** { 

-

-flags conversion=finite;

-

-

-lin

-

-	-- CompoundedAnswers

-	answerSongArtistPlay song artist = {s = variants {(song.s ++ "with" ++ artist.s)

-					; (artist.s ++ "with" ++ song.s)} };

-		

-	answerSongArtistAdd song artist = {s = variants {(song.s ++ "with" ++ artist.s)

-					; (artist.s ++ "with" ++ song.s)} };

-		

-

-pattern

-	askArtist = variants { ["what do i have"] ; ["what songs do i have"] ; ["do i have anything"]}

-					++ variants {"with" ; "by"};

-

-

-	askSong = ["who"] ++ variants {"made"; "wrote"};

-

-	askCurrent = ["what"] ++ variants {["song is this"] ; ["is this called"]};

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainPro.gf
deleted file mode 100644
index 237c86ba6..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainPro.gf
+++ /dev/null
@@ -1,15 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/English/:../../../Resource/Media/Swedish:../../../Resorce/Media/Swedish:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-

-

-concrete userDomainPro of userDomain = userCorePro, sharedDomainPro ** {

-

-flags conversion=finite;

-

-

-lin

-	answerSongArtistPlay song artist = { s = ["answer ( item ("] ++ song.s ++ [" ) ) ,"] ++ 

-						["answer ( group ("] ++ artist.s ++ [") )"]};

-	answerSongArtistAdd song artist = { s = ["answer ( item ("] ++ song.s ++ [" ) ) ,"] ++ 

-						["answer ( group ("] ++ artist.s ++ [") )"]};

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainSwe.gf
deleted file mode 100644
index 1530d1dad..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/DJGoDiS/User/userDomainSwe.gf
+++ /dev/null
@@ -1,29 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Media/:../../../Resource/Media/Swedish/:../../../Resorce/Media/English:../../../Resource/Numbers/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-

-concrete userDomainSwe of userDomain = userCoreSwe, sharedDomainSwe ** { 

-

-flags conversion=finite;

-

-

-lin

-

-	-- CompoundedAnswers

-	answerSongArtistPlay song artist = {s = variants {(song.s ++ "med" ++ artist.s)

-					; (artist.s ++ "med" ++ song.s)} };

-		

-	answerSongArtistAdd song artist = {s = variants {(song.s ++ "med" ++ artist.s)

-					; (artist.s ++ "med" ++ song.s)} };

-		

-

-pattern

-	askArtist = variants { ["vad har jag"] ; ["vilka låtar har jag"] ; ["har jag någonting"]}

-					++ variants {"med" ; "av"};

-

-

-	askSong = ["vem har"] ++ variants {"skrivit"; "gjort"};

-

-	askCurrent = ["vad heter"] ++ variants {["den här"] ; ["låten som spelas nu"]};

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/SpecResEng.gf b/grammars/TALK/GF_GoDiS/Domain/SpecResEng.gf
deleted file mode 100644
index f08ce3e9e..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/SpecResEng.gf
+++ /dev/null
@@ -1,27 +0,0 @@
--- A file with Pointers...

--- With pointers I mean the phrases that point out a specific semantics of a segment.

--- Example "I want to listen to the artist Sting" where "the artist" makes clear 

--- that "Sting" is an artist and not a song for instance. 

-

-resource SpecResEng = {

-

-param ListInfo =  Numeric | Ordered ;

-param ItemChoice = Artist | Song | Post;

-

-oper listForm : ListInfo => Str 

-   = table {

-		Numeric => ["number"];

-		Ordered => ["the"]

-		

-	};

-	

-

-oper itemForm : ItemChoice => Str

-	= table {

-		Artist => ["the artist"];

-		Song => ["the song"];

-		Post => ""

-	};

-

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/SpecResSwe.gf b/grammars/TALK/GF_GoDiS/Domain/SpecResSwe.gf
deleted file mode 100644
index 8ff0c8807..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/SpecResSwe.gf
+++ /dev/null
@@ -1,27 +0,0 @@
--- A file with Pointers...

--- With pointers I mean the phrases that point out a specific semantics of a segment.

--- Example "I want to listen to the artist Sting" where "the artist" makes clear 

--- that "Sting" is an artist and not a song for instance. 

-

-resource SpecResSwe = {

-

-param ListInfo =  Numeric | Ordered ;

-param ItemChoice = Artist | Song | Post;

-

-oper listForm : ListInfo => Str 

-   = table {

-		Numeric => ["nummer"];

-		Ordered => ["den"]

-		

-	};

-	

-

-oper itemForm : ItemChoice => Str

-	= table {

-		Artist => "artisten";

-		Song => "låten";

-		Post => ""

-	};

-

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/DB.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/DB.gf
deleted file mode 100644
index 16c1b9b1d..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/DB.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Home

-

-abstract DB = Lamps, Rooms ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/DBEng.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/DBEng.gf
deleted file mode 100644
index 5508418be..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/DBEng.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Home

-

-concrete DBEng of DB= LampsEng, RoomsEng ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/DBPro.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/DBPro.gf
deleted file mode 100644
index 531aef80f..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/DBPro.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Home

-

-concrete DBPro of DB= LampsPro, RoomsPro ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/DBSwe.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/DBSwe.gf
deleted file mode 100644
index 7a74399d8..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/DBSwe.gf
+++ /dev/null
@@ -1,5 +0,0 @@
---# -path=.:../../Resource/Home

-

-concrete DBSwe of DB= LampsSwe, RoomsSwe ** {

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomain.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomain.gf
deleted file mode 100644
index 9606ca232..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomain.gf
+++ /dev/null
@@ -1,50 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-abstract sharedDomain = sharedCore, DB ** {

-

-fun

-

--- ANSWERS

-

-	answerLampOn 		: Lamp 		-> Proposition onTask;

-	answerLampOff		: Lamp 		-> Proposition offTask;

-

-	answerLocation		: Room 		-> Proposition locateTask;

-

-	-- Ask Answers

-	questionWhichLamp	: Lamp		-> Proposition lampQuestion;

-	questionLocation	: Room 		-> Proposition locQuestion;

-

--- LEXICON

-

-	onTask	 		: Task;

-	offTask			: Task;

-	locateTask		: Task;

-	lampQuestion 		: Task;

-	locQuestion 		: Task;

-

-	turnOn			: Action	onTask;

-	turnOff			: Action 	offTask;

-

-	turnOnThis		: SingleAction;

-	turnOffThis		: SingleAction;

-

-	dimmerUp		: SingleAction;

-	dimmerDown		: SingleAction;

-

-	--askLamp		: Ask			lampQuestion;

-	--askLocation	: Ask			locQuestion;

-

-	askStatusLamp	: SingleAsk;

-}

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainEng.gf
deleted file mode 100644
index 1a0ff32c7..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainEng.gf
+++ /dev/null
@@ -1,46 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-

-concrete sharedDomainEng of sharedDomain = sharedCoreEng, DBEng ** 

-		open SpecResEng in {

-

-

-

-

-

-lin

-	-- ANSWERS

-

-	answerLampOn lamp = {s = lamp.s};

-	answerLampOff lamp = {s = lamp.s};

-	answerLocation loc = {s = loc.s};

-	

-	questionWhichLamp lamp = {s = lamp.s};

-	questionLocation loc = {s = loc.s};

-

--- LEXICON

-

-pattern

-	

-	turnOn = ["turn on"];

-	turnOff = ["turn off"];

-

-	turnOnThis = ["turn on"];

-	turnOffThis = ["turn off"];

-

-	dimmerUp = ["dim up"];

-	dimmerDown = ["dim down"];

-

-	--askLamp = ["do i have a"];

-	--askLocation = ["is there a"];

-

-	askStatusLamp = ["what lights are on"];

-}

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainPro.gf
deleted file mode 100644
index e08589b55..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainPro.gf
+++ /dev/null
@@ -1,43 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-

-

-concrete sharedDomainPro of sharedDomain = sharedCorePro, DBPro ** {

-

-

-

-

-

-lin

-	-- ANSWERS

-

-	answerLampOn lamp = {s = lamp.s};

-	answerLampOff lamp = {s = lamp.s};

-	answerLocation loc = {s = loc.s};

-	

-	questionWhichLamp lamp = {s = lamp.s};

-	questionLocation loc = {s = loc.s};

-

-	

--- LEXICON

-

-pattern

-

-	turnOn = "turnOn";

-	turnOff = "turnOff";

-

-	turnOnThis = "turnOn_closest";

-	turnOffThis = "turnOff_closest";

-

-	dimmerUp = "dimmer_up";

-	dimmerDown = "dimmer_down";

-

-	--askLamp = "lamps";

-	--askLocation = "locations";

-

-	askStatusLamp = "status";

-

-}

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainSwe.gf
deleted file mode 100644
index 9c31959fa..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedDomainSwe.gf
+++ /dev/null
@@ -1,48 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-

-

-concrete sharedDomainSwe of sharedDomain = sharedCoreSwe, DBSwe ** {

-

-

-

-

-

-lin

-	-- ANSWERS

-

-	answerLampOn lamp = {s = lamp.s};

-	answerLampOff lamp = {s = lamp.s};

-	answerLocation loc = {s = loc.s};

-	

-	questionWhichLamp lamp = {s = lamp.s};

-	questionLocation loc = {s = loc.s};

-

-	

--- LEXICON

-

-pattern

-

-	turnOn = "tända";

-	turnOff = "släcka";

-

-	turnOnThis = "tända";

-	turnOffThis = "släcka";

-

-	dimmerUp = ["dimma upp"];

-	dimmerDown = ["dimma ner"];

-

-	--askLamp = ["har jag en"];

-	--askLocation = ["finns det ett"];

-

-	askStatusLamp = ["vilka lampor är tända"];

-

-}

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedSpecific.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedSpecific.gf
deleted file mode 100644
index 73e3d7f47..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/Shared/sharedSpecific.gf
+++ /dev/null
@@ -1,58 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-abstract sharedDomain = sharedCore, DB ** {

-

-fun

-

--- ANSWERS

-

-

-	-- Ett alternativ är att gära en Task för varje action som 

-	-- finns i domänen. Alltså En erase Task, en play Task och en add Task

-	-- på det sattet kan man gora funktioner som tar "nummer fem" och gör en 

-	-- "Object play" och en "Object erase" men inte en "Object add".

-

-	-- Request Answers

-

-	answerLampOn 		: Lamp 		-> Object onTask;

-	answerLampOff		: Lamp 		-> Object offTask;

-

-	answerLocation		: Location 	-> Object locateTask;

-

-	-- Ask Answers

-	questionWhichLamp	: Lamp		-> Object lampQuestion;

-	questionLocation	: Location 	-> Object locQuestion;

-

--- LEXICON

-

-	onTask	 		: Task;

-	offTask			: Task;

-	locateTask		: Task;

-	lampQuestion 		: Task;

-	locQuestion 		: Task;

-

-	turnOn			: Action	onTask;

-	turnOff			: Action 	offTask;

-

-	turnOnThis		: SingleAction;

-	turnOffThis		: SingleAction;

-

-	dimmerUp		: SingleAction;

-	dimmerDown		: SingleAction;

-

-	--askLamp		: Ask			lampQuestion;

-	--askLocation	: Ask			locQuestion;

-

-	askStatusLamp	: SingleAsk;

-}

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomain.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomain.gf
deleted file mode 100644
index 9e3e09d83..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomain.gf
+++ /dev/null
@@ -1,34 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-abstract systemDomain = sharedDomain, systemCore ** {

-

-

-fun

-

--- PROPOSITIONS. 

--- 

-

-

-	lampProp : Lamp -> Proposition onTask;

-	locProp : Room -> Proposition onTask;

-

-	whatToTurnOffProp : Lamp -> Proposition offTask;

-	whatToTurnOnProp : Lamp -> Proposition onTask;

-

--- Asks

-	whatLampQuestion : SingleAsk;   -- "what song do you mean?"

-	whatLocQuestion : SingleAsk;	-- "what artist do you mean?"

-

--- Confirms

-

-	turnedOnLamp : Confirm;

-	turnedOffLamp : Confirm;

-

-}

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainEng.gf
deleted file mode 100644
index 98ede07e6..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainEng.gf
+++ /dev/null
@@ -1,32 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

---# -path=.:../:../DBase/:../Shared

-

-

-concrete systemDomainEng of systemDomain = sharedDomainEng, systemCoreEng ** {

-

-

-lin

-

--- PROPOSITIONS

-

-	lampProp lamp = { s = lamp.s };

-	locProp loc =  { s = loc.s };

-

-	whatToTurnOffProp lamp = { s = lamp.s };

-	whatToTurnOnProp lamp = { s = lamp.s };

-

-pattern

-

--- Asks

-

-	whatLampQuestion = ["what lamp do you mean"];

-	whatLocQuestion = ["what room do you mean"];

-

--- Confirms

-

-	turnedOnLamp = ["the light is on"];

-	turnedOffLamp = ["the light is turned off"];

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainPro.gf
deleted file mode 100644
index 213dce355..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainPro.gf
+++ /dev/null
@@ -1,28 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-concrete systemDomainPro of systemDomain = sharedDomainPro, systemCorePro  ** {

-

-lin

-

--- PROPOSITIONS

-

-	lampProp lamp = { s = lamp.s };

-	locProp loc =  { s = loc.s };

-

-	whatToTurnOffProp lamp = { s = lamp.s };

-	whatToTurnOnProp lamp = { s = lamp.s };

-

-pattern

-

--- Asks

-

-	whatLampQuestion = ["X^lamp(X)"];

-	whatLocQuestion = ["X^loc(X)"];

-

--- Confirms

-

-	turnedOnLamp = ["turnOn"];

-	turnedOffLamp = ["turnOff"];

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainSwe.gf
deleted file mode 100644
index d4924aacf..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/System/systemDomainSwe.gf
+++ /dev/null
@@ -1,28 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/System

-

-concrete systemDomainSwe of systemDomain = sharedDomainSwe, systemCoreSwe ** {

-

-lin

-

--- PROPOSITIONS

-

-	lampProp lamp = { s = lamp.s };

-	locProp loc =  { s = loc.s };

-

-	whatToTurnOffProp lamp = { s = lamp.s };

-	whatToTurnOnProp lamp = { s = lamp.s };

-

-pattern

-

--- Asks

-

-	whatLampQuestion = ["vilken lampa menar du"];

-	whatLocQuestion = ["vilket rum menar du"];

-

--- Confirms

-

-	turnedOnLamp = ["lampan är tänd"];

-	turnedOffLamp = ["lampan är släckt"];

-}

-

-

diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomain.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomain.gf
deleted file mode 100644
index 642d253b8..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomain.gf
+++ /dev/null
@@ -1,13 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-abstract userDomain = userCore, sharedDomain ** {

-

-

-fun

-	-- CompoundedAnswers

-

-	answerLampLocTurnOn : Lamp -> Room -> AnswerList onTask;

-	answerLampLocTurnOff : Lamp -> Room -> AnswerList offTask;

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainEng.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainEng.gf
deleted file mode 100644
index 7eabf6a03..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainEng.gf
+++ /dev/null
@@ -1,12 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-concrete userDomainEng of userDomain = userCoreEng, sharedDomainEng ** { 

-

-lin

-

-	-- CompoundedAnswers

-	-- CompoundedAnswers

-	answerLampLocTurnOn lamp loc = {s = lamp.s ++ "in" ++ loc.s};

-		

-	answerLampLocTurnOff lamp loc = {s = lamp.s ++ "in" ++ loc.s};

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainPro.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainPro.gf
deleted file mode 100644
index a8dffd1f7..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainPro.gf
+++ /dev/null
@@ -1,14 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-concrete userDomainPro of userDomain = userCorePro, sharedDomainPro ** {

-

-lin

-

-	-- CompoundedAnswers

-	answerLampLocTurnOn lamp loc = {s = "answer(lamp(" ++ lamp.s ++ ")," ++ 

-					"answer(loc(" ++ loc.s ++ ")"};

-		

-	answerLampLocTurnOff lamp loc = {s = "answer(lamp(" ++ lamp.s ++ ")," ++ 

-					"answer(loc(" ++ loc.s ++ ")"};

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainSwe.gf b/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainSwe.gf
deleted file mode 100644
index 0df4d8618..000000000
--- a/grammars/TALK/GF_GoDiS/Domain/deLux/User/userDomainSwe.gf
+++ /dev/null
@@ -1,11 +0,0 @@
---# -path=.:../:../../:../Shared/:../../../Resource/Home/:../../../Core:../../../Core/Shared/:../../../Core/User

-

-concrete userDomainSwe of userDomain = userCoreSwe, sharedDomainSwe ** { 

-

-lin

-

-	-- CompoundedAnswers

-	answerLampLocTurnOn lamp loc = {s = lamp.s ++ "i" ++ loc.s};

-		

-	answerLampLocTurnOff lamp loc = {s = lamp.s ++ "i" ++ loc.s};

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DB.gf b/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DB.gf
deleted file mode 100644
index dbe5d2df2..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DB.gf
+++ /dev/null
@@ -1,37 +0,0 @@
-abstract DB = { 

-

-cat

-	Event;

-	Location; 

-

-fun

-

-	-- anEvent : Event;

-	meeting : Event;

-	presentation : Event;

-	date : Event;

-	lecture : Event;

-

-{-

-	appointment : Event;

-	class : Event;

-	converence : Event;

-	hairdresser : Event;

-	dentist : Event;		

-	party : Event;

-	deadline : Event;

--}

-

-	-- aLocation : Location;

-	plaza : Location;

-	station : Location;

-	university : Location;

-{-	

-	fair : Location;

-	ritz : Location;

-	cafe : Location;

--}	

-

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBPro.gf b/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBPro.gf
deleted file mode 100644
index 7c345f456..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBPro.gf
+++ /dev/null
@@ -1,17 +0,0 @@
-concrete DBPro of DB = { 

-

-pattern

-

-	-- anEvent = "EVENT";

-	meeting = "meeting";

-	presentation = "presentation";

-	date = "appointment";

-	lecture = "lecture";

-	

-

-	-- aLocation = "LOCATION";

-	plaza = "plaza";

-	station = "station";

-	university = "university";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBSwe.gf
deleted file mode 100644
index e664600e6..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Events_Locations/DBSwe.gf
+++ /dev/null
@@ -1,29 +0,0 @@
-concrete DBSwe of DB = {

-

-pattern

-

-

-	-- anEvent = "EVENT";

-	meeting = ["ett möte"];

-	presentation = ["en presentation"];

-	date = ["en träff"];

-	lecture = ["en lektion"];

-

-	-- aLocation = "LOCATION";

-	plaza = ["på plaza"];

-	station = ["på stationen"];

-	university = ["på universitetet"];

-}

-

-

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/Lamps.gf b/grammars/TALK/GF_GoDiS/Resource/Home/Lamps.gf
deleted file mode 100644
index f95761464..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/Lamps.gf
+++ /dev/null
@@ -1,14 +0,0 @@
-abstract Lamps = {

-

-cat Lamp;

-

-fun

-

---aLamp : Lamp;

-ceilinglamp : Lamp;

-tablelamp : Lamp;

-desklamp : Lamp;

-floorlamp : Lamp;

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/LampsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Home/LampsEng.gf
deleted file mode 100644
index 23a2dfddb..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/LampsEng.gf
+++ /dev/null
@@ -1,12 +0,0 @@
-concrete LampsEng of Lamps = {

-

-pattern

-

---aLamp = "LIGHT";

-ceilinglamp = ["the ceiling light"];

-tablelamp = ["the table light"];

-desklamp = ["the desk light"];

-floorlamp = ["the floor light"];

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/LampsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Home/LampsPro.gf
deleted file mode 100644
index 2f96418e8..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/LampsPro.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-concrete LampsPro of Lamps = {

-

-pattern

-

---aLamp = "LIGHT";

-ceilinglamp = "[ceilinglamp]";

-tablelamp = "[tablelamp]";

-desklamp = "[desklamp]";

-floorlamp = "[floorlamp]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/LampsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Home/LampsSwe.gf
deleted file mode 100644
index 5040e946e..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/LampsSwe.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-concrete LampsSwe of Lamps = {

-

-pattern 

-

---aLamp = "LAMPA";

-ceilinglamp = variants{"taklampan" ; ["en taklampa"]};

-tablelamp = variants{ "bordslampan" ; ["en bordslampa"]};

-desklamp = variants{ "skrivbordslampan" ; ["en skrivbordslampa"]};

-floorlamp = variants{ "golvlampan" ; ["en golvlampa"]};

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/Rooms.gf b/grammars/TALK/GF_GoDiS/Resource/Home/Rooms.gf
deleted file mode 100644
index c26325d57..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/Rooms.gf
+++ /dev/null
@@ -1,15 +0,0 @@
-abstract Rooms = {

-

-cat Room;

-

-fun

-

---aRoom : Room;

-kitchen : Room;

-bedroom : Room;

-hall : Room;

-livingroom : Room;

-

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Home/RoomsEng.gf
deleted file mode 100644
index 2ce6c4c3f..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsEng.gf
+++ /dev/null
@@ -1,12 +0,0 @@
-concrete RoomsEng of Rooms = {

-

-pattern

-

---aRoom = "ROOM";

-kitchen = ["the kitchen"];

-bedroom = ["the bedroom"];

-hall = ["the hall"];

-livingroom = ["the living room"];

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Home/RoomsPro.gf
deleted file mode 100644
index 2db67c0fb..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsPro.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-concrete RoomsPro of Rooms = {

-

-pattern

-

---aLocation = "ROOM";

-kitchen = "[kitchen]";

-bedroom = "[bedroom]";

-hall = "[hall]";

-livingroom = "[livingroom]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Home/RoomsSwe.gf
deleted file mode 100644
index 122ba0a9b..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Home/RoomsSwe.gf
+++ /dev/null
@@ -1,12 +0,0 @@
-concrete RoomsSwe of Rooms = {

-

-pattern

-

---aRoom = "RUM";

-kitchen = "köket";

-bedroom = "sovrumet";

-hall = "hallen";

-livingroom = "vardagsrumet";

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbums.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbums.gf
deleted file mode 100644
index f7787a75b..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbums.gf
+++ /dev/null
@@ -1,23 +0,0 @@
-abstract EnglishAlbums = {

-

-cat Album;

-

-fun

-

-london_calling_album 			: Album;

-singles_album 				: Album;

-wish_album 				: Album;

-in_the_city_album 			: Album;

-the_sidewinder_album 			: Album;

-the_immaculate_collection_album 	: Album;

-lets_get_it_on_album 			: Album;

-mezzanine_album 			: Album;

-protection_album 			: Album;

-heads_high_album 			: Album;

-every_good_boy_deserves_fudge_album 	: Album;

-please_album 				: Album;

-doolittle_album 	 		: Album;

-music_for_the_jilted_generation_album 	: Album;

-swedish_classics 			: Album;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsEng.gf
deleted file mode 100644
index 8dad6c93d..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsEng.gf
+++ /dev/null
@@ -1,21 +0,0 @@
-concrete EnglishAlbumsEng of EnglishAlbums = {

-

-pattern

-

-london_calling_album = ["london calling"];

-singles_album = ["singles"];

-wish_album = ["wish"];

-in_the_city_album = ["in the city"];

-the_sidewinder_album = ["the sidewinder"];

-the_immaculate_collection_album = ["the immaculate collection"];

-lets_get_it_on_album = ["lets get it on"];

-mezzanine_album = ["mezzanine"];

-protection_album = ["protection"];

-heads_high_album = ["heads high"];

-every_good_boy_deserves_fudge_album = ["every good boy deserves fudge"];

-please_album = ["please"];

-doolittle_album = ["doolittle"];

-music_for_the_jilted_generation_album = ["music for the jilted generation"];

-swedish_classics = ["swedish classics"];

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsPro.gf
deleted file mode 100644
index c943fda29..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishAlbumsPro.gf
+++ /dev/null
@@ -1,21 +0,0 @@
-concrete EnglishAlbumsPro of EnglishAlbums = {

-

-pattern

-

-london_calling_album = "[london,calling]";

-singles_album = "[singles]";

-wish_album = "[wish]";

-in_the_city_album = "[in,the,city]";

-the_sidewinder_album = "[the,sidewinder]";

-the_immaculate_collection_album = "[the,immaculate,collection]";

-lets_get_it_on_album = "[lets,get,it,on]";

-mezzanine_album = "[mezzanine]";

-protection_album = "[protection]";

-heads_high_album = "[heads,high]";

-every_good_boy_deserves_fudge_album = "[every,good,boy,deserves,fudge]";

-please_album = "[please]";

-doolittle_album = "[doolittle]";

-music_for_the_jilted_generation_album = "[music,for,the,jilted,generation]";

-swedish_classics = "[svenska,klassiker]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtists.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtists.gf
deleted file mode 100644
index 7e426cfde..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtists.gf
+++ /dev/null
@@ -1,62 +0,0 @@
-abstract EnglishArtists = {

-

-cat

-

-Artist;

-

-fun

--- ENGELSKA

-

--- ARTIST

-beborn_beton 		: Artist;

-clash 			: Artist;

-covenant 		: Artist;

-cure 			: Artist;

-enigma 			: Artist;

-garbage 		: Artist;

-jam 			: Artist;

-kate_bush 		: Artist;

-lee_morgan 		: Artist;

-madonna 		: Artist;

-marvin_gaye 		: Artist;

-massive_attack 		: Artist;

-michael_jackson		: Artist;

-morlocks 		: Artist;

-morrisey 		: Artist;

-mr_vegas 		: Artist;

-mudhoney 		: Artist;

-nitzer_ebb 		: Artist;

-pain 			: Artist;

-pet_shop_boys 		: Artist;

-pixies 			: Artist;

-prodigy 		: Artist;

-project_pitchfork 	: Artist;

-vnv_nation 		: Artist;

-britney_spears 		: Artist;

-usher 			: Artist;

-fifty_cent		: Artist;

-green_day 		: Artist;

-billy_idol 		: Artist;

-elvis_presley 		: Artist;

-shania_twain 		: Artist;

-trace_adkins 		: Artist;

-the_chemical_brothers 	: Artist;

-eminem 			: Artist;

-ozzy_osbourne 		: Artist;

-norah_jones 		: Artist;

-jessica_simpson 	: Artist;

-guns_and_roses 		: Artist;

-europe 			: Artist;

-led_zeppelin 		: Artist;

-the_cardigans 		: Artist;

-ace_of_base 		: Artist;

-atomic_swing 		: Artist;

-jessica_simpson 	: Artist;

-creeps 			: Artist;

-eagle_eye_cherry 	: Artist;

-stephen_simmonds 	: Artist;

-the_ark 		: Artist;

-trance_dance 		: Artist;

-vacuum 			: Artist;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsEng.gf
deleted file mode 100644
index 0cd300099..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsEng.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete EnglishArtistsEng of EnglishArtists = {

-

-pattern 

-

-beborn_beton = ["beborn beton"];

-clash = "clash";

-covenant = "covenant";

-cure = "cure";

-enigma = "enigma";

-garbage = "garbage";

-jam = "jam";

-kate_bush = ["kate bush"];

-lee_morgan = ["lee morgan"];

-madonna = "madonna";

-marvin_gaye = ["mavin gaye"];

-massive_attack = ["massive attack"];

-michael_jackson = ["michael jackson"];

-morlocks = "morlocks";

-morrisey = "morrisey";

-mr_vegas = ["mister vegas"];

-mudhoney = "mudhoney";

-nitzer_ebb = ["nitzer ebb"];

-pain = "pain";

-pet_shop_boys = ["pet shop boys"];

-pixies = "pixies";

-prodigy = "prodigy";

-project_pitchfork = ["project pitchfork"];

-vnv_nation = ["vnv nation"];

-britney_spears = ["britney spears"];

-usher = "usher";

-fifty_cent = ["fifty cent"];

-green_day = ["green day"];

-billy_idol = ["billy idol"];

-elvis_presley = ["elvis presley"];

-shania_twain = ["shania twain"];

-trace_adkins = ["trace adkins"];

-the_chemical_brothers = ["the chemical brothers"];

-eminem = "eminem";

-ozzy_osbourne = ["ozzy osbourne"];

-norah_jones = ["norah jones"];

-jessica_simpson = ["jessica simpson"];

-guns_and_roses = ["guns and roses"];

-europe = "europe";

-led_zeppelin = ["led zeppelin"];

-the_cardigans = ["the cardigans"];

-ace_of_base = ["ace of base"];

-atomic_swing = ["atomic swing"];

-jessica_simpson = ["jessica simpson"];

-creeps = "creeps";

-eagle_eye_cherry = ["eagle eye cherry"];

-stephen_simmonds = ["stephen simmonds"];

-the_ark = ["the ark"];

-trance_dance = ["trance dance"];

-vacuum = "vacuum";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsPro.gf
deleted file mode 100644
index c33cc90db..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishArtistsPro.gf
+++ /dev/null
@@ -1,57 +0,0 @@
-concrete EnglishArtistsPro of EnglishArtists = {

-

-pattern

-

-beborn_beton = "[beborn,beton]";

-clash = "[clash]";

-covenant = "[covenant]";

-cure = "[cure]";

-enigma = "[enigma]";

-garbage = "[garbage]";

-jam = "[jam]";

-kate_bush = "[kate,bush]";

-lee_morgan = "[lee,morgan]";

-madonna = "[madonna]";

-marvin_gaye = "[mavin,gaye]";

-massive_attack = "[massive,attack]";

-michael_jackson = "[michael,jackson]";

-morlocks = "[morlocks]";

-morrisey = "[morrisey]";

-mr_vegas = "[mister,vegas]";

-mudhoney = "[mudhoney]";

-nitzer_ebb = "[nitzer,ebb]";

-pain = "[pain]";

-pet_shop_boys = "[pet,shop,boys]";

-pixies = "[pixies]";

-prodigy = "[prodigy]";

-project_pitchfork = "[project,pitchfork]";

-vnv_nation = "[vnv,nation]";

-britney_spears = "[britney,spears]";

-usher = "[usher]";

-fifty_cent = "[fifty,cent]";

-green_day = "[green,day]";

-billy_idol = "[billy,idol]";

-elvis_presley = "[elvis,presley]";

-shania_twain = "[shania,twain]";

-trace_adkins = "[trace,adkins]";

-the_chemical_brothers = "[the,chemical,brothers]";

-eminem = "[eminem]";

-ozzy_osbourne = "[ozzy,osbourne]";

-norah_jones = "[norah,jones]";

-jessica_simpson = "[jessica,simpson]";

-guns_and_roses = "[guns,and,roses]";

-europe = "[europe]";

-led_zeppelin = "[led,zeppelin]";

-the_cardigans = "[the,cardigans]";

-ace_of_base = "[ace,of,base]";

-atomic_swing = "[atomic,swing]";

-jessica_simpson = "[jessica,simpson]";

-creeps = "[creeps]";

-eagle_eye_cherry = "[eagle,eye,cherry]";

-stephen_simmonds = "[stephen,simmonds]";

-the_ark = "[the,ark]";

-trance_dance = "[trance,dance]";

-vacuum = "[vacuum]";

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStations.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStations.gf
deleted file mode 100644
index bd9796f0c..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStations.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract EnglishRadioStations = {

-

-cat Station;

-

-fun

-

-digital_gunfire : Station;

-rant_radio 	: Station;

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsEng.gf
deleted file mode 100644
index 98cc9cf91..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsEng.gf
+++ /dev/null
@@ -1,8 +0,0 @@
-concrete EnglishRadioStationsEng of EnglishRadioStations = {

-

-pattern

-

-digital_gunfire = ["digital gunfire"];

-rant_radio 	= ["rant radio"];

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsPro.gf
deleted file mode 100644
index a791d1f56..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishRadioStationsPro.gf
+++ /dev/null
@@ -1,8 +0,0 @@
-concrete EnglishRadioStationsPro of EnglishRadioStations = {

-

-pattern

-

-digital_gunfire = "[digital,gunfire]";

-rant_radio 	= "[rant,radio]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongs.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongs.gf
deleted file mode 100644
index f52f9b058..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongs.gf
+++ /dev/null
@@ -1,57 +0,0 @@
-abstract EnglishSongs = {

-cat Song;

-

-fun

-

-another_world 				: Song;

-deeper_than_the_usual_feeling 		: Song;

-london_calling 				: Song;

-should_i_stay_or_should_i_go 		: Song;

-dead_stars 				: Song;

-like_tears_in_rain 			: Song;

-figurehead 				: Song;

-leviathan 				: Song;

-stalker 				: Song;

-friday_im_in_love 			: Song;

-sadness 				: Song;

-i_think_im_paranoid 			: Song;

-in_the_city 				: Song;

-time_for_truth 				: Song;

-the_man_with_the_child_in_his_eyes 	: Song;

-totem_pole 				: Song;

-lucky_star 				: Song;

-material_girl 				: Song;

-if_i_should_die_tonight 		: Song;

-angel 					: Song;

-teardrop 				: Song;

-sly 					: Song;

-sex_by_force 				: Song;

-ars_magica 				: Song;

-razors_through_flesh 			: Song;

-heads_high 				: Song;

-latest_news 				: Song;

-good_enough 				: Song;

-thorn 					: Song;

-let_beauty_loose 			: Song;

-eleanor_rigby 				: Song;

-west_end_girls 				: Song;

-suburbia 				: Song;

-debaser 				: Song;

-poison 					: Song;

-existence 				: Song;

-darkangel 				: Song;

-rubicon 				: Song;

-all_that_she_wants 			: Song;

-the_final_countdown 			: Song;

-stone_me_into_the_groove 		: Song;

-oh_i_like_it 				: Song;

-save_tonight 				: Song;

-tears_never_dry 			: Song;

-it_takes_a_fool_to_remain_sain 		: Song;

-youre_gonna_get_it 			: Song;

-i_breathe 				: Song;

-legion 					: Song;

-standing 				: Song;

-like_a_prayer 				: Song;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsEng.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsEng.gf
deleted file mode 100644
index e089044fb..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsEng.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete EnglishSongsEng of EnglishSongs = {

-

-pattern

-

-another_world = ["another world"];

-deeper_than_the_usual_feeling = ["deeper then the usual feeling"];

-london_calling = ["london calling"];

-should_i_stay_or_should_i_go = ["should i stay or should i go"];

-dead_stars = ["dead stars"];

-like_tears_in_rain = ["like tears in rain"];

-figurehead = ["figurehead"];

-leviathan = ["leviathan"];

-stalker = ["stalker"];

-friday_im_in_love = ["friday im in love"];

-sadness = ["sadness"];

-i_think_im_paranoid = ["i think im paranoid"];

-in_the_city = ["in the city"];

-time_for_truth = ["time for truth"];

-the_man_with_the_child_in_his_eyes = ["the man with the child in his eyes"];

-totem_pole = ["totem pole"];

-lucky_star = ["lucky star"];

-material_girl = ["material girl"];

-if_i_should_die_tonight = ["if i should die tonight"];

-angel = ["angel"];

-teardrop = ["teardrop"];

-sly = ["sly"];

-sex_by_force = ["sex by force"];

-ars_magica = ["ars magica"];

-razors_through_flesh = ["razors through flesh"];

-heads_high = ["heads high"];

-latest_news = ["latest news"];

-good_enough = ["good enough"];

-thorn = ["thorn"];

-let_beauty_loose = ["let beauty loose"];

-eleanor_rigby = ["eleanor rigby"];

-west_end_girls = ["west end girls"];

-suburbia = ["suburbia"];

-debaser = ["debaser"];

-poison = ["poison"];

-existence = ["existance"];

-darkangel = ["darkangel"];

-rubicon = ["rubicon"];

-all_that_she_wants = ["all that she wants"];

-the_final_countdown = ["the final countown"];

-stone_me_into_the_groove = ["stone me into the groove"];

-oh_i_like_it = ["oh i like it"];

-save_tonight = ["save tonight"];

-tears_never_dry = ["tears never dry"];

-it_takes_a_fool_to_remain_sain = ["it takes s fool to remain sain"];

-youre_gonna_get_it = ["youre gonna get it"];

-i_breathe = ["i breathe"];

-legion = ["legion"];

-standing = ["standing"];

-like_a_prayer = ["like a prayer"];

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsPro.gf
deleted file mode 100644
index 0d8f68ad4..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/English/EnglishSongsPro.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete EnglishSongsPro of EnglishSongs = {

-

-pattern

-

-another_world = "[another,world]";

-deeper_than_the_usual_feeling = "[deeper,then,the,usual,feeling]";

-london_calling = "[london,calling]";

-should_i_stay_or_should_i_go = "[should,i,stay,or,should,i,go]";

-dead_stars = "[dead,stars]";

-like_tears_in_rain = "[like,tears,in,rain]";

-figurehead = "[figurehead]";

-leviathan = "[leviathan]";

-stalker = "[stalker]";

-friday_im_in_love = "[friday,im,in,love]";

-sadness = "[sadness]";

-i_think_im_paranoid = "[i,think,im,paranoid]";

-in_the_city = "[in,the,city]";

-time_for_truth = "[time,for,truth]";

-the_man_with_the_child_in_his_eyes = "[the,man,with,the,child,in,his,eyes]";

-totem_pole = "[totem,pole]";

-lucky_star = "[lucky,star]";

-material_girl = "[material,girl]";

-if_i_should_die_tonight = "[if,i,should,die,tonight]";

-angel = "[angel]";

-teardrop = "[teardrop]";

-sly = "[sly]";

-sex_by_force = "[sex,by,force]";

-ars_magica = "[ars,magica]";

-razors_through_flesh = "[razors,through,flesh]";

-heads_high = "[heads,high]";

-latest_news = "[latest,news]";

-good_enough = "[good,enough]";

-thorn = "[thorn]";

-let_beauty_loose = "[let,beauty,loose]";

-eleanor_rigby = "[eleanor,rigby]";

-west_end_girls = "[west,end,girls]";

-suburbia = "[suburbia]";

-debaser = "[debaser]";

-poison = "[poison]";

-existence = "[existance]";

-darkangel = "[darkangel]";

-rubicon = "[rubicon]";

-all_that_she_wants = "[all,that,she,wants]";

-the_final_countdown = "[the,final,countown]";

-stone_me_into_the_groove = "[stone,me,into,trh,groove]";

-oh_i_like_it = "[oh,i,like,it]";

-save_tonight = "[save,tonight]";

-tears_never_dry = "[tears,never,dry]";

-it_takes_a_fool_to_remain_sain = "[it,takes,s,fool,to,remain,sain]";

-youre_gonna_get_it = "[youre,gonna,get,it]";

-i_breathe = "[i,breathe]";

-legion = "[legion]";

-standing = "[standing]";

-like_a_prayer = "[like,a,prayer]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbums.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbums.gf
deleted file mode 100644
index c143f7ada..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbums.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract SwedishAlbums = {

-

-cat Album;

-

-fun

-

-peps_one		: Album;

-peps_two 		: Album;

-swedish_classics 	: Album;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsPro.gf
deleted file mode 100644
index daf16e291..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsPro.gf
+++ /dev/null
@@ -1,10 +0,0 @@
-concrete SwedishAlbumsPro of SwedishAlbums = {

-

-pattern

-

-peps_one = "[peps,bitar,ett]";

-peps_two = "[peps,bitar,två]";

-swedish_classics = "[svenska,klassiker]";

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsSwe.gf
deleted file mode 100644
index a97a1f640..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishAlbumsSwe.gf
+++ /dev/null
@@ -1,10 +0,0 @@
-concrete SwedishAlbumsSwe of SwedishAlbums = {

-

-pattern

-

-swedish_classics = ["svenska klassiker"];

-peps_one = ["peps bitar ett"];

-peps_two = ["peps bitar två"];

-

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtists.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtists.gf
deleted file mode 100644
index dee879752..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtists.gf
+++ /dev/null
@@ -1,58 +0,0 @@
-abstract SwedishArtists = {

-

-cat Artist;

-

-fun

-

-abba 			: Artist;

-adolphson_och_falk 	: Artist;

-anne_lie_ryde 		: Artist;

-bo_kaspers_orkester 	: Artist;

-christer_sandelin 	: Artist;

-dan_hylander_och_rmb 	: Artist;

-di_leva 		: Artist;

-dilba 			: Artist;

-docent_dod 		: Artist;

-dr_alban 		: Artist;

-ebba_gron 		: Artist;

-eldkvarn 		: Artist;

-eric_gadd 		: Artist;

-eva_dahlgren 		: Artist;

-freda 			: Artist;

-gyllende_tider 		: Artist;

-imperiet 		: Artist;

-irma 			: Artist;

-jakob_hellman 		: Artist;

-jumper 			: Artist;

-kent 			: Artist;

-lars_winnerback 	: Artist;

-lisa_ekdahl 		: Artist;

-lisa_nilsson 		: Artist;

-lolita_pop 		: Artist;

-lustans_lakejer 	: Artist;

-marie_fredriksson 	: Artist;

-mauro_scocco 		: Artist;

-mikael_rickfors 	: Artist;

-mikael_wiehe 		: Artist;

-monica_tornell 		: Artist;

-nordman 		: Artist;

-norum_och_nilsson 	: Artist;

-orup 			: Artist;

-patrik_isaksson 	: Artist;

-peter_lemarc 		: Artist;

-petter 			: Artist;

-peps_persson 		: Artist;

-ratata 			: Artist;

-robyn 			: Artist;

-roger_pontare 		: Artist;

-roxette 		: Artist;

-staffan_hellstrand 	: Artist;

-stakka_bo 		: Artist;

-stefan_andersson 	: Artist;

-stina_nordenstam 	: Artist;

-tomas_ledin 		: Artist;

-ulf_lundell 		: Artist;

-uno_svenningsson 	: Artist;

-viba_femba 		: Artist;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsPro.gf
deleted file mode 100644
index 1613a279b..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsPro.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete SwedishArtistsPro of SwedishArtists = {

-

-pattern

-

-abba = "[abba]";

-adolphson_och_falk = "[adolphson,och,falk]";

-anne_lie_ryde = "[anne-lie,ryde]";

-bo_kaspers_orkester = "[bo,kaspers,orkester]";

-christer_sandelin = "[christer,sandelin]";

-dan_hylander_och_rmb = "[dan,hylander,och,rmb]";

-di_leva = "[di,leva]";

-dilba = "[dilba]";

-docent_dod = "[docent,dod]";

-dr_alban = "[dr,alban]";

-ebba_gron = "[ebba,gron]";

-eldkvarn = "[eldkvarn]";

-eric_gadd = "[eric,gadd]";

-eva_dahlgren = "[eva,dahlgren]";

-freda = "[freda]";

-gyllende_tider = "[gyllende,tider]";

-imperiet = "[imperiet]";

-irma = "[irma]";

-jakob_hellman = "[jakob,hellman]";

-jumper = "[jumper]";

-kent = "[kent]";

-lars_winnerback = "[lars,winnerback]";

-lisa_ekdahl = "[lisa,ekdahl]";

-lisa_nilsson = "[lisa,nilsson]";

-lolita_pop = "[lolita,pop]";

-lustans_lakejer = "[lustans,lakejer]";

-marie_fredriksson = "[marie,fredriksson]";

-mauro_scocco = "[mauro,scocco]";

-mikael_rickfors = "[mikael,rickfors]";

-mikael_wiehe = "[mikael,wiehe]";

-monica_tornell = "[monica,tornell]";

-nordman = "[nordman]";

-norum_och_nilsson = "[norum,och,nilsson]";

-orup = "[orup]";

-patrik_isaksson = "[patrik,isaksson]";

-peter_lemarc = "[peter,lemarc]";

-petter = "[petter]";

-peps_persson = "[peps,persson]";

-ratata = "[ratata]";

-robyn = "[robyn]";

-roger_pontare = "[roger,pontare]";

-roxette = "[roxette]";

-staffan_hellstrand = "[staffan,hellstrand]";

-stakka_bo = "[stakka_bo]";

-stefan_andersson = "[stefan,andersson]";

-stina_nordenstam = "[stina,nordenstam]";

-tomas_ledin = "[tomas,ledin]";

-ulf_lundell = "[ulf,lundell]";

-uno_svenningsson = "[uno,svenningsson]";

-viba_femba = "[viba,femba]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsSwe.gf
deleted file mode 100644
index 93afba8b8..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishArtistsSwe.gf
+++ /dev/null
@@ -1,55 +0,0 @@
-concrete SwedishArtistsSwe of SwedishArtists = {

-

-pattern

-

-abba = ["abba"];

-adolphson_och_falk = ["adolphson och falk"];

-anne_lie_ryde = ["anne-lie rydé"];

-bo_kaspers_orkester = ["bo kaspers orkester"];

-christer_sandelin = ["christer sandelin"];

-dan_hylander_och_rmb = ["dan hylander och rmb"];

-di_leva = ["di leva"];

-dilba = ["dilba"];

-docent_dod = ["docent död"];

-dr_alban = ["dr alban"];

-ebba_gron = ["ebba grön"];

-eldkvarn = ["eldkvarn"];

-eric_gadd = ["eric gadd"];

-eva_dahlgren = ["eva dahlgren"];

-freda = ["freda"];

-gyllende_tider = ["gyllene tider"];

-imperiet = ["imperiet"];

-irma = ["irma"];

-jakob_hellman = ["jakob hellman"];

-jumper = ["jumper"];

-kent = ["kent"];

-lars_winnerback = ["lars winnerbäck"];

-lisa_ekdahl = ["lisa ekdahl"];

-lisa_nilsson = ["lisa nilsson"];

-lolita_pop = ["lolita pop"];

-lustans_lakejer = ["lustans lakejer"];

-marie_fredriksson = ["marie fredriksson"];

-mauro_scocco =  ["mauro scocco"];

-mikael_rickfors =  ["mikael rickfors"];

-mikael_wiehe =  ["mikael wiehe"];

-monica_tornell =  ["monica törnell"];

-nordman =  ["nordman"];

-norum_och_nilsson =  ["norum och nilsson"];

-orup =  ["orup"];

-patrik_isaksson =  ["patrik isaksson"];

-peter_lemarc =  ["peter lemarc"];

-petter =  ["petter"];

-peps_persson =  ["peps persson"];

-ratata =  ["ratata"];

-robyn =  ["robyn"];

-roger_pontare =  ["roger pontare"];

-roxette =  ["roxette"];

-staffan_hellstrand =  ["staffan hellstrand"];

-stakka_bo =  ["stakka_bo"];

-stefan_andersson =  ["stefan andersson"];

-stina_nordenstam =  ["stina nordenstam"];

-tomas_ledin =  ["tomas ledin"];

-ulf_lundell =  ["ulf lundell"];

-uno_svenningsson =  ["uno svenningsson"];

-viba_femba =  ["viba femba"];

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStations.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStations.gf
deleted file mode 100644
index eebd36b71..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStations.gf
+++ /dev/null
@@ -1,12 +0,0 @@
-abstract SwedishRadioStations = {

-

-cat Station;

-

-fun

-

-lugna_favoriter		: Station;

-sveriges_radio		: Station;

-mix_megapol		: Station;

-stockholm		: Station;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsPro.gf
deleted file mode 100644
index 8784d9ebf..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsPro.gf
+++ /dev/null
@@ -1,10 +0,0 @@
-concrete SwedishRadioStationsPro of SwedishRadioStations = {

-

-pattern

-

-lugna_favoriter		= "[lugna,favoriter]";

-sveriges_radio		= "[sveriges,radio]";

-mix_megapol		= "[mix,megapol]";

-stockholm		= "[stockholm,närradio]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsSwe.gf
deleted file mode 100644
index 652675a43..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishRadioStationsSwe.gf
+++ /dev/null
@@ -1,10 +0,0 @@
-concrete SwedishRadioStationsSwe of SwedishRadioStations = {

-

-pattern

-

-lugna_favoriter		= ["lugna favoriter"];

-sveriges_radio		= ["sveriges radio"];

-mix_megapol		= ["mix megapol"];

-stockholm		= ["stockholm närradio"];

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongs.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongs.gf
deleted file mode 100644
index 914292257..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongs.gf
+++ /dev/null
@@ -1,58 +0,0 @@
-abstract SwedishSongs = {

-

-cat Song;

-

-fun

-

-blinkar_bla 			: Song;

-segla_pa_ett_moln 		: Song;

-undantag 			: Song;

-det_hon_vill_ha 		: Song;

-skuggor_i_skymningen 		: Song;

-vem_ska_jag_tro_pa 		: Song;

-solglasogon 			: Song;

-atta_hundra_grader 		: Song;

-karlekens_tunga 		: Song;

-angeln_i_rummet 		: Song;

-vem_tander_stjarnorna 		: Song;

-vindarna 			: Song;

-flickorna_pa_tv_tva 		: Song;

-du_ska_va_president 		: Song;

-precis_som_du 			: Song;

-vara_vanner 			: Song;

-om_du_var_har 			: Song;

-kom_ihag_mig 			: Song;

-vem_vet 			: Song;

-himlen_runt_hornet 		: Song;

-diamanter 			: Song;

-efter_stormen 			: Song;

-det_finns 			: Song;

-sarah 				: Song;

-vingar 				: Song;

-flickan_och_krakan 		: Song;

-vintersaga 			: Song;

-allt_som_jag_kanner 		: Song;

-jag_blir_hellre_jagad_av_vargar : Song;

-du_far_gora_som_du_vill 	: Song;

-hall_om_mig 			: Song;

-sag_som_det_ar 			: Song;

-vinden_har_vant 		: Song;

-jackie 				: Song;

-lilla_fagel_bla 		: Song;

-sommaren_ar_kort 		: Song;

-en_del_av_mitt_hjarta 		: Song;

-oppna_landskap 			: Song;

-under_ytan 			: Song;

-teknikens_under 		: Song;

-tva_av_oss 			: Song;

-vandraren 			: Song;

-under_norrskenet 		: Song;

-vill_ha_mer 			: Song;

-flykting 			: Song;

-sanningens_krigare 		: Song;

-i_vargens_spar 			: Song;

-nu_tandas_tusen_julejus 	: Song;

-alla_alskar_dig 		: Song;

-hon_far 			: Song;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsPro.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsPro.gf
deleted file mode 100644
index c8f50c37f..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsPro.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete SwedishSongsPro of SwedishSongs = {

-

-pattern

-

-blinkar_bla = "[blinkar,blå]";

-segla_pa_ett_moln = "[segla,på,ett,moln]";

-undantag = "[undantag]";

-det_hon_vill_ha = "[det,hon,vill,ha]";

-skuggor_i_skymningen = "[skuggor,i,skymningen]";

-vem_ska_jag_tro_pa = "[vem,ska,jag,tro,på]";

-solglasogon = "[solglasögon]";

-atta_hundra_grader = "[åtta,hundra,grader]";

-karlekens_tunga = "[kärlekens,tunga]";

-angeln_i_rummet = "[ängeln,i,rummet]";

-vem_tander_stjarnorna = "[vem,tänder,stjärnorna]";

-vindarna = "[vindarna]";

-flickorna_pa_tv_tva = "[flickorna,på,tv,två]";

-du_ska_va_president = "[du,ska,va,president]";

-precis_som_du = "[precis,som,du]";

-vara_vanner = "[vara,vänner]";

-om_du_var_har = "[om,du,var,här]";

-kom_ihag_mig = "[kom,ihåg,mig]";

-vem_vet = "[vem,vet]";

-himlen_runt_hornet = "[himlen,runt,hörnet]";

-diamanter = "[diamanter]";

-efter_stormen = "[efter,stormen]";

-det_finns = "[det,finns]";

-sarah = "[sarah]";

-vingar = "[vingar]";

-flickan_och_krakan = "[flickan,och,kråkan]";

-vintersaga = "[vintersaga]";

-allt_som_jag_kanner = "[allt,som,jag,känner]";

-jag_blir_hellre_jagad_av_vargar = "[jag,blir,hellre,jagad,av,vargar]";

-du_far_gora_som_du_vill = "[du,får,göra,som,du,vill]";

-hall_om_mig = "[håll,om,mig]";

-sag_som_det_ar = "[säg,som,det,är]";

-vinden_har_vant = "[vinden,har,vänt]";

-jackie = "[jackie]";

-lilla_fagel_bla = "[lilla,fågel,blå]";

-sommaren_ar_kort = "[sommaren,är,kort]";

-en_del_av_mitt_hjarta = "[en,del,av,mitt,hjärta]";

-oppna_landskap = "[öppna,landskap]";

-under_ytan = "[under,ytan]";

-teknikens_under = "[teknikens,under]";

-tva_av_oss = "[två,av,oss]";

-vandraren = "[vandraren]";

-under_norrskenet = "[under,norrskenet]";

-vill_ha_mer = "[vill,ha,mer]";

-flykting = "[flykting]";

-sanningens_krigare = "[sanningens,krigare]";

-i_vargens_spar = "[i,vargens,spår]";

-nu_tandas_tusen_julejus = "[nu,tändas,tusen,julejus]";

-alla_alskar_dig = "[alla,älskar,dig]";

-hon_far = "[hon,får]";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsSwe.gf
deleted file mode 100644
index 9834440e1..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/Swedish/SwedishSongsSwe.gf
+++ /dev/null
@@ -1,56 +0,0 @@
-concrete SwedishSongsSwe of SwedishSongs = {

-

-pattern

-

-blinkar_bla =  ["blinkar blå"];

-segla_pa_ett_moln =  ["segla på ett moln"];

-undantag =  ["undantag"];

-det_hon_vill_ha =  ["det hon vill ha"];

-skuggor_i_skymningen =  ["skuggor i skymningen"];

-vem_ska_jag_tro_pa =  ["vem ska jag tro på"];

-solglasogon =  ["solglasögon"];

-atta_hundra_grader =  ["åtta hundra grader"];

-karlekens_tunga =  ["kärlekens tunga"];

-angeln_i_rummet =  ["ängeln i rummet"];

-vem_tander_stjarnorna =  ["vem tänder stjärnorna"];

-vindarna =  ["vindarna"];

-flickorna_pa_tv_tva =  ["flickorna på tv två"];

-du_ska_va_president =  ["du ska va president"];

-precis_som_du =  ["precis som du"];

-vara_vanner =  ["vara vänner"];

-om_du_var_har =  ["om du var här"];

-kom_ihag_mig =  ["kom ihåg mig"];

-vem_vet =  ["vem vet"];

-himlen_runt_hornet =  ["himlen runt hörnet"];

-diamanter =  ["diamanter"];

-efter_stormen =  ["efter stormen"];

-det_finns =  ["det finns"];

-sarah =  ["sarah"];

-vingar =  ["vingar"];

-flickan_och_krakan =  ["flickan och kråkan"];

-vintersaga =  ["vintersaga"];

-allt_som_jag_kanner =  ["allt som jag känner"];

-jag_blir_hellre_jagad_av_vargar =  ["jag blir hellre jagad av vargar"];

-du_far_gora_som_du_vill =  ["du får göra som du vill"];

-hall_om_mig =  ["håll om mig"];

-sag_som_det_ar =  ["säg som det är"];

-vinden_har_vant =  ["vinden har vänt"];

-jackie =  ["jackie"];

-lilla_fagel_bla =  ["lilla fågel blå"];

-sommaren_ar_kort =  ["sommaren är kort"];

-en_del_av_mitt_hjarta =  ["en del av mitt hjärta"];

-oppna_landskap =  ["öppna landskap"];

-under_ytan =  ["under ytan"];

-teknikens_under =  ["teknikens under"];

-tva_av_oss =  ["två av oss"];

-vandraren =  ["vandraren"];

-under_norrskenet =  ["under norrskenet"];

-vill_ha_mer =  ["vill ha mer"];

-flykting =  ["flykting"];

-sanningens_krigare =  ["sanningens krigare"];

-i_vargens_spar =  ["i vargens spår"];

-nu_tandas_tusen_julejus =  ["nu tändas tusen julejus"];

-alla_alskar_dig =  ["alla älskar dig"];

-hon_far =  ["hon får"];

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/TVStations.gf b/grammars/TALK/GF_GoDiS/Resource/Media/TVStations.gf
deleted file mode 100644
index 64a7421bf..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/TVStations.gf
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract TVStations = {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Media/TVStationsSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Media/TVStationsSwe.gf
deleted file mode 100644
index 086e16556..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Media/TVStationsSwe.gf
+++ /dev/null
@@ -1,3 +0,0 @@
-concrete TVStationsSwe of TVStations = {

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbers.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/numbers.gf
deleted file mode 100644
index 782dc01e7..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbers.gf
+++ /dev/null
@@ -1,19 +0,0 @@
-abstract numbers = {

-

-cat

-Number;

-

-fun

-one : Number;

-two : Number;

-three : Number;

-four : Number;

-five : Number;

-six : Number;

-seven : Number;

-eight : Number;

-nine : Number;

-ten : Number;

-

---aNumber : Number;

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersEng.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersEng.gf
deleted file mode 100644
index 140619152..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersEng.gf
+++ /dev/null
@@ -1,18 +0,0 @@
-concrete numbersEng of numbers = {

-

-lincat

-Number = {s : Str};

-

-pattern

-one = "one";

-two = "two";

-three = "three";

-four = "four";

-five = "five";

-six = "six";

-seven = "seven";

-eight = "eight";

-nine = "nine";

-ten = "ten";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersPro.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersPro.gf
deleted file mode 100644
index 0fe311b57..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersPro.gf
+++ /dev/null
@@ -1,18 +0,0 @@
-concrete numbersPro of numbers = {

-

-lincat

-Number = {s : Str};

-

-pattern

-one = "1";

-two = "2";

-three = "3";

-four = "4";

-five = "5";

-six = "6";

-seven = "7";

-eight = "8";

-nine = "9";

-ten = "10";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersSwe.gf
deleted file mode 100644
index 562dbfec0..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/numbersSwe.gf
+++ /dev/null
@@ -1,20 +0,0 @@
-concrete numbersSwe of numbers = {

-

-lincat

-Number = {s : Str};

-

-pattern

-one = "ett";

-two = "två";

-three = "tre";

-four = "fyra";

-five = "fem";

-six = "sex";

-seven = "sju";

-eight = "åtta";

-nine = "nio";

-ten = "tio";

-

---aNumber = "NUMMER";

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNum.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNum.gf
deleted file mode 100644
index 820caf06a..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNum.gf
+++ /dev/null
@@ -1,19 +0,0 @@
-abstract orderNum = {

-

-cat

-OrderNumber;

-

-fun

-first : OrderNumber;

-second : OrderNumber;

-third : OrderNumber;

-fourth : OrderNumber;

-fifth : OrderNumber;

-sixth : OrderNumber;

-seventh : OrderNumber;

-eighth : OrderNumber;

-ninth : OrderNumber;

-tenth : OrderNumber;

-

---anOrder : OrderNumber;

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumEng.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumEng.gf
deleted file mode 100644
index 44dcbb547..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumEng.gf
+++ /dev/null
@@ -1,18 +0,0 @@
-concrete orderNumEng of orderNum = {

-

-lincat

-OrderNumber = {s : Str};

-

-pattern

-first = "first" ;

-second = "second" ;

-third = "third" ;

-fourth = "fourth" ;

-fifth = "fifth" ;

-sixth = "sixth" ;

-seventh = "seventh" ;

-eighth = "eight" ;

-ninth = "ninth" ; 

-tenth = "tenth" ; 

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumPro.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumPro.gf
deleted file mode 100644
index 0f984f662..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumPro.gf
+++ /dev/null
@@ -1,18 +0,0 @@
-concrete orderNumPro of orderNum = {

-

-lincat

-OrderNumber = {s : Str};

-

-pattern

-first = "1" ;

-second = "2" ;

-third = "3" ;

-fourth = "4" ;

-fifth = "5" ;

-sixth = "6" ;

-seventh = "7" ;

-eighth = "8" ;

-ninth = "9" ; 

-tenth = "10" ; 

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumSwe.gf
deleted file mode 100644
index fa722e508..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Numbers/orderNumSwe.gf
+++ /dev/null
@@ -1,20 +0,0 @@
-concrete orderNumSwe of orderNum = {

-

-lincat

-OrderNumber = {s : Str};

-

-pattern

-first = "första" ;

-second = "andra" ;

-third = "tredje" ;

-fourth = "fjärde" ;

-fifth = "femte" ;

-sixth = "sjätte" ;

-seventh = "sjunde" ;

-eighth = "åttonde" ;

-ninth = "nionde" ; 

-tenth = "tionde" ;

-

---anOrder = "ORDERNUMBER"; 

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/ResEng.gf b/grammars/TALK/GF_GoDiS/Resource/Time/ResEng.gf
deleted file mode 100644
index 5a6cc4b9c..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/ResEng.gf
+++ /dev/null
@@ -1,12 +0,0 @@
-resource ResEng = {

-

-param RefHour = ThisFormal | ThisLex | NextLex ;

-oper refs : Str -> Str -> Str -> RefHour => Str = 

-	\x,y,z -> table {ThisFormal => x ; ThisLex => y ; NextLex => z } ; 

-param MinMin = Form | Past | To ;

-oper mins : Str -> Str -> Str -> MinMin => Str = \x,y,z -> table {Form => x ; Past => y ; To => z } ; 

---oper mins : Str -> Str -> Str -> MinMin => Str = \x,y,z -> table {Form => x ; Past => y ; To => z } ; 

--- jag vill ha en variantsexpanderare, tänk tänk

---oper mins : Str -> Str -> Str -> MinMin => Str = \x,y,z -> table {Form => (variants{x}) ; Past => (variants{y}) ; To => (variants{z}) } ; 

--- Time expressions

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/ResProlog.gf b/grammars/TALK/GF_GoDiS/Resource/Time/ResProlog.gf
deleted file mode 100644
index e12b3a17c..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/ResProlog.gf
+++ /dev/null
@@ -1,24 +0,0 @@
-resource ResProlog = {

-oper

---with single quotes

---app2 : Str -> Str -> Str -> Str = \pred -> \argH -> \argM -> pred ++ "(" ++ "'" ++ argH ++ ":" ++ argM ++ "'" ++ ")" ;

---without single quotes

---app2 : Str -> Str -> Str -> Str = \pred -> \argH -> \argM -> pred ++ "(" ++ argH ++ ":" ++ argM ++ ")" ;

-

-app3 : Str -> Str -> Str = \argH -> \argM -> argH ++ ":" ++ argM ;

-

-oper

-app : Str -> Str -> Str = 

-		\pred -> \arg -> 

-		pred ++ "(" ++ arg ++ ")" ;

-

-appHakeOne : Str -> Str = 

-		\arg -> 

-		"["++ arg ++ "]" ;

-

-appCurlyOne : Str -> Str = 

-		\arg -> 

-		"{"++ arg ++"}" ;

-

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/ResourceSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Time/ResourceSwe.gf
deleted file mode 100644
index e889ae5c6..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/ResourceSwe.gf
+++ /dev/null
@@ -1,10 +0,0 @@
-resource ResourceSwe = {

-

-param RefHour = ThisFormal | ThisLex | NextLex ;

-oper refs : Str -> Str -> Str -> RefHour => Str = \x,y,z -> table {ThisFormal => x ; ThisLex => y ; NextLex => z } ; 

-

-

-param MinMin = Form | Past | To ;

-oper mins : Str -> Str -> Str -> MinMin => Str = \u,x,y -> table {Form => u ; Past => x ; To => y } ; 

-}

-

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/Time.gf b/grammars/TALK/GF_GoDiS/Resource/Time/Time.gf
deleted file mode 100644
index fc608d683..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/Time.gf
+++ /dev/null
@@ -1,103 +0,0 @@
-abstract Time = {

-cat 

-

--- Times

-Time ; 

-Hour ; 

-Minute ; 

-

-fun

--- Time

-hour0 : Hour ;

-hour1 : Hour ;

-hour2 : Hour ;

-hour3 : Hour ;

-hour4 : Hour ;

-hour5 : Hour ;

-hour6 : Hour ;

-hour7 : Hour ;

-hour8 : Hour ;

-hour9 : Hour ;

-hour10 : Hour ;

-hour11 : Hour ;

-hour12 : Hour ;

-hour13 : Hour ;

-hour14 : Hour ;

-hour15 : Hour ;

-hour16 : Hour ;

-hour17 : Hour ;

-hour18 : Hour ;

-hour19 : Hour ;

-hour20 : Hour ;

-hour21 : Hour ;

-hour22 : Hour ; 

-hour23 : Hour ;

-

--- Minutes

-minute0 : Minute ;

-minute1 : Minute ;

-minute2 : Minute ;

-minute3 : Minute ;

-minute4 : Minute ;

-minute5 : Minute ;

-minute6 : Minute ;

-minute7 : Minute ;

-minute8 : Minute ;

-minute9 : Minute ;

-minute10 : Minute ;

-minute11 : Minute ;

-minute12 : Minute ;

-minute13 : Minute ;

-minute14 : Minute ;

-minute15 : Minute ;

-minute16 : Minute ;

-minute17 : Minute ;

-minute18 : Minute ;

-minute19 : Minute ;

-minute20 : Minute ;

-minute21 : Minute ;

-minute22 : Minute ;

-minute23 : Minute ;

-minute24 : Minute ;

-minute25 : Minute ;

-minute26 : Minute ;

-minute27 : Minute ;

-minute28 : Minute ;

-minute29 : Minute ;

-minute30 : Minute ;

-minute31 : Minute ;

-minute32 : Minute ;

-minute33 : Minute ;

-minute34 : Minute ;

-minute35 : Minute ;

-minute36 : Minute ;

-minute37 : Minute ;

-minute38 : Minute ;

-minute39 : Minute ;

-minute40 : Minute ;

-minute41 : Minute ;

-minute42 : Minute ;

-minute43 : Minute ;

-minute44 : Minute ;

-minute45 : Minute ;

-minute46 : Minute ;

-minute47 : Minute ;

-minute48 : Minute ;

-minute49 : Minute ;

-minute50 : Minute ;

-minute51 : Minute ;

-minute52 : Minute ;

-minute53 : Minute ;

-minute54 : Minute ;

-minute55 : Minute ;

-minute56 : Minute ;

-minute57 : Minute ;

-minute58 : Minute ;

-minute59 : Minute ;

-

--- Time expressions

---timeFormal : Hour -> Minute -> Time ;

---timeInformal : Hour -> Minute -> Time ;

-time : Hour -> Minute -> Time ;

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/TimeEng.gf b/grammars/TALK/GF_GoDiS/Resource/Time/TimeEng.gf
deleted file mode 100644
index ef7088887..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/TimeEng.gf
+++ /dev/null
@@ -1,122 +0,0 @@
--- Time grammar English

-

-concrete TimeEng of Time = open ResEng in {

-

-lin

-hour0 = {s = refs ["null null"] (variants {["midnight"];["twelve"]}) "one"} ;

-hour1 = {s = refs "one" (variants {["one"];["one a.m"]}) "two"} ; 

-hour2 = {s = refs "two" (variants {["two"];["two a.m"]}) "three"} ; 

-hour3 = {s = refs "three" (variants {["three"];["three a.m"]}) "four"} ; 

-hour4 = {s = refs "four" (variants {["four"];["four a.m"]}) "five"} ; 

-hour5 = {s = refs "five" (variants {["five"];["five a.m"]}) "six"} ; 

-hour6 = {s = refs "six" (variants {["six"];["six a.m"]}) "seven"} ; 

-hour7 = {s = refs "seven" (variants {["seven"];["seven a.m"]}) "eight"} ; 

-hour8 = {s = refs "eight" (variants {["eight"];["eight a.m"]}) "nine"} ; 

-hour9 = {s = refs "nine" (variants {["nine"];["nine a.m"]}) "ten"} ; 

-hour10 = {s = refs "ten" (variants {["ten"];["ten a.m"]}) "eleven"} ; 

-hour11 = {s = refs "eleven" (variants {["eleven"];["eleven a.m"]}) "twelve"} ; 

-hour12 = {s = refs "twelve" (variants {["twelve"];["twelve a.m"]}) "one" } ; 

-hour13 = {s = refs "thirten" (variants {["one"];["one p.m"]}) "two" };

-hour14 = {s = refs "fourteen" (variants {["two"];["two p.m"]}) "three" } ;

-hour15 = {s = refs "fifteen" (variants {["three"];["three p.m"]}) "four" } ;

-hour16 = {s = refs "sixteen" (variants {["four"];["four p.m"]}) "five" } ;

-hour17 = {s = refs "seventeen" (variants {["five"];["five p.m"]}) "six" } ;

-hour18 = {s = refs "eighteen" (variants {["six"];["six p.m"]}) "seven" } ;

-hour19 = {s = refs "nineteen" (variants {["seven"];["seven p.m"]}) "eight" } ;

-hour20 = {s = refs "twenty" (variants {["eight"];["eight p.m"]}) "nine" } ;

-hour21 = {s = refs ["twenty one"] (variants {["nine"];["nine p.m"]}) "eight" } ; 

-hour22 = {s = refs ["twenty two"] (variants {["ten"];["ten p.m"]}) "eleven" } ;

-hour23 = {s = refs ["twenty three"] (variants {["eleven"]}) (variants {["midnight"];["twelve"]})} ;

-

-

-lin

-

-minute0 = {s = mins (variants {["o'clock"];["sharp"];["hundred hours"]}) (variants{[""]}) (variants{})};

-minute1 = {s = mins ["oh one"] (variants{["one minute past"];["one past"]}) (variants{})};

-minute2 = {s = mins ["oh two"] (variants{["two minutes past"];["two past"]}) (variants{})};

-minute3 = {s = mins ["oh three"] (variants{["three minutes past"];["three past"]}) (variants{})};

-minute4 = {s = mins ["oh four"] (variants{["four minutes past"];["four past"]}) (variants{})};

-minute5 = {s = mins ["oh five"] (variants{["five minutes past"];["five past"]}) (variants{})};

-minute6 = {s = mins ["oh six"] (variants{["six minutes past"];["six past"]}) (variants{})};

-minute7 = {s = mins ["oh seven"] (variants{["seven minutes past"];["seven past"]}) (variants{})};

-minute8 = {s = mins ["oh eight"] (variants{["eight minutes past"];["eight past"]}) (variants{})};

-minute9 = {s = mins ["oh nine"] (variants{["nine minutes past"];["nine past"]}) (variants{})};

-

-minute10 = {s = mins ["ten"] (variants{["ten minutes past"];["ten past"]}) (variants{})};

-minute11 = {s = mins ["eleven"] (variants{["eleven minutes past"];["eleven past"]}) (variants{})};

-minute12 = {s = mins ["twelve"] (variants{["twelve minutes past"];["twelve past"]}) (variants{})};

-minute13 = {s = mins ["thirteen"] (variants{["thirteen minutes past"];["thirteen past"]}) (variants{})};

-minute14 = {s = mins ["fourteen"] (variants{["fourteen minutes past"];["fourteen past"]}) (variants{})};

-minute15 = {s = mins ["fifteen"] (variants{["fifteen minutes past"];["fifteen past"];["quarter past"];["a quarter past"]}) (variants{})};

-minute16 = {s = mins ["sixteen"] (variants{["sixteen minutes past"];["sixteen past"]}) (variants{})};

-minute17 = {s = mins ["seventeen"] (variants{["seventeen minutes past"];["seventeen past"]}) (variants{})};

-minute18 = {s = mins ["eightteen"] (variants{["eighteen minutes past"];["eighteen past"]}) (variants{})};

-minute19 = {s = mins ["nineteen"] (variants{["nineteen minutes past"];["nineteen past"]}) (variants{})};

-

-minute20 = {s = mins ["twenty"] (variants{["twenty minutes past"];["twenty past"]}) (variants{})};

-minute21 = {s = mins ["twenty one"] (variants{["twenty one minutes past"];["twenty one past"]}) (variants{})};

-minute22 = {s = mins ["twenty two"] (variants{["twenty two minutes past"];["twenty two past"]}) (variants{})};

-minute23 = {s = mins ["twenty three"] (variants{["twenty three minutes past"];["twenty three past"]}) (variants{})};

-minute24 = {s = mins ["twenty four"] (variants{["twenty four minutes past"];["twenty four past"]}) (variants{})};

-minute25 = {s = mins ["twenty five"] (variants{["twenty five minutes past"];["twenty two five past"]}) (variants{})};

-minute26 = {s = mins ["twenty six"] (variants{["twenty six minutes past"];["twenty six past"]}) (variants{})};

-minute27 = {s = mins ["twenty seven"] (variants{["twenty seven minutes past"];["twenty seven past"]}) (variants{})};

-minute28 = {s = mins ["twenty eight"] (variants{["twenty eight minutes past"];["twenty eight past"]}) (variants{})};

-minute29 = {s = mins ["twenty nine"] (variants{["twenty nine minutes past"];["twenty nine past"]}) (variants{})};

-

-minute30 = {s = mins ["thirty"] (variants{["thirty minutes past"];["thirty past"];["half past"]}) (variants{})};

-

-minute31 = {s = mins ["thirty one"] (variants{["one minute past half past????"]}) (variants{["twenty nine minutes to"];["twenty nine to"]})};

-minute32 = {s = mins ["thirty two"] (variants{}) (variants{["twenty eight minutes to"];["twenty eight to"]})};

-minute33 = {s = mins ["thirty three"] (variants{}) (variants{["twenty seven minutes to"];["twenty seven to"]})};

-minute34 = {s = mins ["thirty four"] (variants{}) (variants{["twenty six minutes to"];["twenty six to"]})};

-minute35 = {s = mins ["thirty five"] (variants{}) (variants{["twenty five minutes to"];["twenty five to"]})};

-minute36 = {s = mins ["thirty six"] (variants{}) (variants{["twenty four minutes to"];["twenty four to"]})};

-minute37 = {s = mins ["thirty seven"] (variants{}) (variants{["twenty three minutes to"];["twenty three to"]})};

-minute38 = {s = mins ["thirty eight"] (variants{}) (variants{["twenty two minutes to"];["twenty two to"]})};

-minute39 = {s = mins ["thirty nine"] (variants{}) (variants{["twenty one minutes to"];["twenty one to"]})};

-minute40 = {s = mins ["fourty"] (variants{}) (variants{["twenty minutes to"];["twenty to"]})};

-

-minute41 = {s = mins ["fourty one"] (variants{}) (variants{["nineteen minutes to"];["nineteen to"]})};

-minute42 = {s = mins ["fourty two"] (variants{}) (variants{["eightteen minutes to"];["eightteen to"]})};

-minute43 = {s = mins ["fourty three"] (variants{}) (variants{["seventeen minutes to"];["seventeen to"]})};

-minute44 = {s = mins ["fourty four"] (variants{}) (variants{["sixteen minutes to"];["sixteen to"]})};

-minute45 = {s = mins ["fourty five"] (variants{["three quarters past???"]}) (variants{["fifteen minutes to"];["fifteen to"]})};

-minute46 = {s = mins ["fourty six"] (variants{}) (variants{["fourteen minutes to"];["fourteen to"]})};

-minute47 = {s = mins ["fourty seven"] (variants{}) (variants{["thirteen minutes to"];["thirteen to"]})};

-minute48 = {s = mins ["fourty eight"] (variants{}) (variants{["twelve minutes to"];["twelve to"]})};

-minute49 = {s = mins ["fourty nine"] (variants{}) (variants{["eleven minutes to"];["eleven to"]})};

-minute50 = {s = mins ["fifty"] (variants{}) (variants{["ten minutes to"];["ten to"]})};

-

-minute51 = {s = mins ["fifty one"] (variants{}) (variants{["nine minutes to"];["nine to"]})};

-minute52 = {s = mins ["fifty two"] (variants{}) (variants{["eight minutes to"];["eight to"]})};

-minute53 = {s = mins ["fifty three"] (variants{}) (variants{["seven minutes to"];["seven to"]})};

-minute54 = {s = mins ["fifty four"] (variants{}) (variants{["six minutes to"];["six to"]})};

-minute55 = {s = mins ["fifty five"] (variants{}) (variants{["five minutes to"];["five to"]})};

-minute56 = {s = mins ["fifty six"] (variants{}) (variants{["four minutes to"];["four to"]})};

-minute57 = {s = mins ["fifty seven"] (variants{}) (variants{["three minutes to"];["three to"]})};

-minute58 = {s = mins ["fifty eight"] (variants{}) (variants{["two minutes to"];["two to"]})};

-minute59 = {s = mins ["fifty nine"] (variants{}) (variants{["one minute to"];["one to"]})};

-

-

-

-lincat Hour = {s : RefHour => Str} ;

-lincat Minute = {s : MinMin => Str} ;

-

-

-lin 

-

---timeFormal h m = {s = h.s ! ThisFormal ++ m.s ! Form} ;

---timeInformal h m = {s = variants { 

-	--m.s ! Past ++ h.s ! ThisLex ; 

-	--m.s ! To ++ h.s ! NextLex

-	--} 

-       --};

-

-time h m = {s = variants { 

-	h.s ! ThisFormal ++ m.s ! Form ;

-	m.s ! Past ++ h.s ! ThisLex ; 

-	m.s ! To ++ h.s ! NextLex

-	} 

-       };

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/TimeProlog.gf b/grammars/TALK/GF_GoDiS/Resource/Time/TimeProlog.gf
deleted file mode 100644
index d706af0e9..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/TimeProlog.gf
+++ /dev/null
@@ -1,105 +0,0 @@
---File name TimeProlog

--- Time grammar Prolog output notation

---# -path=.:../Time

-concrete TimeProlog of Time = open ResProlog in {

-

-flags lexer=codelit ; unlexer=codelit ; startcat=Time ;

---flags lexer=code ; unlexer=code ; startcat=Time ;

-

-pattern

-

-hour0 = "00" ; 

-hour1 = "01" ;

-hour2 = "02" ;

-hour3 = "03" ;

-hour4 = "04" ;

-hour5 = "05" ;

-hour6 = "06" ;

-hour7 = "07" ;

-hour8 = "08" ;

-hour9 = "09" ;

-hour10 = "10" ;

-hour11 = "11" ;

-hour12 = "12" ;

-hour13 = "13" ;

-hour14 = "14" ;

-hour15 = "15" ;

-hour16 = "16" ;

-hour17 = "17" ;

-hour18 = "18" ;

-hour19 = "19" ;

-hour20 = "20" ;

-hour21 = "21" ;

-hour22 = "22" ;

-hour23 = "23" ;

-

---Minutes

-minute0 = "00" ;

-minute1 = "01" ;

-minute2 = "02" ;

-minute3 = "03" ;

-minute4 = "04" ;

-minute5 = "05" ;

-minute6 = "06" ;

-minute7 = "07" ;

-minute8 = "08" ;

-minute9 = "09" ;

-minute10 = "10" ;

-minute11 = "11" ;

-minute12 = "12" ;

-minute13 = "13" ;

-minute14 = "14" ;

-minute15 = "15" ;

-minute16 = "16" ;

-minute17 = "17" ;

-minute18 = "18" ;

-minute19 = "19" ;

-minute20 = "20" ;

-minute21 = "21" ;

-minute22 = "22" ;

-minute23 = "23" ;

-minute24 = "24" ;

-minute25 = "25" ;

-minute26 = "26" ;

-minute27 = "27" ;

-minute28 = "28" ;

-minute29 = "29" ;

-minute30 = "30" ;

-

-minute31 = "31" ;

-minute32 = "32" ;

-minute33 = "33" ;

-minute34 = "34" ;

-minute35 = "35" ;

-minute36 = "36" ;

-minute37 = "37" ;

-minute38 = "38" ;

-minute39 = "39" ;

-minute40 = "40" ;

-minute41 = "41" ;

-minute42 = "42" ;

-minute43 = "43" ;

-minute44 = "44" ;

-minute45 = "45" ;

-minute46 = "46" ;

-minute47 = "47" ;

-minute48 = "48" ;

-minute49 = "49" ;

-minute50 = "50" ;

-minute51 = "51" ;

-minute52 = "52" ;

-minute53 = "53" ;

-minute54 = "54" ;

-minute55 = "55" ;

-minute56 = "56" ;

-minute57 = "57" ;

-minute58 = "58" ;

-minute59 = "59" ;

-

-

-lin

---timeFormal h m = {s = app2 "time" h.s m.s } ;

---timeInformal h m = {s = app2 "time" h.s m.s } ;

---time h m = {s = app2 "time" h.s m.s } ;

-time h m = {s = app3 h.s m.s } ;

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/TimeSwe.gf b/grammars/TALK/GF_GoDiS/Resource/Time/TimeSwe.gf
deleted file mode 100644
index f7a145454..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/TimeSwe.gf
+++ /dev/null
@@ -1,163 +0,0 @@
--- File name TimeSwe

-

---# -path=.:..:../Time:../Weekday

-concrete TimeSwe of Time = open ResourceSwe in {

-

---Hours

-lin

-

---hour0 = {s = refs (variants{["noll noll"];["noll"]}) "tolv" "ett"} ; 

-hour0 = {s = refs (variants{["noll noll"];["noll"]})(variants{}) (variants{})} ; 

-hour1 = {s = refs ["noll ett"] "ett" "två"} ; 

-hour2 = {s = refs ["noll två"] "två" "tre"} ; 

-hour3 = {s = refs ["noll tre"] "tre" "fyra"} ; 

-hour4 = {s = refs ["noll fyra"] "fyra" "fem"} ; 

-hour5 = {s = refs ["noll fem"] "fem" "sex"} ; 

-hour6 = {s = refs ["noll sex"] "sex" "sju"} ; 

-hour7 = {s = refs ["noll sju"] "sju" "åtta"} ; 

-hour8 = {s = refs ["noll åtta"] "åtta" "nio"} ; 

-hour9 = {s = refs ["noll nio"] "nio" "tio"} ; 

-hour10 = {s = refs "tio" "tio" "elva"} ; 

-hour11 = {s = refs "elva""elva" "tolv"} ; 

-hour12 = {s = refs "tolv" "tolv" "ett" } ;

- 

-hour13 = {s = refs "tretton" "ett" "två" };

-hour14 = {s = refs "fjorton" "två" "tre" };

-hour15 = {s = refs "femton" "tre" "fyra" };

-hour16 = {s = refs "sexton" "fyra" "fem" };

-hour17 = {s = refs "sjutton" "fem" "sex" };

-hour18 = {s = refs "arton" "sex" "sju" };

-hour19 = {s = refs "nitton" "sju" "åtta" } ;

-hour20 = {s = refs "tjugo" "åtta" "nio" } ;

-hour21 = {s = refs (variants{["tju ett"];["tjugo ett"]}) "nio" "tio" } ;

-hour22 = {s = refs (variants{["tju två"];["tjugo två"]}) "tio" "elva" } ;

-hour23 = {s = refs (variants{["tju tre"];["tjugo tre"]}) "elva" "tolv" };

-

---Minutes

---0-9

---minute0 = {s = mins (variants{["noll noll"]}) (variants{}) (variants{}) (variants{[""]})} ;

-minute0 = {s = mins ["noll noll"] (variants{[""]}) (variants{})} ;

-minute1 = {s = mins ["noll ett"] (variants {["ett över"] ; ["en minut över"]}) (variants{}) } ;

-minute2 = {s = mins ["noll två"] (variants {["två över"] ; ["två minuter över"]}) (variants{})} ;

-minute3 = {s = mins ["noll tre"] (variants { ["tre över"] ; ["tre minuter över"]}) (variants{})} ;

-minute4 = {s = mins ["noll fyra"] (variants { ["fyra över"] ; ["fyra minuter över"]}) (variants{})} ;

-minute5 = {s = mins ["noll fem"] (variants { ["fem över"] ; ["fem minuter över"]}) (variants{})} ;

-minute6 = {s = mins ["noll sex"] (variants { ["sex över"] ; ["sex minuter över"]}) (variants{})} ;

-minute7 = {s = mins ["noll sju"] (variants { ["sju över"] ; ["sju minuter över"]}) (variants{})} ;

-minute8 = {s = mins ["noll åtta"] (variants { ["åtta över"] ; ["åtta minuter över"]}) (variants{})} ;

-minute9 = {s = mins ["noll nio"] (variants { ["nio över"] ; ["nio minuter över"]}) (variants{})} ;

-

---10-19

-minute10 = {s = mins ["tio"] (variants { ["tio över"] ; ["tio minuter över"]}) (variants{})} ;

-minute11 = {s = mins ["elva"] (variants { ["elva över"] ; ["elva minuter över"]}) (variants{})} ;

-minute12 = {s = mins ["tolv"] (variants { ["tolv över"] ; ["tolv minuter över"]}) (variants{})} ;

-minute13 = {s = mins ["tretton"] (variants { ["tretton över"] ; ["tretton minuter över"]}) (variants{})} ;

-minute14 = {s = mins ["fjorton"] (variants { ["fjorton över"] ; ["fjorton minuter över"]}) (variants{})} ;

-minute15 = {s = mins ["femton"] (variants { ["femton över"] ; ["femton minuter över"] ; ["kvart över"]}) (variants{})} ;

-minute16 = {s = mins ["sexton"] (variants { ["sexton över"] ; ["sexton minuter över"]}) (variants{})} ;

-minute17 = {s = mins ["sjutton"] (variants { ["sjutton över"] ; ["sjutton minuter över"]}) (variants{})} ;

-minute18 = {s = mins ["arton"] (variants { ["arton över"] ; ["arton minuter över"]}) (variants{})} ;

-minute19 = {s = mins ["nitton"] (variants { ["nitton över"] ; ["nitton minuter över"]}) (variants{})} ;

-

---20-29

-minute20 = {s = mins ["tjugo"] (variants { ["tjugo över"] ; ["tjugo minuter över"]}) (variants {})} ;

-minute21 = {s = mins (variants{["tju ett"];["tjugo ett"]}) (variants {["tju en över"];["tjugo en över"];["tju ett över"];["tjugo ett över"];["tju en minuter över"];["tjugo en minuter över"]}) (variants {}) } ;

-minute22 = {s = mins (variants{["tju två"];["tjugo två"]}) (variants {["tju två över"];["tjugo två över"];["tju två minuter över"];["tjugo två minuter över"]}) (variants {}) } ;

-minute23 = {s = mins (variants{["tju tre"];["tjugo tre"]}) (variants {["tju tre över"];["tjugo tre över"];["tju tre minuter över"];["tjugo tre minuter över"];}) (variants {}) } ;

---minute23 = {s = mins ["tjugo tre"] (variants { ["tjugo tre över"] ; ["tjugo tre minuter över"]}) (variants {}) } ;

-minute24 = {s = mins (variants{["tju fyra"];["tjugo fyra"]}) (variants {["tju fyra över"];["tjugo fyra över"];["tju fyra minuter över"];["tjugo fyra minuter över"];}) (variants {["sex minuter i halv"];["sex i halv"]}) } ;

---minute24 = {s = mins ["tjugo fyra"] (variants { ["tjugo fyra över"];["tjugo fyra minuter över"]}) (variants {["sex minuter i halv"];["sex i halv"]})} ;

-minute25 = {s = mins (variants{["tju fem"];["tjugo fem"]}) (variants {["tju fem över"];["tjugo fem över"];["tju fem minuter över"];["tjugo fem minuter över"];}) (variants {["fem minuter i halv"];["fem i halv"]}) } ;

---minute25 = {s = mins ["tjugo fem"] (variants { ["tjugo fem över"] ; ["tjugo fem minuter över"]}) (variants {["fem minuter i halv"];["fem i halv"]}) } ;

-minute26 = {s = mins (variants{["tju sex"];["tjugo sex"]}) (variants {["tju sex över"];["tjugo sex över"];["tju sex minuter över"];["tjugo sex minuter över"];}) (variants {["fyra minuter i halv"];["fyra i halv"]}) } ;

---minute26 = {s = mins ["tjugo sex"] (variants { ["tjugo sex över"] ; ["tjugo sex minuter över"]}) (variants {["fyra minuter i halv"];["fyra i halv"]}) } ;

-minute27 = {s = mins (variants{["tju sju"];["tjugo sju"]}) (variants {["tju sju över"];["tjugo sju över"];["tju sju minuter över"];["tjugo sju minuter över"];}) (variants {["tre minuter i halv"];["tre i halv"]}) } ;

---minute27 = {s = mins ["tjugo sju"] (variants { ["tjugo sju över"] ; ["tjugo sju minuter över"]}) (variants {["tre minuter i halv"];["tre i halv"]}) } ;

-minute28 = {s = mins (variants{["tju åtta"];["tjugo åtta"]}) (variants {["tju åtta över"];["tjugo åtta över"];["tju åtta minuter över"];["tjugo åtta minuter över"];}) (variants {["två minuter i halv"];["två i halv"]}) } ;

---minute28 = {s = mins ["tjugo åtta"] (variants { ["tjugo åtta över"] ; ["tjugo åtta minuter över"]}) (variants {["två minuter i halv"];["två i halv"]}) } ;

-minute29 = {s = mins (variants{["tju nio"];["tjugo nio"]}) (variants {["tju nio över"];["tjugo nio över"];["tju nio minuter över"];["tjugo nio minuter över"];}) (variants {["en minuter i halv"];["en i halv"]}) } ;

---minute29 = {s = mins ["tjugo nio"] (variants { ["tjugo nio över"] ; ["tjugo nio minuter över"]}) (variants {["en minut i halv"];["en i halv"]}) } ;

-

---30-39

-minute30 = {s = mins ["trettio"] (variants { ["trettio minuter över"]}) ["halv"] } ;

-minute31 = {s = mins ["trettio ett"] (variants { ["trettio en över"] ; ["trettio ett över"] ; ["trettio en minuter över"]}) (variants {["tjugo nio minuter i"];["tjugo nio i"];["en minut över halv"];["en över halv"]}) } ;

-minute32 = {s = mins ["trettio två"] (variants { ["trettio två över"] ; ["trettio två minuter över"]}) (variants {["tjugo åtta minuter i"];["tjugo åtta i"];["två minuter över halv"];["två över halv"]}) } ;

-minute33 = {s = mins ["trettio tre"] (variants { ["trettio tre över"] ; ["trettio tre minuter över"]}) (variants {["tjugo sju minuter i"];["tjugo sju i"];["tre minuter över halv"];["tre över halv"]}) } ;

-minute34 = {s = mins ["trettio fyra"] (variants { ["trettio fyra över"] ; ["trettio fyra minuter över"]}) (variants {["tjugo sex minuter i"];["tjugo sex i"];["fyra minuter över halv"];["fyra över halv"]}) } ;

-minute35 = {s = mins ["trettio fem"] (variants { ["trettio fem över"] ; ["trettio fem minuter över"]}) (variants {["tjugo fem minuter i"];["tjugo fem i"];["fem minuter över halv"]; ["fem över halv"]}) } ;

-minute36 = {s = mins ["trettio sex"] (variants { ["trettio sex över"] ; ["trettio sex minuter över"]}) (variants {["tjugo fyra minuter i"];["tjugo fyra i"];["sex minuter över halv"];["sex över halv"]}) } ;

-minute37 = {s = mins ["trettio sju"] (variants { ["trettio sju över"] ; ["trettio sju minuter över"]}) (variants {["tjugo tre minuter i"];["tjugo tre i"];["sju minuter över halv"];["sju över halv"]}) } ;

-minute38 = {s = mins ["trettio åtta"] (variants { ["trettio åtta över"] ; ["trettio åtta minuter över"]}) (variants {["tjugo två minuter i"];["tjugo två i"]}) } ;

-minute39 = {s = mins ["trettio nio"] (variants { ["trettio nio över"] ; ["trettio nio minuter över"]}) (variants {["tjugo en minuter i"];["tjugo en i"];["tjugo ett i"]}) } ;

-

---40-49

-minute40 = {s = mins ["fyrtio"] (variants {}) (variants {["tjugo minuter i"];["tjugo i"]}) } ;

-minute41 = {s = mins ["fyrtio ett"] (variants {}) (variants {["nitton minuter i"];["nitton i"]}) } ;

-minute42 = {s = mins ["fyrtio två"] (variants {}) (variants {["arton minuter i"];["arton i"]}) } ;

-minute43 = {s = mins ["fyrtio tre"] (variants {}) (variants {["sjutton minuter i"];["sjutton i"]}) } ;

-minute44 = {s = mins ["fyrtio fyra"] (variants {}) (variants {["sexton minuter i"];["sexton i"]}) } ;

-minute45 = {s = mins (variants {["fyrtio fem"];["tre kvart"]}) (variants {}) (variants {["femton minuter i"];["femton i"];["kvart i"]}) } ;

-minute46 = {s = mins ["fyrtio sex"] (variants {}) (variants {["fjorton minuter i"];["fjorton i"]}) } ;

-minute47 = {s = mins ["fyrtio sju"] (variants {}) (variants {["tretton minuter i"];["tretton i"]}) } ;

-minute48 = {s = mins ["fyrtio åtta"] (variants {}) (variants {["tolv minuter i"];["tolv i"]}) } ;

-minute49 = {s = mins ["fyrtio nio"] (variants {}) (variants {["elva minuter i"];["elva i"]}) } ;

-

---50-59

-minute50 = {s = mins ["femtio"] (variants {}) (variants {["tio minuter i"];["tio i"]}) } ;

-minute51 = {s = mins ["femtio ett"] (variants {}) (variants {["nio minuter i"];["nio i"]}) } ;

-minute52 = {s = mins ["femtio två"] (variants {}) (variants {["åtta minuter i"];["åtta i"]}) } ;

-minute53 = {s = mins ["femtio tre"] (variants {}) (variants {["sju minuter i"];["sju i"]}) } ;

-minute54 = {s = mins ["femtio fyra"] (variants {}) (variants {["sex minuter i"];["sex i"]}) } ;

-minute55 = {s = mins ["femtio fem"] (variants {}) (variants {["fem minuter i"];["fem i"]}) } ;

-minute56 = {s = mins ["femtio sex"] (variants {}) (variants {["fyra minuter i"];["fyra i"]}) } ;

-minute57 = {s = mins ["femtio sju"] (variants {}) (variants {["tre minuter i"];["tre i"]}) } ;

-minute58 = {s = mins ["femtio åtta"] (variants {}) (variants {["två minuter i"];["två i"]}) } ;

-minute59 = {s = mins ["femtio nio"] (variants {}) (variants {["en minut i"];["en i"];["ett i"]}) } ;

-

-lincat Hour = {s : RefHour => Str} ;

-

-lincat Minute = {s : MinMin => Str} ;

-

--- Time expressions

-lin 

---timeDotty h m = {s = h.s ! ThisLex ++ m.s ! Dot };

---timeInformal h m = {s = variants { 

-	--m.s ! Past ++ h.s ! ThisLex ; 

-	--m.s ! To ++ h.s ! NextLex 

-	--} 

-       --};

---timeFormal h m = {s = h.s ! ThisFormal ++ m.s ! Form} ;

-

---klockan arton och tjugo

---arton och tjugo

---arton och

---sex och

-

-time h m = {s = 

-     variants { 

-	h.s ! ThisFormal ++ m.s ! Form ;

-	h.s ! ThisFormal ++ "och" ++ m.s ! Form ;

-	m.s ! Past ++ h.s ! ThisLex ;

-	m.s ! To ++ h.s ! NextLex;

-	"klockan" ++ h.s ! ThisFormal ++ m.s ! Form ;

-	--"klockan" ++ h.s ! ThisFormal ++ "och" ++ m.s ! Form ;

-	"klockan" ++ m.s ! Past ++ h.s ! ThisLex ;

-	"klockan" ++ m.s ! To ++ h.s ! NextLex

-	} 

-       };

-

-}

-

-

-

-

-

-

-

-

-

-

-

-

-

-

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/Weekday.gf b/grammars/TALK/GF_GoDiS/Resource/Time/Weekday.gf
deleted file mode 100644
index 6ae308273..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/Weekday.gf
+++ /dev/null
@@ -1,22 +0,0 @@
----File name Weekday.gf

-

-abstract Weekday = {

-

-cat

-Weekday ;

-Day ;

-

-fun

-monday : Weekday ;

-tuesday : Weekday ;

-wednesday : Weekday ;

-thursday : Weekday ;

-friday : Weekday ;

-saturday : Weekday ;

-sunday : Weekday ;

-

-fun

-today : Day ;

-tomorrow : Day;

-

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayEng.gf b/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayEng.gf
deleted file mode 100644
index dc2f795e6..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayEng.gf
+++ /dev/null
@@ -1,15 +0,0 @@
-concrete WeekdayEng of Weekday = {

-

-pattern

-today = "today" ;

-monday = "monday" ;

-tuesday = "tuesday" ;

-wednesday = "wednesday" ;

-thursday = "thursday" ;

-friday = "friday" ;

-saturday = "saturday" ;

-sunday = "sunday" ;

-today = "today" ;

-tomorrow = "tomorrow" ;

-

-}
\ No newline at end of file
diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayProlog.gf b/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayProlog.gf
deleted file mode 100644
index 523d0f310..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdayProlog.gf
+++ /dev/null
@@ -1,19 +0,0 @@
---# -path=.:../Time

-

----File name weekday.Swe.gf

-

-concrete WeekdayProlog of Weekday = {

-

-pattern

-

-monday = "monday" ;

-tuesday = "tuesday" ;

-wednesday = "wednesday" ;

-thursday = "thursday" ;

-friday = "friday" ;

-saturday = "saturday" ;

-sunday = "sunday" ;

-

-today = "today" ;

-tomorrow = "tomorrow";

-}

diff --git a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdaySwe.gf b/grammars/TALK/GF_GoDiS/Resource/Time/WeekdaySwe.gf
deleted file mode 100644
index 7422d032c..000000000
--- a/grammars/TALK/GF_GoDiS/Resource/Time/WeekdaySwe.gf
+++ /dev/null
@@ -1,16 +0,0 @@
-concrete WeekdaySwe of Weekday = {

-

-pattern

-

-monday = "måndag" ;

-tuesday = "tisdag" ;

-wednesday = "onsdag" ;

-thursday = "torsdag" ;

-friday = "fredag" ;

-saturday = "lördag" ;

-sunday = "söndag" ;

-

-today = "idag" ;

-tomorrow = "imorgon" ;

-

-}

diff --git a/grammars/TALK/README b/grammars/TALK/README
deleted file mode 100644
index 468c7a6d2..000000000
--- a/grammars/TALK/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Grammars from the European TALK Project.
-
-Under construction, mostly work by Ann-Charlotte Forslund.
-
-To test:
-
-  cd GF_GoDiS/Domain/DJGoDiS/User/
-
-  gf userDomainPro.gf userDomainSwe.gf userDomainEng.gf
-
-
-  > gr | l -multi -all
-
-  > p "lower the volume"
-
-  > gt -depth=5 | pt -transform=solve | l -lang=userDomainSwe
-
-(README by Aarne Ranta 27/6/2005)