From 46a4abb45aa81037b578749b4ad464866808fe28 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 10 Jan 2006 20:51:08 +0000 Subject: [PATCH] working on API documentation --- resource-1.0/Makefile | 8 +++ resource-1.0/abstract/Adjective.gf | 33 ++++++----- resource-1.0/abstract/Adverb.gf | 31 +++++++--- resource-1.0/abstract/Noun.gf | 5 +- resource-1.0/doc/gfdoc/Adjective.html | 55 +++++++++-------- resource-1.0/doc/gfdoc/Adverb.html | 66 ++++++++++++++------- resource-1.0/doc/gfdoc/Basic.html | 8 +-- resource-1.0/doc/gfdoc/Cat.html | 59 +++++++++--------- resource-1.0/doc/gfdoc/Conjunction.html | 8 +-- resource-1.0/doc/gfdoc/Lang.html | 8 +-- resource-1.0/doc/gfdoc/Lex.html | 8 +-- resource-1.0/doc/gfdoc/Math.html | 8 +-- resource-1.0/doc/gfdoc/Noun.html | 28 ++++----- resource-1.0/doc/gfdoc/Numeral.html | 8 +-- resource-1.0/doc/gfdoc/ParadigmsEng.html | 8 +-- resource-1.0/doc/gfdoc/ParadigmsGer.html | 8 +-- resource-1.0/doc/gfdoc/ParadigmsSwe.html | 8 +-- resource-1.0/doc/gfdoc/Phrase.html | 8 +-- resource-1.0/doc/gfdoc/Question.html | 8 +-- resource-1.0/doc/gfdoc/Relative.html | 8 +-- resource-1.0/doc/gfdoc/Sentence.html | 8 +-- resource-1.0/doc/gfdoc/SeqConjunction.html | 8 +-- resource-1.0/doc/gfdoc/Structural.html | 12 +--- resource-1.0/doc/gfdoc/Tense.html | 8 +-- resource-1.0/doc/gfdoc/Tensed.html | 8 +-- resource-1.0/doc/gfdoc/Test.html | 8 +-- resource-1.0/doc/gfdoc/Untensed.html | 8 +-- resource-1.0/doc/gfdoc/Verb.html | 8 +-- resource-1.0/english/AdjectiveEng.gf | 8 +-- resource-1.0/english/NounEng.gf | 3 +- resource-1.0/german/AdjectiveGer.gf | 8 +-- resource-1.0/german/NounGer.gf | 7 +-- resource-1.0/scandinavian/AdjectiveScand.gf | 8 +-- resource-1.0/scandinavian/NounScand.gf | 8 +-- 34 files changed, 217 insertions(+), 274 deletions(-) diff --git a/resource-1.0/Makefile b/resource-1.0/Makefile index d6778ebb..47bbc8ca 100644 --- a/resource-1.0/Makefile +++ b/resource-1.0/Makefile @@ -1,3 +1,11 @@ +test: + gf -src english/LangEng.gf swedish/LangSwe.gf german/TestGer.gf + +stat: + wc english/*.gfc + wc swedish/*.gfc + wc german/*.gfc + gfdoc: gfdoc -txthtml abstract/*.gf gfdoc -txthtml */Paradigms*.gf diff --git a/resource-1.0/abstract/Adjective.gf b/resource-1.0/abstract/Adjective.gf index 7cae616d..b97f3770 100644 --- a/resource-1.0/abstract/Adjective.gf +++ b/resource-1.0/abstract/Adjective.gf @@ -1,25 +1,30 @@ +--1 Adjectives and adjectival phrases + abstract Adjective = Cat ** { fun - PositA : A -> AP ; - ComparA : A -> NP -> AP ; +-- The principal ways of forming an adjectival phrase are +-- positive, comparative, relational, reflexive-relational, and +-- elliptic-relational. +-- (The superlative use is covered in [Noun Noun.html].$SuperlA$.) --- $SuperlA$ belongs to determiner syntax in $Noun$. + PositA : A -> AP ; -- warm + ComparA : A -> NP -> AP ; -- warmer than Spain + ComplA2 : A2 -> NP -> AP ; -- divisible by 2 + ReflA2 : A2 -> AP ; -- divisible by itself + UseA2 : A2 -> A ; -- divisible - ComplA2 : A2 -> NP -> AP ; +-- Sentence and question complements defined for all adjectival +-- phrases, although the semantics is only clear for some adjective. + + SentAP : AP -> SC -> AP ; -- great that she won, uncertain if she did - ReflA2 : A2 -> AP ; +-- An adjectival phrase can be modified by an *adadjective*, such as "very". - SentAP : AP -> S -> AP ; - QuestAP : AP -> QS -> AP ; + AdAP : AdA -> AP -> AP ; -- very uncertain - AdAP : AdA -> AP -> AP ; - --- $AdvA$ that forms adverbs belongs to $Adverb$. - --- Elliptic constructions as usual. - - UseA2 : A2 -> A ; +-- The formation of adverbs from adjective (e.g. "quickly") is covered +-- by [Adverb Adverb.html]. } diff --git a/resource-1.0/abstract/Adverb.gf b/resource-1.0/abstract/Adverb.gf index ead353f6..9165d1c9 100644 --- a/resource-1.0/abstract/Adverb.gf +++ b/resource-1.0/abstract/Adverb.gf @@ -1,19 +1,34 @@ +--1 Adverbs and adverbial phrases + abstract Adverb = Cat ** { fun - PositAdvAdj : A -> Adv ; - ComparAdvAdj : CAdv -> A -> NP -> Adv ; - ComparAdvAdjS : CAdv -> A -> S -> Adv ; +-- The two main ways of formins adverbs is from adjectives and by +-- prepositions from noun phrases. - PrepNP : Prep -> NP -> Adv ; + PositAdvAdj : A -> Adv ; -- quickly + PrepNP : Prep -> NP -> Adv ; -- in the house - AdAdv : AdA -> Adv -> Adv ; - SubjS : Subj -> S -> Adv ; - AdvSC : SC -> Adv ; +-- Comparative adverbs have a noun phrase or a sentence as object of +-- comparison. - AdnCAdv : CAdv -> AdN ; + ComparAdvAdj : CAdv -> A -> NP -> Adv ; -- more quickly than John + ComparAdvAdjS : CAdv -> A -> S -> Adv ; -- more quickly than he runs + +-- Adverbs can be modified by 'adadjectives', just like adjectives. + + AdAdv : AdA -> Adv -> Adv ; -- very quickly + +-- Subordinate clauses can function as adverbs. + + SubjS : Subj -> S -> Adv ; -- when he arrives + AdvSC : SC -> Adv ; ---- REMOVE THIS? + +-- Comparison adverbs also work as numeral adverbs. + + AdnCAdv : CAdv -> AdN ; -- more (than five) } diff --git a/resource-1.0/abstract/Noun.gf b/resource-1.0/abstract/Noun.gf index 14eb5698..5e0a27a4 100644 --- a/resource-1.0/abstract/Noun.gf +++ b/resource-1.0/abstract/Noun.gf @@ -109,9 +109,8 @@ abstract Noun = Cat ** { -- Nouns can also be modified by embedded sentences and questions. -- For some nouns this makes little sense, but we leave this for applications --- to decide. +-- to decide. Sentential complements are defined in [Verb Verb.html]. - SentCN : CN -> S -> CN ; -- fact that John smokes - QuestCN : CN -> QS -> CN ; -- question whether John smokes + SentCN : CN -> SC -> CN ; -- fact that John smokes, question if he does } ; diff --git a/resource-1.0/doc/gfdoc/Adjective.html b/resource-1.0/doc/gfdoc/Adjective.html index b6a21f37..27a1da82 100644 --- a/resource-1.0/doc/gfdoc/Adjective.html +++ b/resource-1.0/doc/gfdoc/Adjective.html @@ -2,8 +2,12 @@ + Adjectives and adjectival phrases +

