--- stem-hr.pl	2005/02/25 23:14:44	1
+++ stem-hr.pl	2005/02/25 23:40:18	2
@@ -27,7 +27,7 @@
 	$replace =~ s/[cè]/k/g;
 	$replace =~ s/[z¾]/g/g;
 	$replace =~ s/[s¹]/h/g;
-	return $pre . $replace . $post . "\tkgh";
+	return $pre . $replace . $post;
 }
 
 # samoglasnici
@@ -44,21 +44,22 @@
 	# vrsta a
 
 	unless (
+		# 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 ||
 		# nepostojano a
-		s/(${su}a{$su})a/$1 1/g ||
-		s/(${su})(${su})(a|u|i|e|om|ima)$/$1a$2\t3/g
+		s/(${su}a{$su})a/$1 4/g ||
+		s/(${su})(${su})(a|u|i|e|om|ima)$/$1a$2 5/g
 	) {
-		# kgh
-		s/(${su}${sa})([è¾¹czs])(i|e|ima)$/kgh($1,$2,'')/gex;
-#		s/${su}${sa}[c](i|ima) 4//g;
-		s/(${su}${sa}[kgh])(a|u|om)\t5/$1/g;
 
 		# mno¾ina
-		s/(${su})(ov|ev)*(i|a|ima|e|in|ina)$/$1\t6/g;
+		s/(${su})(ov|ev)*(i|a|ima|e|in|ina)$/$1 6/g;
 		# jednina
-		s/(o|e|a|u|om|em)$/\t7/g;
+		s/(o|e|a|u|om|em)$/ 7/g;
 	}
 
+	s/\s(\d+)$/\t$1/g;
 
 	printf("%-15s %s\n",$orig,$_);
 }