libXfont: Changes to 'master'

Kristian Høgsberg krh at kemper.freedesktop.org
Fri Jun 22 06:59:11 PDT 2007


 configure.ac               |    2 
 include/X11/fonts/fntfil.h |    4 
 src/fontfile/Makefile.am   |    3 
 src/fontfile/catalogue.c   |  457 +++++++++++++++++++++++++++++++++++++++++++++
 src/fontfile/fontfile.c    |   41 +---
 src/fontfile/register.c    |    1 
 6 files changed, 480 insertions(+), 28 deletions(-)

New commits:
commit 8d47483711be6076e7bfefab14aa890c5f37e1aa
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Thu Jun 21 21:44:02 2007 -0400

    Bump version to 1.2.9.

commit c5ab59762c4ad5def68436d55937a2bd558d5c99
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Tue Jun 19 10:38:02 2007 -0400

    Add a new 'catalogue' FPE, which takes font paths from symlinks in a dir.
    
    This patch adds a new FPE type, which will match font path elements of the
    form
    
    	catalogue:<dir>
    
    The dir specified after the catalogue: prefix will be scanned for symlinks
    and each symlink destination will be added as a local fontfile FPE.
    The symlink can be suffixed by attributes, such as 'unscaled', which
    will be passed through to the underlying fontfile FPE.  Except the new
    attribute 'pri' which will be used for ordering the fontfile FPEs.
    
    An example configuration:
    
    	75dpi:unscaled:pri=20 -> /usr/share/X11/fonts/75dpi
    	ghostscript:pri=60 -> /usr/share/fonts/default/ghostscript
    	misc:unscaled:pri=10 -> /usr/share/X11/fonts/misc
    	type1:pri=40 -> /usr/share/X11/fonts/Type1
    	type1:pri=50 -> /usr/share/fonts/default/Type1
    
    will add /usr/share/X11/fonts/misc as the first FPE with the attribute
    'unscaled', second FPE will be /usr/share/X11/fonts/75dpi, also with
    the attribute unscaled etc.  This is functionally equivalent to setting
    the following font path:
    
    	/usr/share/X11/fonts/misc:unscaled,
    	/usr/share/X11/fonts/75dpi:unscaled,
    	/usr/share/X11/fonts/Type1,
    	/usr/share/fonts/default/Type1,
    	/usr/share/fonts/default/ghostscript
    
    The motivation is to let font packages add a symlink to the new font
    directory they provide instead of rewriting either the Xorg config file
    or the xfs config file.



More information about the xorg-commit mailing list