continued restructuring of resources

lib/resource/scandinavian/ClauseScand.gf

@@ -0,0 +1,71 @@
+--# -path=.:../abstract:../../prelude
+
+incomplete concrete ClauseScand of Clause = CategoriesScand ** 
+  open Prelude, SyntaxScand in {
+
+  lin
+  SPredV np v = predVerbGroupClause np (predVerb v) ;
+  SPredPassV np v = predVerbGroupClause np (passVerb v) ;
+  SPredV2 np v x = predVerbGroupClause np (complTransVerb v x) ;
+  SPredReflV2 np v = predVerbGroupClause np (reflTransVerb v) ;
+  SPredVS np v x = predVerbGroupClause np (complSentVerb v x) ;
+  SPredVV np v x = predVerbGroupClause np (complVerbVerb v x) ;
+  SPredVQ np v x = predVerbGroupClause np (complQuestVerb v x) ;
+  SPredVA np v x = predVerbGroupClause np (complAdjVerb v x) ;
+  SPredV2A np v x y = predVerbGroupClause np (complDitransAdjVerb v x y) ;
+  SPredSubjV2V np v x y = predVerbGroupClause np (complDitransVerbVerb
+  False v x y) ;
+  SPredObjV2V np v x y = predVerbGroupClause np (complDitransVerbVerb
+  True v x y) ;
+  SPredV2S np v x y = predVerbGroupClause np (complDitransSentVerb v x y) ;
+  SPredV2Q np v x y = predVerbGroupClause np (complDitransQuestVerb v x y) ;
+
+  SPredAP np v = predVerbGroupClause np (predAdjective v) ;
+  SPredSuperl np a = predVerbGroupClause np (predAdjective (superlAdjPhrase a)) ;
+  SPredCN np v = predVerbGroupClause np (predCommNoun v) ;
+  SPredNP np v = predVerbGroupClause np (predNounPhrase v) ;
+  SPredPP np v = predVerbGroupClause np (predAdverb v) ;
+  SPredAV np v x = predVerbGroupClause np (complVerbAdj v x) ;
+  SPredObjA2V np v x y = predVerbGroupClause np (complVerbAdj2 True v x y) ;
+
+
+  QPredV np v = intVerbPhrase np (predVerb v) ;
+  QPredPassV np v = intVerbPhrase np (passVerb v) ;
+  QPredV2 np v x = intVerbPhrase np (complTransVerb v x) ;
+  QPredReflV2 np v = intVerbPhrase np (reflTransVerb v) ;
+  QPredVS np v x = intVerbPhrase np (complSentVerb v x) ;
+  QPredVV np v x = intVerbPhrase np (complVerbVerb v x) ;
+  QPredVQ np v x = intVerbPhrase np (complQuestVerb v x) ;
+  QPredVA np v x = intVerbPhrase np (complAdjVerb v x) ;
+  QPredV2A np v x y = intVerbPhrase np (complDitransAdjVerb v x y) ;
+  QPredSubjV2V np v x y = intVerbPhrase np (complDitransVerbVerb
+  False v x y) ;
+  QPredObjV2V np v x y = intVerbPhrase np (complDitransVerbVerb
+  True v x y) ;
+  QPredV2S np v x y = intVerbPhrase np (complDitransSentVerb v x y) ;
+  QPredV2Q np v x y = intVerbPhrase np (complDitransQuestVerb v x y) ;
+
+  QPredAP np v = intVerbPhrase np (predAdjective v) ;
+  QPredSuperl np a = intVerbPhrase np (predAdjective (superlAdjPhrase a)) ;
+  QPredCN np v = intVerbPhrase np (predCommNoun v) ;
+  QPredNP np v = intVerbPhrase np (predNounPhrase v) ;
+  QPredPP np v = intVerbPhrase np (predAdverb v) ;
+  QPredAV np v x = intVerbPhrase np (complVerbAdj v x) ;
+  QPredObjA2V np v x y = intVerbPhrase np (complVerbAdj2 True v x y) ;
+
+{-
+-- Use VPs
+
+  PredVP = predVerbGroupClause ;
+  IntVP = intVerbPhrase ;
+  RelVP = relVerbPhrase ;
+
+
+  PosVP tp = predVerbGroup True tp.a ;
+  NegVP tp = predVerbGroup False tp.a ;
+
+  AdvVP = adVerbPhrase ;
+  SubjVP = subjunctVerbPhrase ;
+-}
+
+}

lib/resource/scandinavian/RulesScand.gf

@@ -49,28 +49,6 @@ lin
 
 -- verbs and verb phrases
 
-  UseV  = predVerb ;
-  UsePassV = passVerb ;
-  ComplV2 = complTransVerb ;
-  ComplReflV2 = reflTransVerb ;
-  ComplVS = complSentVerb ;
-  ComplVV = complVerbVerb ;
-  ComplVQ = complQuestVerb ;
-  ComplVA = complAdjVerb ;
-  ComplV2A = complDitransAdjVerb ;
-  ComplSubjV2V = complDitransVerbVerb False ;
-  ComplObjV2V = complDitransVerbVerb True ;
-  ComplV2S = complDitransSentVerb ;
-  ComplV2Q = complDitransQuestVerb ;
-
-  PredAP = predAdjective ;
-  PredSuperl a = predAdjective (superlAdjPhrase a) ;
-  PredCN = predCommNoun ;
-  PredNP = predNounPhrase ;
-  PredPP = predAdverb ;
-  PredAV = complVerbAdj ;
-  PredObjA2V = complVerbAdj2 True ;
-
   PredAS = predAdjSent ;
   PredV0 = predVerb0 ;
 
@@ -92,9 +70,6 @@ lin
 
 -- Formation of infinitival phrases.
 
