diff options
| author | aarne <aarne@chalmers.se> | 2010-09-03 09:02:00 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2010-09-03 09:02:00 +0000 |
| commit | 9fc58ce0e7c00e5207d72225430bde9817c76bb0 (patch) | |
| tree | e30143324ddf7df20bb83d3944cc89cff2a5a964 /examples/phrasebook/WordsGer.gf | |
| parent | 1527d470ecadbf4828e7ad158b58a80aef064635 (diff) | |
kein Deutsch and some other Phrasebook fixes
Diffstat (limited to 'examples/phrasebook/WordsGer.gf')
| -rw-r--r-- | examples/phrasebook/WordsGer.gf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/examples/phrasebook/WordsGer.gf b/examples/phrasebook/WordsGer.gf index f19074e1c..1852b4482 100644 --- a/examples/phrasebook/WordsGer.gf +++ b/examples/phrasebook/WordsGer.gf @@ -94,7 +94,7 @@ CitRestaurant cit = mkCNPlace (mkCN cit (mkN "Restaurant" "Restaurants" neuter) Dutch = mkNat "den Niederlanden" "Niederländisch" "niederländisch" ; English = mkNat "England" "Englisch" "englisch" ; Finnish = mkNat "Finnland" "Finnisch" "finnisch" ; - Flemish = mkNP (mkPN "Flämisch") ; + Flemish = mkCN (mkN "Flämisch" "Flämisch" neuter) ; French = mkNat "Frankreich" "Französisch" "französisch" ; German = mkNat "Deutschland" "Deutsch" "deutsche" ; Italian = mkNat "Italien" "Italienisch" "italienisch" ; @@ -127,7 +127,8 @@ CitRestaurant cit = mkCNPlace (mkCN cit (mkN "Restaurant" "Restaurants" neuter) AMarried p = prop (mkCl p.name (mkA "verheiratet")) ; AReady p = prop (mkCl p.name (mkA "bereit")) ; AScared p = prop (mkCl p.name have_V2 (mkNP (mkN "Angst" "Angsten" feminine))) ; - ASpeak p lang = prop (mkCl p.name (mkV2 sprechen_V) lang) ; + ASpeak p lang = mkProp (mkCl p.name (mkV2 sprechen_V) (mkNP lang)) + (mkS (mkCl p.name (mkV2 sprechen_V) (mkNP no_Quant lang))) ; AThirsty p = prop (mkCl p.name (mkA "durstig")) ; ATired p = prop (mkCl p.name (mkA "müde")) ; AUnderstand p = prop (mkCl p.name (fixprefixV "ver" stehen_V)) ; @@ -209,8 +210,8 @@ CitRestaurant cit = mkCNPlace (mkCN cit (mkN "Restaurant" "Restaurants" neuter) HowFar place = mkQS (mkQCl far_IAdv place.name) ; HowFarFrom x y = mkQS (mkQCl far_IAdv (mkNP (mkNP y.name (SyntaxGer.mkAdv from_Prep x.name)) (ParadigmsGer.mkAdv "entfernt"))) ; HowFarFromBy x y t = - mkQS (mkQCl how_long_IAdv (mkCl (mkVP (SyntaxGer.mkAdv zu_Prep (mkNP (mkNP y.name (SyntaxGer.mkAdv from_Prep x.name)) t))))) ; - HowFarBy y t = mkQS (mkQCl how_long_IAdv (mkCl (mkVP (SyntaxGer.mkAdv zu_Prep (mkNP y.name t))))) ; + mkQS (mkQCl far_IAdv (mkCl (mkVP (SyntaxGer.mkAdv zu_Prep (mkNP (mkNP y.name (SyntaxGer.mkAdv from_Prep x.name)) t))))) ; + HowFarBy y t = mkQS (mkQCl far_IAdv (mkCl (mkVP (SyntaxGer.mkAdv zu_Prep (mkNP y.name t))))) ; WhichTranspPlace trans place = mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ; @@ -223,8 +224,8 @@ CitRestaurant cit = mkCNPlace (mkCN cit (mkN "Restaurant" "Restaurants" neuter) oper - mkNat : Str -> Str -> Str -> {lang : NP ; prop : A ; country : NP} = \co, la, adj -> - {lang = mkNP (mkPN la) ; + mkNat : Str -> Str -> Str -> {lang : CN ; prop : A ; country : NP} = \co, la, adj -> + {lang = mkCN (mkN la la neuter) ; prop = mkA adj ; country = mkNP (mkPN co)} ; mkDay : Str -> {name : NP ; point : Adv ; habitual : Adv} = \d -> @@ -256,5 +257,5 @@ CitRestaurant cit = mkCNPlace (mkCN cit (mkN "Restaurant" "Restaurants" neuter) } ; far_IAdv = ss "wie weit" ** {lock_IAdv = <>} ; - how_long_IAdv = ss "wie lange dauert" ** {lock_IAdv=<>} ; + } |