From 683dc3c476f1ee514c252a05311efc7a97fbaee9 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 3 Mar 2005 06:20:57 +0000 Subject: [PATCH] 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. --- ChangeLog | 22 ++++++++++++++++++++++ Makefile.am | 3 --- conf.d/Makefile.am | 7 +++++-- {debian => conf.d}/autohint.conf | 0 {debian => conf.d}/no-sub-pixel.conf | 3 --- conf.d/sub-pixel.conf | 3 --- {debian => conf.d}/unhinted.conf | 0 debian/fontconfig.install | 1 + debian/fontconfig.postinst | 4 ++-- debian/fontconfig.templates | 11 +++++------ 10 files changed, 35 insertions(+), 19 deletions(-) rename {debian => conf.d}/autohint.conf (100%) rename {debian => conf.d}/no-sub-pixel.conf (77%) rename {debian => conf.d}/unhinted.conf (100%) diff --git a/ChangeLog b/ChangeLog index 4c3145d..f12660e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2005-03-02 Keith Packard + * 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 + * .cvsignore: * conf.d/.cvsignore: * doc/.cvsignore: diff --git a/Makefile.am b/Makefile.am index 3acadd4..ed624c6 100644 --- 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 410a418..c9cb012 100644 --- 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/debian/autohint.conf b/conf.d/autohint.conf similarity index 100% rename from debian/autohint.conf rename to conf.d/autohint.conf diff --git a/debian/no-sub-pixel.conf b/conf.d/no-sub-pixel.conf similarity index 77% rename from debian/no-sub-pixel.conf rename to conf.d/no-sub-pixel.conf index b62d2ef..5d64a0b 100644 --- a/debian/no-sub-pixel.conf +++ b/conf.d/no-sub-pixel.conf @@ -4,9 +4,6 @@ - - unknown - none diff --git a/conf.d/sub-pixel.conf b/conf.d/sub-pixel.conf index f3933c8..c4e8a42 100644 --- a/conf.d/sub-pixel.conf +++ b/conf.d/sub-pixel.conf @@ -4,9 +4,6 @@ - - unknown - rgb diff --git a/debian/unhinted.conf b/conf.d/unhinted.conf similarity index 100% rename from debian/unhinted.conf rename to conf.d/unhinted.conf diff --git a/debian/fontconfig.install b/debian/fontconfig.install index 800f0aa..def0010 100644 --- 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 e7f6817..bf6b06e 100755 --- 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 9d30fef..eea8802 100644 --- 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 -- 2.7.4