diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf index 45b82f030..031253b9e 100644 --- a/examples/phrasebook/Sentences.gf +++ b/examples/phrasebook/Sentences.gf @@ -145,5 +145,11 @@ abstract Sentences = Numeral ** { ByTransp : Transport -> ByTransport ; -- by bus + AKnowSentence : Person -> Sentence -> Action ; -- you know that I am in the bar + AKnowPerson : Person -> Person -> Action ; -- you know me + +-- in Words, as long as Lexicon doesn't have it +-- AKnowQuestion : Person -> Question -> Action ; -- you know how far the bar is + } diff --git a/examples/phrasebook/SentencesBul.gf b/examples/phrasebook/SentencesBul.gf index d2f3eb17a..4f6d6317f 100644 --- a/examples/phrasebook/SentencesBul.gf +++ b/examples/phrasebook/SentencesBul.gf @@ -2,7 +2,8 @@ concrete SentencesBul of Sentences = NumeralBul ** SentencesI - [IMale, IFemale, YouFamMale, YouFamFemale, YouPolMale, YouPolFemale, ACitizen, Citizenship, PCitizenship, LangNat, CitiNat, CountryNat, PropCit, - Nationality, Country, Language, PLanguage, PCountry] with + Nationality, Country, Language, PLanguage, PCountry + ] with (Syntax = SyntaxBul), (Symbolic = SymbolicBul), (Lexicon = LexiconBul) ** open ExtraBul, (R = ResBul) in { diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf index f871c7d06..334b7e92a 100644 --- a/examples/phrasebook/SentencesI.gf +++ b/examples/phrasebook/SentencesI.gf @@ -133,6 +133,9 @@ incomplete concrete SentencesI of Sentences = Numeral ** ABePlace p place = mkCl p.name place.at ; ByTransp t = t.by ; + AKnowSentence p s = mkCl p.name Lexicon.know_VS s ; + AKnowPerson p q = mkCl p.name Lexicon.know_V2 q.name ; + oper -- These operations are used internally in Sentences. diff --git a/examples/phrasebook/WordsGer.gf b/examples/phrasebook/WordsGer.gf index ad132e4f7..35fb3db1a 100644 --- a/examples/phrasebook/WordsGer.gf +++ b/examples/phrasebook/WordsGer.gf @@ -33,7 +33,7 @@ concrete WordsGer of Words = SentencesGer ** Fresh = mkA "frisch" ; Good = L.good_A ; Warm = L.warm_A ; - Suspect = mkA "vermut" ; + Suspect = mkA "verdächtig" ; -- places diff --git a/examples/query/README b/examples/query/README index 81442cd01..94ead32e7 100644 --- a/examples/query/README +++ b/examples/query/README @@ -19,7 +19,7 @@ Test: -- which can be provided by 'runghc Make present lang api langs=Eng' in lib/src/ % gf QueryEng.gf -- parse a sentence and see all variants - > "p "Bulgarian people working at Google" | l -all + > p "Bulgarian people working at Google" | l -all Regression test: diff --git a/lib/src/danish/LexiconDan.gf b/lib/src/danish/LexiconDan.gf index 38361a67b..ebe7584c9 100644 --- a/lib/src/danish/LexiconDan.gf +++ b/lib/src/danish/LexiconDan.gf @@ -103,7 +103,8 @@ lin iron_N = mk2N "jern" "jernet" ; john_PN = mkPN "John" utrum ; king_N = mk2N "konge" "kongen" ; - know_V2 = dirV2 vide_V ; + know_V2 = dirV2 (mkV "kende" "kendte") ; + know_VS = mkVS vide_V ; lake_N = mk2N "sø" "søen" ; lamp_N = mk2N "lampe" "lampen" ; learn_V2 = dirV2 (mk2V "lære" "lærte") ; diff --git a/lib/src/german/NounGer.gf b/lib/src/german/NounGer.gf index 4415069bc..a6516eb21 100644 --- a/lib/src/german/NounGer.gf +++ b/lib/src/german/NounGer.gf @@ -16,9 +16,10 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in { isPron = False } ; - UsePN pn = heavyNP { + UsePN pn = { s = \\c => usePrepC c (\k -> pn.s ! k) ; - a = agrP3 Sg + a = agrP3 Sg ; + isPron = True --- means: this is not a heavy NP, but comes before negation } ; UsePron pron = { diff --git a/lib/src/norwegian/LexiconNor.gf b/lib/src/norwegian/LexiconNor.gf index cdc17ec3c..7a5f6dfd0 100644 --- a/lib/src/norwegian/LexiconNor.gf +++ b/lib/src/norwegian/LexiconNor.gf @@ -101,7 +101,8 @@ lin iron_N = regGenN "jern" neutrum ; john_PN = mkPN "John" masculine ; king_N = regGenN "konge" masculine ; - know_V2 = dirV2 IrregNor.vite_V ; + know_V2 = dirV2 (mkV "kjenne" "kjente") ; + know_VS = mkVS IrregNor.vite_V ; lake_N = regGenN "vann" neutrum ; lamp_N = regGenN "lampe" feminine ; learn_V2 = dirV2 (mk2V "lære" "lærte") ; diff --git a/lib/src/spanish/LexiconSpa.gf b/lib/src/spanish/LexiconSpa.gf index 07c985f9b..d51240c73 100644 --- a/lib/src/spanish/LexiconSpa.gf +++ b/lib/src/spanish/LexiconSpa.gf @@ -100,7 +100,8 @@ lin industry_N = regN "industria" ; iron_N = regN "fierro" ; king_N = regN "rey" ; - know_V2 = dirV2 (verboV (saber_71 "saber")) ; -- conocer + know_V2 = mkV2 (verboV (conocer_25 "conocer")) ; + know_VS = mkVS (verboV (saber_71 "saber")) ; lake_N = regN "lago" ; lamp_N = regN "lámpara" ; learn_V2 = dirV2 (regV "aprender") ;