diff --git a/lib/resource-1.0/abstract/Basic.gf b/lib/resource-1.0/abstract/Basic.gf index 547b9cbe5..dfffd549c 100644 --- a/lib/resource-1.0/abstract/Basic.gf +++ b/lib/resource-1.0/abstract/Basic.gf @@ -1,3 +1,15 @@ +--1 A Basic Lexicon + +-- This files gives a list of words whose purpose is to test the GF +-- resource grammar. It covers all lexical categories of [Cat Cat.html]. +-- By containing some of the most common words, +-- it is aimed to cover, with high probability, all morphological +-- patterns in the different languages. + +-- Using this lexicon for translation is not recommended. The linearizations +-- of the words in different languages are not guaranteed to be translation +-- equivalents. + abstract Basic = Cat ** { fun add_V3 : V3 ; @@ -129,6 +141,7 @@ abstract Basic = Cat ** { open_V2 : V2 ; paint_V2A : V2A ; paper_N : N ; + paris_PN : PN ; peace_N : N ; pen_N : N ; planet_N : N ; diff --git a/lib/resource-1.0/abstract/Conjunction.gf b/lib/resource-1.0/abstract/Conjunction.gf index d92c733d5..38a99dcb0 100644 --- a/lib/resource-1.0/abstract/Conjunction.gf +++ b/lib/resource-1.0/abstract/Conjunction.gf @@ -7,6 +7,9 @@ -- - distributed conjunction: both X,...,X and X -- -- +-- *Note*. This module uses right-recursive lists. If backward +-- compatibility with API 0.9 is needed, use +-- [SeqConjunction SeqConjunction.html]. abstract Conjunction = Cat ** { diff --git a/lib/resource-1.0/abstract/Lang.gf b/lib/resource-1.0/abstract/Lang.gf index 96d660c74..5395ade2e 100644 --- a/lib/resource-1.0/abstract/Lang.gf +++ b/lib/resource-1.0/abstract/Lang.gf @@ -1,3 +1,9 @@ +--1 The Main Module of the Resource Grammar + +-- This grammar is just a collection of the different modules, +-- and the one that can be imported when one wants to test the +-- grammar. A smaller top module is [Test Test.html]. + abstract Lang = Noun, Verb, diff --git a/lib/resource-1.0/abstract/Lex.gf b/lib/resource-1.0/abstract/Lex.gf index 5f926dc60..ed246af9e 100644 --- a/lib/resource-1.0/abstract/Lex.gf +++ b/lib/resource-1.0/abstract/Lex.gf @@ -1,5 +1,13 @@ +--1 Test lexicon + +-- This lexicon is used when developing a grammar, and called by +-- [Test Test.html]. The full lexicon is divided between +-- [Structural Structural.html], [Basic Basic.html], and [Numeral Numeral.html]. + abstract Lex = Cat ** { +-- Words of open classes + fun walk_V : V ; help_V2 : V2 ; @@ -15,7 +23,7 @@ abstract Lex = Cat ** { warm_A : A ; close_A2 : A2 ; --- structural +-- Structural words only_Predet, all_Predet : Predet ; diff --git a/lib/resource-1.0/abstract/Math.gf b/lib/resource-1.0/abstract/Math.gf index 367116767..4598fd724 100644 --- a/lib/resource-1.0/abstract/Math.gf +++ b/lib/resource-1.0/abstract/Math.gf @@ -1,15 +1,20 @@ +--1 Symbolic expressions + +-- *Note*. This module is not automatically included in the main +-- grammar [Lang Lang.html]. + abstract Math = Cat ** { ---3 Noun phrases with symbols +--2 Noun phrases with symbols fun - SymbPN : Symb -> PN ; -- "x" - IntPN : Int -> PN ; -- "27" - CNIntNP : CN -> Int -> NP ; -- "level 53" - CNSymbNP : Det -> CN -> [Symb] -> NP ; -- "(the) (2) numbers x and y" + SymbPN : Symb -> PN ; -- x + IntPN : Int -> PN ; -- 27 + CNIntNP : CN -> Int -> NP ; -- level 53 + CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y ---3 Symbol lists +--2 Symbol lists -- A symbol list has at least two elements. The last two are separated -- by a conjunction ("and" in English), the others by commas. diff --git a/lib/resource-1.0/abstract/SeqConjunction.gf b/lib/resource-1.0/abstract/SeqConjunction.gf index 57b47bbbe..ad81ad5e1 100644 --- a/lib/resource-1.0/abstract/SeqConjunction.gf +++ b/lib/resource-1.0/abstract/SeqConjunction.gf @@ -1,7 +1,9 @@ +--1 Conjunctions of left-recursive lists + abstract SeqConjunction = Cat ** { -- This module is for backward compatibility with API 0.9. --- To be used instead of Conjunction. +-- To be used instead of [Conjunction Conjunction.html]. fun diff --git a/lib/resource-1.0/abstract/Tense.gf b/lib/resource-1.0/abstract/Tense.gf index 9d4466f0a..c54d520e2 100644 --- a/lib/resource-1.0/abstract/Tense.gf +++ b/lib/resource-1.0/abstract/Tense.gf @@ -1,3 +1,13 @@ +--1 Tense, Polarity, and Anteriority + +-- This module defines the abstract parameters of tense, polarity, and +-- anteriority, which are used in [Tensed Tensed.html] to generate different +-- forms of sentences. Together they give 2 x 4 x 4 = 16 sentence forms. + +-- These tenses are defined for all languages in the library. More tenses +-- can be defined in the language extensions, e.g. the "passé simple" of +-- Romance languages. + abstract Tense = { cat @@ -6,8 +16,8 @@ abstract Tense = { Ant ; fun - PPos, PNeg : Pol ; - TPres, TPast, TFut, TCond : Tense ; - ASimul, AAnter : Ant ; + PPos, PNeg : Pol ; -- I sleep/don't sleep + TPres, TPast, TFut, TCond : Tense ; -- I sleep/slept/will sleep/would sleep + ASimul, AAnter : Ant ; -- I sleep/have slept } diff --git a/lib/resource-1.0/abstract/Tensed.gf b/lib/resource-1.0/abstract/Tensed.gf index 218a40e3a..d16f4c1c5 100644 --- a/lib/resource-1.0/abstract/Tensed.gf +++ b/lib/resource-1.0/abstract/Tensed.gf @@ -1,3 +1,11 @@ +--1 Tensed forms of sentences, questions, and relative clauses + +-- This module defines the 2 x 4 x 4 = 16 forms generated by different +-- combinations of tense, polarity, and +-- anteriority, which are defined in [Tense Tense.html]. +-- A variant with just the polarity variation is given in +-- [Untensed Untensed.html]. + abstract Tensed = Cat, Tense ** { fun @@ -5,4 +13,24 @@ abstract Tensed = Cat, Tense ** { UseQCl : Tense -> Ant -> Pol -> QCl -> QS ; UseRCl : Tense -> Ant -> Pol -> RCl -> RS ; -} \ No newline at end of file +} + +-- Examples for English $S$: +{- + Pres Simul Pos ODir : he sleeps + Pres Simul Neg ODir : he doesn't sleep + Pres Anter Pos ODir : he has slept + Pres Anter Neg ODir : he hasn't slept + Past Simul Pos ODir : he slept + Past Simul Neg ODir : he didn't sleep + Past Anter Pos ODir : he had slept + Past Anter Neg ODir : he hadn't slept + Fut Simul Pos ODir : he will sleep + Fut Simul Neg ODir : he won't sleep + Fut Anter Pos ODir : he will have slept + Fut Anter Neg ODir : he won't have slept + Cond Simul Pos ODir : he would sleep + Cond Simul Neg ODir : he wouldn't sleep + Cond Anter Pos ODir : he would have slept + Cond Anter Neg ODir : he wouldn't have slept +-} \ No newline at end of file diff --git a/lib/resource-1.0/abstract/Test.gf b/lib/resource-1.0/abstract/Test.gf index 21b2c3452..25717ed49 100644 --- a/lib/resource-1.0/abstract/Test.gf +++ b/lib/resource-1.0/abstract/Test.gf @@ -1,9 +1,17 @@ +--1 The Reduced Top Module of the Resource Grammar + +-- This grammar is just a collection of the different modules, +-- and one that can be imported when one wants to test a reduced version +-- of the grammar. The complete top module is [Lang Lang.html]. + +-- The main constructs missing are tenses of sentences, numerals, and +-- comprehensive lexicon. + abstract Test = Noun, Verb, Adjective, Adverb, - -- Numeral, Sentence, Question, Relative, @@ -11,5 +19,8 @@ abstract Test = Phrase, Untensed, -- Tensed, + -- Structural, + -- Basic, + -- Numeral, Lex ** {} ; diff --git a/lib/resource-1.0/abstract/Untensed.gf b/lib/resource-1.0/abstract/Untensed.gf index 0ff11c9fd..172ec42c0 100644 --- a/lib/resource-1.0/abstract/Untensed.gf +++ b/lib/resource-1.0/abstract/Untensed.gf @@ -1,3 +1,9 @@ +--1 Untensed forms of sentences, questions, and relative clauses + +-- This module defines just positive and negative present tense forms. +-- Am alternative with full variation in polarity, tense, and anteriority is +-- given in [Untensed Untensed.html]. + abstract Untensed = Cat ** { fun diff --git a/lib/resource-1.0/doc/gf-resource-lib.html b/lib/resource-1.0/doc/gf-resource-lib.html new file mode 100644 index 000000000..5f3dd2d8c --- /dev/null +++ b/lib/resource-1.0/doc/gf-resource-lib.html @@ -0,0 +1,72 @@ + + +
+ +
+Notice. This document concerns the API v. 1.0 which has not
+yet been "officially" released. You can find the beginnings of it
+in GF/lib/resource-1.0/. See the
+resource-1.0/README for
+details on how it differs from previous versions
+and how much has been implemented
+
+The API is divided into a bunch of abstract modules.
+The following figure gives the dependencies of these modules.
+
+
+
+The documentation of the individual modules: +
+-Author: -Last update: Tue Jan 17 15:29:08 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This files gives a list of words whose purpose is to test the GF +resource grammar. It covers all lexical categories of Cat. +By containing some of the most common words, +it is aimed to cover, with high probability, all morphological +patterns in the different languages. +Using this lexicon for translation is not recommended. The linearizations +of the words in different languages are not guaranteed to be translation +equivalents.
abstract Basic = Cat ** {
@@ -156,6 +169,7 @@ gfdoc - a rudimentary GF document generator.
open_V2 : V2 ;
paint_V2A : V2A ;
paper_N : N ;
+ paris_PN : PN ;
peace_N : N ;
pen_N : N ;
planet_N : N ;
diff --git a/lib/resource-1.0/doc/gfdoc/Cat.html b/lib/resource-1.0/doc/gfdoc/Cat.html
index f0e840a53..383c03b19 100644
--- a/lib/resource-1.0/doc/gfdoc/Cat.html
+++ b/lib/resource-1.0/doc/gfdoc/Cat.html
@@ -7,7 +7,7 @@
The category system
Author:
-Last update: Tue Jan 17 15:29:08 2006
+Last update: Wed Jan 18 19:07:59 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Conjunction.html b/lib/resource-1.0/doc/gfdoc/Conjunction.html
index d6052a2a7..3d3c0ccbe 100644
--- a/lib/resource-1.0/doc/gfdoc/Conjunction.html
+++ b/lib/resource-1.0/doc/gfdoc/Conjunction.html
@@ -7,7 +7,7 @@
Coordination
Author:
-Last update: Tue Jan 17 15:29:08 2006
+Last update: Wed Jan 18 19:07:59 2006
@@ -42,6 +42,11 @@ and define two general patterns:
+Note. This module uses right-recursive lists. If backward +compatibility with API 0.9 is needed, use +SeqConjunction. +
abstract Conjunction = Cat ** {
diff --git a/lib/resource-1.0/doc/gfdoc/Lang.html b/lib/resource-1.0/doc/gfdoc/Lang.html
index 2ffc0d1c4..a8619c02c 100644
--- a/lib/resource-1.0/doc/gfdoc/Lang.html
+++ b/lib/resource-1.0/doc/gfdoc/Lang.html
@@ -2,27 +2,35 @@
+-Author: -Last update: Tue Jan 17 15:29:08 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This grammar is just a collection of the different modules, +and the one that can be imported when one wants to test the +grammar. A smaller top module is Test.
abstract Lang =
diff --git a/lib/resource-1.0/doc/gfdoc/Lex.html b/lib/resource-1.0/doc/gfdoc/Lex.html
index e750ae951..014773522 100644
--- a/lib/resource-1.0/doc/gfdoc/Lex.html
+++ b/lib/resource-1.0/doc/gfdoc/Lex.html
@@ -2,31 +2,44 @@
+ Test lexicon
+ Test lexicon
+Author:
+Last update: Wed Jan 18 19:07:59 2006
+ -Author: -Last update: Tue Jan 17 15:29:08 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This lexicon is used when developing a grammar, and called by +Test. The full lexicon is divided between +Structural, Basic, and Numeral.
abstract Lex = Cat ** {
-
+
+
++Words of open classes +
+
fun
walk_V : V ;
help_V2 : V2 ;
@@ -44,7 +57,7 @@ gfdoc - a rudimentary GF document generator.
-structural +Structural words
only_Predet, all_Predet : Predet ;
diff --git a/lib/resource-1.0/doc/gfdoc/ListConjunction.html b/lib/resource-1.0/doc/gfdoc/ListConjunction.html
index c22707c21..1c17b4449 100644
--- a/lib/resource-1.0/doc/gfdoc/ListConjunction.html
+++ b/lib/resource-1.0/doc/gfdoc/ListConjunction.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:29:08 2006
+Last update: Wed Jan 18 19:08:00 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Math.html b/lib/resource-1.0/doc/gfdoc/Math.html
index 479f0017f..da2abcf18 100644
--- a/lib/resource-1.0/doc/gfdoc/Math.html
+++ b/lib/resource-1.0/doc/gfdoc/Math.html
@@ -2,50 +2,56 @@
+ Symbolic expressions
+ Symbolic expressions
+Author:
+Last update: Wed Jan 18 19:08:00 2006
-
+
-Author: -Last update: Tue Jan 17 15:29:08 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +Note. This module is not automatically included in the main +grammar Lang.
abstract Math = Cat ** {
-
-
fun
- SymbPN : Symb -> PN ; -- "x"
- IntPN : Int -> PN ; -- "27"
- CNIntNP : CN -> Int -> NP ; -- "level 53"
- CNSymbNP : Det -> CN -> [Symb] -> NP ; -- "(the) (2) numbers x and y"
+ SymbPN : Symb -> PN ; -- x
+ IntPN : Int -> PN ; -- 27
+ CNIntNP : CN -> Int -> NP ; -- level 53
+ CNSymbNP : Det -> CN -> [Symb] -> NP ; -- (the) (2) numbers x and y
-
-A symbol list has at least two elements. The last two are separated by a conjunction (and in English), the others by commas. diff --git a/lib/resource-1.0/doc/gfdoc/Noun.html b/lib/resource-1.0/doc/gfdoc/Noun.html index 6abb0e119..06802e26b 100644 --- a/lib/resource-1.0/doc/gfdoc/Noun.html +++ b/lib/resource-1.0/doc/gfdoc/Noun.html @@ -7,7 +7,7 @@
- UseN2 : N2 -> CN ; -- son - UseN3 : N3 -> CN ; -- flight + UseN2 : N2 -> CN ; -- son + UseN3 : N3 -> CN ; -- flight
-Nouns can be modified by adjectives and relative clauses. +Nouns can be modified by adjectives, relative clauses, and adverbs +(the last rule will give rise to many 'PP attachement' ambiguities +when used in connection with verb phrases).
- AdjCN : AP -> CN -> CN ; -- big house - RelCN : CN -> RS -> CN ; -- house that John owns + AdjCN : AP -> CN -> CN ; -- big house + RelCN : CN -> RS -> CN ; -- house that John owns + AdvCN : CN -> Adv -> CN ; -- house on the hill
diff --git a/lib/resource-1.0/doc/gfdoc/Numeral.html b/lib/resource-1.0/doc/gfdoc/Numeral.html index 5a7d8a2a2..98997d242 100644 --- a/lib/resource-1.0/doc/gfdoc/Numeral.html +++ b/lib/resource-1.0/doc/gfdoc/Numeral.html @@ -7,7 +7,7 @@
Author: -Last update: Tue Jan 17 15:29:11 2006 +Last update: Wed Jan 18 19:08:02 2006
Produced by diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html index 1d1ced58c..942fa0746 100644 --- a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html +++ b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html @@ -18,14 +18,15 @@
Author: -Last update: Tue Jan 17 15:29:11 2006 +Last update: Wed Jan 18 19:08:02 2006
Produced by @@ -185,10 +186,10 @@ The regular genitive is s, omitted after s.
-Adjectives need four forms: two for the positive and one for the other degrees. +Adjectives need three forms, one for each degree.
- mkA : (x1,_,_,x4 : Str) -> A ; -- gut,gut,besser,best + mkA : (x1,_,x3 : Str) -> A ; -- gut,besser,beste
@@ -214,6 +215,15 @@ Two-place adjectives are formed by adding a preposition to an adjective.
++Adverbs are just strings. +
++ mkAdv : Str -> Adv ; ++ +
A preposition is formed from a string and a case. @@ -239,7 +249,7 @@ A couple of common prepositions (always with the dative). zu_Prep : Prep ;
- +The worst-case constructor needs six forms: @@ -302,7 +312,7 @@ Reflexive verbs can take reflexive pronouns of different cases. reflV : V -> Case -> V ;
- +Two-place verbs need a preposition, except the special case with direct object @@ -315,7 +325,7 @@ Two-place verbs need a preposition, except the special case with direct object datV2 : V -> V2 ;
- +Three-place (ditransitive) verbs need two prepositions, of which @@ -327,7 +337,7 @@ the first one or both can be absent. accdatV3 : V -> V3 ; -- give,_,_
- +
Verbs and adjectives can take complements such as sentences,
@@ -338,7 +348,7 @@ questions, verb phrases, and adjectives.
mkVS : V -> VS ;
mkV2S : V -> Prep -> V2S ;
mkVV : V -> VV ;
- mkV2V : V -> Prep -> Prep -> V2V ;
+ mkV2V : V -> Prep -> V2V ;
mkVA : V -> VA ;
mkV2A : V -> Prep -> V2A ;
mkVQ : V -> VQ ;
@@ -361,7 +371,7 @@ as an adverb. Likewise AS, A2S, AV, A2V are just A.
AS, A2S, AV, A2V : Type ;
The definitions should not bother the user of the API. So they are diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html index 9198079db..40bb80aab 100644 --- a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html +++ b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html @@ -43,7 +43,7 @@
Author: -Last update: Tue Jan 17 15:29:11 2006 +Last update: Wed Jan 18 19:08:02 2006
Produced by diff --git a/lib/resource-1.0/doc/gfdoc/Phrase.html b/lib/resource-1.0/doc/gfdoc/Phrase.html index fa7cba3a1..eb3f8c015 100644 --- a/lib/resource-1.0/doc/gfdoc/Phrase.html +++ b/lib/resource-1.0/doc/gfdoc/Phrase.html @@ -7,7 +7,7 @@
-Author: -Last update: Tue Jan 17 15:29:10 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
--== -
+ +
abstract SeqConjunction = Cat ** {
This module is for backward compatibility with API 0.9. -To be used instead of Conjunction. +To be used instead of Conjunction.
fun
diff --git a/lib/resource-1.0/doc/gfdoc/Structural.html b/lib/resource-1.0/doc/gfdoc/Structural.html
index 18403f225..917cd1de4 100644
--- a/lib/resource-1.0/doc/gfdoc/Structural.html
+++ b/lib/resource-1.0/doc/gfdoc/Structural.html
@@ -7,7 +7,7 @@
GF Resource Grammar API for Structural Words
Author:
-Last update: Tue Jan 17 15:29:10 2006
+Last update: Wed Jan 18 19:08:01 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Tense.html b/lib/resource-1.0/doc/gfdoc/Tense.html
index ec492d50b..cb85be2f8 100644
--- a/lib/resource-1.0/doc/gfdoc/Tense.html
+++ b/lib/resource-1.0/doc/gfdoc/Tense.html
@@ -2,27 +2,38 @@
+ Tense, Polarity, and Anteriority
+ Tense, Polarity, and Anteriority
+Author:
+Last update: Wed Jan 18 19:08:01 2006
+
+
-Author: -Last update: Tue Jan 17 15:29:10 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This module defines the abstract parameters of tense, polarity, and +anteriority, which are used in Tensed to generate different +forms of sentences. Together they give 2 x 4 x 4 = 16 sentence forms. +These tenses are defined for all languages in the library. More tenses +can be defined in the language extensions, e.g. the passé simple of +Romance languages.
abstract Tense = {
@@ -33,9 +44,9 @@ gfdoc - a rudimentary GF document generator.
Ant ;
fun
- PPos, PNeg : Pol ;
- TPres, TPast, TFut, TCond : Tense ;
- ASimul, AAnter : Ant ;
+ PPos, PNeg : Pol ; -- I sleep/don't sleep
+ TPres, TPast, TFut, TCond : Tense ; -- I sleep/slept/will sleep/would sleep
+ ASimul, AAnter : Ant ; -- I sleep/have slept
}
diff --git a/lib/resource-1.0/doc/gfdoc/Tensed.html b/lib/resource-1.0/doc/gfdoc/Tensed.html
index 8c50e3800..989e0e0e8 100644
--- a/lib/resource-1.0/doc/gfdoc/Tensed.html
+++ b/lib/resource-1.0/doc/gfdoc/Tensed.html
@@ -2,27 +2,37 @@
+-Author: -Last update: Tue Jan 17 15:29:10 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This module defines the 2 x 4 x 4 = 16 forms generated by different +combinations of tense, polarity, and +anteriority, which are defined in Tense. +A variant with just the polarity variation is given in +Untensed.
abstract Tensed = Cat, Tense ** {
@@ -35,6 +45,27 @@ gfdoc - a rudimentary GF document generator.
}
+
+Examples for English S:
+
+Pres Simul Pos ODir : he sleeps +Pres Simul Neg ODir : he doesn't sleep +Pres Anter Pos ODir : he has slept +Pres Anter Neg ODir : he hasn't slept +Past Simul Pos ODir : he slept +Past Simul Neg ODir : he didn't sleep +Past Anter Pos ODir : he had slept +Past Anter Neg ODir : he hadn't slept +Fut Simul Pos ODir : he will sleep +Fut Simul Neg ODir : he won't sleep +Fut Anter Pos ODir : he will have slept +Fut Anter Neg ODir : he won't have slept +Cond Simul Pos ODir : he would sleep +Cond Simul Neg ODir : he wouldn't sleep +Cond Anter Pos ODir : he would have slept +Cond Anter Neg ODir : he wouldn't have slept +
diff --git a/lib/resource-1.0/doc/gfdoc/Test.html b/lib/resource-1.0/doc/gfdoc/Test.html index 80557a13d..2d2e78d4d 100644 --- a/lib/resource-1.0/doc/gfdoc/Test.html +++ b/lib/resource-1.0/doc/gfdoc/Test.html @@ -2,27 +2,37 @@ +-Author: -Last update: Tue Jan 17 15:29:10 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This grammar is just a collection of the different modules, +and one that can be imported when one wants to test a reduced version +of the grammar. The complete top module is Lang. +The main constructs missing are tenses of sentences, numerals, and +comprehensive lexicon.
abstract Test =
@@ -30,7 +40,6 @@ gfdoc - a rudimentary GF document generator.
Verb,
Adjective,
Adverb,
- -- Numeral,
Sentence,
Question,
Relative,
@@ -38,6 +47,9 @@ gfdoc - a rudimentary GF document generator.
Phrase,
Untensed,
-- Tensed,
+ -- Structural,
+ -- Basic,
+ -- Numeral,
Lex
** {} ;
diff --git a/lib/resource-1.0/doc/gfdoc/Untensed.html b/lib/resource-1.0/doc/gfdoc/Untensed.html
index 0172ca7cc..45e75f01d 100644
--- a/lib/resource-1.0/doc/gfdoc/Untensed.html
+++ b/lib/resource-1.0/doc/gfdoc/Untensed.html
@@ -2,27 +2,35 @@
+-Author: -Last update: Tue Jan 17 15:29:10 2006 -
-Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.
+ +-== +This module defines just positive and negative present tense forms. +Am alternative with full variation in polarity, tense, and anteriority is +given in Untensed.
abstract Untensed = Cat ** {
diff --git a/lib/resource-1.0/doc/gfdoc/Verb.html b/lib/resource-1.0/doc/gfdoc/Verb.html
index 38584450c..4472024d1 100644
--- a/lib/resource-1.0/doc/gfdoc/Verb.html
+++ b/lib/resource-1.0/doc/gfdoc/Verb.html
@@ -7,7 +7,7 @@
The construction of verb phrases
Author:
-Last update: Tue Jan 17 15:29:10 2006
+Last update: Wed Jan 18 19:08:02 2006
diff --git a/lib/resource-1.0/english/BasicEng.gf b/lib/resource-1.0/english/BasicEng.gf
index b2e9d4057..deb15beb6 100644
--- a/lib/resource-1.0/english/BasicEng.gf
+++ b/lib/resource-1.0/english/BasicEng.gf
@@ -129,6 +129,7 @@ lin
open_V2 = dirV2 (regV "open") ;
paint_V2A = mkV2A (regV "paint") [] ;
paper_N = regN "paper" ;
+ paris_PN = regPN "Paris" nonhuman ;
peace_N = regN "peace" ;
pen_N = regN "pen" ;
planet_N = regN "planet" ;
diff --git a/lib/resource-1.0/german/BasicGer.gf b/lib/resource-1.0/german/BasicGer.gf
index 10252947d..e55fb0efe 100644
--- a/lib/resource-1.0/german/BasicGer.gf
+++ b/lib/resource-1.0/german/BasicGer.gf
@@ -136,6 +136,7 @@ lin
open_V2 = dirV2 (regV "öffnen") ;
paint_V2A = mkV2A (regV "malen") accPrep ;
paper_N = reg2N "Papier" "Papiere" neuter ;
+ paris_PN = mkPN "Paris" "Paris" ;
peace_N = mkN "Friede" "Frieden" "Frieden" "Friedens" "Frieden" "Frieden" masculine ;
pen_N = regN "Bleistift" ; ----
planet_N = reg2N "Planet" "Planeten" masculine ;
diff --git a/lib/resource-1.0/swedish/BasicSwe.gf b/lib/resource-1.0/swedish/BasicSwe.gf
index 521bbe177..e8a55fcbe 100644
--- a/lib/resource-1.0/swedish/BasicSwe.gf
+++ b/lib/resource-1.0/swedish/BasicSwe.gf
@@ -131,6 +131,7 @@ lin
open_V2 = dirV2 (regV "öppna") ;
paint_V2A = mkV2A (regV "måla") [] ;
paper_N = mkN "papper" "pappret" "papper" "pappren" ;
+ paris_PN = regPN "Paris" neutrum ;
peace_N = regN "fred" utrum ; ---- ar?
pen_N = regN "penna" utrum ;
planet_N = mk2N "planet" "planeter" ;