From 46264e1a785a64bd3774dfdff55be4d769810b59 Mon Sep 17 00:00:00 2001
From: dumol <dumol@gnome.org>
Date: Sat, 10 Apr 2021 18:44:57 +0300
Subject: [PATCH] Final touches for the 0.2 release.

---
 common.conf                 | 20 ++++++++------------
 common/oswald.conf          | 16 ----------------
 fixes.conf                  |  2 +-
 lowdpi.conf                 | 25 +++++++++++++------------
 lowdpi/liberation-sans.conf |  2 +-
 lowdpi/pt-sans.conf         |  7 -------
 os/openbsd.conf             |  2 +-
 test.html                   |  2 ++
 8 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/common.conf b/common.conf
index 51b2a60..440bbac 100644
--- a/common.conf
+++ b/common.conf
@@ -7,7 +7,7 @@
 
 
     <!-- Most of the following common typefaces are not perfectly hinted for
-         low DPI screens, but they are usually used at bigger sizes. -->
+         low DPI screens, but they are typically used at bigger sizes. -->
 
 
         <!-- Metrically-identical replacements. -->
@@ -30,7 +30,7 @@
     <!-- Bitter. An open-source font frequently used for the web.
          TTF version from the googlefontdirectory repo is to be
          used on low DPI screens. Latest version only for high DPI screens.
-         Used on: https://arstechnica.com, https://dasung-tech.myshopify.com -->
+         Used on: https://arstechnica.com. -->
     <include prefix="xdg">fontconfig/common/bitter.conf</include>
 
     <!-- Book Antiqua, Palatino, Palatino Lynotype, etc.
@@ -48,7 +48,7 @@
     <include prefix="xdg">fontconfig/common/urw-fallback-generics.conf</include>
     <include prefix="xdg">fontconfig/common/urw-fallback-specifics.conf</include>
 
-    <!-- Bitstream Charter, ITC Charter.
+    <!-- Charter, Bitstream Charter, ITC Charter.
          Used on: https://medium.com, https://www.economist.com (fallback). -->
     <include prefix="xdg">fontconfig/common/charter.conf</include>
 
@@ -71,17 +71,17 @@
         <!-- End of list of fonts perfectly hinted at small sizes. -->
 
 
-    <!-- Arial Rounded MT Bold, Helvetica Rounded LT Std Bold -->
+    <!-- Arial Rounded MT Bold, Helvetica Rounded LT Std Bold. -->
     <include prefix="xdg">fontconfig/common/varela-round.conf</include>
 
     <!-- Baskerville, Baskerville Old Face, Baskerville PT.
          Used on: https://theconversation.com, https://www.the-scientist.com.-->
     <include prefix="xdg">fontconfig/common/libre-baskerville.conf</include>
 
-    <!-- Brush Script MT -->
+    <!-- Brush Script MT. -->
     <include prefix="xdg">fontconfig/common/kaushan-script.conf</include>
 
-    <!-- Copperplate, Copperplate Gothic -->
+    <!-- Copperplate, Copperplate Gothic. -->
     <include prefix="xdg">fontconfig/common/cinzel-decorative.conf</include>
 
     <!-- Economica, Impact.
@@ -101,6 +101,8 @@
 
         <!-- Emoji settings and aliases -->
 
+    <!-- Twemoji and derivatives is better for Firefox-based browsers.
+         For Chrome-based ones, Noto Color Emoji is best. -->
     <include prefix="xdg">fontconfig/common/twitter-color-emoji.conf</include>
 
 
@@ -112,11 +114,5 @@
             <family>Font Awesome 5 Free Solid</family>
         </prefer>
     </alias>
-    <alias binding="same">
-        <family>FontAwesome</family>
-        <prefer>
-            <family>Font Awesome 5 Free Solid</family>
-        </prefer>
-    </alias>
 
 </fontconfig>
