From fc67c38fe991beefd227b383e1c73e4ccf2534e2 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 3 Jun 2005 08:35:22 +0000 Subject: [PATCH] adjusting doc on gfe --- doc/gf-history.html | 4 ++-- index.html | 6 ++++++ lib/resource/doc/example/HandQuestionsI.gf | 20 +++++++++++++++++++ lib/resource/doc/example/QuestionsEng.gf | 2 +- lib/resource/doc/example/QuestionsExI.gfe | 15 -------------- lib/resource/doc/example/QuestionsI.gf | 19 +++++++----------- lib/resource/doc/gf-resource.html | 23 +++++++++++++++++++++- src/GF/Compile/MkConcrete.hs | 4 +++- 8 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 lib/resource/doc/example/HandQuestionsI.gf delete mode 100644 lib/resource/doc/example/QuestionsExI.gfe diff --git a/doc/gf-history.html b/doc/gf-history.html index 1ff6b5cab..1e5555c11 100644 --- a/doc/gf-history.html +++ b/doc/gf-history.html @@ -20,8 +20,8 @@ converted to .gf files by the command 
   gf -makeconcrete File.gfe
-See -../lib/resource/doc/examples/QuestionsExI.gfe +See +../lib/resource/doc/examples/QuestionsI.gfe for an example.

diff --git a/index.html b/index.html index dce5b4f1b..28b23a429 100644 --- a/index.html +++ b/index.html @@ -20,6 +20,12 @@ May 17, 2005.

News

+June 3, 2005. Started a page on +history of changes. +These changes will appear soon in releases. + +

+ May 17, 2005. Version 2.2 released. See highlights. Download from diff --git a/lib/resource/doc/example/HandQuestionsI.gf b/lib/resource/doc/example/HandQuestionsI.gf new file mode 100644 index 000000000..9915cc8d5 --- /dev/null +++ b/lib/resource/doc/example/HandQuestionsI.gf @@ -0,0 +1,20 @@ +--# -path=.:resource/abstract:resource/../prelude + +-- Language-independent question grammar parametrized on Resource. + +incomplete concrete QuestionsI of Questions = open Resource in { + lincat + Phrase = Phr ; + Entity = N ; + Action = V2 ; + lin + Who act obj = + QuestPhrase (UseQCl (PosTP TPresent ASimul) + (QPredV2 who8one_IP act (IndefNumNP NoNum (UseN obj)))) ; + Whom subj act = + QuestPhrase (UseQCl (PosTP TPresent ASimul) + (IntSlash who8one_IP (SlashV2 (DefOneNP (UseN subj)) act))) ; + Answer subj act obj = + IndicPhrase (UseCl (PosTP TPresent ASimul) + (SPredV2 (DefOneNP (UseN subj)) act (IndefNumNP NoNum (UseN obj)))) ; +} diff --git a/lib/resource/doc/example/QuestionsEng.gf b/lib/resource/doc/example/QuestionsEng.gf index 2a0bb12ff..62234bfec 100644 --- a/lib/resource/doc/example/QuestionsEng.gf +++ b/lib/resource/doc/example/QuestionsEng.gf @@ -1,2 +1,2 @@ -concrete QuestionsEng of Questions = QuestionsExI with +concrete QuestionsEng of Questions = QuestionsI with (Resource = ResourceEng) ; diff --git a/lib/resource/doc/example/QuestionsExI.gfe b/lib/resource/doc/example/QuestionsExI.gfe deleted file mode 100644 index adb54a900..000000000 --- a/lib/resource/doc/example/QuestionsExI.gfe +++ /dev/null @@ -1,15 +0,0 @@ ---# -resource=../../langeng.gfcm - --- to compile: gf -makeconcrete QuestionsExI.gfe - -incomplete concrete QuestionsExI of Questions = open Resource in { - lincat - Phrase = Phr ; - Entity = N ; - Action = V2 ; - - lin Who love_V2 man_N = in Phr "who loves the men?" ; - lin Whom man_N love_V2 = in Phr "whom does the man love?" ; - lin Answer woman_N love_V2 man_N = in Phr "the woman loves the man." ; - -} diff --git a/lib/resource/doc/example/QuestionsI.gf b/lib/resource/doc/example/QuestionsI.gf index 9915cc8d5..18174443f 100644 --- a/lib/resource/doc/example/QuestionsI.gf +++ b/lib/resource/doc/example/QuestionsI.gf @@ -1,20 +1,15 @@ ---# -path=.:resource/abstract:resource/../prelude +--# -resource=../../english/LangEng.gf --- Language-independent question grammar parametrized on Resource. +-- to compile: gf -makeconcrete QuestionsI.gfe incomplete concrete QuestionsI of Questions = open Resource in { lincat Phrase = Phr ; Entity = N ; Action = V2 ; - lin - Who act obj = - QuestPhrase (UseQCl (PosTP TPresent ASimul) - (QPredV2 who8one_IP act (IndefNumNP NoNum (UseN obj)))) ; - Whom subj act = - QuestPhrase (UseQCl (PosTP TPresent ASimul) - (IntSlash who8one_IP (SlashV2 (DefOneNP (UseN subj)) act))) ; - Answer subj act obj = - IndicPhrase (UseCl (PosTP TPresent ASimul) - (SPredV2 (DefOneNP (UseN subj)) act (IndefNumNP NoNum (UseN obj)))) ; + + lin Who love_V2 man_N = QuestPhrase (UseQCl (PosTP TPresent ASimul) (QPredV2 who8one_IP love_V2 (IndefNumNP NoNum (UseN man_N)))) ; + lin Whom man_N love_V2 = QuestPhrase (UseQCl (PosTP TPresent ASimul) (IntSlash who8many_IP (SlashV2 (DefOneNP (UseN man_N)) love_V2))) ; -- AMBIGUOUS + lin Answer woman_N love_V2 man_N = IndicPhrase (UseCl (PosTP TPresent ASimul) (SPredV2 (DefOneNP (UseN woman_N)) love_V2 (IndefNumNP NoNum (UseN man_N)))) ; + } diff --git a/lib/resource/doc/gf-resource.html b/lib/resource/doc/gf-resource.html index a11628544..580d424f8 100644 --- a/lib/resource/doc/gf-resource.html +++ b/lib/resource/doc/gf-resource.html @@ -640,7 +640,7 @@ We build the abstract syntax in two phases: The concrete syntax of English is built in three phases: