Create prototype /etc/fonts/conf.d directory with a few sample

    configuration files. Deprecate use of local.conf for local
    customizations in favor of this directory based scheme which is more
    easily integrated into installation systems.
Tag FC_EMBOLDEN as a boolean variable

5 files changed, 80 insertions, 0 deletions

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
new file mode 100644
index 00000000..410a4184
--- /dev/null
+++ b/conf.d/Makefile.am
@@ -0,0 +1,34 @@
+# 
+#  $Id$
+# 
+#  Copyright © 2005 Keith Packard
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Keith Packard not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Keith Packard makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+CONF_FILES = \
+	no-bitmaps.conf \
+	yes-bitmaps.conf \
+	sub-pixel.conf
+
+EXTRA_DIST = $(CONF_FILES)
+
+configdir=$(CONFDIR)
+confddir=$(configdir)/conf.d
+
+confd_DATA=$(CONF_FILES)
diff --git a/conf.d/README b/conf.d/README
new file mode 100644
index 00000000..7e6cd2cf
--- /dev/null
+++ b/conf.d/README
@@ -0,0 +1,8 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*, so if you
+want to use any of these options, link them to a name of that form.  E.g.
+
+	$ ln -s no-bitmaps.conf 10no-bitmaps.conf
+
diff --git a/conf.d/no-bitmaps.conf b/conf.d/no-bitmaps.conf
new file mode 100644
index 00000000..e8fb6a94
--- /dev/null
+++ b/conf.d/no-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
+<fontconfig>
+<!-- Reject bitmap fonts -->
+ <selectfont>
+  <rejectfont>
+   <pattern>
+     <patelt name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </rejectfont>
+ </selectfont>
+</fontconfig>
diff --git a/conf.d/sub-pixel.conf b/conf.d/sub-pixel.conf
new file mode 100644
index 00000000..f3933c88
--- /dev/null
+++ b/conf.d/sub-pixel.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <test qual="all" name="rgba">
+      <const>unknown</const>
+    </test>
+    <edit name="rgba" mode="assign"><const>rgb</const></edit>
+  </match>
+</fontconfig>
diff --git a/conf.d/yes-bitmaps.conf b/conf.d/yes-bitmaps.conf
new file mode 100644
index 00000000..c539c70a
--- /dev/null
+++ b/conf.d/yes-bitmaps.conf
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/yes-bitmaps.conf -->
+<fontconfig>
+<!-- Accept bitmap fonts -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>