Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Switch to the same hack in pkgsrc for avoiding bitmap fonts ...
details: https://anonhg.NetBSD.org/src/rev/83475a12067d
branches: trunk
changeset: 1014998:83475a12067d
user: nia <nia%NetBSD.org@localhost>
date: Sat Oct 10 09:17:33 2020 +0000
description:
Switch to the same hack in pkgsrc for avoiding bitmap fonts on the web
Just for consistency's sake, and making it easier to disable this if
someone wants to do that.
diffstat:
distrib/sets/lists/xetc/mi | 4 +-
external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf | 31 ++++++++++
external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile | 5 +-
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile | 3 +-
external/mit/xorg/lib/fontconfig/etc/fonts.conf | 27 --------
5 files changed, 39 insertions(+), 31 deletions(-)
diffs (136 lines):
diff -r a5fd0f7acc73 -r 83475a12067d distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Sat Oct 10 08:33:29 2020 +0000
+++ b/distrib/sets/lists/xetc/mi Sat Oct 10 09:17:33 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2020/08/27 15:32:01 riastradh Exp $
+# $NetBSD: mi,v 1.39 2020/10/10 09:17:33 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -57,6 +57,7 @@
./etc/fonts/conf.avail/65-khmer.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/65-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/69-unifont.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.avail/70-no-bitmap-webfonts.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/70-no-bitmaps.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/70-yes-bitmaps.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.avail/80-delicious.conf xetc-fontconfig-etc xorg
@@ -78,6 +79,7 @@
./etc/fonts/conf.d/65-fonts-persian.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/65-nonlatin.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/69-unifont.conf xetc-fontconfig-etc xorg
+./etc/fonts/conf.d/70-no-bitmap-webfonts.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/80-delicious.conf xetc-fontconfig-etc xorg
./etc/fonts/conf.d/90-synthetic.conf xetc-fontconfig-etc xorg
./etc/fonts/fonts.conf xetc-fontconfig-etc xorg
diff -r a5fd0f7acc73 -r 83475a12067d external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/70-no-bitmap-webfonts.conf Sat Oct 10 09:17:33 2020 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!-- $NetBSD: 70-no-bitmap-webfonts.conf,v 1.1 2020/10/10 09:17:33 nia Exp $ -->
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+ Reject X11 bitmap fonts which may be selected in place of scalable
+ proportional fonts, e.g. on the web.
+
+ Mostly these are included as scalable system fonts in macOS.
+-->
+ <selectfont>
+ <rejectfont>
+ <pattern>
+ <patelt name="family"><string>Charter</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Courier</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Helvetica</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ <pattern>
+ <patelt name="family"><string>Times</string></patelt>
+ <patelt name="scalable"><bool>false</bool></patelt>
+ </pattern>
+ </rejectfont>
+ </selectfont>
+</fontconfig>
diff -r a5fd0f7acc73 -r 83475a12067d external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Sat Oct 10 08:33:29 2020 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Sat Oct 10 09:17:33 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 05:05:32 nakayama Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
.include <bsd.own.mk>
-.PATH: ${X11SRCDIR.fontconfig}/conf.d
+.PATH: . ${X11SRCDIR.fontconfig}/conf.d
CONFIGFILES= \
10-autohint.conf \
10-hinting-full.conf \
@@ -34,6 +34,7 @@
65-khmer.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmap-webfonts.conf \
70-no-bitmaps.conf \
70-yes-bitmaps.conf \
80-delicious.conf \
diff -r a5fd0f7acc73 -r 83475a12067d external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Sat Oct 10 08:33:29 2020 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Sat Oct 10 09:17:33 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/10 09:17:33 nia Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@
65-fonts-persian.conf \
65-nonlatin.conf \
69-unifont.conf \
+ 70-no-bitmap-webfonts.conf \
80-delicious.conf \
90-synthetic.conf
diff -r a5fd0f7acc73 -r 83475a12067d external/mit/xorg/lib/fontconfig/etc/fonts.conf
--- a/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sat Oct 10 08:33:29 2020 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/fonts.conf Sat Oct 10 09:17:33 2020 +0000
@@ -66,33 +66,6 @@
</match>
<!--
- Reject X11 bitmap fonts which may be selected in place of scalable
- proportional fonts, e.g. on the web.
-
- Mostly these are included as scalable system fonts in macOS.
--->
- <selectfont>
- <rejectfont>
- <pattern>
- <patelt name="family"><string>Charter</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Courier</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Helvetica</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- <pattern>
- <patelt name="family"><string>Times</string></patelt>
- <patelt name="scalable"><bool>false</bool></patelt>
- </pattern>
- </rejectfont>
- </selectfont>
-
-<!--
Load local system customization file
-->
<include ignore_missing="yes">conf.d</include>
Home |
Main Index |
Thread Index |
Old Index