From 6ff11a24582d6c89a969599eb7cc39660681818d Mon Sep 17 00:00:00 2001
From: Roman Suzi <roman.suzi@talentadore.com>
Date: Sun, 6 Sep 2020 16:32:28 +0300
Subject: [PATCH] Fixed notpresent

---
 src/russian/DictRus.gf      | 18 +++++++++---------
 src/russian/ParadigmsRus.gf | 27 +++++++++++++--------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/russian/DictRus.gf b/src/russian/DictRus.gf
index b305f04e..6a98f338 100644
--- a/src/russian/DictRus.gf
+++ b/src/russian/DictRus.gf
@@ -4138,19 +4138,19 @@ lin
   skoree_Adv = mkAdv skoryj_A.comp ;
   skoraja_N = mkN skoryj_A feminine inanimate ;
 
-  uvidennyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Pass Past ;
-  uvidevshyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Act Past ;
+  uvidennyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Pass Past ; --# notpresent
+  uvidevshyi_A = mkA (uvidetq_V ** {pppss="увиден"}) Act Past ; --# notpresent
 
-  vedshij_A = mkA vesti_V Act Past ;
+  vedshij_A = mkA vesti_V Act Past ;--# notpresent
   vedomyj_A = mkA vesti_V Pass Pres ;
-  vedyonnyj_A = mkA vesti_V Pass Past ;
+  vedyonnyj_A = mkA vesti_V Pass Past ;--# notpresent
 
-  pevshij_A = mkA petq_V Act Past ;
+  pevshij_A = mkA petq_V Act Past ;--# notpresent
   pojuszij_A = mkA petq_V Act Pres ;
-  petyj_A = mkA petq_V Pass Past ;
+  petyj_A = mkA petq_V Pass Past ; --# notpresent
 
-  napravivshij_A = mkA napravitq_V Act Past ;
-  napravlennyj_A = mkA napravitq_V Pass Past ;
+  napravivshij_A = mkA napravitq_V Act Past ; --# notpresent
+  napravlennyj_A = mkA napravitq_V Pass Past ; --# notpresent
 
-  okazavshijsja_A = mkA okazatqsja_V Act Past ;
+  okazavshijsja_A = mkA okazatqsja_V Act Past ;  --# notpresent
 }
\ No newline at end of file
diff --git a/src/russian/ParadigmsRus.gf b/src/russian/ParadigmsRus.gf
index 5ba9f3bb..79ec9710 100644
--- a/src/russian/ParadigmsRus.gf
+++ b/src/russian/ParadigmsRus.gf
@@ -306,29 +306,28 @@ oper
       = \v,voice,t ->
         let refl = case v.refl of {Reflexive => "ся" ; _ => ""} in
         case <voice,t> of {
-          <Pass,Past|Cond> => lin A ( -- TODO: very rough. Cover more cases
-            guessAdjectiveForms (v.pppss + "ный") ** {
-              sm=v.pppss ;
-              sf=v.pppss + "а";
-              sn=v.pppss + "о";
-              sp=v.pppss + "ы"
-              }
-            ) ;
+          <Pass,Past|Cond> => lin A ( --# notpresent TODO: very rough. Cover more cases
+            guessAdjectiveForms (v.pppss + "ный") ** {  --# notpresent
+              sm=v.pppss ;  --# notpresent
+              sf=v.pppss + "а"; --# notpresent
+              sn=v.pppss + "о"; --# notpresent
+              sp=v.pppss + "ы" --# notpresent
+              } --# notpresent
+            ) ;--# notpresent
           <Pass,Pres> => lin A ( -- overgenerated
             let s : Str = case v.prpl1 of {
               f + #consonant + "ём" => (Predef.tk 2 v.prpl1) + "омый" ;
               _ => v.prpl1 + "ый"
               } in
             makeAdjectiveFormsUseIndex s "" (Z.ZA 1 Z.No Z.A_ Z.NoC) PreferFull) ;
+          <Act,Past|Cond> => lin A ( --# notpresent
+            let s : Str = case v.inf of { --# notpresent
+              _ + ("сти"|"зти") => (Predef.tk 1 v.prsg1) + "ший" ;  --# notpresent TODO: check if not all of these cases are ok
+              _  => (Predef.tk 1 v.psgm) + "вший" --# notpresent
+              } in Z.onlyParticipleForms (makeAdjectiveFormsUseIndex (s + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ; --# notpresent
           <Act,Pres> => lin A (
             Z.onlyParticipleForms (
              makeAdjectiveFormsUseIndex (((Predef.tk 1 v.prpl3) + "щий") + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ;
-          <Act,Past|Cond> => lin A (
-            let s : Str = case v.inf of {
-              _ + ("сти"|"зти") => (Predef.tk 1 v.prsg1) + "ший" ;  -- TODO: check if not all of these cases are ok
-              _  => (Predef.tk 1 v.psgm) + "вший"
-              } in
-              Z.onlyParticipleForms (makeAdjectiveFormsUseIndex (s + refl) "" (Z.ZA 4 Z.No Z.A_ Z.NoC) PreferFull)) ;
           _ => Predef.error "Error: participle for this voice and tense does not exist"
           }  -- TODO: suppress comp and short for all but Pass Pres
   } ;