Adjectives and adjectival phrases

+Last update: Tue Jan 10 21:50:56 2006
+% NOTE: this is a txt2tags file.

@@ -13,51 +17,54 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 -

-

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Adjective = Cat ** {
     
       fun
-    
-        PositA  : A -> AP ;
-        ComparA : A -> NP -> AP ;

-SuperlA belongs to determiner syntax in Noun. +The principal ways of forming an adjectival phrase are +positive, comparative, relational, reflexive-relational, and +elliptic-relational. +(The superlative use is covered in Noun.SuperlA.) 

-        ComplA2 : A2 -> NP -> AP ;
-    
-        ReflA2  : A2 -> AP ;
-    
-        SentAP  : AP -> S  -> AP ;
-        QuestAP : AP -> QS -> AP ;
-    
-        AdAP : AdA -> AP -> AP ;
+        PositA  : A -> AP ;         -- warm
+        ComparA : A -> NP -> AP ;   -- warmer than Spain
+        ComplA2 : A2 -> NP -> AP ;  -- divisible by 2
+        ReflA2  : A2 -> AP ;        -- divisible by itself
+        UseA2   : A2 -> A ;         -- divisible

-AdvA that forms adverbs belongs to Adverb. -Elliptic constructions as usual. +Sentence and question complements defined for all adjectival +phrases, although the semantics is only clear for some adjective. +

+
+        SentAP  : AP -> SC -> AP ;  -- great that she won, uncertain if she did
+
+

+

+An adjectival phrase can be modified by an adadjective, such as very. +

+
+        AdAP    : AdA -> AP -> AP ; -- very uncertain
+
+

+

+The formation of adverbs from adjective (e.g. quickly) is covered +by Adverb. 

-        UseA2 : A2 -> A ;
-    
     }

