From 01efa368c31adb414bf556f60a7389b637c644e2 Mon Sep 17 00:00:00 2001
From: bulbul <bulbulthegreat@gmail.com>
Date: Mon, 4 May 2020 18:17:20 +0200
Subject: [PATCH] Corrections to ResSlo.gf, mostly pronouns and numerals.

---
 Setup.bat            |  3 ++-
 src/slovak/ResSlo.gf | 41 +++++++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Setup.bat b/Setup.bat
index 9dc085fb9..fc2ff3994 100644
--- a/Setup.bat
+++ b/Setup.bat
@@ -7,7 +7,8 @@ REM ---
 
 REM Modules to compile for each language
 REM TODO read from languages.csv
-set langs=Afr Amh Ara Eus Bul Cat Chi Dan Dut Eng Est Fin Fre Grc Gre Heb Hin Ger Ice Ina Ita Jpn Lat Lav Mlt Mon Nep Nor Nno Pes Pol Por Pnb Ron Rus Snd Spa Swe Tha Tur Urd
+set langs=Slo
+REM set langs=Afr Amh Ara Eus Bul Cat Chi Dan Dut Eng Est Fin Fre Grc Gre Heb Hin Ger Ice Ina Ita Jpn Lat Lav Mlt Mon Nep Nor Nno Pes Pol Por Pnb Ron Rus Snd Spa Swe Tha Tur Urd
 set modules_langs=All Symbol Compatibility
 set modules_api=Try Symbolic
 
diff --git a/src/slovak/ResSlo.gf b/src/slovak/ResSlo.gf
index e190cd27f..905428d44 100644
--- a/src/slovak/ResSlo.gf
+++ b/src/slovak/ResSlo.gf
@@ -739,10 +739,15 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
         } ;
       Ag (Masc _) Sg P3 => {
         nom = "on" ;
-        gen,acc = "jeho" ;  ---- + other forms
+        gen,acc = "jeho" ;
         cgen,cacc = "ho" ;
-        pgen,pacc = "neho" ; ---- + other forms
+        pgen,pacc = "neho" ;
+        ---- pgen = "ňho"; ---- bind, only with prepositions "do", "u"
+        ---- pgen = "ň"; ---- bind, only with preposition "do", "u"
         dat = "jemu" ;
+        ---- pacc = "eň" ; ---- bind, only with preposition "cez" 
+        ---- pacc = "ňho" ; ---- bind, only with prepositions "na", "pre", "za"
+        ---- pacc = "ň" ; ---- bind, only with preposition "na", "pre", "za"
 	cdat = "mu" ;
 	pdat = "nemu" ;
 	loc = "ňom" ;
@@ -757,12 +762,16 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
         } ;
       Ag Neutr Sg P3 => {
         nom = "ono" ;
-        gen = "jeho" ;
+        gen, acc = "jeho" ;
         cgen,cacc = "ho" ;
         pgen = "neho" ;
-        dat = "jemu" ;
-	acc = "je" ;
-        pacc = "eň" ; ---- bind?
+        ---- pgen = "ňho"; ---- bind, only with prepositions "do", "u"
+        ---- pgen = "ň"; ---- bind, only with preposition "do", "u"
+        dat = "jemu" ; 
+        ---- pacc = "eň" ; ---- bind, only with preposition "cez" 
+        ---- pacc = "ňho" ; ---- bind, only with prepositions "na", "pre", "za"
+        ---- pacc = "ň" ; ---- bind, only with preposition "na", "pre", "za"
+        pacc = "jeho"; ---- doublecheck
 	cdat = "mu" ;
 	pdat = "nemu" ;
 	loc = "ňom" ;
@@ -843,7 +852,7 @@ oper
     } ;
 
   mkDemPronForms : Str -> DemPronForms = \jedn -> {
-      msnom   = jedn + "y" ;
+      msnom   = jedn + "y" ; -- should be "jeden"
       fsnom   = jedn + "a" ;
       nsnom   = jedn + "o" ;
       msgen   = jedn + "ého" ;
@@ -854,7 +863,7 @@ oper
       msins   = jedn + "ým" ;
       fsins   = jedn + "ou" ;
       ampnom  = jedn + "i" ;
-      fpnom   = jedn + "é" ; ---- ?
+      fpnom   = jedn + "y" ;
       pgen    = jedn + "ých" ;
       pdat    = jedn + "ým" ;
       pins    = jedn + "ými" ;
@@ -886,7 +895,7 @@ oper
 
 -- interrogatives
 
- kdoForms : Case => Str = table {
+ ktoForms : Case => Str = table {
    Nom => "kto" ;
    Gen | Acc => "koho" ;
    Dat => "komu" ;
@@ -897,7 +906,7 @@ oper
  coForms : Case => Str = table {
    Nom|Acc => "čo" ;
    Gen => "čoho" ;
-   Dat => "čemu" ;
+   Dat => "čomu" ;
    Loc => "čom" ;
    Ins => "čím"
    } ;
@@ -957,12 +966,12 @@ oper
 
   fourNumeral : Determiner =
       let forms = {
-      ---- amsnom = "štiraja" ;
-      msnom, fsnom, nsnom, fsacc = "štiri" ; ---- amsacc = "štiroch"
-      msgen, fsgen = "štiroch" ;
-      msdat = "štirom" ;
-      msloc = "štiroch" ;
-      msins,fsins = "štiromi" ;
+      ---- amsnom = "štyria" ;
+      msnom, fsnom, nsnom, fsacc = "štyri" ; ---- amsacc = "štyroch"
+      msgen, fsgen = "štyroch" ;
+      msdat = "štyrom" ;
+      msloc = "štyroch" ;
+      msins,fsins = "štyrmi" ;
       }
     in numeralFormsDeterminer forms Num2_4 ;