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 @@
 	</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>

Reply via email to