From cc977917d4a5b0d23565502fefc6f0bb3c365a6c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Mon, 26 Feb 2018 17:34:01 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 2 + fonts/conf.avail/30-metric-aliases.conf | 29 +----- fonts/conf.avail/45-generic.conf | 128 ++++++++++++++++++++++++ fonts/conf.avail/60-generic.conf | 61 +++++++++++ fonts/conf.avail/65-nonlatin.conf | 5 +- fonts/conf.d/10-hinting-slight.conf | 2 +- fonts/conf.d/45-generic.conf | 1 + fonts/conf.d/60-generic.conf | 1 + 8 files changed, 199 insertions(+), 30 deletions(-) create mode 100644 fonts/conf.avail/45-generic.conf create mode 100644 fonts/conf.avail/60-generic.conf create mode 120000 fonts/conf.d/45-generic.conf create mode 120000 fonts/conf.d/60-generic.conf diff --git a/.etckeeper b/.etckeeper index 033e7013..2af1a686 100755 --- 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 1f0778d6..c755c5e9 100644 --- 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 --> @@ -308,7 +311,6 @@ but in an order preferring similar designs first. We do this in three steps: - Arimo @@ -460,7 +462,6 @@ but in an order preferring similar designs first. We do this in three steps: - Arial @@ -490,8 +491,6 @@ but in an order preferring similar designs first. We do this in three steps: - - @@ -499,8 +498,6 @@ but in an order preferring similar designs first. We do this in three steps: Helvetica TeX Gyre Heros - Nimbus Sans - Nimbus Sans L @@ -508,7 +505,6 @@ but in an order preferring similar designs first. We do this in three steps: Helvetica Narrow TeX Gyre Heros Cn - Nimbus Sans Narrow @@ -516,8 +512,6 @@ but in an order preferring similar designs first. We do this in three steps: Times TeX Gyre Termes - Nimbus Roman - Nimbus Roman No9 L @@ -525,9 +519,6 @@ but in an order preferring similar designs first. We do this in three steps: Courier TeX Gyre Cursor - Nimbus Mono PS - Nimbus Mono - Nimbus Mono L @@ -535,8 +526,6 @@ but in an order preferring similar designs first. We do this in three steps: ITC Avant Garde Gothic TeX Gyre Adventor - URW Gothic - URW Gothic L @@ -545,9 +534,6 @@ but in an order preferring similar designs first. We do this in three steps: Bookman Old Style TeX Gyre Bonum - URW Bookman - Bookman URW - URW Bookman L @@ -555,9 +541,6 @@ but in an order preferring similar designs first. We do this in three steps: ITC Zapf Chancery TeX Gyre Chorus - Z003 - Chancery URW - URW Chancery L @@ -566,9 +549,6 @@ but in an order preferring similar designs first. We do this in three steps: Palatino Linotype TeX Gyre Pagella - P052 - Palladio URW - URW Palladio L @@ -577,9 +557,6 @@ but in an order preferring similar designs first. We do this in three steps: Century Schoolbook TeX Gyre Schola - C059 - Century SchoolBook URW - Century Schoolbook L diff --git a/fonts/conf.avail/45-generic.conf b/fonts/conf.avail/45-generic.conf new file mode 100644 index 00000000..f6076bb3 --- /dev/null +++ b/fonts/conf.avail/45-generic.conf @@ -0,0 +1,128 @@ + + + + + + + + + Emoji Two + emoji + + + Emoji One + emoji + + + Noto Color Emoji + emoji + + + Apple Color Emoji + emoji + + + Segoe UI Emoji + emoji + + + Twitter Color Emoji + emoji + + + EmojiOne Mozilla + emoji + + + + Noto Emoji + emoji + + + Android Emoji + emoji + + + + + + emoji + + + und-zsye + + + + + + und-zsye + + + emoji + + + + + emoji + + + + + + + + + XITS Math + math + + + STIX Two Math + math + + + Cambria Math + math + + + Latin Modern Math + math + + + Minion Math + math + + + Lucida Math + math + + + Asana Math + math + + + + + + math + + + und-zmth + + + + + + und-zmth + + + math + + + + + math + + + + + diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf new file mode 100644 index 00000000..2a2b809d --- /dev/null +++ b/fonts/conf.avail/60-generic.conf @@ -0,0 +1,61 @@ + + + + + + + + + + + und-zsye + + + true + + + false + + + true + + + + + + emoji + + Emoji Two + Emoji One + + Noto Color Emoji + Apple Color Emoji + Segoe UI Emoji + Twitter Color Emoji + EmojiOne Mozilla + + Noto Emoji + Android Emoji + + + + + + + math + + XITS Math + STIX Two Math + Cambria Math + Latin Modern Math + Minion Math + Lucida Math + Asana Math + + + + diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf index 9306f749..7cedf3bd 100644 --- a/fonts/conf.avail/65-nonlatin.conf +++ b/fonts/conf.avail/65-nonlatin.conf @@ -96,9 +96,8 @@ Hapax Berbère MS Gothic UmePlus P Gothic - - SimSun - PMingLiu + Microsoft YaHei + Microsoft JhengHei WenQuanYi Zen Hei WenQuanYi Bitmap Song AR PL ShanHeiSun Uni diff --git a/fonts/conf.d/10-hinting-slight.conf b/fonts/conf.d/10-hinting-slight.conf index 8206fa02..54881424 120000 --- 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 index 00000000..f1878058 --- /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 index 00000000..4fa65b59 --- /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 -- 2.39.5