- + diff --git a/resource-1.0/doc/gfdoc/Adverb.html b/resource-1.0/doc/gfdoc/Adverb.html index 97f0d003..e0ca9a55 100644 --- a/resource-1.0/doc/gfdoc/Adverb.html +++ b/resource-1.0/doc/gfdoc/Adverb.html @@ -2,8 +2,12 @@ + Adverbs and adverbial phrases +

Adverbs and adverbial phrases

+Last update: Tue Jan 10 21:50:56 2006
+% NOTE: this is a txt2tags file.

@@ -13,39 +17,59 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 -

-

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Adverb = Cat ** {
     
       fun
-    
-        PositAdvAdj   : A -> Adv ;
-        ComparAdvAdj  : CAdv -> A -> NP -> Adv ;
-        ComparAdvAdjS : CAdv -> A -> S -> Adv ;
-    
-        PrepNP : Prep -> NP -> Adv ;
-    
-        AdAdv  : AdA -> Adv -> Adv ;
-    
-        SubjS : Subj -> S -> Adv ;
-        AdvSC : SC -> Adv ;
-    
-        AdnCAdv : CAdv -> AdN ;
+
+

+

+The two main ways of formins adverbs is from adjectives and by +prepositions from noun phrases. +

+
+        PositAdvAdj : A -> Adv ;                 -- quickly
+        PrepNP      : Prep -> NP -> Adv ;        -- in the house
+
+

+

+Comparative adverbs have a noun phrase or a sentence as object of +comparison. +

+
+        ComparAdvAdj  : CAdv -> A -> NP -> Adv ; -- more quickly than John
+        ComparAdvAdjS : CAdv -> A -> S -> Adv ;  -- more quickly than he runs
+
+

+

+Adverbs can be modified by 'adadjectives', just like adjectives. +

+
+        AdAdv  : AdA -> Adv -> Adv ;             -- very quickly
+
+

+

+Subordinate clauses can function as adverbs. +

+
+        SubjS : Subj -> S -> Adv ;               -- when he arrives
+        AdvSC : SC -> Adv ;                      ---- REMOVE THIS?
+
+

+

+Comparison adverbs also work as numeral adverbs. +

+
+        AdnCAdv : CAdv -> AdN ;                  -- more (than five)
     
     }