diff --git a/common/oswald.conf b/common/oswald.conf
index a84c87e..172cba2 100644
--- a/common/oswald.conf
+++ b/common/oswald.conf
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-    <!-- Generic name aliasing -->
-    <alias>
-        <family>fantasy</family>
-        <prefer>
-            <family>Oswald</family>
-        </prefer>
-    </alias>
-
-    <!-- Generic name assignment -->
-    <alias>
-        <family>Oswald</family>
-        <default>
-            <family>fantasy</family>
-        </default>
-    </alias>
-
     <!-- Font substitution rules -->
     <alias binding="same">
         <family>Economica</family>
diff --git a/fixes.conf b/fixes.conf
index af55ffe..954b97d 100644
--- a/fixes.conf
+++ b/fixes.conf
@@ -5,7 +5,7 @@
 
     <description>Various rendering fixes</description>
 
-    <!-- Disable hinting for sizes less than 8ppem for Vera-derived fonts.
+    <!-- Disable hinting at sizes less than 8ppem for Vera-derived fonts.
          The Bistream Vera fonts have GASP entries suggesting that hinting be
          disabled below 8 ppem, but FreeType ignores those, preferring to use
          the data found in the instructed hints. The initial Vera release
diff --git a/lowdpi.conf b/lowdpi.conf
index fd496b2..8880568 100644
--- a/lowdpi.conf
+++ b/lowdpi.conf
@@ -138,7 +138,7 @@
          Source Code Pro used on https://www.vice.com. -->
     <include prefix="xdg">fontconfig/lowdpi/noto-mono.conf</include>
 
-    <!-- Bitstream Vera Serif -->
+    <!-- Bitstream Vera Serif, DejaVu Serif. -->
     <include prefix="xdg">fontconfig/lowdpi/dejavu-serif.conf</include>
 
     <!-- Courier, Courier New/Std. Not the greatest match, but Wine's Courier
@@ -152,10 +152,10 @@
          Arimo used on https://www.anandtech.com. -->
     <include prefix="xdg">fontconfig/lowdpi/liberation-sans.conf</include>
 
-    <!-- Lucida Console, Lucida Sans Typewriter, Menlo -->
+    <!-- Liberation Mono, Menlo, Lucida Console, Lucida Sans Typewriter. -->
     <include prefix="xdg">fontconfig/lowdpi/liberation-mono.conf</include>
 
-    <!-- Times, MS Serif, Tinos, and other missing aliases.
+    <!-- Times New Roman, Times, MS Serif, Tinos, and other missing aliases.
          Times New Roman used on https://www.nlm.nih.gov/,
          https://www.latimes.com (fallback).
          Times used on https://www.thetimes.co.uk. -->
@@ -173,40 +173,38 @@
          https://time.com (fallback). -->
     <include prefix="xdg">fontconfig/lowdpi/pt-sans-narrow.conf</include>
 
-    <!-- Georgia, Georgia Pro. Similar metrics with even higher x-height, but
-         no old-style figures. More similar than Liberation/DejaVu Serif though.
+    <!-- Georgia, PT Serif. Similar metrics, with a slightly higher x-height for
+         the latter. PT Serif is a much better alias for Georgia compared to
+         Liberation/DejaVu Serif. None have Georgia's old-style figures though.
          Georgia used on many sites, e.g. https://www.washingtonpost.com.
          PT Serif used on https://time.com. -->
     <include prefix="xdg">fontconfig/lowdpi/pt-serif.conf</include>
 
-    <!-- Geneva. This is Wine's Tahoma. Bold font is problematic at some sizes.
+    <!-- Geneva, Tahoma. This is Wine's Tahoma. Some Bold bitmaps are wrong.
          Tahoma used on many sites, e.g. https://web.telegram.org.
          Geneva used on https://news.ycombinator.com/ (fallback). -->
     <include prefix="xdg">fontconfig/lowdpi/tahoma.conf</include>
 
-    <!-- Lucida Bright -->
+    <!-- Lucida Bright. -->
     <include prefix="xdg">fontconfig/lowdpi/pt-serif-caption.conf</include>
 
     <!-- Monotype Corsiva, Corsiva. -->
     <include prefix="xdg">fontconfig/lowdpi/felipa.conf</include>
 
