Move debian-specific conf file examples upstream.

Sub-pixel configuration examples must smash subpixel value as Xft always
    sets it from X.
Change sub-pixel rendering debconf descriptions from Enable/Disable to
    Always/Never.

diff --git a/ChangeLog b/ChangeLog
index 4c3145d6a08ac2b1c1379d1e16a6fe59de7b3d3c..f12660e75d3f9cd726d90b27d1c73f9e03fa549b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2005-03-02  Keith Packard  <keithp@keithp.com>
+
+       * Makefile.am:
+       * conf.d/Makefile.am:
+       * conf.d/autohint.conf:
+       * conf.d/no-sub-pixel.conf:
+       * conf.d/sub-pixel.conf:
+       * conf.d/unhinted.conf:
+       * debian/autohint.conf:
+       * debian/fontconfig.install:
+       * debian/fontconfig.postinst:
+       * debian/fontconfig.templates:
+       * debian/no-sub-pixel.conf:
+       * debian/unhinted.conf:
+       Move debian-specific conf file examples upstream.
+       
+       Sub-pixel configuration examples must smash subpixel value
+       as Xft always sets it from X.
+
+       Change sub-pixel rendering debconf descriptions from
+       Enable/Disable to Always/Never.
+
 2005-03-02  Keith Packard  <keithp@keithp.com>
 
        * .cvsignore:

diff --git a/Makefile.am b/Makefile.am
index 3acadd40389b291a21e61f4e09e02aa9123e200d..ed624c6f09f2d55cccd4117b613471f62701b648 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,9 +43,6 @@ DEBIAN = \
        debian/local.conf.md5sum \
        debian/README.Debian \
        debian/rules \
-       debian/autohint.conf \
-       debian/no-sub-pixel.conf \
-       debian/unhinted.conf \
        debian/po/POTFILES.in \
        debian/po/templates.pot \
        debian/po/cs.po \

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 410a4184aae2325bf65e15ecccc985cb90084f8b..c9cb012520f5af7401353ea605347c8713ffb814 100644 (file)
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -22,9 +22,12 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 CONF_FILES = \
+       autohint.conf \
        no-bitmaps.conf \
-       yes-bitmaps.conf \
-       sub-pixel.conf
+       no-sub-pixel.conf \
+       sub-pixel.conf \
+       unhinted.conf \
+       yes-bitmaps.conf
 
 EXTRA_DIST = $(CONF_FILES)
 

diff --git a/conf.d/autohint.conf b/conf.d/autohint.conf
new file mode 100644 (file)
index 0000000..5406f4e
--- /dev/null
+++ b/conf.d/autohint.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/autohint.conf -->
+<fontconfig>
+<!--  Use the Autohinter --> 
+  <match target="font">
+    <edit name="autohint" mode="assign"><bool>true</bool></edit>
+  </match>
+</fontconfig>

diff --git a/conf.d/no-sub-pixel.conf b/conf.d/no-sub-pixel.conf
new file mode 100644 (file)
index 0000000..5d64a0b
--- /dev/null
+++ b/conf.d/no-sub-pixel.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- conf.d/sub-pixel.conf -->
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="font">
+    <edit name="rgba" mode="assign"><const>none</const></edit>
+  </match>
+</fontconfig>

diff --git a/conf.d/sub-pixel.conf b/conf.d/sub-pixel.conf
index f3933c88f5bc03f1f1bcfd27cff90b55a81028f2..c4e8a42e1c184f79e4d91def1fc0a8c9d043a30d 100644 (file)
--- a/conf.d/sub-pixel.conf
+++ b/conf.d/sub-pixel.conf
@@ -4,9 +4,6 @@
 <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/unhinted.conf b/conf.d/unhinted.conf
new file mode 100644 (file)
index 0000000..fb0b375
--- /dev/null
+++ b/conf.d/unhinted.conf
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- debian/unhinted.conf -->
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="font">
+    <edit name="hinting" mode="assign"><bool>false</bool></edit>
+  </match>
+</fontconfig>