-  PosVP tp = predVerbGroup True tp.a ;
-  NegVP tp = predVerbGroup False tp.a ;
-
   ProgVG = progressiveVerbPhrase ;
 
   UseCl tp cl = {s = \\o => tp.s ++ cl.s ! tp.b ! ClFinite tp.t tp.a o} ;
@@ -119,21 +94,17 @@ lin
   AdvPP p = p ;
   PrepNP p = prepPhrase p.s ; ---
 
-  AdvVP = adVerbPhrase ;
   AdvCN = advCommNounPhrase ;
   AdvAP = advAdjPhrase ;
 
 --3 Sentences and relative clauses
 --
 
-  PredVP = predVerbGroupClause ;
-
   SlashV2 = slashTransVerb ;
   OneVP = predVerbGroupClause npMan ;
 
   IdRP = identRelPron ;
   FunRP = funRelPron ;
-  RelVP = relVerbGroup ;
   RelSlash = relSlash ;
   ModRS = modRelClause ;
   RelCl = relSuch ;
@@ -152,7 +123,6 @@ lin
   NounIPMany = nounIntPron plural ;
 
   QuestCl = questClause ;
-  IntVP = intVerbPhrase ;
   IntSlash = intSlash ;
   QuestAdv = questAdverbial ;
 
@@ -190,13 +160,13 @@ lin
   SubjS = subjunctSentence ;
   SubjImper = subjunctImperative ;
   SubjQS = subjunctQuestion ;
-  SubjVP = subjunctVerbPhrase ;
 
   PhrNP = useNounPhrase ;
   PhrOneCN = useCommonNounPhrase singular ;
   PhrManyCN = useCommonNounPhrase plural ;
   PhrIP ip = ip ;
   PhrIAdv ia = ia ;
+  PhrVPI = verbUtterance ;
 
   OnePhr p = p ;
   ConsPhr = cc2 ;
@@ -213,12 +183,5 @@ lin
                 (complTransVerb (mkDirectVerb (deponentVerb verbFinnas)) 
                    (indefNounPhraseNum plural nu A)) ;
 
-  ExistQCl A = questVerbPhrase npDet 
-                (complTransVerb (mkDirectVerb (deponentVerb verbFinnas)) 
-                   (indefNounPhrase singular A)) ;
-  ExistNumQCl nu A = questVerbPhrase npDet 
-                (complTransVerb (mkDirectVerb (deponentVerb verbFinnas)) 
-                   (indefNounPhraseNum plural nu A)) ;
-
 
 } ;

lib/resource/scandinavian/SyntaxScand.gf

@@ -1367,6 +1367,12 @@ oper
 
   defaultSentence : Sentence -> Utterance = \x -> ss (x.s ! Main) ;
 
+-- --- Here the agreement feature should really be given in context: 
+-- "What do you want to do? - Wash myself."
+
+  verbUtterance : VerbPhrase -> Utterance = \vp ->
+    ss (vp.s ++ vp.s2 ++ vp.s3 ! utrum !  Sg ! P1) ; 
+
 ----------- changes when parametrizing 20/1/2005
 
 ---- moved from Morphology

lib/resource/scandinavian/VerbphraseScand.gf

@@ -0,0 +1,63 @@
+--# -path=.:../abstract:../../prelude
+
+incomplete concrete VerbphraseScand of Verbphrase = CategoriesScand ** 
+  open Prelude, SyntaxScand in {
+
+--1 The Top-Level English Resource Grammar: Combination Rules
+--
+-- Aarne Ranta 2002 -- 2003
+--
+-- This is the English concrete syntax of the multilingual resource
+-- grammar. Most of the work is done in the file $syntax.Eng.gf$.
+-- However, for the purpose of documentation, we make here explicit the
+-- linearization types of each category, so that their structures and
+-- dependencies can be seen.
+-- Another substantial part are the linearization rules of some
+-- structural words.
+--
+-- The users of the resource grammar should not look at this file for the
+-- linearization rules, which are in fact hidden in the document version.
+-- They should use $resource.Abs.gf$ to access the syntactic rules.
+-- This file can be consulted in those, hopefully rare, occasions in which
+-- one has to know how the syntactic categories are
+-- implemented. The parameter types are defined in $TypesEng.gf$.
+
+concrete VerbphraseEng of Verbphrase = CategoriesEng ** 
+  open Prelude, SyntaxEng in {
+
+  lin
+  UseV  = predVerb ;
+  UsePassV = passVerb ;
+  ComplV2 = complTransVerb ;
+  ComplReflV2 = reflTransVerb ;
+  ComplVS = complSentVerb ;
+  ComplVV = complVerbVerb ;
+  ComplVQ = complQuestVerb ;
+  ComplVA = complAdjVerb ;
+  ComplV2A = complDitransAdjVerb ;
+  ComplSubjV2V = complDitransVerbVerb False ;
+  ComplObjV2V = complDitransVerbVerb True ;
+  ComplV2S = complDitransSentVerb ;
+  ComplV2Q = complDitransQuestVerb ;
+
+  PredAP = predAdjective ;
+  PredSuperl a = predAdjective (superlAdjPhrase a) ;
+  PredCN = predCommNoun ;
+  PredNP = predNounPhrase ;
+  PredPP = predAdverb ;
+  PredAV = complVerbAdj ;
+  PredObjA2V = complVerbAdj2 True ;
+
+-- Use VPs
+
+  PredVP = predVerbGroupClause ;
+  RelVP = relVerbPhrase ;
+  IntVP = intVerbPhrase ;
+
+  PosVP tp = predVerbGroup True tp.a ;
+  NegVP tp = predVerbGroup False tp.a ;
+
+  AdvVP = adVerbPhrase ;
+  SubjVP = subjunctVerbPhrase ;
+
+}