- + diff --git a/resource-1.0/doc/gfdoc/Basic.html b/resource-1.0/doc/gfdoc/Basic.html index 2dac0415..77904464 100644 --- a/resource-1.0/doc/gfdoc/Basic.html +++ b/resource-1.0/doc/gfdoc/Basic.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 +Last update: Tue Jan 10 21:50:56 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Basic = Cat ** {
       fun
@@ -251,6 +247,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Cat.html b/resource-1.0/doc/gfdoc/Cat.html index 04096a60..49143dbb 100644 --- a/resource-1.0/doc/gfdoc/Cat.html +++ b/resource-1.0/doc/gfdoc/Cat.html @@ -6,30 +6,27 @@

The category system

-Author:
-Last update: Tue Jan 10 16:38:50 2006 +Last update: Tue Jan 10 21:50:57 2006
+% NOTE: this is a txt2tags file.

-

@@ -39,15 +36,13 @@ Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

- -

The category system

     abstract Cat = {
     
       cat

- +

Top-level units

Constructed in Phrase. @@ -59,7 +54,7 @@ Constructed in Phrase. Voc ; -- vocative or "please" e.g. "my darling"

- +

Tensed sentences

Constructed in Tensed. @@ -71,7 +66,7 @@ A simplified variant, with just present forms, is Untens RS ; -- relative e.g. "in which she lived"

- +

Clauses

Constructed in Sentence. @@ -82,7 +77,7 @@ Constructed in Sentence. Imp ; -- imperative e.g. "look at this"

- +

Questions and interrogatives

Constructed in Question. @@ -94,7 +89,7 @@ Constructed in Question. IDet ; -- interrogative determiner e.g. "which"

- +

Relative clauses and pronouns

Constructed in Relative. @@ -104,7 +99,7 @@ Constructed in Relative. RP ; -- relative pronoun e.g. "in which"

- +

Verb phrases

Constructed in Verb. @@ -115,7 +110,7 @@ Constructed in Verb. SC ; -- embedded sentence or question e.g. "that it rains"

- +

Adjectival phrases

Constructed in Adjective. @@ -124,7 +119,7 @@ Constructed in Adjective. AP ; -- adjectival phrase e.g. "very warm"

- +

Nouns and noun phrases

Constructed in Noun. @@ -150,7 +145,7 @@ as defined in Noun. Ord ; -- ordinal number (used in Det) e.g. "seventh"

- +

Adverbs

Constructed in Adverb. @@ -163,7 +158,7 @@ Many adverbs are constructed in Structural. AdN ; -- numeral-modifying adverb, e.g. "more than"

- +

Numerals

Constructed in Numeral. @@ -172,7 +167,7 @@ Constructed in Numeral. Numeral;-- cardinal or ordinal, e.g. "five/fifth"

- +

Structural words

Constructed in Structural. @@ -186,7 +181,7 @@ Constructed in Structural. Prep ; -- preposition, or just case e.g. "in"

- +

Words of open classes

These are constructed in Basic and in additional lexicon modules. @@ -213,6 +208,6 @@ These are constructed in Basic and in additional lexico

- + diff --git a/resource-1.0/doc/gfdoc/Conjunction.html b/resource-1.0/doc/gfdoc/Conjunction.html index b2b7f549..48ee60c2 100644 --- a/resource-1.0/doc/gfdoc/Conjunction.html +++ b/resource-1.0/doc/gfdoc/Conjunction.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 +Last update: Tue Jan 10 21:50:57 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Conjunction = Cat ** {
     
@@ -54,6 +50,6 @@ These categories are internal to this module.

- + diff --git a/resource-1.0/doc/gfdoc/Lang.html b/resource-1.0/doc/gfdoc/Lang.html index 70cd6621..ba1ae7ef 100644 --- a/resource-1.0/doc/gfdoc/Lang.html +++ b/resource-1.0/doc/gfdoc/Lang.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 +Last update: Tue Jan 10 21:50:57 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Lang = 
       Noun,
@@ -43,6 +39,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Lex.html b/resource-1.0/doc/gfdoc/Lex.html index 00584223..438e921d 100644 --- a/resource-1.0/doc/gfdoc/Lex.html +++ b/resource-1.0/doc/gfdoc/Lex.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:50 2006 +Last update: Tue Jan 10 21:50:57 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Lex = Cat ** {
     
@@ -84,6 +80,6 @@ structural

- + diff --git a/resource-1.0/doc/gfdoc/Math.html b/resource-1.0/doc/gfdoc/Math.html index fe0be55e..3fad6351 100644 --- a/resource-1.0/doc/gfdoc/Math.html +++ b/resource-1.0/doc/gfdoc/Math.html @@ -18,17 +18,13 @@

-Author: -Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:57 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Math = Cat ** {
@@ -63,6 +59,6 @@ This produces x, y and z, in English.

- + diff --git a/resource-1.0/doc/gfdoc/Noun.html b/resource-1.0/doc/gfdoc/Noun.html index f5916c58..896f90f4 100644 --- a/resource-1.0/doc/gfdoc/Noun.html +++ b/resource-1.0/doc/gfdoc/Noun.html @@ -6,21 +6,18 @@

The construction of nouns, noun phrases, and determiners

-Author:
-Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:58 2006
+% NOTE: this is a txt2tags file.

-

@@ -30,15 +27,13 @@ Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

- -

The construction of nouns, noun phrases, and determiners

     abstract Noun = Cat ** {
     
       fun

- +

Noun phrases

The three main types of noun phrases are @@ -58,7 +53,7 @@ The three main types of noun phrases are

Pronouns are given in the module Structural.

- +

Determiners

The determiner has a fine-grained structure, in which four @@ -149,7 +144,7 @@ in semantically odd expressions.

Other determiners are defined in Structural.

- +

Common nouns

Simple nouns can be used as nouns outright. @@ -186,16 +181,15 @@ Nouns can be modified by adjectives and relative clauses.

Nouns can also be modified by embedded sentences and questions. For some nouns this makes little sense, but we leave this for applications -to decide. +to decide. Sentential complements are defined in Verb. 

-        SentCN  : CN -> S  -> CN ;    -- fact that John smokes
-        QuestCN : CN -> QS -> CN ;    -- question whether John smokes
+        SentCN  : CN -> SC  -> CN ;   -- fact that John smokes, question if he does
     
     } ;

- + diff --git a/resource-1.0/doc/gfdoc/Numeral.html b/resource-1.0/doc/gfdoc/Numeral.html index c8a1fb64..51b67fd6 100644 --- a/resource-1.0/doc/gfdoc/Numeral.html +++ b/resource-1.0/doc/gfdoc/Numeral.html @@ -13,8 +13,7 @@

-Author: -Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:58 2006

Produced by @@ -22,9 +21,6 @@ gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-== -

-

numerals from 1 to 999999 in decimal notation 

@@ -60,6 +56,6 @@ numerals from 1 to 999999 in decimal notation

- + diff --git a/resource-1.0/doc/gfdoc/ParadigmsEng.html b/resource-1.0/doc/gfdoc/ParadigmsEng.html index 5b2b7f23..320868fb 100644 --- a/resource-1.0/doc/gfdoc/ParadigmsEng.html +++ b/resource-1.0/doc/gfdoc/ParadigmsEng.html @@ -41,8 +41,7 @@

-Author: -Last update: Tue Jan 10 16:38:53 2006 +Last update: Tue Jan 10 21:51:01 2006

Produced by @@ -50,9 +49,6 @@ gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-== -

-

# -path=.:../abstract:../../prelude

@@ -454,6 +450,6 @@ The definitions should not bother the user of the API. So they are hidden from the document.

- + diff --git a/resource-1.0/doc/gfdoc/ParadigmsGer.html b/resource-1.0/doc/gfdoc/ParadigmsGer.html index ebfe0865..202bcf2b 100644 --- a/resource-1.0/doc/gfdoc/ParadigmsGer.html +++ b/resource-1.0/doc/gfdoc/ParadigmsGer.html @@ -13,8 +13,7 @@

-Author: -Last update: Tue Jan 10 16:38:53 2006 +Last update: Tue Jan 10 21:51:01 2006

Produced by @@ -22,9 +21,6 @@ gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-== -

-

--# -path=.:../abstract:../../prelude

@@ -590,6 +586,6 @@ mkA2V v p = mkA2 v p **** {lock_A2 = <>} ; } ;

- + diff --git a/resource-1.0/doc/gfdoc/ParadigmsSwe.html b/resource-1.0/doc/gfdoc/ParadigmsSwe.html index a3b22645..d3012317 100644 --- a/resource-1.0/doc/gfdoc/ParadigmsSwe.html +++ b/resource-1.0/doc/gfdoc/ParadigmsSwe.html @@ -42,8 +42,7 @@

-Author: -Last update: Tue Jan 10 16:38:53 2006 +Last update: Tue Jan 10 21:51:01 2006

Produced by @@ -51,9 +50,6 @@ gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-== -

-

# -path=.:../scandinavian:../common:../abstract:../../prelude

@@ -454,6 +450,6 @@ The definitions should not bother the user of the API. So they are hidden from the document.

- + diff --git a/resource-1.0/doc/gfdoc/Phrase.html b/resource-1.0/doc/gfdoc/Phrase.html index 115448f5..05f3f7b9 100644 --- a/resource-1.0/doc/gfdoc/Phrase.html +++ b/resource-1.0/doc/gfdoc/Phrase.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:58 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Phrase = Cat, Tense ** {
     
@@ -49,6 +45,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Question.html b/resource-1.0/doc/gfdoc/Question.html index 7fab6c78..b833ff11 100644 --- a/resource-1.0/doc/gfdoc/Question.html +++ b/resource-1.0/doc/gfdoc/Question.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:58 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Question = Cat ** {
     
@@ -43,6 +39,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Relative.html b/resource-1.0/doc/gfdoc/Relative.html index 2b0619ab..4636934a 100644 --- a/resource-1.0/doc/gfdoc/Relative.html +++ b/resource-1.0/doc/gfdoc/Relative.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:51 2006 +Last update: Tue Jan 10 21:50:59 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Relative = Cat ** {
     
@@ -40,6 +36,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Sentence.html b/resource-1.0/doc/gfdoc/Sentence.html index fdfc005f..dac1c096 100644 --- a/resource-1.0/doc/gfdoc/Sentence.html +++ b/resource-1.0/doc/gfdoc/Sentence.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:50:59 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Sentence = Cat ** {
     
@@ -43,6 +39,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/SeqConjunction.html b/resource-1.0/doc/gfdoc/SeqConjunction.html index 23a73141..dea82567 100644 --- a/resource-1.0/doc/gfdoc/SeqConjunction.html +++ b/resource-1.0/doc/gfdoc/SeqConjunction.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:50:59 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract SeqConjunction = Cat ** {
@@ -74,6 +70,6 @@ we use right-associative lists instead of GF's built-in lists

- + diff --git a/resource-1.0/doc/gfdoc/Structural.html b/resource-1.0/doc/gfdoc/Structural.html index 92900ca1..4ee28e2c 100644 --- a/resource-1.0/doc/gfdoc/Structural.html +++ b/resource-1.0/doc/gfdoc/Structural.html @@ -6,17 +6,13 @@

GF Resource Grammar API for Structural Words

-Author:
-Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:50:59 2006
+% NOTE: this is a txt2tags file.

- -

@@ -25,8 +21,6 @@ Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

- -

GF Resource Grammar API for Structural Words

AR 21/11/2003 -- 30/11/2005

@@ -164,6 +158,6 @@ they8fem_NP : NP ;

- + diff --git a/resource-1.0/doc/gfdoc/Tense.html b/resource-1.0/doc/gfdoc/Tense.html index ec52a751..b53f4083 100644 --- a/resource-1.0/doc/gfdoc/Tense.html +++ b/resource-1.0/doc/gfdoc/Tense.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:51:00 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Tense = {
     
@@ -41,6 +37,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Tensed.html b/resource-1.0/doc/gfdoc/Tensed.html index 2dc29871..08d569d0 100644 --- a/resource-1.0/doc/gfdoc/Tensed.html +++ b/resource-1.0/doc/gfdoc/Tensed.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:50:59 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Tensed = Cat, Tense ** {
     
@@ -36,6 +32,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Test.html b/resource-1.0/doc/gfdoc/Test.html index 776911e0..2b2dbd6b 100644 --- a/resource-1.0/doc/gfdoc/Test.html +++ b/resource-1.0/doc/gfdoc/Test.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:51:00 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Test = 
       Noun,
@@ -43,6 +39,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Untensed.html b/resource-1.0/doc/gfdoc/Untensed.html index f47f9732..09432e45 100644 --- a/resource-1.0/doc/gfdoc/Untensed.html +++ b/resource-1.0/doc/gfdoc/Untensed.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:52 2006 +Last update: Tue Jan 10 21:51:00 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Untensed = Cat ** {
     
@@ -36,6 +32,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/doc/gfdoc/Verb.html b/resource-1.0/doc/gfdoc/Verb.html index 4887a1ab..0b4ee059 100644 --- a/resource-1.0/doc/gfdoc/Verb.html +++ b/resource-1.0/doc/gfdoc/Verb.html @@ -13,17 +13,13 @@

-Author: -Last update: Tue Jan 10 16:38:53 2006 +Last update: Tue Jan 10 21:51:00 2006

Produced by gfdoc - a rudimentary GF document generator. (c) Aarne Ranta (aarne@cs.chalmers.se) 2002 under GNU GPL.

-

-== -

     abstract Verb = Cat ** {
     
@@ -63,6 +59,6 @@ gfdoc - a rudimentary GF document generator.

- + diff --git a/resource-1.0/english/AdjectiveEng.gf b/resource-1.0/english/AdjectiveEng.gf index ba8d4bd7..19dd5ddd 100644 --- a/resource-1.0/english/AdjectiveEng.gf +++ b/resource-1.0/english/AdjectiveEng.gf @@ -23,12 +23,8 @@ concrete AdjectiveEng of Adjective = CatEng ** open ResEng, Prelude in { isPre = False } ; - SentAP ap s = { - s = \\a => ap.s ! a ++ conjThat ++ s.s ; - isPre = False - } ; - QuestAP ap qs = { - s = \\a => ap.s ! a ++ qs.s ! QIndir ; + SentAP ap sc = { + s = \\a => ap.s ! a ++ sc.s ; isPre = False } ; diff --git a/resource-1.0/english/NounEng.gf b/resource-1.0/english/NounEng.gf index 7507384c..b8827832 100644 --- a/resource-1.0/english/NounEng.gf +++ b/resource-1.0/english/NounEng.gf @@ -55,7 +55,6 @@ concrete NounEng of Noun = CatEng ** open ResEng, Prelude in { } ; RelCN cn rs = {s = \\n,c => cn.s ! n ! c ++ rs.s ! {n = n ; p = P3}} ; - SentCN cn s = {s = \\n,c => cn.s ! n ! c ++ conjThat ++ s.s} ; - QuestCN cn qs = {s = \\n,c => cn.s ! n ! c ++ qs.s ! QIndir} ; + SentCN cn sc = {s = \\n,c => cn.s ! n ! c ++ sc.s} ; } diff --git a/resource-1.0/german/AdjectiveGer.gf b/resource-1.0/german/AdjectiveGer.gf index 897eff38..b284590e 100644 --- a/resource-1.0/german/AdjectiveGer.gf +++ b/resource-1.0/german/AdjectiveGer.gf @@ -25,12 +25,8 @@ concrete AdjectiveGer of Adjective = CatGer ** open ResGer, Prelude in { -- isPre = False -- } ; - SentAP ap s = { - s = \\a => ap.s ! a ++ conjThat ++ s.s ! Sub ; - isPre = False - } ; - QuestAP ap qs = { - s = \\a => ap.s ! a ++ qs.s ! QIndir ; + SentAP ap sc = { + s = \\a => ap.s ! a ++ sc.s ; isPre = False } ; diff --git a/resource-1.0/german/NounGer.gf b/resource-1.0/german/NounGer.gf index 790cba41..2e5235a9 100644 --- a/resource-1.0/german/NounGer.gf +++ b/resource-1.0/german/NounGer.gf @@ -122,13 +122,8 @@ concrete NounGer of Noun = CatGer ** open ResGer, Prelude in { } ; SentCN cn s = { - s = \\a,n,c => cn.s ! a ! n ! c ++ conjThat ++ s.s ! Sub ; + s = \\a,n,c => cn.s ! a ! n ! c ++ s.s ; g = cn.g } ; - QuestCN cn qs = { - s = \\a,n,c => cn.s ! a ! n ! c ++ qs.s ! QIndir ; - g = cn.g - } ; - } diff --git a/resource-1.0/scandinavian/AdjectiveScand.gf b/resource-1.0/scandinavian/AdjectiveScand.gf index 488cf454..df556738 100644 --- a/resource-1.0/scandinavian/AdjectiveScand.gf +++ b/resource-1.0/scandinavian/AdjectiveScand.gf @@ -24,12 +24,8 @@ incomplete concrete AdjectiveScand of Adjective = -- isPre = False -- } ; -- - SentAP ap s = { - s = \\a => ap.s ! a ++ conjThat ++ s.s ! Inv ; - isPre = False - } ; - QuestAP ap qs = { - s = \\a => ap.s ! a ++ qs.s ! QIndir ; + SentAP ap sc = { + s = \\a => ap.s ! a ++ sc.s ; isPre = False } ; diff --git a/resource-1.0/scandinavian/NounScand.gf b/resource-1.0/scandinavian/NounScand.gf index 040e9ec9..507797a2 100644 --- a/resource-1.0/scandinavian/NounScand.gf +++ b/resource-1.0/scandinavian/NounScand.gf @@ -86,12 +86,8 @@ incomplete concrete NounScand of Noun = s = \\n,d,c => cn.s ! n ! d ! c ++ rs.s ! agrP3 g n ; g = g } ; - SentCN cn s = let g = cn.g in { - s = \\n,d,c => cn.s ! n ! d ! c ++ conjThat ++ s.s ! Sub ; - g = g - } ; - QuestCN cn qs = let g = cn.g in { - s = \\n,d,c => cn.s ! n ! d ! c ++ qs.s ! QIndir ; + SentCN cn sc = let g = cn.g in { + s = \\n,d,c => cn.s ! n ! d ! c ++ sc.s ; g = g } ;