diff --git a/debian/autohint.conf b/debian/autohint.conf
deleted file mode 100644 (file)
index 5406f4e..0000000
--- a/debian/autohint.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
-<fontconfig>
-<!--  Use the Autohinter --> 
-  <match target="font">
-    <edit name="autohint" mode="assign"><bool>true</bool></edit>
-  </match>
-</fontconfig>

diff --git a/debian/fontconfig.install b/debian/fontconfig.install
index 800f0aa44e196b07bc72408211c0a656edf169d1..def00101c153ed45aaf1d5efaa29c84a8e16abbe 100644 (file)
--- a/debian/fontconfig.install
+++ b/debian/fontconfig.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/bin/fc-*
 debian/tmp/etc/fonts/fonts.*
+debian/tmp/etc/fonts/conf.d/*
 debian/tmp/usr/share/doc/fontconfig/fontconfig-user.*
 debian/tmp/usr/share/man/man5
 debian/tmp/usr/share/man/man1

diff --git a/debian/fontconfig.postinst b/debian/fontconfig.postinst
index e7f6817dd421dbeedd638c17c52e56fd1fcee171..bf6b06e0b0838759a830be27c5088b04a5a99666 100755 (executable)
--- a/debian/fontconfig.postinst
+++ b/debian/fontconfig.postinst
@@ -52,10 +52,10 @@ fi
 case "$subpixel_rendering" in
 "Automatic")
        ;;
-"Enable")
+"Always")
        ln -s $CONFDIR/$subpixel $CONFDIR/$subpixel_prio$subpixel
        ;;
-"Disable")
+"Never")
        ln -s $CONFDIR/$no_subpixel $CONFDIR/$subpixel_prio$no_subpixel
        ;;
 esac

diff --git a/debian/fontconfig.templates b/debian/fontconfig.templates
index 9d30fef15fbadfc12cfb73d5e458f3b96f9b5947..eea8802d78a837ae5128d5018c29edfe4e7742b6 100644 (file)
--- a/debian/fontconfig.templates
+++ b/debian/fontconfig.templates
@@ -3,7 +3,6 @@ Type: select
 _Choices: Native, Autohinter, None
 Default: Native
 _Description: With what method should fonts be hinted?
-
  The FreeType font library can adjust glyph outlines to accomodate the pixel
  grid for improved legibility.  This process is called "hinting". 
  FreeType can either use the hints built-in to each font or it can use a
@@ -25,19 +24,19 @@ _Description: With what method should fonts be hinted?
 
 Template: fontconfig/subpixel_rendering
 Type: select
-_Choices: Automatic, Enable, Disable
+_Choices: Automatic, Always, Never
 Default: Automatic
-_Description: Should font be rendered using sub-pixel elements?
+_Description: Should fonts be rendered using sub-pixel elements?
  With known sub-pixel geometry, LCD screens can synthesize higher resolution
  in one dimension.  Taking advantage of this when rendering glyphs sharpens
  the appearance of text on the screen.  This can cause color artifacts,
  especially when rendering unhinted or autohinted fonts.  
- .  
+ .
  This option selects when sub-pixel rendering should be used.  Automatic
  enables sub-pixel rendering whenever the X server detects an LCD monitor,
  which it can generally do when the monitor is built into the computer or
- connected with a digital (DVI) cable.  Enable forces the system to use
- sub-pixel rendering while Disable forces the system to not use sub-pixel
+ connected with a digital (DVI) cable.  Always forces the system to use
+ sub-pixel rendering while Never forces the system to not use sub-pixel
  rendering.
 
 Template: fontconfig/enable_bitmaps

diff --git a/debian/no-sub-pixel.conf b/debian/no-sub-pixel.conf
deleted file mode 100644 (file)
index b62d2ef..0000000
--- a/debian/no-sub-pixel.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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>none</const></edit>
-  </match>
-</fontconfig>

diff --git a/debian/unhinted.conf b/debian/unhinted.conf
deleted file mode 100644 (file)
index fb0b375..0000000
--- a/debian/unhinted.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
-<fontconfig>
-<!--  Disable hinting --> 
-  <match target="font">
-    <edit name="hinting" mode="assign"><bool>false</bool></edit>
-  </match>
-</fontconfig>