[Commit] fontconfig configure.in,1.36,1.37 fonts.conf.in,1.23,1.24

Keith Packard commit@keithp.com
Mon, 12 May 2003 13:28:29 -0700


Committed by: keithp

Update of /local/src/CVS/fontconfig
In directory evo:/local/src/fontconfig

Modified Files:
	configure.in fonts.conf.in 
Log Message:
Take advantage of filename based font selection to exclude pcf/bdf fonts by default

Index: configure.in
===================================================================
RCS file: /local/src/CVS/fontconfig/configure.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- configure.in	4 May 2003 22:53:49 -0000	1.36
+++ configure.in	12 May 2003 20:28:26 -0000	1.37
@@ -252,18 +252,7 @@
 		case x"$FC_ADD_FONTS" in
 		x)
 			if test -d "$dir/fonts"; then
-				for sub in "$dir"/fonts/*; do
-					if ls "$sub" | grep -q -i '\.pf\|\.tt\|\.ot'; then
-						case x$FC_ADD_FONTS in
-						x)
-							FC_ADD_FONTS="$sub"
-							;;
-						*)
-							FC_ADD_FONTS="$FC_ADD_FONTS,$sub"
-							;;
-						esac
-					fi
-				done
+				FC_ADD_FONTS="$dir/fonts"
 			fi
 			;;
 		esac

Index: fonts.conf.in
===================================================================
RCS file: /local/src/CVS/fontconfig/fonts.conf.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- fonts.conf.in	16 Apr 2003 22:04:42 -0000	1.23
+++ fonts.conf.in	12 May 2003 20:28:26 -0000	1.24
@@ -27,6 +27,18 @@
 	@FC_FONTPATH@
 	<dir>~/.fonts</dir>
 
+<!-- 
+  Reject bdf and pcf fonts by default.  Users can re-add them with
+  suitable accept globs.
+-->
+	<selectfont>
+		<rejectfont>
+			<glob>*.pcf</glob>
+			<glob>*.pcf.gz</glob>
+			<glob>*.bdf</glob>
+			<glob>*.bdf.gz</glob>
+		</rejectfont>
+	</selectfont>
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->