CVS commit: src/external/mit/xorg/lib/fontconfig/etc/conf.avail
Module Name:src Committed By: nia Date: Thu Nov 5 12:13:02 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc/conf.avail: 70-no-bitmap-webfonts.conf Log Message: Also deny bitmap Lucida, Utopia from being selected through fontconfig. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.1 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.2 --- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf:1.1 Sat Oct 10 09:17:33 2020 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Thu Nov 5 12:13:02 2020 @@ -1,5 +1,5 @@ - +
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: nia Date: Mon Oct 5 09:16:26 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: Adjust the default fontconfig fonts.conf to avoid selecting bitmap fonts included as part of X11 that are also included as scalable fonts as part of macOS. Many websites will attempt to select these fonts, which results in very strange, poor quality rendering. This should keep legacy X11 applications that want the old "Helvetica" and "Times" fonts working, but prevent them from being selected by applications that want scalable fonts. It should not prevent "Helvetica" or "Times" from being selected if the user installs a scalable version. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8 Tue Aug 29 20:53:56 2017 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Oct 5 09:16:26 2020 @@ -66,6 +66,33 @@ + + + + Charter + false + + + Courier + false + + + Helvetica + false + + + Times + false + + + + + conf.d
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: nia Date: Mon Oct 5 09:16:53 UTC 2020 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: fix indentation To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.10 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.9 Mon Oct 5 09:16:26 2020 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Oct 5 09:16:53 2020 @@ -90,7 +90,7 @@ false - +
CVS commit: src/external/mit/xorg/lib/fontconfig/etc/conf.avail
Module Name:src Committed By: mrg Date: Sat Mar 9 02:56:44 UTC 2019 Modified Files: src/external/mit/xorg/lib/fontconfig/etc/conf.avail: Makefile Log Message: don't install 30-urw-aliases.conf anymore, it's gone. my builds don't fail here for some reason, but this causes the build cluster to fail and this file is gone so my builds should be failing but i need to figure out why they aren't. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile diff -u src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.5 src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.6 --- src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile:1.5 Tue Aug 29 09:02:10 2017 +++ src/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Sat Mar 9 02:56:44 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/08/29 09:02:10 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2019/03/09 02:56:44 mrg Exp $ .include @@ -22,7 +22,6 @@ CONFIGFILES= \ 20-unhint-small-vera.conf \ 25-unhint-nonlatin.conf \ 30-metric-aliases.conf \ - 30-urw-aliases.conf \ 40-nonlatin.conf \ 45-latin.conf \ 49-sansserif.conf \
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: mrg Date: Tue Aug 29 20:53:56 UTC 2017 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: Makefile fonts.conf Log Message: update fonts.conf for fontconfig 2.12.4. removes section. add a Makefile comment about how to regenerate it. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/Makefile diff -u src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3 src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.4 --- src/external/mit/xorg/lib/fontconfig/etc/Makefile:1.3 Mon Sep 7 21:07:03 2009 +++ src/external/mit/xorg/lib/fontconfig/etc/Makefile Tue Aug 29 20:53:56 2017 @@ -1,4 +1,18 @@ -# $NetBSD: Makefile,v 1.3 2009/09/07 21:07:03 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2017/08/29 20:53:56 mrg Exp $ + +# When updating fontconfig, be sure to update the fonts.conf. This +# requires running ./configure like this: +# +# env PKG_CONFIG_PATH=/usr/X11R7/share/pkgconfig \ +# ./configure \ +# --localstatedir=/var \ +# --with-default-fonts=/usr/X11R7/lib/X11/fonts \ +# --with-add-fonts=/usr/pkg/lib/X11/fonts,/usr/pkg/share/fonts \ +# --with-configdir=conf.d +# +# and then running gmake fonts.conf and copying the new file here. +# (gmake is required here as the FC_CONFIGDIR pattern uses $(subst).) +# SUBDIR= conf.d conf.avail Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.8 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 Thu Jun 5 10:45:39 2014 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Tue Aug 29 20:53:56 2017 @@ -1,6 +1,5 @@ - @@ -25,8 +24,7 @@ /usr/X11R7/lib/X11/fonts - /usr/pkg/lib/X11/fonts - /usr/pkg/share/fonts + /usr/pkg/lib/X11/fonts /usr/pkg/share/fonts fonts ~/.fonts @@ -81,72 +79,6 @@ - - 0x0020 - 0x00A0 - 0x00AD - 0x034F - 0x0600 - 0x0601 - 0x0602 - 0x0603 - 0x06DD - 0x070F - 0x115F - 0x1160 - 0x1680 - 0x17B4 - 0x17B5 - 0x180E - 0x2000 - 0x2001 - 0x2002 - 0x2003 - 0x2004 - 0x2005 - 0x2006 - 0x2007 - 0x2008 - 0x2009 - 0x200A - 0x200B - 0x200C - 0x200D - 0x200E - 0x200F - 0x2028 - 0x2029 - 0x202A - 0x202B - 0x202C - 0x202D - 0x202E - 0x202F - 0x205F - 0x2060 - 0x2061 - 0x2062 - 0x2063 - 0x206A - 0x206B - 0x206C - 0x206D - 0x206E - 0x206F - 0x2800 - 0x3000 - 0x3164 - 0xFEFF - 0xFFA0 - 0xFFF9 - 0xFFFA - 0xFFFB - -
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: wiz Date: Thu Jun 5 10:45:39 UTC 2014 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: Also look in new pkgsrc default path, /usr/pkg/share/fonts. Noted by tsutsui. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.6 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.7 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.6 Mon Jun 3 06:46:53 2013 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Thu Jun 5 10:45:39 2014 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE fontconfig SYSTEM fonts.dtd -!-- $NetBSD: fonts.conf,v 1.6 2013/06/03 06:46:53 mrg Exp $ -- +!-- $NetBSD: fonts.conf,v 1.7 2014/06/05 10:45:39 wiz Exp $ -- !-- /etc/fonts/fonts.conf file to configure system font access -- fontconfig @@ -26,6 +26,7 @@ dir/usr/X11R7/lib/X11/fonts/dir dir/usr/pkg/lib/X11/fonts/dir + dir/usr/pkg/share/fonts/dir dir prefix=xdgfonts/dir !-- the following element will be removed in the future -- dir~/.fonts/dir
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: jmcneill Date: Sat Feb 12 04:49:19 UTC 2011 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: add /usr/pkg/lib/X11/fonts to font directory list To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.4 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.5 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.4 Mon Dec 14 00:39:58 2009 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sat Feb 12 04:49:19 2011 @@ -1,6 +1,6 @@ ?xml version=1.0? !DOCTYPE fontconfig SYSTEM fonts.dtd -!-- $NetBSD: fonts.conf,v 1.4 2009/12/14 00:39:58 mrg Exp $ -- +!-- $NetBSD: fonts.conf,v 1.5 2011/02/12 04:49:19 jmcneill Exp $ -- !-- /etc/fonts/fonts.conf file to configure system font access -- fontconfig @@ -25,6 +25,7 @@ !-- Font directory list -- dir/usr/X11R7/lib/X11/fonts/dir + dir/usr/pkg/lib/X11/fonts/dir dir~/.fonts/dir !--
CVS commit: src/external/mit/xorg/lib/fontconfig/etc
Module Name:src Committed By: mrg Date: Mon Dec 14 00:39:58 UTC 2009 Modified Files: src/external/mit/xorg/lib/fontconfig/etc: fonts.conf Log Message: update the generated fonts.conf from the template. from Jukka Salmi in PR #42169. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/fontconfig/etc/fonts.conf diff -u src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.3 src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.4 --- src/external/mit/xorg/lib/fontconfig/etc/fonts.conf:1.3 Fri Sep 26 11:13:28 2008 +++ src/external/mit/xorg/lib/fontconfig/etc/fonts.conf Mon Dec 14 00:39:58 2009 @@ -1,41 +1,33 @@ ?xml version=1.0? !DOCTYPE fontconfig SYSTEM fonts.dtd -!-- $NetBSD: fonts.conf,v 1.3 2008/09/26 11:13:28 jmcneill Exp $ -- -!-- /etc/fonts.conf file to configure system font access -- +!-- $NetBSD: fonts.conf,v 1.4 2009/12/14 00:39:58 mrg Exp $ -- +!-- /etc/fonts/fonts.conf file to configure system font access -- fontconfig !-- + DO NOT EDIT THIS FILE. + IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED. + LOCAL CHANGES BELONG IN 'local.conf'. + The intent of this standard configuration file is to be adequate for most environments. If you have a reasonably normal environment and have found problems with this configuration, they are probably - things that others will also want fixed. Please send any suggested - changes to fo...@xfree86.org so that future releases can include - such changes. + things that others will also want fixed. Please submit any + problems to the fontconfig bugzilla system located at fontconfig.org - Note that the normal 'make install' procedure for XFree86 is to + Note that the normal 'make install' procedure for fontconfig is to replace any existing fonts.conf file with the new version. Place any local customizations in local.conf which this file references. Keith Packard -- -!-- Font directory list configured on Sun Aug 24 19:25:49 EST 2003 -- +!-- Font directory list -- dir/usr/X11R7/lib/X11/fonts/dir - dir/usr/share/fonts/dir dir~/.fonts/dir !-- - Enable sub-pixel rendering - match target=font - test qual=all name=rgba - constunknown/const - /test - edit name=rgba mode=assignconstrgb/const/edit - /match --- - -!-- Accept deprecated 'mono' alias, replacing it with 'monospace' -- match target=pattern @@ -72,178 +64,15 @@ /match !-- - Mark common families with their generics so we'll get - something reasonable --- - -!-- - Serif faces - -- - alias - familyTimes/family - familyTimes New Roman/family - familyNimbus Roman No9 L/family - familyLuxi Serif/family - familyKochi Mincho/family - familyAR PL SungtiL GB/family - familyAR PL Mingti2L Big5/family - familyBaekmuk Batang/family - defaultfamilyserif/family/default - /alias -!-- - Sans-serif faces - -- - alias - familyHelvetica/family - familyArial/family - familyVerdana/family - familyNimbus Sans L/family - familyLuxi Sans/family - familyKochi Gothic/family - familyAR PL KaitiM GB/family - familyAR PL KaitiM Big5/family - familyBaekmuk Dotum/family - familySimSun/family - defaultfamilysans-serif/family/default - /alias -!-- - Monospace faces - -- - alias - familyCourier/family - familyCourier New/family - familyAndale Mono/family - familyLuxi Mono/family - familyNimbus Mono L/family - familyNSimSun/family - defaultfamilymonospace/family/default - /alias -!-- - If the font still has no generic name, add sans-serif - -- - match target=pattern - test qual=all name=family compare=not_eq - stringsans-serif/string - /test - test qual=all name=family compare=not_eq - stringserif/string - /test - test qual=all name=family compare=not_eq - stringmonospace/string - /test - edit name=family mode=append_last - stringsans-serif/string - /edit - /match - -!-- - Load per-user customization file --- - include ignore_missing=yes~/.fonts.conf/include - -!-- Load local system customization file -- include ignore_missing=yesconf.d/include -!-- - Font cache directory list --- +!-- Font cache directory list -- + cachedir/var/cache/fontconfig/cachedir cachedir~/.fontconfig/cachedir -!-- - Alias well known font names to available TrueType fonts --- - alias - familyTimes/family - acceptfamilyTimes New Roman/family/accept - /alias - alias - familyHelvetica/family - acceptfamilyVerdana/family/accept - /alias - alias - familyArial/family - acceptfamilyVerdana/family/accept - /alias - alias - familyCourier/family - acceptfamilyCourier New/family/accept - /alias - -!-- - Provide required aliases for standard names --- - alias - familyserif/family - prefer - familyTimes New Roman/family - familyNimbus Roman No9 L/family - familyLuxi Serif/family - familyTimes/family -
