commit 76c443222313577236c898f7644098e7cad80c75 Author: Keith Packard Date: Sat Sep 9 22:08:40 2006 -0700 Update to version 2.4.0 INSTALL | 3 +++ README | 38 ++++++++++++++++++++++++++++++++++++-- configure.in | 2 +- fontconfig/fontconfig.h | 4 ++-- 4 files changed, 42 insertions(+), 5 deletions(-) commit 6c5619a08575943f75d2341e1a4931ec5faf716b Author: Keith Packard Date: Sat Sep 9 21:32:14 2006 -0700 Split much of the configuration into separate files. Renumber files Most of the remaining elements in fonts.conf have been moved to separate files. The numbering scheme for conf.d files has been documented in the README and the files have been renumbered. Config files have been validated against the DTD and a few minor errors fixed. conf.d/10-autohint.conf | 9 + conf.d/10-no-sub-pixel.conf | 9 + conf.d/10-sub-pixel-bgr.conf | 9 + conf.d/10-sub-pixel-rgb.conf | 9 + conf.d/10-sub-pixel-vbgr.conf | 9 + conf.d/10-sub-pixel-vrgb.conf | 9 + conf.d/10-unhinted.conf | 9 + conf.d/10-urw-aliases.conf | 52 ---- conf.d/15-amt-aliases.conf | 21 - conf.d/20-lohit-gujarati.conf | 11 + conf.d/20-unhint-small-vera.conf | 49 +++ conf.d/30-amt-aliases.conf | 21 + conf.d/30-unhint-small-vera.conf | 49 --- conf.d/30-urw-aliases.conf | 52 ++++ conf.d/40-generic.conf | 66 +++++ conf.d/49-sansserif.conf | 21 + conf.d/60-LohitGujarati.conf | 5 conf.d/60-delicious.conf | 20 - conf.d/60-fonts-persian.conf | 539 -------------------------------------- conf.d/60-latin.conf | 42 +++ conf.d/65-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++++++ conf.d/65-nonlatin.conf | 38 +++ conf.d/69-unifont.conf | 24 ++ conf.d/70-no-bitmaps.conf | 13 + conf.d/70-no-sub-pixel.conf | 9 - conf.d/70-sub-pixel-bgr.conf | 9 - conf.d/70-sub-pixel-rgb.conf | 9 - conf.d/70-sub-pixel-vbgr.conf | 9 - conf.d/70-sub-pixel-vrgb.conf | 9 - conf.d/70-yes-bitmaps.conf | 13 + conf.d/73-autohint.conf | 9 - conf.d/73-unhinted.conf | 9 - conf.d/76-no-bitmaps.conf | 13 - conf.d/76-yes-bitmaps.conf | 13 - conf.d/80-delicious.conf | 20 + conf.d/90-synthetic.conf | 64 +++++ conf.d/Makefile.am | 55 ++-- conf.d/README | 46 +++ fonts.conf.in | 207 --------------- 39 files changed, 1113 insertions(+), 1006 deletions(-) commit 9596dce93b751c01770da175d208d78aeaf6ae00 Author: Keith Packard Date: Sat Sep 9 21:30:06 2006 -0700 Don't display tests for DESTDIR on make install. Make install output quieter by eliding the shell commands used to test for DESTDIR being set during make install. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d08feb851a585b6cfe3ef1f390d60dd8886249b2 Author: Keith Packard Date: Sat Sep 9 21:29:08 2006 -0700 Include cachedir in fonts.dtd. Fonts.dtd element was missing the new cachedir element. fonts.dtd | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) commit 9419bb34f6eac685fcf957faf6a38a5cdfa811d9 Author: Keith Packard Date: Sat Sep 9 21:21:01 2006 -0700 Fix conf.d directory sorting. Sort was using broken comparison function. src/fcxml.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) commit 248b5903b7057b3c44ea1cd3a9b0d27624eba24a Author: Keith Packard Date: Sat Sep 9 19:37:22 2006 -0700 Rename conf.avail to conf.d Makefile.am | 2 conf.avail/10-urw-aliases.conf | 52 --- conf.avail/15-amt-aliases.conf | 21 - conf.avail/20-fix-globaladvance.conf | 29 -- conf.avail/30-unhint-small-vera.conf | 49 --- conf.avail/50-user.conf | 7 conf.avail/51-local.conf | 7 conf.avail/60-LohitGujarati.conf | 5 conf.avail/60-delicious.conf | 20 - conf.avail/60-fonts-persian.conf | 539 ---------------------------------- conf.avail/70-no-sub-pixel.conf | 9 - conf.avail/70-sub-pixel-bgr.conf | 9 - conf.avail/70-sub-pixel-rgb.conf | 9 - conf.avail/70-sub-pixel-vbgr.conf | 9 - conf.avail/70-sub-pixel-vrgb.conf | 9 - conf.avail/73-autohint.conf | 9 - conf.avail/73-unhinted.conf | 9 - conf.avail/76-no-bitmaps.conf | 13 - conf.avail/76-yes-bitmaps.conf | 13 - conf.avail/Makefile.am | 71 ---- conf.avail/README | 8 - conf.d/10-urw-aliases.conf | 52 +++ conf.d/15-amt-aliases.conf | 21 + conf.d/20-fix-globaladvance.conf | 29 ++ conf.d/30-unhint-small-vera.conf | 49 +++ conf.d/50-user.conf | 7 conf.d/51-local.conf | 7 conf.d/60-LohitGujarati.conf | 5 conf.d/60-delicious.conf | 20 + conf.d/60-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++ conf.d/70-no-sub-pixel.conf | 9 + conf.d/70-sub-pixel-bgr.conf | 9 + conf.d/70-sub-pixel-rgb.conf | 9 + conf.d/70-sub-pixel-vbgr.conf | 9 + conf.d/70-sub-pixel-vrgb.conf | 9 + conf.d/73-autohint.conf | 9 + conf.d/73-unhinted.conf | 9 + conf.d/76-no-bitmaps.conf | 13 + conf.d/76-yes-bitmaps.conf | 13 + conf.d/Makefile.am | 71 ++++ conf.d/README | 8 + configure.in | 1 42 files changed, 898 insertions(+), 899 deletions(-) commit 9e292c889f1138b1af2f60621d7e2bfd8c490ff7 Author: Keith Packard Date: Sat Sep 9 16:52:21 2006 -0700 Add XML headers to new conf files. Move link make commands to conf.avail dir Fix up new config fragments to include XML headers as required. Move symbolic link installation to conf.avail directory to centralize both steps. conf.avail/10-urw-aliases.conf | 5 +++ conf.avail/15-amt-aliases.conf | 5 +++ conf.avail/20-fix-globaladvance.conf | 5 +++ conf.avail/30-unhint-small-vera.conf | 5 +++ conf.avail/Makefile.am | 22 ++++++++++++++ conf.d/Makefile.am | 52 ---------------------------------- 6 files changed, 42 insertions(+), 52 deletions(-) commit 49b44b277f2a8a67009a3b68b178b2f1a4c7f72a Author: Keith Packard Date: Sat Sep 9 16:41:58 2006 -0700 Insert newly created caches into reference data structure. All caches used in the application must be in the cache reference list so internal references can be tracked correctly. Failing to have newly created caches in the list would cause the cache to be deallocated while references were still present. src/fccache.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit 766a9b2f61458202be0fbf5745ce1e02ecd95c6e Merge: 5d2f7a9... 164e267... Author: Keith Packard Date: Sat Sep 9 15:49:24 2006 -0700 Merge branch 'jhcloos' commit 5d2f7a9d9224d4df1655cd1d6fd72646734b0272 Author: Keith Packard Date: Sat Sep 9 10:04:42 2006 -0700 Accept locale environment variables that do not contain territory. Locale environment variables (LC_ALL, LC_CTYPE, LANG) must contain language, and may contain territory and encoding. Don't accidentally require territory as that will cause fontconfig to fall back to 'en'. src/fcdefault.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) commit 164e267d286eccbbdde69e8935a658dced4331b4 Author: James Cloos Date: Sat Sep 9 01:24:08 2006 -0400 Make conf.avail and conf.d work Add conf.avail to configure.in Add install: target to conf.d/Makefile.am to create the initial symlinks to conf.avail conf.d/Makefile.am | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) commit f6cfbe16bfc252b46532f699b496e4a41a1a1c22 Author: Keith Packard Date: Thu Sep 7 15:17:10 2006 -0700 Attempt to fix makealias usage for build on Mac OS X. Avoid using fcalias.h or fcaliastail.h on systems which don't support it. Provided solution still generates these files, but does not use them. src/fcint.h | 3 ++- src/makealias | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) commit 6cff1dca81b60fcd75e19f3ed827aae98f643fd1 Author: Keith Packard Date: Thu Sep 7 14:37:52 2006 -0700 Replace gnu-specific sed command with simple grep. makealias was using a gnu-extension to sed addressing, replace that with a simple (and more robuse) grep command. Also, found a bug in the public header file that was leaving one symbol out of the process. fontconfig/fontconfig.h | 2 +- src/makealias | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 31e0f0321057a7612ed5a7fa890dad09e6a53ee6 Author: David Turner Date: Thu Sep 7 14:29:35 2006 -0700 Replace character discovery loop with simpler, faster version. The existing loop for discovering which characters map to glyphs is ugly and inefficient. The replacement is functionally identical, but far cleaner and faster. src/fcfreetype.c | 83 ++++++++++++++++++++---------------------------------- 1 files changed, 30 insertions(+), 53 deletions(-) commit 8d779ce4b3cdac796e20ca568654c0ef1c576809 Author: Keith Packard Date: Thu Sep 7 14:22:16 2006 -0700 Reference patterns in FcCacheCopySet. As patterns are put into the font set copy, mark them as referenced so the cache stays around while the font set is in use. src/fccache.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 4c34c0c52a4e943c6770a6178e5012a3d6fe96d0 Author: Keith Packard Date: Thu Sep 7 10:37:24 2006 -0700 Create fc_cachedir at install time. Bug 8157. Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 469010c1bdd5cc8801405ef809540bd4b17f41c1 Author: James Cloos Date: Mon Sep 4 15:57:19 2006 -0400 Update Makefile.am files Makefile.am | 2 +- conf.avail/Makefile.am | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) commit c3425fa671663b11aa5288a0b52a0618c5d075ef Author: James Cloos Date: Mon Sep 4 15:47:52 2006 -0400 Move some section from fonts.conf into conf.avail files URL aliases, AMT aliases, Che globaladvance fixes and Vera <8pt unhinting sections all moved into conf.avail, to load before user and local confs. conf.avail/10-urw-aliases.conf | 47 ++++++++++++ conf.avail/15-amt-aliases.conf | 16 ++++ conf.avail/20-fix-globaladvance.conf | 24 ++++++ conf.avail/30-unhint-small-vera.conf | 44 +++++++++++ fonts.conf.in | 133 ---------------------------------- 5 files changed, 131 insertions(+), 133 deletions(-) commit 60018915891bd146271b687278782fe38b4c4461 Author: James Cloos Date: Mon Sep 4 15:45:28 2006 -0400 Re-order old conf.d files Make sure they continue to load after ~/.fonts.conf and local.conf conf.avail/20-LohitGujarati.conf | 5 conf.avail/20-fonts-persian.conf | 539 ------------------------------------- conf.avail/30-no-sub-pixel.conf | 9 - conf.avail/30-sub-pixel-bgr.conf | 9 - conf.avail/30-sub-pixel-rgb.conf | 9 - conf.avail/30-sub-pixel-vbgr.conf | 9 - conf.avail/30-sub-pixel-vrgb.conf | 9 - conf.avail/33-autohint.conf | 9 - conf.avail/33-unhinted.conf | 9 - conf.avail/36-no-bitmaps.conf | 13 - conf.avail/36-yes-bitmaps.conf | 13 - conf.avail/60-LohitGujarati.conf | 5 conf.avail/60-fonts-persian.conf | 539 +++++++++++++++++++++++++++++++++++++ conf.avail/70-no-sub-pixel.conf | 9 + conf.avail/70-sub-pixel-bgr.conf | 9 + conf.avail/70-sub-pixel-rgb.conf | 9 + conf.avail/70-sub-pixel-vbgr.conf | 9 + conf.avail/70-sub-pixel-vrgb.conf | 9 + conf.avail/73-autohint.conf | 9 + conf.avail/73-unhinted.conf | 9 + conf.avail/76-no-bitmaps.conf | 13 + conf.avail/76-yes-bitmaps.conf | 13 + 22 files changed, 633 insertions(+), 633 deletions(-) commit 31f8061b5d0a60f497eaafe6d38006ae71e53163 Author: James Cloos Date: Mon Sep 4 15:36:46 2006 -0400 Make room for chunks from fonts.conf in conf.avail conf.avail/10-LohitGujarati.conf | 5 conf.avail/10-fonts-persian.conf | 539 -------------------------------------- conf.avail/20-LohitGujarati.conf | 5 conf.avail/20-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 544 insertions(+), 544 deletions(-) commit d55620c90676951fc70ec9430c2670edca2147cb Author: James Cloos Date: Mon Sep 4 15:32:37 2006 -0400 Replace load of conf.d in fonts.conf.in fonts.conf.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit f6e645c4993fff77d596dba734c09cdb255f4ca0 Author: James Cloos Date: Mon Sep 4 15:30:10 2006 -0400 Update Makefile.am to match conf.avail changes conf.avail/Makefile.am | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) commit cbdd74d6569b5975b86bd425b56b1b50aa73d2bb Author: James Cloos Date: Mon Sep 4 15:27:29 2006 -0400 Number the remaining conf.avail files conf.avail/30-no-sub-pixel.conf | 9 +++++++++ conf.avail/30-sub-pixel-bgr.conf | 9 +++++++++ conf.avail/30-sub-pixel-rgb.conf | 9 +++++++++ conf.avail/30-sub-pixel-vbgr.conf | 9 +++++++++ conf.avail/30-sub-pixel-vrgb.conf | 9 +++++++++ conf.avail/33-autohint.conf | 9 +++++++++ conf.avail/33-unhinted.conf | 9 +++++++++ conf.avail/36-no-bitmaps.conf | 13 +++++++++++++ conf.avail/36-yes-bitmaps.conf | 13 +++++++++++++ conf.avail/autohint.conf | 9 --------- conf.avail/no-bitmaps.conf | 13 ------------- conf.avail/no-sub-pixel.conf | 9 --------- conf.avail/sub-pixel-bgr.conf | 9 --------- conf.avail/sub-pixel-rgb.conf | 9 --------- conf.avail/sub-pixel-vbgr.conf | 9 --------- conf.avail/sub-pixel-vrgb.conf | 9 --------- conf.avail/unhinted.conf | 9 --------- conf.avail/yes-bitmaps.conf | 13 ------------- 18 files changed, 89 insertions(+), 89 deletions(-) commit 57b42cef2ad2f18618ca0748325fc800165bdc1b Author: James Cloos Date: Mon Sep 4 01:33:09 2006 -0400 Move user and local conf file loading into conf.avail files conf.avail/50-user.conf | 7 +++++++ conf.avail/51-local.conf | 7 +++++++ fonts.conf.in | 11 ----------- 3 files changed, 14 insertions(+), 11 deletions(-) commit 04ceb322c8e8c4bfc5f4df27d15e8353058a19b8 Author: James Cloos Date: Mon Sep 4 01:28:07 2006 -0400 Support all five possibilities for sub-pixel Make sub-pixel.conf be sub-pixel-rgb.conf and add the three other possibilites: bgr, vrgb and vbgr. conf.avail/sub-pixel-bgr.conf | 9 +++++++++ conf.avail/sub-pixel-rgb.conf | 9 +++++++++ conf.avail/sub-pixel-vbgr.conf | 9 +++++++++ conf.avail/sub-pixel-vrgb.conf | 9 +++++++++ conf.avail/sub-pixel.conf | 9 --------- 5 files changed, 36 insertions(+), 9 deletions(-) commit 085d12cd4bcc215a5fb2bc403148e68c45bd3d2a Author: James Cloos Date: Mon Sep 4 01:24:02 2006 -0400 Standardize conf.avail number prefixing convention Always use \d- rather than just \d as prefix conf.avail/10-LohitGujarati.conf | 5 +++++ conf.avail/10LohitGujarati.conf | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) commit 709f32438d814f73b6ce677a48b81a238cd0d6aa Author: James Cloos Date: Mon Sep 4 01:21:55 2006 -0400 Move files from conf.d to conf.avail All of the files in conf.d are now in conf.avail Makefile.am is updated to reflect the change Makefile.am | 2 conf.avail/10-fonts-persian.conf | 539 ++++++++++++++++++++++++++++++++++++++ conf.avail/10LohitGujarati.conf | 5 conf.avail/60-delicious.conf | 20 + conf.avail/Makefile.am | 40 +++ conf.avail/README | 8 + conf.avail/autohint.conf | 9 + conf.avail/no-bitmaps.conf | 13 + conf.avail/no-sub-pixel.conf | 9 + conf.avail/sub-pixel.conf | 9 + conf.avail/unhinted.conf | 9 + conf.avail/yes-bitmaps.conf | 13 + conf.d/10-fonts-persian.conf | 539 -------------------------------------- conf.d/10LohitGujarati.conf | 5 conf.d/60-delicious.conf | 20 - conf.d/Makefile.am | 40 --- conf.d/README | 8 - conf.d/autohint.conf | 9 - conf.d/no-bitmaps.conf | 13 - conf.d/no-sub-pixel.conf | 9 - conf.d/sub-pixel.conf | 9 - conf.d/unhinted.conf | 9 - conf.d/yes-bitmaps.conf | 13 - 23 files changed, 675 insertions(+), 675 deletions(-)