--- stem-hr.pl	2005/02/26 18:23:56	8
+++ stem-hr.pl	2005/02/26 18:54:49	9
@@ -79,13 +79,13 @@
 
 	unless (
 		# infinitiv
-		s/(${sa})(ti|ći)$/$1.$2 100/g ||
+		s/(\w)(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 ||
+		s/([^sk])[td](em|eš|e|emo|ete|oh|osmo|oste|oše|ijah|ijaše|ijasno|ijaste|ijahu|imo|ite|en|ena|eni)$/$1s.ti 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/ ||
+		s/(${sa})[sz](em|eš|e|ešemo|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)$/$1s.ti 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/ ||
+		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)$/$1s.ti 103/ ||
 
 		# imenice
 
@@ -93,7 +93,7 @@
 		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/(\w${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
@@ -107,15 +107,16 @@
 		# 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/(\w${sa}${su})(o|e|a|u|om|em|i|ima|ina|eta)$/$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 ||
+		s/(${su})([oe])$/$1$2 18/g ||
+
+		0;
 
-		# množina
-		s/(${su})(ov|ev)*(i|a|ima|e|in|ina|eta)$/$1 6/g;
 	}
 
 	if (s/^(.+)\s(\d+)$/$1\t$2/g) {