fixed Danish auxialiary and particle verb word order in Scandinavian

lib/resource-1.0/scandinavian/CommonScand.gf

@@ -214,11 +214,6 @@ oper
 
 -- For $Verb$.
 
-  Verb : Type = {
-    s : VForm => Str ;
-    vtype : VType
-    } ;
-
   VP = {
       s : VPForm => {
         fin : Str ;          -- V1 har  ---s1

lib/resource-1.0/scandinavian/DiffScand.gf

@@ -14,6 +14,12 @@ interface DiffScand = open CommonScand, Prelude in {
 
     detDef : Species ;
 
+-- Danish verbs have a marking for compound-tense auxiliary ("have" or "være").
+
+    Verb : Type ;
+
+    hasAuxBe : Verb -> Bool ;
+
 -- Strings.
 
     conjThat : Str ;
@@ -25,10 +31,10 @@ interface DiffScand = open CommonScand, Prelude in {
 
     artIndef : Gender => Str ;
 
-    verbHave : {s : VForm => Str ; vtype : VType} ;
-    verbBe   : {s : VForm => Str ; vtype : VType} ;
+    verbHave : Verb ;
+    verbBe   : Verb ;
 
-    verbBecome : {s : VForm => Str ; vtype : VType} ;
+    verbBecome : Verb ;
 
     auxFut : Str ;
     auxCond : Str ;

lib/resource-1.0/scandinavian/ResScand.gf

@@ -27,11 +27,16 @@ interface ResScand = DiffScand ** open CommonScand, Prelude in {
       vsup = verb.s ! VI (VSupin diath) ; --# notpresent  
       vinf = verb.s ! VI (VInfin diath) ;
 
-      har : Tense -> Str = \t -> verbHave.s ! vFin t Act ;
-      ha  : Str = verbHave.s ! VI (VInfin Act) ;
+      auxv = case hasAuxBe verb of {
+        True => verbBe.s ;
+        _ => verbHave.s
+        } ;
+
+      har : Tense -> Str = \t -> auxv ! vFin t Act ;
+      ha  : Str = auxv ! VI (VInfin Act) ;
 
       vf : Str -> Str -> {fin,inf : Str} = \fin,inf -> {
-        fin = fin ; inf = inf
+        fin = fin ; inf = inf ++ verb.part
         } ;
 
     in {

lib/resource-1.0/scandinavian/VerbScand.gf

@@ -38,6 +38,7 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand i
         (\\a => v.s ! VI (VPtPret (agrAdj a.gn DIndef) Nom)) 
         (predV verbBecome) ;
 
-    UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; vtype = vv.vtype} ;
+    UseVS, UseVQ = \vv -> 
+      vv ** {c2 = []} ;
 
 }