X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=blobdiff_plain;f=mkrules;h=5baa1d6dd97f27c32e959e02b4ef8ab463c32a9d;hp=5b07879fcf99a3de55c9ce8651daea72bca9cd2e;hb=72d604693d37945971ea221c84524a2750f9467b;hpb=5ab700e88a1462059c491eaba1b573d52f980d8d

diff --git a/mkrules b/mkrules
index 5b07879..5baa1d6 100755
--- a/mkrules
+++ b/mkrules
@@ -24,6 +24,9 @@ chars () {
 	done
 }
 
+seenrules=/
+seenfoundries=/
+
 while read keyword rest; do
 	case "$keyword" in
 	'#'|'')	continue ;;
@@ -45,21 +48,41 @@ while read keyword rest; do
 			m/^\d+\,(\d+)\b/ or die;
 			print "key=$_; height=$1\n" or die $!;
 			exit;
-		' <$good`
+		' <$bad`
 		oldfoundry=`perl -ne '
 			next unless s/^FOUNDRY\s+\"?//;
 			s/\"?\s+$//;
 			print or die $!;
 			exit;
 		' <$good`
-		printf "%s %s" "$oldfoundry" "$newfoundry" >>rules/foundries.new
-		exec 3>rules/$newfoundry,$key.rules
-		echo >&3 '# -*- perl -*-'
-		echo >&3 '# autogenerated by mkrules'
-		echo >&3 'sub {'
+		case "$seenfoundries" in
+		*/"$oldfoundry,$newfoundry"/*)
+			;;
+		*/"$oldfoundry,"*)
+			echo >&2 "inconsistent foundry mapping"
+			exit 1
+			;;
+		*)
+			seenfoundries=$seenfoundries$oldfoundry,$newfoundry/
+			printf >>rules/foundries.new \
+				"%s %s\n" "$oldfoundry" "$newfoundry"
+			;;
+		esac
+		case "$seenrules" in
+		*/"$newfoundry,$key"/*)
+			exec 3>>rules/$newfoundry,$key.rules
+			;;
+		*)
+			exec 3>rules/$newfoundry,$key.rules
+			echo >&3 '# -*- perl -*-'
+			echo >&3 '# autogenerated by mkrules'
+			echo >&3 'sub {'
+			seenrules=$seenrules$newfoundry,$key/
+			;;
+		esac
+		echo >&3 "    # $pcf"
 		;;
 	endrules)
-		echo >&3 '}'
 		exec 3</dev/null
 		;;
 	entire)
@@ -80,4 +103,12 @@ while read keyword rest; do
 	esac
 done
 
+while :; do
+	case "$seenrules" in /) break ;; esac
+	seenrules=${seenrules#/}
+	rulefile=${seenrules%%/*}
+	seenrules=/${seenrules#*/}
+	echo "}" >>rules/$rulefile.rules
+done
+
 mv rules/foundries.new rules/foundries