--- stem-hr.pl	2005/02/26 00:37:18	4
+++ stem-hr.pl	2005/02/26 18:13:14	7
@@ -33,15 +33,38 @@
 # suglasnici
 my $su = '[^aeiou]';
 
+my $palatal = '(lj|nj|j|æ|¾|¹|¾|¹t|¾d)';
+
+# glagolni razredi
+my $g_1r = '[td]';
+my $g_2r = '[sz]';
+my $g_3r = '[pb]';
+my $g_4r = '[kgh]';
+my $g_5r = '[nm]';
+my $g_6r = '(:?nu|n)';
+
 my %rules;
 my %stem_words;
 my $words = 0;
 my $stems = 0;
 
+
+my $last_stem = '';
+sub check_stem {
+	my $s = shift || return;
+	if ($last_stem) {
+		print "ERROR==> " if ($last_stem ne $s);
+	} else {
+		$last_stem = $s;
+	}
+}
+
 while(<>) {
 	chomp;
+	next if (/^#/);
 	if (/^$/) {
 		print "\n";
+		$last_stem = '';
 		next;
 	}
 
@@ -49,29 +72,55 @@
 
 	my $orig = $_;
 
-	# imenice
-	# vrsta a
 
 	unless (
+		# infinitiv
+		s/(${sa})(ti|æi)$/$1.$2 100/g ||
+		# 1. razred
+		s/([^s])[td](em|e¹|emo|ete|oh|osmo|oste|o¹e|ijah|ija¹e|ijasno|ijaste|ijahu|imo|ite|en|ena|eni)$/$1.sti 101/g ||
+		# 2. razred
+		s/(${sa}[sz])(em|e¹|e¹emo|ete|u|oh|e|osmo|oste|o¹e|ijah|ija¹e|ijasmo|ijaste|ijahu|imo|ite|uæi|av¹i|ao|la|lo|li|le|la|en|ena|eni)$/$1.sti 102/ ||
+		# 3. razdred
+		s/(p|b|sp|su)(em|e¹|e|emo|ete|u|oh|osmo|oste|o¹e|ah|a¹e|asmo|aste|ahu|ijah|ija¹e|i|imo|ite||uæi|av¹i|ao|la|lo|en|ena|eni)$/$1.sti 103/ ||
+
+		# imenice
+
+		# vrsta a
+		s/(${su}st)a$/$1 13/g ||
+		s/(${su})c[ae]$/$1ce 17/g ||
 		# kgh
 		s/(${sa})([è¾¹czs])(i|e|ima)$/kgh($1,$2,' 1')/gex ||
 		s/(${sa}[kgh])(a|u|om)$/$1 2/g ||
 		s/(${su})([è¾¹czs])(i|e|ima)$/kgh($1,"a$2",' 3')/gex ||
+		# imenice na palatal
+		s/${palatal}${palatal}(a|u|em|i|ima|e)$/$1a$2 9/g ||
+		s/${palatal}(a|u|em)$/$1 8/g ||
 		# nepostojano a
 		s/(${su}a{$su})a/$1 4/g ||
 		s/(${su})(${su})(a|u|i|e|om|ima)$/$1a$2 5/g
 	) {
 
+		# vrsta a
+		s/me$/me 11/g ||
+		s/(eta|ena)$/e 12/g ||
+		s/(${sa}${su})(o|e|a|u|om|em|i|ima|ina)$/$1 7/g ||
+
+		s/(${su})sa$/$1as 14/g ||
+		s/(${su})ena$/$1e 16/g ||
+		s/(${su})eta$/$1e 17/g ||
+		s/(${su})([oe])$/$1-$2 18/g ||
+
 		# mno¾ina
-		s/(${su})(ov|ev)*(i|a|ima|e|in|ina)$/$1 6/g;
-		# jednina
-		s/(o|e|a|u|om|em)$/ 7/g;
+		s/(${su})(ov|ev)*(i|a|ima|e|in|ina|eta)$/$1 6/g;
 	}
 
 	if (s/^(.+)\s(\d+)$/$1\t$2/g) {
 		$rules{$2}++;
 		$stems++;
 		$stem_words{$1}++;
+		check_stem($1);
+	} else  {
+		$last_stem = $_;
 	}
 
 	printf("%-15s %s\n",$orig,$_);
@@ -84,6 +133,6 @@
 	print "#stem $stem_words{$s} $s\n";
 }
 
-foreach my $r (keys %rules) {
+foreach my $r (sort keys %rules) {
 	print "#rule $rules{$r} $r\n";
 }