From 7704f6a18cea80a8511ad9b3a7e57db6348c6e4b Mon Sep 17 00:00:00 2001
From: Meowyam <maryam@chilon.net>
Date: Mon, 3 Jan 2022 21:39:01 +0800
Subject: [PATCH] changed which from apa to yang mana, which is more correct

---
 src/malay/StructuralMay.gf          |  5 ++---
 src/malay/unittest/questions.gftest | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/malay/StructuralMay.gf b/src/malay/StructuralMay.gf
index 057909bf..e9db991f 100644
--- a/src/malay/StructuralMay.gf
+++ b/src/malay/StructuralMay.gf
@@ -74,7 +74,7 @@ lin someSg_Det =
 lin no_Quant = -}
 lin that_Quant = mkQuant "itu" ;
 lin this_Quant = mkQuant "ini" ;
-lin which_IQuant = mkQuant "apa" ** {isPre = False} ;
+lin which_IQuant = mkQuant "yang mana" ** {isPre = False} ;
 
 -----
 -- NP
@@ -115,7 +115,6 @@ lin to_Prep = mkPrep "ke" ;
 lin with_Prep = mkPrep "dengan" ;
 -- lin without_Prep = mkPrep "" ;
 
-
 -------
 -- Pron
 
@@ -141,7 +140,7 @@ lin they_Pron = mkPron "mereka" P3 ;
 -- lin although_Subj =
 -- lin because_Subj =
 lin if_Subj = ss "sekiranya" ;
--- lin that_Subj =
+lin that_Subj = ss "yang" ;
 lin when_Subj = ss "kalau" ;
 
 
diff --git a/src/malay/unittest/questions.gftest b/src/malay/unittest/questions.gftest
index f80996b4..b5e654df 100644
--- a/src/malay/unittest/questions.gftest
+++ b/src/malay/unittest/questions.gftest
@@ -1,10 +1,10 @@
 Lang: IdetCN (IdetQuant which_IQuant (NumCard (NumNumeral (num (pot2as3 (pot1as2 (pot0as1 (pot0 n5)))))))) (UseN song_N)
 LangEng: which five songs
-LangMay: lima lagu apa
+LangMay: lima lagu yang mana
 
 Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumPl) (UseN song_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a like_V2))))) NoVoc
 LangEng: which songs do you like
-LangMay: kamu suka lagu-lagu apa
+LangMay: kamu suka lagu-lagu yang mana
 
 Lang: PhrUtt NoPConj (UttQS (UseQCl (TTAnt TPres ASimul) PPos (QuestSlash (IdetCN how8many_IDet (UseN cat_N)) (SlashVP (UsePron youPl_Pron) (SlashV2a have_V2))))) NoVoc
 LangEng: how many cats do you have
@@ -28,7 +28,7 @@ LangMay: adakah awak tidak mengajar kucing
 
 Lang: UseQCl (TTAnt TPres ASimul) PPos (QuestVP (IdetCN (IdetQuant which_IQuant NumSg) (UseN cat_N)) (ComplSlash (SlashV2a teach_V2) (UsePron he_Pron)))
 LangEng: which cat teaches him
-LangMay: kucing apa mengajar dia
+LangMay: kucing yang mana mengajar dia
 
 Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv where_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
 LangEng: where did you go
@@ -36,4 +36,13 @@ LangMay: awak pergi mana
 
 Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestIAdv why_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
 LangEng: why did you go
-LangMay: mengapa awak pergi
\ No newline at end of file
+LangMay: mengapa awak pergi
+
+Lang: UseQCl (TTAnt TPast ASimul) PNeg (QuestIAdv why_IAdv (PredVP (UsePron youSg_Pron) (UseV go_V)))
+LangEng: why didn't you go
+LangMay: mengapa awak tidak pergi
+
+-- With ComplSlash: Wh-word is the object
+Lang: UseQCl (TTAnt TPast ASimul) PPos (QuestSlash (IdetCN (IdetQuant which_IQuant NumSg) (UseN woman_N)) (SlashVP (UsePron youSg_Pron) (SlashV2a see_V2)))
+LangEng: which woman did you see
+LangMay : awak melihat perempuan yang mana
\ No newline at end of file