saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 033e701336a485ccc9d5053ef2570af5b99e277f..2af1a68603c706f2adb72c5630c4e09ebe7df9a9 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1428,6 +1428,7 @@ maybe chmod 0644 'fonts/conf.avail/30-urw-aliases.conf'
 maybe chmod 0644 'fonts/conf.avail/31-cantarell.conf'
 maybe chmod 0644 'fonts/conf.avail/40-nonlatin.conf'
 maybe chmod 0644 'fonts/conf.avail/42-luxi-mono.conf'
+maybe chmod 0644 'fonts/conf.avail/45-generic.conf'
 maybe chmod 0644 'fonts/conf.avail/45-latin.conf'
 maybe chmod 0644 'fonts/conf.avail/49-sansserif.conf'
 maybe chmod 0644 'fonts/conf.avail/50-user.conf'
@@ -1436,6 +1437,7 @@ maybe chmod 0644 'fonts/conf.avail/52-infinality.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans-mono.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-sans.conf'
 maybe chmod 0644 'fonts/conf.avail/57-dejavu-serif.conf'
+maybe chmod 0644 'fonts/conf.avail/60-generic.conf'
 maybe chmod 0644 'fonts/conf.avail/60-latin.conf'
 maybe chmod 0644 'fonts/conf.avail/60-liberation.conf'
 maybe chmod 0644 'fonts/conf.avail/62-croscore-arimo.conf'

diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf
index 1f0778d68c463818c0d6de4fee03d6b2213dc120..c755c5e96ca0dfd7610c4524b4e96201f201bab6 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -44,6 +44,9 @@ but in an order preferring similar designs first.  We do this in three steps:
 3) Alias each generic to its specifics.
    e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
 
+NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
+      upstream now includes them in their release of (URW)++ Core Font Set here:
+      https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig
 -->
 
 <!-- Map specifics to generics -->
@@ -308,7 +311,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
-
        <!-- Microsoft -->
        <alias binding="same">
          <family>Arimo</family>
@@ -460,7 +462,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
-
        <!-- Microsoft -->
        <alias>
          <family>Arial</family>
@@ -490,8 +491,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          </default>
        </alias>
 
-
-
 <!-- Map generics to specifics -->
 
        <!-- PostScript -->
@@ -499,8 +498,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Helvetica</family>
          <accept>
          <family>TeX Gyre Heros</family>
-         <family>Nimbus Sans</family>
-         <family>Nimbus Sans L</family>
          </accept>
        </alias>
 
@@ -508,7 +505,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Helvetica Narrow</family>
          <accept>
          <family>TeX Gyre Heros Cn</family>
-         <family>Nimbus Sans Narrow</family>
          </accept>
        </alias>
 
@@ -516,8 +512,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Times</family>
          <accept>
          <family>TeX Gyre Termes</family>
-         <family>Nimbus Roman</family>
-         <family>Nimbus Roman No9 L</family>
          </accept>
        </alias>
 
@@ -525,9 +519,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>Courier</family>
          <accept>
          <family>TeX Gyre Cursor</family>
-         <family>Nimbus Mono PS</family>
-         <family>Nimbus Mono</family>
-         <family>Nimbus Mono L</family>
          </accept>
        </alias>
 
@@ -535,8 +526,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>ITC Avant Garde Gothic</family>
          <accept>
          <family>TeX Gyre Adventor</family>
-         <family>URW Gothic</family>
-         <family>URW Gothic L</family>
          </accept>
        </alias>
 
@@ -545,9 +534,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Bookman Old Style</family>
          <family>TeX Gyre Bonum</family>
-         <family>URW Bookman</family>
-         <family>Bookman URW</family>
-         <family>URW Bookman L</family>
          </accept>
        </alias>
 
@@ -555,9 +541,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <family>ITC Zapf Chancery</family>
          <accept>
          <family>TeX Gyre Chorus</family>
-         <family>Z003</family>
-         <family>Chancery URW</family>
-         <family>URW Chancery L</family>
          </accept>
        </alias>
 
@@ -566,9 +549,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Palatino Linotype</family>
          <family>TeX Gyre Pagella</family>
-         <family>P052</family>
-         <family>Palladio URW</family>
-         <family>URW Palladio L</family>
          </accept>
        </alias>
 
@@ -577,9 +557,6 @@ but in an order preferring similar designs first.  We do this in three steps:
          <accept>
          <family>Century Schoolbook</family>
          <family>TeX Gyre Schola</family>
-         <family>C059</family>
-         <family>Century SchoolBook URW</family>
-         <family>Century Schoolbook L</family>
          </accept>
        </alias>
 

