From 050009129739bb25dc92d81ffd565790ffbda7ae Mon Sep 17 00:00:00 2001
From: Aarne Ranta <aarne@chalmers.se>
Date: Wed, 21 Sep 2022 17:54:16 +0200
Subject: [PATCH] Hrv: some Neutr and Fem paradigms

---
 src/croatian/ResHrv.gf     | 46 +++++++++++++++++++++++++++++
 src/croatian/gold-test.txt | 60 ++++++++++++++++++++++++++++++++++++++
 src/croatian/testHrv.gfs   |  7 +++++
 3 files changed, 113 insertions(+)

diff --git a/src/croatian/ResHrv.gf b/src/croatian/ResHrv.gf
index 3e632fde..2e6c4c4b 100644
--- a/src/croatian/ResHrv.gf
+++ b/src/croatian/ResHrv.gf
@@ -35,6 +35,8 @@ oper
 
    animate = Masc Anim ;
    inanimate = Masc Inanim ;
+   feminine = Fem ;
+   neuter = Neutr ;
 
 palatalize : Str -> Str = \s -> case s of {
   x + "ki" => x + "ci" ;
@@ -265,6 +267,50 @@ palatalize : Str -> Str = \s -> case s of {
 
     taksiN : DeclensionType = ziriN ;
 
+---- Danilo, Hrvoje, raščupànko skipped
+
+    koljenoN : DeclensionType = \koljeno ->
+      let
+        koljen = init koljeno
+      in izvorN koljen ** {
+        snom, sacc, svoc = koljeno ;
+	pnom, pacc, pvoc = koljen + "a" ;
+        } ;
+
+    jedroN : DeclensionType = \jedro ->
+      let
+        jed = Predef.tk 2 jedro ;
+	r = last (init jedro) ; 
+      in koljenoN jedro ** {
+        pgen = jed + "a" + r + "a" ;
+        } ;
+
+---- drvo - drveta skipped, can also decline as koljeno
+---- oči, čudo skipped
+
+    poljeN : DeclensionType = \polje ->
+      koljenoN polje ** {
+        pdat = init polje + "ima" ;
+        } ;
+    
+---- sunce, uže, zvonce, rame, podne, doba
+
+---- no tables given in the sources for feminine nouns, so guessing from ending tables
+
+    zenaN : DeclensionType = \zena -> 
+      let
+        zen = init zena
+      in {
+        snom = zena ;
+	sgen = zen + "e" ;
+	sdat = zen + "i" ;
+	sacc = zen + "u" ;
+	svoc = zen + "o" ; ---- o/a in Wiki ; o in https://sh.wiktionary.org/wiki/%C5%BEena
+	sins = zen + "om" ;
+	pnom, pacc, pvoc = zen + "e" ;
+	pdat = zen + "ama" ;
+	pgen = zen + "a" ;
+        } ;
 
 {-
 
diff --git a/src/croatian/gold-test.txt b/src/croatian/gold-test.txt
index e6284368..00055963 100644
--- a/src/croatian/gold-test.txt
+++ b/src/croatian/gold-test.txt
@@ -268,3 +268,63 @@ s . Pl => Voc => taksiji
 s . Pl => Loc => taksijima
 s . Pl => Ins => taksijima
 g . Masc Inanim
+s . Sg => Nom => koljeno
+s . Sg => Gen => koljena
+s . Sg => Dat => koljenu
+s . Sg => Acc => koljeno
+s . Sg => Voc => koljeno
+s . Sg => Loc => koljenu
+s . Sg => Ins => koljenom
+s . Pl => Nom => koljena
+s . Pl => Gen => koljena
+s . Pl => Dat => koljenima
+s . Pl => Acc => koljena
+s . Pl => Voc => koljena
+s . Pl => Loc => koljenima
+s . Pl => Ins => koljenima
+g . Neutr
+s . Sg => Nom => jedro
+s . Sg => Gen => jedra
+s . Sg => Dat => jedru
+s . Sg => Acc => jedro
+s . Sg => Voc => jedro
+s . Sg => Loc => jedru
+s . Sg => Ins => jedrom
+s . Pl => Nom => jedra
+s . Pl => Gen => jedara
+s . Pl => Dat => jedrima
+s . Pl => Acc => jedra
+s . Pl => Voc => jedra
+s . Pl => Loc => jedrima
+s . Pl => Ins => jedrima
+g . Neutr
+s . Sg => Nom => polje
+s . Sg => Gen => polja
+s . Sg => Dat => polju
+s . Sg => Acc => polje
+s . Sg => Voc => polje
+s . Sg => Loc => polju
+s . Sg => Ins => poljem
+s . Pl => Nom => polja
+s . Pl => Gen => polja
+s . Pl => Dat => poljima
+s . Pl => Acc => polja
+s . Pl => Voc => polja
+s . Pl => Loc => poljima
+s . Pl => Ins => poljima
+g . Neutr
+s . Sg => Nom => žena
+s . Sg => Gen => žene
+s . Sg => Dat => ženi
+s . Sg => Acc => ženu
+s . Sg => Voc => ženo
+s . Sg => Loc => ženi
+s . Sg => Ins => ženom
+s . Pl => Nom => žene
+s . Pl => Gen => žena
+s . Pl => Dat => ženama
+s . Pl => Acc => žene
+s . Pl => Voc => žene
+s . Pl => Loc => ženama
+s . Pl => Ins => ženama
+g . Fem
diff --git a/src/croatian/testHrv.gfs b/src/croatian/testHrv.gfs
index 60409f42..481a657f 100644
--- a/src/croatian/testHrv.gfs
+++ b/src/croatian/testHrv.gfs
@@ -16,3 +16,10 @@ cc -table -unqual nounFormsNoun (ugaoN "ugao") inanimate
 cc -table -unqual nounFormsNoun (bifeN "bife") inanimate
 cc -table -unqual nounFormsNoun (ziriN "žiri") inanimate
 cc -table -unqual nounFormsNoun (taksiN "taksi") inanimate
+
+cc -table -unqual nounFormsNoun (koljenoN "koljeno") neuter
+cc -table -unqual nounFormsNoun (jedroN "jedro") neuter
+cc -table -unqual nounFormsNoun (poljeN "polje") neuter
+
+cc -table -unqual nounFormsNoun (zenaN "žena") feminine
+