-    <!-- Proxima Nova. Most successfull commercial font on the web. There's no
+    <!-- Proxima Nova. Most successful commercial font on the web. There's no
          open-source font with perfect hinting to replace it. To avoid falling
          back to default sans-serif, let's give Cabin a bit more use...
          Proxima Nova used on: https://www.cnbc.com, https://duckduckgo.com.
          Proxima Nova Cond used on https://gizmodo.com. -->
     <include prefix="xdg">fontconfig/lowdpi/cabin.conf</include>
 
-    <!-- Segoe UI, Segoe, Lucida Sans/Grande, Cantarell.
+    <!-- Segoe UI, Segoe, Lucida Sans/Grande, PT Sans, Cantarell.
          Segoe UI used on https://www.microsoft.com, https://msn.com, etc.
          Segoe used on https://outlook.live.com.
          Lucida Grande used on https://telegram.org, https://arxiv.org.
          Lucida Sans Unicode used on https://telegram.org (fallback). -->
     <include prefix="xdg">fontconfig/lowdpi/pt-sans.conf</include>
 
-    <!-- SFMono-Regular. Sets best option for GitHub's default code font. -->
-    <include prefix="xdg">fontconfig/lowdpi/luculent.conf</include>
-
     <!-- Verdana, DejaVu Sans. Not that far away. Unfortunately, no italics.
          Verdana used on: https://www.imdb.com, https://news.ycombinator.com.-->
     <include prefix="xdg">fontconfig/lowdpi/pt-sans-caption.conf</include>
@@ -214,6 +212,9 @@
 
         <!-- Extra rules -->
 
+    <!-- Recommended font for consoles/terminals. -->
+    <include prefix="xdg">fontconfig/lowdpi/luculent.conf</include>
+
     <!-- Fonts frequently used w/o any fallbacks. Aliased to avoid serif. -->
 
     <!-- On https://arstechnica.com (the desktop site). -->
diff --git a/lowdpi/liberation-sans.conf b/lowdpi/liberation-sans.conf
index a609520..e8f4eb4 100644
--- a/lowdpi/liberation-sans.conf
+++ b/lowdpi/liberation-sans.conf
@@ -99,7 +99,7 @@
     </alias>
 
     <alias binding="same">
-        <family>Helvetica</family>
+        <family>MS Sans Serif</family>
         <prefer>
             <family>Liberation Sans</family>
         </prefer>
diff --git a/lowdpi/pt-sans.conf b/lowdpi/pt-sans.conf
index eecaa58..73d5194 100644
--- a/lowdpi/pt-sans.conf
+++ b/lowdpi/pt-sans.conf
@@ -66,11 +66,4 @@
             <family>PT Sans</family>
         </prefer>
     </alias>
-
-    <alias binding="same">
-        <family>SegoeUI</family>
-        <prefer>
-            <family>PT Sans</family>
-        </prefer>
-    </alias>
 </fontconfig>
diff --git a/os/openbsd.conf b/os/openbsd.conf
index df87362..29dad53 100644
--- a/os/openbsd.conf
+++ b/os/openbsd.conf
@@ -6,7 +6,7 @@
     <description>Extra settings for OpenBSD setups</description>
 
 
-    <!-- This is for an OpenBSD 6.7 X.org installation. -->
+    <!-- This is for an OpenBSD 6.8 X.org installation. -->
     <selectfont>
         <rejectfont>
             <glob>/usr/X11R6/lib/X11/fonts/100dpi/*</glob>
diff --git a/test.html b/test.html
index d7c7499..c87b502 100644
--- a/test.html
+++ b/test.html
@@ -5,6 +5,8 @@
 
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
+        <title>PixelPerfect test page.</title>
+
         <style>
             h3{
                 font-family: 'Archivo Narrow', 'Helvetica Condensed', 'Nimbus Sans Narrow', 'Arial Narrow', sans-serif;