From 709f32438d814f73b6ce677a48b81a238cd0d6aa Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 01:21:55 -0400 Subject: [PATCH 01/12] 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.d => conf.avail}/10-fonts-persian.conf | 0 {conf.d => conf.avail}/10LohitGujarati.conf | 0 {conf.d => conf.avail}/60-delicious.conf | 0 {conf.d => conf.avail}/Makefile.am | 0 {conf.d => conf.avail}/README | 0 {conf.d => conf.avail}/autohint.conf | 0 {conf.d => conf.avail}/no-bitmaps.conf | 0 {conf.d => conf.avail}/no-sub-pixel.conf | 0 {conf.d => conf.avail}/sub-pixel.conf | 0 {conf.d => conf.avail}/unhinted.conf | 0 {conf.d => conf.avail}/yes-bitmaps.conf | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename {conf.d => conf.avail}/10-fonts-persian.conf (100%) rename {conf.d => conf.avail}/10LohitGujarati.conf (100%) rename {conf.d => conf.avail}/60-delicious.conf (100%) rename {conf.d => conf.avail}/Makefile.am (100%) rename {conf.d => conf.avail}/README (100%) rename {conf.d => conf.avail}/autohint.conf (100%) rename {conf.d => conf.avail}/no-bitmaps.conf (100%) rename {conf.d => conf.avail}/no-sub-pixel.conf (100%) rename {conf.d => conf.avail}/sub-pixel.conf (100%) rename {conf.d => conf.avail}/unhinted.conf (100%) rename {conf.d => conf.avail}/yes-bitmaps.conf (100%) diff --git a/Makefile.am b/Makefile.am index 1b28303..3b31bd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \ - fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test + fc-cache fc-cat fc-list fc-match conf.avail $(DOCSRC) test EXTRA_DIST = \ fontconfig.pc.in \ diff --git a/conf.d/10-fonts-persian.conf b/conf.avail/10-fonts-persian.conf similarity index 100% rename from conf.d/10-fonts-persian.conf rename to conf.avail/10-fonts-persian.conf diff --git a/conf.d/10LohitGujarati.conf b/conf.avail/10LohitGujarati.conf similarity index 100% rename from conf.d/10LohitGujarati.conf rename to conf.avail/10LohitGujarati.conf diff --git a/conf.d/60-delicious.conf b/conf.avail/60-delicious.conf similarity index 100% rename from conf.d/60-delicious.conf rename to conf.avail/60-delicious.conf diff --git a/conf.d/Makefile.am b/conf.avail/Makefile.am similarity index 100% rename from conf.d/Makefile.am rename to conf.avail/Makefile.am diff --git a/conf.d/README b/conf.avail/README similarity index 100% rename from conf.d/README rename to conf.avail/README diff --git a/conf.d/autohint.conf b/conf.avail/autohint.conf similarity index 100% rename from conf.d/autohint.conf rename to conf.avail/autohint.conf diff --git a/conf.d/no-bitmaps.conf b/conf.avail/no-bitmaps.conf similarity index 100% rename from conf.d/no-bitmaps.conf rename to conf.avail/no-bitmaps.conf diff --git a/conf.d/no-sub-pixel.conf b/conf.avail/no-sub-pixel.conf similarity index 100% rename from conf.d/no-sub-pixel.conf rename to conf.avail/no-sub-pixel.conf diff --git a/conf.d/sub-pixel.conf b/conf.avail/sub-pixel.conf similarity index 100% rename from conf.d/sub-pixel.conf rename to conf.avail/sub-pixel.conf diff --git a/conf.d/unhinted.conf b/conf.avail/unhinted.conf similarity index 100% rename from conf.d/unhinted.conf rename to conf.avail/unhinted.conf diff --git a/conf.d/yes-bitmaps.conf b/conf.avail/yes-bitmaps.conf similarity index 100% rename from conf.d/yes-bitmaps.conf rename to conf.avail/yes-bitmaps.conf From 085d12cd4bcc215a5fb2bc403148e68c45bd3d2a Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 01:24:02 -0400 Subject: [PATCH 02/12] Standardize conf.avail number prefixing convention Always use \d- rather than just \d as prefix --- conf.avail/{10LohitGujarati.conf => 10-LohitGujarati.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename conf.avail/{10LohitGujarati.conf => 10-LohitGujarati.conf} (100%) diff --git a/conf.avail/10LohitGujarati.conf b/conf.avail/10-LohitGujarati.conf similarity index 100% rename from conf.avail/10LohitGujarati.conf rename to conf.avail/10-LohitGujarati.conf From 04ceb322c8e8c4bfc5f4df27d15e8353058a19b8 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 01:28:07 -0400 Subject: [PATCH 03/12] 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.conf => sub-pixel-rgb.conf} | 0 conf.avail/sub-pixel-vbgr.conf | 9 +++++++++ conf.avail/sub-pixel-vrgb.conf | 9 +++++++++ 4 files changed, 27 insertions(+) create mode 100644 conf.avail/sub-pixel-bgr.conf rename conf.avail/{sub-pixel.conf => sub-pixel-rgb.conf} (100%) create mode 100644 conf.avail/sub-pixel-vbgr.conf create mode 100644 conf.avail/sub-pixel-vrgb.conf diff --git a/conf.avail/sub-pixel-bgr.conf b/conf.avail/sub-pixel-bgr.conf new file mode 100644 index 0000000..2aba95e --- /dev/null +++ b/conf.avail/sub-pixel-bgr.conf @@ -0,0 +1,9 @@ + + + + + + + bgr + + diff --git a/conf.avail/sub-pixel.conf b/conf.avail/sub-pixel-rgb.conf similarity index 100% rename from conf.avail/sub-pixel.conf rename to conf.avail/sub-pixel-rgb.conf diff --git a/conf.avail/sub-pixel-vbgr.conf b/conf.avail/sub-pixel-vbgr.conf new file mode 100644 index 0000000..0cdad2a --- /dev/null +++ b/conf.avail/sub-pixel-vbgr.conf @@ -0,0 +1,9 @@ + + + + + + + vbgr + + diff --git a/conf.avail/sub-pixel-vrgb.conf b/conf.avail/sub-pixel-vrgb.conf new file mode 100644 index 0000000..60239e0 --- /dev/null +++ b/conf.avail/sub-pixel-vrgb.conf @@ -0,0 +1,9 @@ + + + + + + + vrgb + + From 57b42cef2ad2f18618ca0748325fc800165bdc1b Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 01:33:09 -0400 Subject: [PATCH 04/12] 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(-) create mode 100644 conf.avail/50-user.conf create mode 100644 conf.avail/51-local.conf diff --git a/conf.avail/50-user.conf b/conf.avail/50-user.conf new file mode 100644 index 0000000..9a38a40 --- /dev/null +++ b/conf.avail/50-user.conf @@ -0,0 +1,7 @@ + + + + + + ~/.fonts.conf + diff --git a/conf.avail/51-local.conf b/conf.avail/51-local.conf new file mode 100644 index 0000000..d35046e --- /dev/null +++ b/conf.avail/51-local.conf @@ -0,0 +1,7 @@ + + + + + + local.conf + diff --git a/fonts.conf.in b/fonts.conf.in index adc44e8..a4f3389 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -282,17 +282,6 @@ - - ~/.fonts.conf - - - conf.d - local.conf - From cbdd74d6569b5975b86bd425b56b1b50aa73d2bb Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:27:29 -0400 Subject: [PATCH 05/12] Number the remaining conf.avail files --- conf.avail/{no-sub-pixel.conf => 30-no-sub-pixel.conf} | 0 conf.avail/{sub-pixel-bgr.conf => 30-sub-pixel-bgr.conf} | 0 conf.avail/{sub-pixel-rgb.conf => 30-sub-pixel-rgb.conf} | 0 conf.avail/{sub-pixel-vbgr.conf => 30-sub-pixel-vbgr.conf} | 0 conf.avail/{sub-pixel-vrgb.conf => 30-sub-pixel-vrgb.conf} | 0 conf.avail/{autohint.conf => 33-autohint.conf} | 0 conf.avail/{unhinted.conf => 33-unhinted.conf} | 0 conf.avail/{no-bitmaps.conf => 36-no-bitmaps.conf} | 0 conf.avail/{yes-bitmaps.conf => 36-yes-bitmaps.conf} | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename conf.avail/{no-sub-pixel.conf => 30-no-sub-pixel.conf} (100%) rename conf.avail/{sub-pixel-bgr.conf => 30-sub-pixel-bgr.conf} (100%) rename conf.avail/{sub-pixel-rgb.conf => 30-sub-pixel-rgb.conf} (100%) rename conf.avail/{sub-pixel-vbgr.conf => 30-sub-pixel-vbgr.conf} (100%) rename conf.avail/{sub-pixel-vrgb.conf => 30-sub-pixel-vrgb.conf} (100%) rename conf.avail/{autohint.conf => 33-autohint.conf} (100%) rename conf.avail/{unhinted.conf => 33-unhinted.conf} (100%) rename conf.avail/{no-bitmaps.conf => 36-no-bitmaps.conf} (100%) rename conf.avail/{yes-bitmaps.conf => 36-yes-bitmaps.conf} (100%) diff --git a/conf.avail/no-sub-pixel.conf b/conf.avail/30-no-sub-pixel.conf similarity index 100% rename from conf.avail/no-sub-pixel.conf rename to conf.avail/30-no-sub-pixel.conf diff --git a/conf.avail/sub-pixel-bgr.conf b/conf.avail/30-sub-pixel-bgr.conf similarity index 100% rename from conf.avail/sub-pixel-bgr.conf rename to conf.avail/30-sub-pixel-bgr.conf diff --git a/conf.avail/sub-pixel-rgb.conf b/conf.avail/30-sub-pixel-rgb.conf similarity index 100% rename from conf.avail/sub-pixel-rgb.conf rename to conf.avail/30-sub-pixel-rgb.conf diff --git a/conf.avail/sub-pixel-vbgr.conf b/conf.avail/30-sub-pixel-vbgr.conf similarity index 100% rename from conf.avail/sub-pixel-vbgr.conf rename to conf.avail/30-sub-pixel-vbgr.conf diff --git a/conf.avail/sub-pixel-vrgb.conf b/conf.avail/30-sub-pixel-vrgb.conf similarity index 100% rename from conf.avail/sub-pixel-vrgb.conf rename to conf.avail/30-sub-pixel-vrgb.conf diff --git a/conf.avail/autohint.conf b/conf.avail/33-autohint.conf similarity index 100% rename from conf.avail/autohint.conf rename to conf.avail/33-autohint.conf diff --git a/conf.avail/unhinted.conf b/conf.avail/33-unhinted.conf similarity index 100% rename from conf.avail/unhinted.conf rename to conf.avail/33-unhinted.conf diff --git a/conf.avail/no-bitmaps.conf b/conf.avail/36-no-bitmaps.conf similarity index 100% rename from conf.avail/no-bitmaps.conf rename to conf.avail/36-no-bitmaps.conf diff --git a/conf.avail/yes-bitmaps.conf b/conf.avail/36-yes-bitmaps.conf similarity index 100% rename from conf.avail/yes-bitmaps.conf rename to conf.avail/36-yes-bitmaps.conf From f6e645c4993fff77d596dba734c09cdb255f4ca0 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:30:10 -0400 Subject: [PATCH 06/12] Update Makefile.am to match conf.avail changes --- conf.avail/Makefile.am | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am index 98e8dbd..bfba74b 100644 --- a/conf.avail/Makefile.am +++ b/conf.avail/Makefile.am @@ -22,19 +22,22 @@ # PERFORMANCE OF THIS SOFTWARE. CONF_FILES = \ - 10LohitGujarati.conf \ + 10-LohitGujarati.conf \ 10-fonts-persian.conf \ - 60-delicious.conf \ - autohint.conf \ - no-bitmaps.conf \ - no-sub-pixel.conf \ - sub-pixel.conf \ - unhinted.conf \ - yes-bitmaps.conf + 33-autohint.conf \ + 33-unhinted.conf \ + 30-no-sub-pixel.conf \ + 30-sub-pixel-rgb.conf \ + 30-sub-pixel-bgr.conf \ + 30-sub-pixel-vrgb.conf \ + 30-sub-pixel-vbgr.conf \ + 36-no-bitmaps.conf \ + 36-yes-bitmaps.conf \ + 60-delicious.conf EXTRA_DIST = $(CONF_FILES) configdir=$(CONFDIR) -confddir=$(configdir)/conf.d +confddir=$(configdir)/conf.avail confd_DATA=$(CONF_FILES) From d55620c90676951fc70ec9430c2670edca2147cb Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:32:37 -0400 Subject: [PATCH 07/12] Replace load of conf.d in fonts.conf.in --- fonts.conf.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fonts.conf.in b/fonts.conf.in index a4f3389..343df79 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -282,6 +282,11 @@ + + conf.d + From 31f8061b5d0a60f497eaafe6d38006ae71e53163 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:36:46 -0400 Subject: [PATCH 08/12] Make room for chunks from fonts.conf in conf.avail --- conf.avail/{10-LohitGujarati.conf => 20-LohitGujarati.conf} | 0 conf.avail/{10-fonts-persian.conf => 20-fonts-persian.conf} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename conf.avail/{10-LohitGujarati.conf => 20-LohitGujarati.conf} (100%) rename conf.avail/{10-fonts-persian.conf => 20-fonts-persian.conf} (100%) diff --git a/conf.avail/10-LohitGujarati.conf b/conf.avail/20-LohitGujarati.conf similarity index 100% rename from conf.avail/10-LohitGujarati.conf rename to conf.avail/20-LohitGujarati.conf diff --git a/conf.avail/10-fonts-persian.conf b/conf.avail/20-fonts-persian.conf similarity index 100% rename from conf.avail/10-fonts-persian.conf rename to conf.avail/20-fonts-persian.conf From 60018915891bd146271b687278782fe38b4c4461 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:45:28 -0400 Subject: [PATCH 09/12] Re-order old conf.d files Make sure they continue to load after ~/.fonts.conf and local.conf --- conf.avail/{20-LohitGujarati.conf => 60-LohitGujarati.conf} | 0 conf.avail/{20-fonts-persian.conf => 60-fonts-persian.conf} | 0 conf.avail/{30-no-sub-pixel.conf => 70-no-sub-pixel.conf} | 0 conf.avail/{30-sub-pixel-bgr.conf => 70-sub-pixel-bgr.conf} | 0 conf.avail/{30-sub-pixel-rgb.conf => 70-sub-pixel-rgb.conf} | 0 conf.avail/{30-sub-pixel-vbgr.conf => 70-sub-pixel-vbgr.conf} | 0 conf.avail/{30-sub-pixel-vrgb.conf => 70-sub-pixel-vrgb.conf} | 0 conf.avail/{33-autohint.conf => 73-autohint.conf} | 0 conf.avail/{33-unhinted.conf => 73-unhinted.conf} | 0 conf.avail/{36-no-bitmaps.conf => 76-no-bitmaps.conf} | 0 conf.avail/{36-yes-bitmaps.conf => 76-yes-bitmaps.conf} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename conf.avail/{20-LohitGujarati.conf => 60-LohitGujarati.conf} (100%) rename conf.avail/{20-fonts-persian.conf => 60-fonts-persian.conf} (100%) rename conf.avail/{30-no-sub-pixel.conf => 70-no-sub-pixel.conf} (100%) rename conf.avail/{30-sub-pixel-bgr.conf => 70-sub-pixel-bgr.conf} (100%) rename conf.avail/{30-sub-pixel-rgb.conf => 70-sub-pixel-rgb.conf} (100%) rename conf.avail/{30-sub-pixel-vbgr.conf => 70-sub-pixel-vbgr.conf} (100%) rename conf.avail/{30-sub-pixel-vrgb.conf => 70-sub-pixel-vrgb.conf} (100%) rename conf.avail/{33-autohint.conf => 73-autohint.conf} (100%) rename conf.avail/{33-unhinted.conf => 73-unhinted.conf} (100%) rename conf.avail/{36-no-bitmaps.conf => 76-no-bitmaps.conf} (100%) rename conf.avail/{36-yes-bitmaps.conf => 76-yes-bitmaps.conf} (100%) diff --git a/conf.avail/20-LohitGujarati.conf b/conf.avail/60-LohitGujarati.conf similarity index 100% rename from conf.avail/20-LohitGujarati.conf rename to conf.avail/60-LohitGujarati.conf diff --git a/conf.avail/20-fonts-persian.conf b/conf.avail/60-fonts-persian.conf similarity index 100% rename from conf.avail/20-fonts-persian.conf rename to conf.avail/60-fonts-persian.conf diff --git a/conf.avail/30-no-sub-pixel.conf b/conf.avail/70-no-sub-pixel.conf similarity index 100% rename from conf.avail/30-no-sub-pixel.conf rename to conf.avail/70-no-sub-pixel.conf diff --git a/conf.avail/30-sub-pixel-bgr.conf b/conf.avail/70-sub-pixel-bgr.conf similarity index 100% rename from conf.avail/30-sub-pixel-bgr.conf rename to conf.avail/70-sub-pixel-bgr.conf diff --git a/conf.avail/30-sub-pixel-rgb.conf b/conf.avail/70-sub-pixel-rgb.conf similarity index 100% rename from conf.avail/30-sub-pixel-rgb.conf rename to conf.avail/70-sub-pixel-rgb.conf diff --git a/conf.avail/30-sub-pixel-vbgr.conf b/conf.avail/70-sub-pixel-vbgr.conf similarity index 100% rename from conf.avail/30-sub-pixel-vbgr.conf rename to conf.avail/70-sub-pixel-vbgr.conf diff --git a/conf.avail/30-sub-pixel-vrgb.conf b/conf.avail/70-sub-pixel-vrgb.conf similarity index 100% rename from conf.avail/30-sub-pixel-vrgb.conf rename to conf.avail/70-sub-pixel-vrgb.conf diff --git a/conf.avail/33-autohint.conf b/conf.avail/73-autohint.conf similarity index 100% rename from conf.avail/33-autohint.conf rename to conf.avail/73-autohint.conf diff --git a/conf.avail/33-unhinted.conf b/conf.avail/73-unhinted.conf similarity index 100% rename from conf.avail/33-unhinted.conf rename to conf.avail/73-unhinted.conf diff --git a/conf.avail/36-no-bitmaps.conf b/conf.avail/76-no-bitmaps.conf similarity index 100% rename from conf.avail/36-no-bitmaps.conf rename to conf.avail/76-no-bitmaps.conf diff --git a/conf.avail/36-yes-bitmaps.conf b/conf.avail/76-yes-bitmaps.conf similarity index 100% rename from conf.avail/36-yes-bitmaps.conf rename to conf.avail/76-yes-bitmaps.conf From c3425fa671663b11aa5288a0b52a0618c5d075ef Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:47:52 -0400 Subject: [PATCH 10/12] 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(-) create mode 100644 conf.avail/10-urw-aliases.conf create mode 100644 conf.avail/15-amt-aliases.conf create mode 100644 conf.avail/20-fix-globaladvance.conf create mode 100644 conf.avail/30-unhint-small-vera.conf diff --git a/conf.avail/10-urw-aliases.conf b/conf.avail/10-urw-aliases.conf new file mode 100644 index 0000000..23cbc09 --- /dev/null +++ b/conf.avail/10-urw-aliases.conf @@ -0,0 +1,47 @@ + + + Avant Garde + URW Gothic L + + + Bookman + URW Bookman L + + + Courier + Nimbus Mono L + + + Helvetica + Nimbus Sans L + + + New Century Schoolbook + Century Schoolbook L + + + Palatino + URW Palladio L + + + Times + Nimbus Roman No9 L + + + Zapf Chancery + URW Chancery L + + + Zapf Dingbats + Dingbats + + + + Symbol + + + Standard Symbols L + + diff --git a/conf.avail/15-amt-aliases.conf b/conf.avail/15-amt-aliases.conf new file mode 100644 index 0000000..ba73638 --- /dev/null +++ b/conf.avail/15-amt-aliases.conf @@ -0,0 +1,16 @@ + + + Times New Roman + Thorndale AMT + + + Arial + Albany AMT + + + Courier New + Cumberland AMT + diff --git a/conf.avail/20-fix-globaladvance.conf b/conf.avail/20-fix-globaladvance.conf new file mode 100644 index 0000000..8d76d32 --- /dev/null +++ b/conf.avail/20-fix-globaladvance.conf @@ -0,0 +1,24 @@ + + + GulimChe + false + + + + DotumChe + false + + + + BatangChe + false + + + + GungsuhChe + false + diff --git a/conf.avail/30-unhint-small-vera.conf b/conf.avail/30-unhint-small-vera.conf new file mode 100644 index 0000000..245580f --- /dev/null +++ b/conf.avail/30-unhint-small-vera.conf @@ -0,0 +1,44 @@ + + + + + Bitstream Vera Sans + + + 7.5 + + + false + + + + + + Bitstream Vera Serif + + + 7.5 + + + false + + + + + + Bitstream Vera Sans Mono + + + 7.5 + + + false + + + diff --git a/fonts.conf.in b/fonts.conf.in index 343df79..d70800e 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -149,139 +149,6 @@ - - - Avant Garde - URW Gothic L - - - Bookman - URW Bookman L - - - Courier - Nimbus Mono L - - - Helvetica - Nimbus Sans L - - - New Century Schoolbook - Century Schoolbook L - - - Palatino - URW Palladio L - - - Times - Nimbus Roman No9 L - - - Zapf Chancery - URW Chancery L - - - Zapf Dingbats - Dingbats - - - - Symbol - - - Standard Symbols L - - - - - Times New Roman - Thorndale AMT - - - Arial - Albany AMT - - - Courier New - Cumberland AMT - - - - - GulimChe - false - - - - DotumChe - false - - - - BatangChe - false - - - - GungsuhChe - false - - - - - - - Bitstream Vera Sans - - - 7.5 - - - false - - - - - - Bitstream Vera Serif - - - 7.5 - - - false - - - - - - Bitstream Vera Sans Mono - - - 7.5 - - - false - - - From 469010c1bdd5cc8801405ef809540bd4b17f41c1 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 4 Sep 2006 15:57:19 -0400 Subject: [PATCH 11/12] Update Makefile.am files --- Makefile.am | 2 +- conf.avail/Makefile.am | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b31bd4..a7a6015 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \ - fc-cache fc-cat fc-list fc-match conf.avail $(DOCSRC) test + fc-cache fc-cat fc-list fc-match conf.avail conf.d $(DOCSRC) test EXTRA_DIST = \ fontconfig.pc.in \ diff --git a/conf.avail/Makefile.am b/conf.avail/Makefile.am index bfba74b..a999dd6 100644 --- a/conf.avail/Makefile.am +++ b/conf.avail/Makefile.am @@ -22,22 +22,28 @@ # PERFORMANCE OF THIS SOFTWARE. CONF_FILES = \ - 10-LohitGujarati.conf \ - 10-fonts-persian.conf \ - 33-autohint.conf \ - 33-unhinted.conf \ - 30-no-sub-pixel.conf \ - 30-sub-pixel-rgb.conf \ - 30-sub-pixel-bgr.conf \ - 30-sub-pixel-vrgb.conf \ - 30-sub-pixel-vbgr.conf \ - 36-no-bitmaps.conf \ - 36-yes-bitmaps.conf \ - 60-delicious.conf + 10-urw-aliases.conf \ + 15-amt-aliases.conf \ + 20-fix-globaladvance.conf \ + 30-unhint-small-vera.conf \ + 50-user.conf \ + 51-local.conf \ + 60-LohitGujarati.conf \ + 60-delicious.conf \ + 60-fonts-persian.conf \ + 70-no-sub-pixel.conf \ + 70-sub-pixel-bgr.conf \ + 70-sub-pixel-rgb.conf \ + 70-sub-pixel-vbgr.conf \ + 70-sub-pixel-vrgb.conf \ + 73-autohint.conf \ + 73-unhinted.conf \ + 76-no-bitmaps.conf \ + 76-yes-bitmaps.conf EXTRA_DIST = $(CONF_FILES) configdir=$(CONFDIR) -confddir=$(configdir)/conf.avail +confavaildir=$(configdir)/conf.avail -confd_DATA=$(CONF_FILES) +confavail_DATA=$(CONF_FILES) From 164e267d286eccbbdde69e8935a658dced4331b4 Mon Sep 17 00:00:00 2001 From: James Cloos Date: Sat, 9 Sep 2006 01:24:08 -0400 Subject: [PATCH 12/12] 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(+) create mode 100644 conf.d/Makefile.am diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am new file mode 100644 index 0000000..85d7135 --- /dev/null +++ b/conf.d/Makefile.am @@ -0,0 +1,52 @@ +# +# $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_LINKS = \ + 10-urw-aliases.conf \ + 15-amt-aliases.conf \ + 20-fix-globaladvance.conf \ + 30-unhint-small-vera.conf \ + 50-user.conf \ + 51-local.conf \ + 60-LohitGujarati.conf \ + 60-delicious.conf \ + 60-fonts-persian.conf + +EXTRA_DIST = $(CONF_LINKS) + +configdir=$(CONFDIR) +confddir=$(configdir)/conf.d + +install: + mkdir -p ${DESTDIR}/${confddir} + ln -s ../conf.avail/10-urw-aliases.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/15-amt-aliases.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/20-fix-globaladvance.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/30-unhint-small-vera.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/50-user.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/51-local.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/60-LohitGujarati.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/60-delicious.conf ${DESTDIR}/${confddir} + ln -s ../conf.avail/60-fonts-persian.conf ${DESTDIR}/${confddir} + + diff --git a/configure.in b/configure.in index e8e1062..5a6309d 100644 --- a/configure.in +++ b/configure.in @@ -560,6 +560,7 @@ fc-case/Makefile fc-arch/Makefile src/Makefile src/fontconfig.def +conf.avail/Makefile conf.d/Makefile fc-cache/Makefile fc-cat/Makefile