From ab90b3c7ef61957fa136b0dd042046bbe4ff1026 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 28 Nov 2013 08:05:58 +0000
Subject: [PATCH] added linref's to Ger Hin Romance

---
 lib/src/german/CatGer.gf              | 14 ++++++++++++++
 lib/src/hindustani/CatHindustani.gf   | 14 ++++++++++++++
 lib/src/romance/CatRomance.gf         | 22 ++++++++++++++++++++++
 lib/src/romance/ConjunctionRomance.gf |  1 +
 lib/src/romance/SentenceRomance.gf    |  2 +-
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/lib/src/german/CatGer.gf b/lib/src/german/CatGer.gf
index 9a0087bb3..8cf90e157 100644
--- a/lib/src/german/CatGer.gf
+++ b/lib/src/german/CatGer.gf
@@ -98,4 +98,18 @@ concrete CatGer of Cat =
     Temp = {s : Str ; t : ResGer.Tense ; a : Anteriority ; m : Mood} ;
     Tense = {s : Str ; t : ResGer.Tense ; m : Mood} ;
 
+  linref
+    SSlash = \ss -> ss.s ! Main ++ ss.c2.s  ;
+    ClSlash = \cls -> cls.s ! MIndic ! Pres ! Simul ! Pos ! Main ++ cls.c2.s ;
+
+    VP = \vp -> useInfVP False vp ;
+    VPSlash = \vps -> useInfVP False vps ++ vps.c2.s ;
+
+    V, VS, VQ, VA = \v -> useInfVP False (predV v) ;
+    V2, V2A, V2Q, V2S = \v -> useInfVP False (predV v) ++ v.c2.s ;
+    V3 = \v -> useInfVP False (predV v) ++ v.c2.s ++ v.c3.s ;
+    VV = \v -> useInfVP False (predV v) ;
+    V2V = \v -> useInfVP False (predV v) ++ v.c2.s ;
+
+    Conj = \c -> c.s1 ++ c.s2 ;
 }
diff --git a/lib/src/hindustani/CatHindustani.gf b/lib/src/hindustani/CatHindustani.gf
index aa6fd411e..b50e5ffb9 100644
--- a/lib/src/hindustani/CatHindustani.gf
+++ b/lib/src/hindustani/CatHindustani.gf
@@ -92,4 +92,18 @@ incomplete concrete CatHindustani of Cat =
     N3 = {s : Number => Case => Str ; g : Gender} ** {c2 : Str ; c3 : Str ; c4 : Str} ;
     PN = {s : Case => Str ; g : Gender} ;
 
+
+--infVV False
+  linref
+    VP = \vp -> infVV False vp ;
+    VPSlash = \vps -> infVV False vps ++ vps.c2.s ;
+
+    V, VS, VQ, VA = \v -> infVV False (predV v) ;
+    V2, V2A, V2Q, V2S = \v -> infVV False (predV v) ++ v.c2.s ;
+    V3 = \v -> infVV False (predV v) ++ v.c2 ++ v.c3 ;
+    VV = \v -> infVV False (predV v) ;
+    V2V = \v -> infVV False (predV v) ++ v.c2 ;
+
+    Conj = \c -> c.s1 ++ c.s2 ;
+
 }
diff --git a/lib/src/romance/CatRomance.gf b/lib/src/romance/CatRomance.gf
index 38ab9f12d..99492757e 100644
--- a/lib/src/romance/CatRomance.gf
+++ b/lib/src/romance/CatRomance.gf
@@ -117,4 +117,26 @@ incomplete concrete CatRomance of Cat = CommonX - [SC,Pol]
     Temp  = {s : Str ; t : RTense ; a : Anteriority} ;
     Tense = {s : Str ; t : RTense} ;
 
+  linref
+    SSlash = \ss -> ss.s ! aagr Masc Sg ! Indic ++ ss.c2.s ;
+    ClSlash = \cls -> cls.s ! aagr Masc Sg ! DDir ! RPres ! Simul ! RPos ! Indic ++ cls.c2.s ;
+
+    VP = \vp -> infVP vp (agrP3 Masc Sg) ;
+    VPSlash = \vps -> infVP vps (agrP3 Masc Sg) ++ vps.c2.s ;
+
+    V, VS, VQ, VA = \v -> infVP (predV v) (agrP3 Masc Sg);
+    V2, V2A, V2Q, V2S = \v -> infVP (predV v) (agrP3 Masc Sg) ++ v.c2.s ;
+    V3 = \v -> infVP (predV v) (agrP3 Masc Sg) ++ v.c2.s ++ v.c3.s ;
+    VV = \v -> infVP (predV v) (agrP3 Masc Sg) ;
+    V2V = \v -> infVP (predV v) (agrP3 Masc Sg) ;
+
+    NP = \np -> (np.s ! Nom).comp ;
+    Conj = \c -> c.s2 ;
+
+    A = \a -> a.s ! Posit ! AF Masc Sg ;
+    A2 = \a -> a.s ! Posit ! AF Masc Sg ++ a.c2.s ;
+
+    N = \n -> n.s ! Sg ;
+    N2 = \n -> n.s ! Sg ++ n.c2.s ;
+    N3 = \n -> n.s ! Sg ++ n.c2.s ++ n.c3.s ;
 }
diff --git a/lib/src/romance/ConjunctionRomance.gf b/lib/src/romance/ConjunctionRomance.gf
index 906eb89ab..84c908799 100644
--- a/lib/src/romance/ConjunctionRomance.gf
+++ b/lib/src/romance/ConjunctionRomance.gf
@@ -52,6 +52,7 @@ incomplete concrete ConjunctionRomance of Conjunction =
   lincat
     [S] = {s1,s2 : Mood => Str} ;
     [Adv] = {s1,s2 : Str} ;
+    [AdV] = {s1,s2 : Str} ;
     [IAdv] = {s1,s2 : Str} ;
     [NP] = {s1,s2 : Case => Str ; a : Agr ; isNeg : Bool} ;
     [AP] = {s1,s2 : AForm  => Str ; isPre : Bool} ;
diff --git a/lib/src/romance/SentenceRomance.gf b/lib/src/romance/SentenceRomance.gf
index 3bac54867..78b5eb42a 100644
--- a/lib/src/romance/SentenceRomance.gf
+++ b/lib/src/romance/SentenceRomance.gf
@@ -48,7 +48,7 @@ incomplete concrete SentenceRomance of Sentence =
       s = \\agr0,d,te,a,b,m => 
         let
 
-          vp : VP = case <vps.c2.c, vps.c2.isDir> of {
+          vp : ResRomance.VP = case <vps.c2.c, vps.c2.isDir> of {
               <Acc,True> => insertAgr agr0 vps ;    -- la fille qu'il a trouvée is decided here
               _ => vps
               } ;