diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index 47bbc8cab..371ad3b0a 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -1,5 +1,5 @@
test:
- gf -src english/LangEng.gf swedish/LangSwe.gf german/TestGer.gf
+ gf -src english/LangEng.gf swedish/LangSwe.gf german/LangGer.gf
stat:
wc english/*.gfc
diff --git a/lib/resource-1.0/doc/gfdoc/Adjective.html b/lib/resource-1.0/doc/gfdoc/Adjective.html
index 281863509..767bf32c9 100644
--- a/lib/resource-1.0/doc/gfdoc/Adjective.html
+++ b/lib/resource-1.0/doc/gfdoc/Adjective.html
@@ -7,7 +7,7 @@
Adjectives and adjectival phrases
Author:
-Last update: Tue Jan 17 15:24:33 2006
+Last update: Tue Jan 17 15:29:07 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Adverb.html b/lib/resource-1.0/doc/gfdoc/Adverb.html
index ad3d76b3c..7c438705c 100644
--- a/lib/resource-1.0/doc/gfdoc/Adverb.html
+++ b/lib/resource-1.0/doc/gfdoc/Adverb.html
@@ -7,7 +7,7 @@
Adverbs and adverbial phrases
Author:
-Last update: Tue Jan 17 15:24:33 2006
+Last update: Tue Jan 17 15:29:07 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Basic.html b/lib/resource-1.0/doc/gfdoc/Basic.html
index f05a2fda3..e4e039dd4 100644
--- a/lib/resource-1.0/doc/gfdoc/Basic.html
+++ b/lib/resource-1.0/doc/gfdoc/Basic.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:33 2006
+Last update: Tue Jan 17 15:29:08 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Cat.html b/lib/resource-1.0/doc/gfdoc/Cat.html
index 204765152..f0e840a53 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:24:33 2006
+Last update: Tue Jan 17 15:29:08 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Conjunction.html b/lib/resource-1.0/doc/gfdoc/Conjunction.html
index 6ebb482f4..d6052a2a7 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:24:34 2006
+Last update: Tue Jan 17 15:29:08 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Lang.html b/lib/resource-1.0/doc/gfdoc/Lang.html
index 1cbe89423..2ffc0d1c4 100644
--- a/lib/resource-1.0/doc/gfdoc/Lang.html
+++ b/lib/resource-1.0/doc/gfdoc/Lang.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:34 2006
+Last update: Tue Jan 17 15:29:08 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Lex.html b/lib/resource-1.0/doc/gfdoc/Lex.html
index 7a2bd0475..e750ae951 100644
--- a/lib/resource-1.0/doc/gfdoc/Lex.html
+++ b/lib/resource-1.0/doc/gfdoc/Lex.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:34 2006
+Last update: Tue Jan 17 15:29:08 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/ListConjunction.html b/lib/resource-1.0/doc/gfdoc/ListConjunction.html
index 1d07d94f3..c22707c21 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:24:34 2006
+Last update: Tue Jan 17 15:29:08 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Math.html b/lib/resource-1.0/doc/gfdoc/Math.html
index ace675baf..479f0017f 100644
--- a/lib/resource-1.0/doc/gfdoc/Math.html
+++ b/lib/resource-1.0/doc/gfdoc/Math.html
@@ -19,7 +19,7 @@
Author:
-Last update: Tue Jan 17 15:24:34 2006
+Last update: Tue Jan 17 15:29:08 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Noun.html b/lib/resource-1.0/doc/gfdoc/Noun.html
index e20aba1b1..6abb0e119 100644
--- a/lib/resource-1.0/doc/gfdoc/Noun.html
+++ b/lib/resource-1.0/doc/gfdoc/Noun.html
@@ -7,7 +7,7 @@
The construction of nouns, noun phrases, and determiners
Author:
-Last update: Tue Jan 17 15:24:34 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Numeral.html b/lib/resource-1.0/doc/gfdoc/Numeral.html
index 3a7d3b56e..5a7d8a2a2 100644
--- a/lib/resource-1.0/doc/gfdoc/Numeral.html
+++ b/lib/resource-1.0/doc/gfdoc/Numeral.html
@@ -7,7 +7,7 @@
Numerals
Author:
-Last update: Tue Jan 17 15:24:34 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
index dff88a80b..9550642e2 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsEng.html
@@ -43,7 +43,7 @@
Author:
-Last update: Tue Jan 17 15:24:36 2006
+Last update: Tue Jan 17 15:29:11 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
index de3e58273..1d1ced58c 100644
--- a/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
+++ b/lib/resource-1.0/doc/gfdoc/ParadigmsGer.html
@@ -34,7 +34,7 @@
Author:
-Last update: Tue Jan 17 15:24:36 2006
+Last update: Tue Jan 17 15:29:11 2006
Produced by
@@ -50,7 +50,7 @@ gfdoc - a rudimentary GF document generator.
German Lexical Paradigms
-Aarne Ranta 2003--2005
+Aarne Ranta & Harald Hammarström 2003--2006
This is an API to the user of the resource grammar
diff --git a/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html b/lib/resource-1.0/doc/gfdoc/ParadigmsSwe.html
index a71121479..9198079db 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:24:37 2006
+Last update: Tue Jan 17 15:29:11 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Phrase.html b/lib/resource-1.0/doc/gfdoc/Phrase.html
index f8c6a27b6..fa7cba3a1 100644
--- a/lib/resource-1.0/doc/gfdoc/Phrase.html
+++ b/lib/resource-1.0/doc/gfdoc/Phrase.html
@@ -7,7 +7,7 @@
Phrases and utterances
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Question.html b/lib/resource-1.0/doc/gfdoc/Question.html
index 921046a54..3ce60febd 100644
--- a/lib/resource-1.0/doc/gfdoc/Question.html
+++ b/lib/resource-1.0/doc/gfdoc/Question.html
@@ -7,7 +7,7 @@
Questions and interrogative pronouns
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Relative.html b/lib/resource-1.0/doc/gfdoc/Relative.html
index 3441466ba..9bd0835af 100644
--- a/lib/resource-1.0/doc/gfdoc/Relative.html
+++ b/lib/resource-1.0/doc/gfdoc/Relative.html
@@ -7,7 +7,7 @@
Relative clauses and pronouns
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Sentence.html b/lib/resource-1.0/doc/gfdoc/Sentence.html
index 0dbc4d9b9..36ff7df5a 100644
--- a/lib/resource-1.0/doc/gfdoc/Sentence.html
+++ b/lib/resource-1.0/doc/gfdoc/Sentence.html
@@ -7,7 +7,7 @@
Clauses, imperatives, and sentential complements
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:09 2006
diff --git a/lib/resource-1.0/doc/gfdoc/SeqConjunction.html b/lib/resource-1.0/doc/gfdoc/SeqConjunction.html
index 30ec4f8de..542758e86 100644
--- a/lib/resource-1.0/doc/gfdoc/SeqConjunction.html
+++ b/lib/resource-1.0/doc/gfdoc/SeqConjunction.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:10 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Structural.html b/lib/resource-1.0/doc/gfdoc/Structural.html
index 4247ff986..18403f225 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:24:35 2006
+Last update: Tue Jan 17 15:29:10 2006
diff --git a/lib/resource-1.0/doc/gfdoc/Tense.html b/lib/resource-1.0/doc/gfdoc/Tense.html
index 185212163..ec492d50b 100644
--- a/lib/resource-1.0/doc/gfdoc/Tense.html
+++ b/lib/resource-1.0/doc/gfdoc/Tense.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:10 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Tensed.html b/lib/resource-1.0/doc/gfdoc/Tensed.html
index 66eee0f47..8c50e3800 100644
--- a/lib/resource-1.0/doc/gfdoc/Tensed.html
+++ b/lib/resource-1.0/doc/gfdoc/Tensed.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:35 2006
+Last update: Tue Jan 17 15:29:10 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Test.html b/lib/resource-1.0/doc/gfdoc/Test.html
index f4f9905fa..80557a13d 100644
--- a/lib/resource-1.0/doc/gfdoc/Test.html
+++ b/lib/resource-1.0/doc/gfdoc/Test.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:36 2006
+Last update: Tue Jan 17 15:29:10 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Untensed.html b/lib/resource-1.0/doc/gfdoc/Untensed.html
index c1988d428..0172ca7cc 100644
--- a/lib/resource-1.0/doc/gfdoc/Untensed.html
+++ b/lib/resource-1.0/doc/gfdoc/Untensed.html
@@ -14,7 +14,7 @@
Author:
-Last update: Tue Jan 17 15:24:36 2006
+Last update: Tue Jan 17 15:29:10 2006
Produced by
diff --git a/lib/resource-1.0/doc/gfdoc/Verb.html b/lib/resource-1.0/doc/gfdoc/Verb.html
index 3d875e619..38584450c 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:24:36 2006
+Last update: Tue Jan 17 15:29:10 2006
diff --git a/lib/resource-1.0/german/BasicGer.gf b/lib/resource-1.0/german/BasicGer.gf
index 520d7c67a..cf2ac0808 100644
--- a/lib/resource-1.0/german/BasicGer.gf
+++ b/lib/resource-1.0/german/BasicGer.gf
@@ -1,12 +1,13 @@
--# -path=.:../common:../abstract:../../prelude
-concrete BasicGer of Basic = CatGer ** open ParadigmsGer in {
+concrete BasicGer of Basic = CatGer ** open Prelude, ParadigmsGer in {
flags
optimize=values ;
lin
airplane_N = regN "Flugzeug" ;
+ already_Adv = ss "schon" ;
answer_V2S = mkV2S (regV "antworten") datPrep ;
apartment_N = regN "Wohnung" ;
apple_N = reg2N "Apfel" "Äpfel" masculine ;
@@ -127,8 +128,8 @@ lin
new_A = regA "neu" ;
newspaper_N = regN "Zeitung" ;
{-
- oil_N = regN "olja" ;
- old_A = mkA "gammal" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ;
+ oil_N = regN "Öl" ; ----
+ old_A = mkA "alt" "gammalt" "gamla" "gamla" "äldre" "äldst" "äldsta" ;
open_V2 = dirV2 (regV "öppna") ;
paint_V2A = mkV2A (regV "måla") [] ;
paper_N = mkN "papper" "pappret" "papper" "pappren" ;
diff --git a/lib/resource-1.0/german/StructuralGer.gf b/lib/resource-1.0/german/StructuralGer.gf
index 1830d9bd6..c3176f390 100644
--- a/lib/resource-1.0/german/StructuralGer.gf
+++ b/lib/resource-1.0/german/StructuralGer.gf
@@ -33,6 +33,7 @@ concrete StructuralGer of Structural = CatGer **
every_Det = detLikeAdj Sg "jed" ;
everything_NP = nameNounPhrase {s = caselist "alles" "alles" "allem" "alles"} ;
everywhere_Adv = ss "überall" ;
+ first_Ord = {s = (regA "erst").s ! Posit} ;
from_Prep = mkPrep "aus" Dat ;
he_Pron = mkPronPers "er" "ihn" "ihm" "seiner" "sein" Sg P3 ;
here7to_Adv = ss ["hierher"] ;