mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-09 04:59:31 -06:00
splits in Phrasebook Kind category: Drink and Plur; some new words in Tha,Eng,Fin,Swe
This commit is contained in:
@@ -25,6 +25,8 @@ abstract Sentences = Numeral ** {
|
||||
Item ; -- a single entity e.g. "this pizza"
|
||||
Kind ; -- a type of an item e.g. "pizza"
|
||||
MassKind ; -- a type mass (uncountable) e.g. "water"
|
||||
PlurKind ; -- a type usually only in plural e.g. "noodles"
|
||||
DrinkKind ; -- a drinkable, countable type e.g. "beer"
|
||||
Quality ; -- qualification of an item, can be complex e.g. "very good"
|
||||
Property ; -- basic property of an item, one word e.g. "good"
|
||||
Place ; -- location e.g. "the bar"
|
||||
@@ -109,6 +111,7 @@ abstract Sentences = Numeral ** {
|
||||
ObjNumber : Number -> Kind -> PrimObject ; -- five pizzas
|
||||
ObjIndef : Kind -> PrimObject ; -- a pizza
|
||||
ObjPlural : Kind -> PrimObject ; -- pizzas
|
||||
ObjPlur : PlurKind -> PrimObject ; -- noodles
|
||||
ObjMass : MassKind -> PrimObject ; -- water
|
||||
ObjAndObj : PrimObject -> Object -> Object ; -- this pizza and a beer
|
||||
OneObj : PrimObject -> Object ; -- this pizza
|
||||
@@ -119,11 +122,15 @@ abstract Sentences = Numeral ** {
|
||||
Too : Property -> Quality ; -- too Italian
|
||||
PropQuality : Property -> Quality ; -- Italian
|
||||
|
||||
MassDrink : DrinkKind -> MassKind ; -- beer
|
||||
KindDrink : DrinkKind -> Kind ; -- (one) beer
|
||||
|
||||
-- Determiners.
|
||||
|
||||
This, That, These, Those : Kind -> Item ; -- this pizza,...,those pizzas
|
||||
The, Thes : Kind -> Item ; -- the pizza, the pizzas
|
||||
ThisMass, ThatMass, TheMass : MassKind -> Item ; -- this/that/the water
|
||||
This, That, These, Those : Kind -> Item ; -- this pizza,...,those pizzas
|
||||
The, Thes : Kind -> Item ; -- the pizza, the pizzas
|
||||
ThisMass, ThatMass, TheMass : MassKind -> Item ; -- this/that/the water
|
||||
ThesePlur, ThosePlur, ThesPlur : PlurKind -> Item ; -- these/those/the potatoes
|
||||
|
||||
AmountCurrency : Number -> Currency -> Price ; -- five euros
|
||||
|
||||
@@ -189,8 +196,8 @@ abstract Sentences = Numeral ** {
|
||||
|
||||
VPlay, VRun, VSit, VSleep, VSwim, VWalk : VerbPhrase ;
|
||||
VDrink, VEat, VRead, VWait, VWrite : VerbPhrase ;
|
||||
--- VBuy, VDrink, VEat : VerbPhrase ;
|
||||
--- VWait : Person -> VerbPhrase ;
|
||||
V2Buy, V2Drink, V2Eat : Object -> VerbPhrase ;
|
||||
V2Wait : Person -> VerbPhrase ;
|
||||
|
||||
-- other new things allowed by the resource
|
||||
|
||||
|
||||
@@ -20,6 +20,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
|
||||
Item = NP ;
|
||||
Kind = CN ;
|
||||
MassKind = CN ;
|
||||
MassKind = CN ;
|
||||
PlurKind = CN ;
|
||||
DrinkKind = CN ;
|
||||
Quality = AP ;
|
||||
Property = A ;
|
||||
Object = NP ;
|
||||
@@ -73,7 +76,7 @@ incomplete concrete SentencesI of Sentences = Numeral **
|
||||
PNo = mkPhrase no_Utt ;
|
||||
PYesToNo = mkPhrase yes_Utt ;
|
||||
|
||||
GObjectPlease o = lin Text (mkPhr noPConj (mkUtt o) please_Voc) ;
|
||||
GObjectPlease o = lin Text (mkPhr noPConj (mkUtt o) please_Voc) | lin Text (mkUtt o) ;
|
||||
|
||||
Is = mkCl ;
|
||||
IsMass m q = mkCl (mkNP m) q ;
|
||||
@@ -93,10 +96,14 @@ incomplete concrete SentencesI of Sentences = Numeral **
|
||||
ObjNumber n k = mkNP n k ;
|
||||
ObjIndef k = mkNP a_Quant k ;
|
||||
ObjPlural k = mkNP aPl_Det k ;
|
||||
ObjPlur k = mkNP aPl_Det k ;
|
||||
ObjMass k = mkNP k ;
|
||||
ObjAndObj = mkNP and_Conj ;
|
||||
OneObj o = o ;
|
||||
|
||||
MassDrink d = d ;
|
||||
KindDrink d = d ;
|
||||
|
||||
This kind = mkNP this_Quant kind ;
|
||||
That kind = mkNP that_Quant kind ;
|
||||
These kind = mkNP this_Quant plNum kind ;
|
||||
@@ -106,6 +113,9 @@ incomplete concrete SentencesI of Sentences = Numeral **
|
||||
ThisMass kind = mkNP this_Quant kind ;
|
||||
ThatMass kind = mkNP that_Quant kind ;
|
||||
TheMass kind = mkNP the_Quant kind ;
|
||||
ThesePlur kind = mkNP this_Quant plNum kind ;
|
||||
ThosePlur kind = mkNP that_Quant plNum kind ;
|
||||
ThesPlur kind = mkNP the_Quant plNum kind ;
|
||||
|
||||
SuchKind quality kind = mkCN quality kind ;
|
||||
SuchMassKind quality kind = mkCN quality kind ;
|
||||
@@ -261,6 +271,11 @@ oper
|
||||
VWait = mkVP <lin V wait_V2 : V> ;
|
||||
VWrite = mkVP <lin V write_V2 : V> ;
|
||||
|
||||
V2Buy o = mkVP buy_V2 o ;
|
||||
V2Drink o = mkVP drink_V2 o ;
|
||||
V2Eat o = mkVP eat_V2 o ;
|
||||
V2Wait o = mkVP wait_V2 o.name ;
|
||||
|
||||
-- other new things allowed by the resource
|
||||
|
||||
--- PBecause a b = SSubjS a because_Subj b ;
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [PYesToNo,NameNN] with
|
||||
concrete SentencesSwe of Sentences = NumeralSwe ** SentencesI - [
|
||||
PYesToNo,NameNN
|
||||
---- , KindDrink -- should be utrum gender when countable
|
||||
] with
|
||||
(Syntax = SyntaxSwe),
|
||||
(Symbolic = SymbolicSwe),
|
||||
(Lexicon = LexiconSwe) ** open Prelude, SyntaxSwe, (P = ParadigmsSwe) in {
|
||||
|
||||
lin PYesToNo = mkPhrase (lin Utt (ss "jo")) ;
|
||||
lin NameNN = mkNP (P.mkPN "NN") ;
|
||||
|
||||
lin
|
||||
PYesToNo = mkPhrase (lin Utt (ss "jo")) ;
|
||||
NameNN = mkNP (P.mkPN "NN") ;
|
||||
---- KindDrink d = mkCN (P.mkN [] [] [] [] P.utrum) (lin Adv (mkUtt d)) ; --- an awful hack...
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--2 Words and idiomatic phrases of the Phrasebook
|
||||
|
||||
|
||||
-- (c) 2009 Aarne Ranta under LGPL --%
|
||||
-- (c) 2010 Aarne Ranta under LGPL --%
|
||||
|
||||
abstract Words = Sentences ** {
|
||||
|
||||
@@ -10,19 +10,19 @@ abstract Words = Sentences ** {
|
||||
-- kinds of items (so far mostly food stuff)
|
||||
|
||||
Apple : Kind ;
|
||||
Beer : MassKind ;
|
||||
Beer : DrinkKind ;
|
||||
Bread : MassKind ;
|
||||
Cheese : MassKind ;
|
||||
Chicken : MassKind ;
|
||||
Coffee : MassKind ;
|
||||
Coffee : DrinkKind ;
|
||||
Fish : MassKind ;
|
||||
Meat : MassKind ;
|
||||
Milk : MassKind ;
|
||||
Pizza : Kind ;
|
||||
Salt : MassKind ;
|
||||
Tea : MassKind ;
|
||||
Water : MassKind ;
|
||||
Wine : MassKind ;
|
||||
Tea : DrinkKind ;
|
||||
Water : DrinkKind ;
|
||||
Wine : DrinkKind ;
|
||||
|
||||
-- properties of kinds (so far mostly of food)
|
||||
|
||||
@@ -207,9 +207,19 @@ abstract Words = Sentences ** {
|
||||
Rice : MassKind ;
|
||||
Pork : MassKind ;
|
||||
Beef : MassKind ;
|
||||
Noodles : PlurKind ;
|
||||
Shrimps : PlurKind ;
|
||||
|
||||
Chili : MassKind ;
|
||||
Garlic : MassKind ;
|
||||
|
||||
Durian : Kind ;
|
||||
Mango : Kind ;
|
||||
Pineapple : Kind ;
|
||||
|
||||
Coke : DrinkKind ;
|
||||
IceCream : DrinkKind ; --- both mass and plural
|
||||
|
||||
Beach : PlaceKind ;
|
||||
|
||||
}
|
||||
|
||||
@@ -269,8 +269,15 @@ concrete WordsEng of Words = SentencesEng **
|
||||
Rice = mkCN (mkN "rice") ;
|
||||
Pork = mkCN (mkN "pork") ;
|
||||
Beef = mkCN (mkN "beef") ;
|
||||
Noodles = mkCN (mkN "noodle") ;
|
||||
Shrimps = mkCN (mkN "shrimp") ;
|
||||
Chili = mkCN (mkN "chili") ;
|
||||
Garlic = mkCN (mkN "garlic") ;
|
||||
Durian = mkCN (mkN "durian") ;
|
||||
Mango = mkCN (mkN "mango") ;
|
||||
Pineapple = mkCN (mkN "pineapple") ;
|
||||
Coke = mkCN (mkN "coke") ;
|
||||
IceCream = mkCN (mkN "ice cream") ;
|
||||
Beach = mkPlace "beach" "on" ;
|
||||
|
||||
}
|
||||
|
||||
@@ -277,4 +277,28 @@ concrete WordsFin of Words = SentencesFin **
|
||||
mkSuperl : A -> Det = \a -> mkDet the_Quant (mkOrd a) ;
|
||||
|
||||
far_IAdv = E.IAdvAdv L.far_Adv ;
|
||||
|
||||
--------------------------------------------------
|
||||
-- New 30/11/2011 AR
|
||||
--------------------------------------------------
|
||||
|
||||
lin
|
||||
Thai = mkNat (mkPN "thai") (mkPN "Thaimaa") (mkA "thaimaalainen") ;
|
||||
Baht = mkCN (mkN "baht" "bahteja") ;
|
||||
|
||||
Rice = mkCN (mkN "riisi") ;
|
||||
Pork = mkCN (mkN "sika") ;
|
||||
Beef = mkCN (mkN "nauta") ;
|
||||
Noodles = mkCN (mkN "nuudeli" "nuudeleita") ;
|
||||
Shrimps = mkCN (mkN "katka" (mkN "rapu")) ;
|
||||
Chili = mkCN (mkN "chili") ;
|
||||
Garlic = mkCN (mkN "valko" (mkN "sipuli")) ;
|
||||
Durian = mkCN (mkN "durian" "durianeja") ;
|
||||
Mango = mkCN (mkN "mango" "mangoja") ;
|
||||
Pineapple = mkCN (mkN "ananas" "ananaksia") ;
|
||||
Coke = mkCN (mkN "coca-cola") ;
|
||||
IceCream = mkCN (mkN "jäätelö" "jäätelöitä") ;
|
||||
Beach = mkPlace (mkN "uima" (mkN "ranta")) lla ;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -245,4 +245,27 @@ concrete WordsSwe of Words = SentencesSwe **
|
||||
mkSuperl : A -> Det = \a -> mkDet the_Art (mkOrd a) ;
|
||||
|
||||
far_IAdv = ExtraSwe.IAdvAdv L.far_Adv ;
|
||||
|
||||
--------------------------------------------------
|
||||
-- New 30/11/2011 AR
|
||||
--------------------------------------------------
|
||||
|
||||
lin
|
||||
Thai = mkNPNationality (mkNP (mkPN "thai")) (mkNP (mkPN "Thailand")) (mkA "thailändsk") ;
|
||||
Baht = mkCN (mkN "baht" "baht") ;
|
||||
|
||||
Rice = mkCN (mkN "ris" "ris") ;
|
||||
Pork = mkCN (mkN "fläsk" "fläsk") ;
|
||||
Beef = mkCN (mkN "nötkött" "nötkött") ;
|
||||
Noodles = mkCN (mkN "nudel" "nudlar") ;
|
||||
Shrimps = mkCN (mkN "räka") ;
|
||||
Chili = mkCN (mkN "chili" "chilier") ;
|
||||
Garlic = mkCN (mkN "vitlök") ;
|
||||
Durian = mkCN (mkN "durian" "durianer") ;
|
||||
Mango = mkCN (mkN "mango" "mangoer") ;
|
||||
Pineapple = mkCN (mkN "ananas" "ananaser") ;
|
||||
Coke = mkCN (mkN "kola") ;
|
||||
IceCream = mkCN (mkN "glass") ;
|
||||
Beach = mkPlace (mkN "badstrand" "badstränder") "på" ;
|
||||
|
||||
}
|
||||
|
||||
@@ -272,9 +272,16 @@ concrete WordsTha of Words = SentencesTha **
|
||||
Rice = mkCN (mkN ("ฆ้าว")) ;
|
||||
Pork = mkCN (mkN ("หมู")) ;
|
||||
Beef = mkCN (mkN ("เนื้อ")) ;
|
||||
Noodles = mkCN (mkN ("เส้ม")) ;
|
||||
Shrimps = mkCN (mkN ("กุ้ง")) ;
|
||||
Chili = mkCN (mkN "พริก") ;
|
||||
Garlic = mkCN (mkN (R.thword "กระ" "เทียม")) ;
|
||||
Durian = mkCN (mkN (R.thword "ทุ" "เรียน")) ;
|
||||
Mango = mkCN (mkN (R.thword "ฆะ" "ม่วง")) ;
|
||||
Pineapple = mkCN (mkN (R.thword "สับ" "ปะ" "รด")) ;
|
||||
Coke = mkCN (mkN ("โค้ก")) ;
|
||||
IceCream = mkCN (mkN (R.thword "ไอ" "ศ" "กรีม")) ;
|
||||
Beach = mkPlace (placeN (R.thword "หาด")) ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
PhrasebookBul :
|
||||
PhrasebookCat :
|
||||
PhrasebookDan :
|
||||
PhrasebookDut :
|
||||
DisambPhrasebookEng :
|
||||
PhrasebookBul : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookCat : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookDan : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookDut : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookEng :
|
||||
PhrasebookFin :
|
||||
PhrasebookFre :
|
||||
PhrasebookGer :
|
||||
PhrasebookIta :
|
||||
PhrasebookNor :
|
||||
PhrasebookPol :
|
||||
PhrasebookRon :
|
||||
PhrasebookSpa :
|
||||
PhrasebookFre : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookGer : AModVerbPhrase AModVerbPhrasePlace Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookIta : Baht Beach Beef Chili Coke Durian Garlic IceCream MCan MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookNor : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookPol : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookRon : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookRus : Baht Beach Beef Belgian Belgium Chili Coke Durian Flemish Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookSpa : Baht Beach Beef Chili Coke Durian Garlic IceCream Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
PhrasebookSwe :
|
||||
PhrasebookTha : ACitizen AHasAge AHasRoom AHasTable AHaveCurr ALike ALive AScared ASpeak AThirsty ATired Airport AmountCurrency AmusementPark Bank Bar Belgian Belgium Bulgarian Bus ByFoot Cafeteria Catalan Center Cheap Chicken Church Cinema CitRestaurant CitiNat Coffee CountryNat Danish DanishCrown Disco Dollar Dutch English Euro Ferry Finnish Flemish French Friday German Hospital Hotel HowFar HowFarBy HowFarFrom HowFarFromBy HowMuchCost ItCost Italian LangNat Lei Leva Monday Museum Norwegian NorwegianCrown OnDay PCitizenship PCountry PCurrency PDay PLanguage PPrice PSeeYouDate PSeeYouPlace PSeeYouPlaceDate Park Parking Pharmacy Polish PostOffice Pound PropCit PropClosedDay PropOpenDay Pub QWhatAge Romanian Rouble Russian Saturday Spanish Station Subway Sunday Supermarket Suspect Swedish SwedishCrown Taxi Tea TheCheapest TheClosest TheMostPopular Theatre Thursday Toilet Tomorrow Tram Tuesday Wednesday Zloty Zoo
|
||||
PhrasebookUrd :
|
||||
PhrasebookTha :
|
||||
PhrasebookUrd : Baht Beach Beef Chili Coke Durian Garlic IceCream MMust Mango Noodles ObjPlur Pineapple Pork Rice Shrimps Thai ThesPlur ThesePlur ThosePlur
|
||||
|
||||
Reference in New Issue
Block a user