diff --git a/fonts/conf.avail/45-generic.conf b/fonts/conf.avail/45-generic.conf
new file mode 100644 (file)
index 0000000..f6076bb
--- /dev/null
+++ b/fonts/conf.avail/45-generic.conf
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 60-generic.conf -->
+
+<!-- Emoji -->
+
+       <alias binding="same">
+               <family>Emoji Two</family>
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Emoji One</family>
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Noto Color Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Apple Color Emoji</family> <!-- Apple -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Segoe UI Emoji</family> <!-- Microsoft -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Twitter Color Emoji</family> <!-- Twitter -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+               <default><family>emoji</family></default>
+       </alias>
+       <!-- B&W -->
+       <alias binding="same">
+               <family>Noto Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Android Emoji</family> <!-- Google -->
+               <default><family>emoji</family></default>
+       </alias>
+
+       <!-- Add language for emoji, to match other emoji fonts. -->
+       <match>
+               <test name="family">
+                       <string>emoji</string>
+               </test>
+               <edit name="lang" mode="prepend">
+                       <string>und-zsye</string>
+               </edit>
+       </match>
+
+       <match>
+               <test name="lang">
+                       <string>und-zsye</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>emoji</string>
+               </test>
+
+               <!-- Add generic family. -->
+               <edit name="family" mode="append" binding="strong">
+                       <string>emoji</string>
+               </edit>
+       </match>
+
+
+<!-- Math -->
+
+       <!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+       <alias binding="same">
+               <family>XITS Math</family> <!-- Khaled Hosny -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>STIX Two Math</family> <!-- AMS -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Cambria Math</family> <!-- Microsoft -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Latin Modern Math</family> <!-- TeX -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Minion Math</family> <!-- Adobe -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Lucida Math</family> <!-- Adobe -->
+               <default><family>math</family></default>
+       </alias>
+       <alias binding="same">
+               <family>Asana Math</family>
+               <default><family>math</family></default>
+       </alias>
+
+       <!-- Add language for math, to match other math fonts. -->
+       <match>
+               <test name="family">
+                       <string>math</string>
+               </test>
+               <edit name="lang" mode="prepend">
+                       <string>und-zmth</string>
+               </edit>
+       </match>
+
+       <match>
+               <test name="lang">
+                       <string>und-zmth</string>
+               </test>
+               <test qual="all" name="family" compare="not_eq">
+                       <string>math</string>
+               </test>
+
+               <!-- Add generic family -->
+               <edit name="family" mode="append" binding="strong">
+                       <string>math</string>
+               </edit>
+       </match>
+
+
+</fontconfig>

diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf
new file mode 100644 (file)
index 0000000..2a2b809
--- /dev/null
+++ b/fonts/conf.avail/60-generic.conf
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 45-generic.conf -->
+
+<!-- Emoji -->
+
+       <!-- Prefer to match color emoji font. -->
+       <match>
+               <test name="lang">
+                       <string>und-zsye</string>
+               </test>
+               <test qual="all" name="color" compare="not_eq">
+                       <bool>true</bool>
+               </test>
+               <test qual="all" name="color" compare="not_eq">
+                       <bool>false</bool>
+               </test>
+               <edit name="color" mode="append">
+                       <bool>true</bool>
+               </edit>
+       </match>
+
+       <!-- TODO
+        ! Match on "color" and alias B&W ones first if no color is requested.
+        ! That's "hard" because <alias> doesn't work in match and needs to be
+        ! expanded to its non-sugar form.
+        !-->
+       <alias binding="same">
+               <family>emoji</family>
+               <prefer>
+                       <family>Emoji Two</family>
+                       <family>Emoji One</family>
+                       <!-- System fonts -->
+                       <family>Noto Color Emoji</family> <!-- Google -->
+                       <family>Apple Color Emoji</family> <!-- Apple -->
+                       <family>Segoe UI Emoji</family> <!-- Microsoft -->
+                       <family>Twitter Color Emoji</family> <!-- Twitter -->
+                       <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+                       <!-- Non-color -->
+                       <family>Noto Emoji</family> <!-- Google -->
+                       <family>Android Emoji</family> <!-- Google -->
+               </prefer>
+       </alias>
+
+<!-- Math -->
+       <alias binding="same">
+               <!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+               <family>math</family>
+               <prefer>
+                       <family>XITS Math</family> <!-- Khaled Hosny -->
+                       <family>STIX Two Math</family> <!-- AMS -->
+                       <family>Cambria Math</family> <!-- Microsoft -->
+                       <family>Latin Modern Math</family> <!-- TeX -->
+                       <family>Minion Math</family> <!-- Adobe -->
+                       <family>Lucida Math</family> <!-- Adobe -->
+                       <family>Asana Math</family>
+               </prefer>
+       </alias>
+
+</fontconfig>

diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf
index 9306f74922ff79e4797dfa57afc9ab4f7214f1cb..7cedf3bd3962112e007ddedd74464ac1fb8ae248 100644 (file)
--- a/fonts/conf.avail/65-nonlatin.conf
+++ b/fonts/conf.avail/65-nonlatin.conf
@@ -96,9 +96,8 @@
                        <family>Hapax Berbère</family> <!-- tifinagh -->
                        <family>MS Gothic</family> <!-- han (ja) -->
                        <family>UmePlus P Gothic</family> <!-- han (ja) -->
-                       <!-- chinese fonts are actually serifed -->
-                       <family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
-                       <family>PMingLiu</family> <!-- han (zh-tw) -->
+                       <family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
+                       <family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
                        <family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
                        <family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
                        <family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->

diff --git a/fonts/conf.d/10-hinting-slight.conf b/fonts/conf.d/10-hinting-slight.conf
index 8206fa02d2a9a93192c6fa73d800db1b322f9e71..548814245d7c0f8bf1a35d631d1899c0f0f37b86 120000 (symlink)
--- a/fonts/conf.d/10-hinting-slight.conf
+++ b/fonts/conf.d/10-hinting-slight.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/10-hinting-slight.conf
\ No newline at end of file
+../conf.avail/10-hinting-slight.conf
\ No newline at end of file

diff --git a/fonts/conf.d/45-generic.conf b/fonts/conf.d/45-generic.conf
new file mode 120000 (symlink)
index 0000000..f187805
--- /dev/null
+++ b/fonts/conf.d/45-generic.conf
@@ -0,0 +1 @@
+/etc/fonts/conf.avail/45-generic.conf
\ No newline at end of file

diff --git a/fonts/conf.d/60-generic.conf b/fonts/conf.d/60-generic.conf
new file mode 120000 (symlink)
index 0000000..4fa65b5
--- /dev/null
+++ b/fonts/conf.d/60-generic.conf
@@ -0,0 +1 @@
+/etc/fonts/conf.avail/60-generic.conf
\ No newline at end of file