From f19fc9c3ed10439953d65fccefe5553abad1c994 Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@chalmers.se>
Date: Thu, 30 Apr 2020 12:07:21 +0200
Subject: [PATCH] =?UTF-8?q?Slavom=C3=ADr=20=C4=8C=C3=A9pl=C3=B6's=20fixes?=
 =?UTF-8?q?=20in=20Slovak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/slovak/ParadigmsSlo.gf  |  2 ++
 src/slovak/ResSlo.gf        | 17 +++++++++++++++++
 src/slovak/StructuralSlo.gf | 18 +++++++++---------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/slovak/ParadigmsSlo.gf b/src/slovak/ParadigmsSlo.gf
index 82f98ea06..3df1fdc53 100644
--- a/src/slovak/ParadigmsSlo.gf
+++ b/src/slovak/ParadigmsSlo.gf
@@ -105,6 +105,8 @@ oper
     = \s -> lin A (R.rydziA s) ;
   otcovA : Str -> A
     = \s -> lin A (R.otcovA s) ;
+  paviA  : Str -> A
+    = \s -> lin A (R.paviA s) ;
 
 
   mkA2 : A -> Prep -> A2
diff --git a/src/slovak/ResSlo.gf b/src/slovak/ResSlo.gf
index c17132b1e..f50783b55 100644
--- a/src/slovak/ResSlo.gf
+++ b/src/slovak/ResSlo.gf
@@ -593,6 +593,23 @@ adjFormsAdjective : AdjForms -> Adjective = \afs -> {
       pins    = otcov + "ými" ;
       } ;
 
+  paviA : Str -> AdjForms = \pavi ->
+    let pav = init pavi in {
+      msnom = pav + "í" ;
+      fsnom = pav + "ia" ;
+      nsnom = pav + "ie" ;
+      msgen = pav + "ieho" ;
+      fsgen = pav + "ej" ;
+      msdat = pav + "iemu" ;
+      fsacc = pav + "iu" ;
+      msloc = pav + "om" ;
+      msins = pav + "ím" ; 
+      fsins = pav + "ou" ;
+      ampnom = pav + "í" ; ----
+      pgen = pav + "ich" ; ----
+      pins = pav + "imi" ; ----
+      } ;
+ 
 ---------------------
 -- Verbs
 -- https://en.wikipedia.org/wiki/Slovak_language#Verbs
diff --git a/src/slovak/StructuralSlo.gf b/src/slovak/StructuralSlo.gf
index 214ca9fe2..a3f347236 100644
--- a/src/slovak/StructuralSlo.gf
+++ b/src/slovak/StructuralSlo.gf
@@ -3,21 +3,21 @@ concrete StructuralSlo of Structural = CatSlo **
 
 lin
     and_Conj = mkConj "a" ;
-    by8agent_Prep = mkPrep "od" Gen ; ---- TODO this means "from", there might be no good translation
-    few_Det = invarNumeral "málo" ; -----
-    for_Prep = mkPrep "pro" accusative ;
-    from_Prep = mkPrep (pre {"s"|"z" => "zo" ; _ => "z"}) Gen ; ---- consonant clusters
+    by8agent_Prep = mkPrep "" Ins ; 
+    few_Det = invarNumeral "málo" ; -- see notes
+    for_Prep = mkPrep "pre" accusative ;
+    from_Prep = mkPrep (pre {"z" => "zo" ; _ => "z"}) Gen ; ---- consonant clusters and syllable with the onset with the same place of articulation 
     have_V2 = mkV2 haveVerbForms ;
-    in_Prep = mkPrep (pre {"v"|"m" => "vo" ; _ => "v"}) Loc ; ----
-    many_Det = regNumeral "mnoho" "mnohých" "mnohým" "mnohými" ; -- CEG 6.8 ----
+    in_Prep = mkPrep (pre {"v" => "vo" ; _ => "v"}) Loc ; ----
+    many_Det = regNumeral "mnoho" "mnohých" "mnohým" "mnohými" ; ---- alternative: invarNumeral "veľa" ;
     or_Conj = mkConj "alebo" ;
-    somePl_Det = {s = \\g,c => (demPronFormsAdjective (mkDemPronForms "nektor") "").s ! g ! Pl ! c ; size = Num5} ;
+    somePl_Det = {s = \\g,c => (demPronFormsAdjective (mkDemPronForms "niektor") "").s ! g ! Pl ! c ; size = Num5} ;
     something_NP = {s,clit,prep = \\c => "nie" + coForms ! c ; a = Ag Neutr Sg P3 ; hasClit = False} ; -- CEG 5.6.3
     possess_Prep = mkPrep "" Gen ;
     that_Quant = demPronFormsAdjective (mkDemPronForms "tamt") "" ;
-    this_Quant = demPronFormsAdjective (mkDemPronForms "t") "to" ;
+    this_Quant = demPronFormsAdjective (mkDemPronForms "ten") "to" ;
     to_Prep = mkPrep "do" Gen ;
-    with_Prep = mkPrep (pre {"s"|"z" => "so" ; _ => "s"}) Ins ; ----
+    with_Prep = mkPrep (pre {"s" => "so" ; _ => "s"}) Ins ; 
 
     i_Pron = personalPron (Ag (Masc Anim) Sg P1) ;
     youSg_Pron = personalPron (Ag (Masc Anim) Sg P2) ;