german paradigms

grammars/health/healthExceptEng.gf

@@ -1,4 +1,4 @@
---# -path=.:../resource/abstract:../prelude:../resource/english
+--# -path=.:../newresource/abstract:../prelude:../newresource/english
 
 concrete healthExceptEng of healthExcept = StructuralEng ** open ParadigmsEng, TypesEng in {
 

lib/resource-0.6/german/MorphoGer.gf

@@ -428,6 +428,8 @@ oper
     in
        mkVerbum legen ((adde leg) + "t") leg legte legte ("ge" + (leg + "t")) ;
 
+  regVerb = verbumWeak ;
+
 
 -- Weak verbs that don't have ge- in the participle
   verbumGratulieren : Str -> Verbum = \gratulieren ->

lib/resource-0.6/german/ParadigmsGer.gf

@@ -77,7 +77,7 @@ oper
 
   nBuch   : (_,_ : Str) -> N ;    -- Buch, (Buches, Bücher) (neut)
   nMesser : Str -> N ;            -- Messer, (Messers, Messer) (neut)
-  nBein : Str -> N ;              -- Bein, (Beins, Beine) (neut)
+  nBein   : Str -> N ;            -- Bein, (Beins, Beine) (neut)
   nAuto   : Str -> N ;            -- Auto, (Autos, Autos) (neut)
 
 -- Feminine patterns. Duplicated "e" is avoided in $nFrau$.

lib/resource-0.6/swedish/ParadigmsSwe.gf

@@ -25,6 +25,7 @@ resource ParadigmsSwe = open (Predef=Predef), Prelude, SyntaxSwe, ResourceSwe in
 -- To abstract over gender names, we define the following identifiers.
 
 oper
+  Gender  : Type ;
   utrum   : Gender ;
   neutrum : Gender ;
 
@@ -200,6 +201,7 @@ oper
 -- hidden from the document.
 --.
 
+  Gender = SyntaxSwe.Gender ;
   utrum = Utr ;
   neutrum = Neutr ;
   masculine = Masc ;

src/GF/Canon/CMacros.hs

@@ -37,11 +37,12 @@ markFocus n p b = if b then ("[*","*]") else ("","")
 markXML :: Marker
 markXML n i b = 
   if b 
-    then ("<focus" +++ p +++ c ++ ">", "</focus>") 
-    else ("<subtree" +++ p +++ c ++ ">", "</subtree>") 
+    then ("<focus"   +++ p +++ c ++ s ++ ">", "</focus>") 
+    else ("<subtree" +++ p +++ c ++ s ++ ">", "</subtree>") 
    where 
      c = "type=" ++ prt (M.valNode n)
      p = "position=" ++ (show $ reverse i)
+     s = "" ---- if (null (M.constrsNode n)) then "" else " status=incorrect"
 
 -- for XML in JGF 1, use
 markXMLjgf :: Marker