From 7259848d3000120bddf0654ae270a628198f6bcf Mon Sep 17 00:00:00 2001
From: EkaterinaVoloshina <vokat@mail.ru>
Date: Fri, 12 Jan 2024 23:42:43 +0300
Subject: [PATCH 1/2] fixed copula verbs

---
 src/russian/NamesRus.gf     | 2 +-
 src/russian/ParadigmsRus.gf | 4 ++++
 src/russian/VerbRus.gf      | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/russian/NamesRus.gf b/src/russian/NamesRus.gf
index 720543bea..29fee8143 100644
--- a/src/russian/NamesRus.gf
+++ b/src/russian/NamesRus.gf
@@ -26,7 +26,7 @@ lin PlSurname sn =
       } ;   -- Does NP need animacy?
 
 lin FullName gn sn =
-      { s=\\cas => gn.s ! Nom ++ sn.s ! gn.g ! cas ;
+      { s=\\cas => gn.s ! cas ++ sn.s ! gn.g ! cas ;
         pron=False;
         a=let g = case gn.g of {
                     Male => Masc ;
diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf
index 8284b133d..36f7917b3 100644
--- a/src/russian/ParadigmsRus.gf
+++ b/src/russian/ParadigmsRus.gf
@@ -511,6 +511,10 @@ oper
       = \a, ln -> ln ** {
                      s = \\cas => (adjFormsAdjective a).s ! (gennum ln.g ln.n) ! ln.anim ! cas ++ ln.s ! cas
                   } ;
+    mkLN : LN -> Str -> LN
+      = \ln, suffix -> ln ** {
+                     s = \\cas =>  ln.s ! cas ++ suffix
+                  } ;
   } ;
 
   invarLN : Str -> Gender -> Number -> LN
diff --git a/src/russian/VerbRus.gf b/src/russian/VerbRus.gf
index 88d535631..281fdd1e7 100644
--- a/src/russian/VerbRus.gf
+++ b/src/russian/VerbRus.gf
@@ -188,17 +188,17 @@ lin
     };
 
   -- : NP -> Comp ;            -- (be) the man
-  CompNP np = {s=\\a=>np.s ! Ins ; adv=[] ; cop=InsCopula} ;
+  CompNP np = {s=\\a=>np.s ! Nom ; adv=[] ; cop=NomCopula} ;
 
   -- : Adv -> Comp ;            -- (be) here
   CompAdv adv = {s=\\a=>[] ; adv=adv.s ; cop=ExplicitCopula} ;
   -- : CN -> Comp ;             -- (be) a man/men
   CompCN cn = {
-    s=\\a=>cn.s ! numGenNum (agrGenNum a) ! Ins ;
+    s=\\a=>cn.s ! numGenNum (agrGenNum a) ! Nom ;
     adv=[] ;
-    cop=InsCopula
+    cop=NomCopula
     } ;
 
   -- : VP ;                     -- be
-  UseCopula = {adv=\\a=>[] ; verb=copulaIns ; dep=[] ; compl=\\p,a=>[]} ;
+  UseCopula = {adv=\\a=>[] ; verb=copulaIns; dep=[] ; compl=\\p,a=>[]} ;
 }

From a67af709c29f914a61cc31f94ca55fffe510b462 Mon Sep 17 00:00:00 2001
From: EkaterinaVoloshina <vokat@mail.ru>
Date: Fri, 12 Jan 2024 23:47:25 +0300
Subject: [PATCH 2/2] fixed copula verbs

---
 src/russian/VerbRus.gf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/russian/VerbRus.gf b/src/russian/VerbRus.gf
index 281fdd1e7..e37732f72 100644
--- a/src/russian/VerbRus.gf
+++ b/src/russian/VerbRus.gf
@@ -200,5 +200,5 @@ lin
     } ;
 
   -- : VP ;                     -- be
-  UseCopula = {adv=\\a=>[] ; verb=copulaIns; dep=[] ; compl=\\p,a=>[]} ;
+  UseCopula = {adv=\\a=>[] ; verb=copulaIns ; dep=[] ; compl=\\p,a=>[]} ;
 }