From a3f1b353e7d659d811ede42f2ac5d377859f63e6 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 14 Sep 2018 15:48:44 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- fonts/conf.avail/10-autohint.conf | 5 +++++ fonts/conf.avail/10-hinting-full.conf | 6 ++++++ fonts/conf.avail/10-hinting-medium.conf | 6 ++++++ fonts/conf.avail/10-hinting-none.conf | 6 ++++++ fonts/conf.avail/10-hinting-slight.conf | 6 ++++++ fonts/conf.avail/10-no-sub-pixel.conf | 5 +++++ fonts/conf.avail/10-scale-bitmap-fonts.conf | 4 ++++ fonts/conf.avail/10-sub-pixel-bgr.conf | 5 +++++ fonts/conf.avail/10-sub-pixel-rgb.conf | 5 +++++ fonts/conf.avail/10-sub-pixel-vbgr.conf | 5 +++++ fonts/conf.avail/10-sub-pixel-vrgb.conf | 5 +++++ fonts/conf.avail/10-unhinted.conf | 5 +++++ fonts/conf.avail/11-lcdfilter-default.conf | 5 +++++ fonts/conf.avail/11-lcdfilter-legacy.conf | 5 +++++ fonts/conf.avail/11-lcdfilter-light.conf | 5 +++++ fonts/conf.avail/20-unhint-small-vera.conf | 5 +++++ fonts/conf.avail/25-unhint-nonlatin.conf | 4 ++++ fonts/conf.avail/30-metric-aliases.conf | 5 +++++ fonts/conf.avail/40-nonlatin.conf | 5 +++++ fonts/conf.avail/45-generic.conf | 22 ++++++++++++++------- fonts/conf.avail/45-latin.conf | 5 +++++ fonts/conf.avail/49-sansserif.conf | 5 +++++ fonts/conf.avail/50-user.conf | 5 +++++ fonts/conf.avail/51-local.conf | 5 +++++ fonts/conf.avail/60-generic.conf | 10 ++++++++-- fonts/conf.avail/60-latin.conf | 5 +++++ fonts/conf.avail/65-fonts-persian.conf | 4 ++++ fonts/conf.avail/65-khmer.conf | 4 ++++ fonts/conf.avail/65-nonlatin.conf | 5 +++++ fonts/conf.avail/69-unifont.conf | 4 ++++ fonts/conf.avail/70-no-bitmaps.conf | 5 +++++ fonts/conf.avail/70-yes-bitmaps.conf | 5 +++++ fonts/conf.avail/80-delicious.conf | 4 ++++ fonts/conf.avail/90-synthetic.conf | 10 +++++++--- fonts/conf.d/45-generic.conf | 2 +- fonts/conf.d/60-generic.conf | 2 +- fonts/fonts.conf | 5 +++++ 37 files changed, 190 insertions(+), 14 deletions(-) diff --git a/fonts/conf.avail/10-autohint.conf b/fonts/conf.avail/10-autohint.conf index f9032ba..50ec3b4 100644 --- a/fonts/conf.avail/10-autohint.conf +++ b/fonts/conf.avail/10-autohint.conf @@ -1,6 +1,11 @@ + + + + + Enable autohinter diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf index c755c5e..147fde6 100644 --- a/fonts/conf.avail/30-metric-aliases.conf +++ b/fonts/conf.avail/30-metric-aliases.conf @@ -1,6 +1,11 @@ + + + + + Set substitutions for similar/metric-compatible families + - Emoji Two + Noto Color Emoji emoji - Emoji One + Apple Color Emoji emoji - Noto Color Emoji + Segoe UI Emoji emoji - Apple Color Emoji + Twitter Color Emoji emoji - Segoe UI Emoji + EmojiOne Mozilla emoji + - Twitter Color Emoji + Emoji Two emoji - EmojiOne Mozilla + Emoji One emoji diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf index c6696f8..a9240b9 100644 --- a/fonts/conf.avail/45-latin.conf +++ b/fonts/conf.avail/45-latin.conf @@ -1,6 +1,11 @@ + + + + + Set substitutions for Latin fonts diff --git a/fonts/conf.avail/50-user.conf b/fonts/conf.avail/50-user.conf index 07c9182..681ed6d 100644 --- a/fonts/conf.avail/50-user.conf +++ b/fonts/conf.avail/50-user.conf @@ -1,6 +1,11 @@ + + + + + Load per-user customization files local.conf diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf index 2a2b809..be7b52b 100644 --- a/fonts/conf.avail/60-generic.conf +++ b/fonts/conf.avail/60-generic.conf @@ -1,6 +1,11 @@ + + + + + Set preferable fonts for emoji/math fonts @@ -29,14 +34,15 @@ emoji - Emoji Two - Emoji One Noto Color Emoji Apple Color Emoji Segoe UI Emoji Twitter Color Emoji EmojiOne Mozilla + + Emoji Two + Emoji One Noto Emoji Android Emoji diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf index 65063bb..6c598ee 100644 --- a/fonts/conf.avail/60-latin.conf +++ b/fonts/conf.avail/60-latin.conf @@ -1,6 +1,11 @@ + + + + + Set preferable fonts for Latin serif diff --git a/fonts/conf.avail/65-fonts-persian.conf b/fonts/conf.avail/65-fonts-persian.conf index ea00661..5591486 100644 --- a/fonts/conf.avail/65-fonts-persian.conf +++ b/fonts/conf.avail/65-fonts-persian.conf @@ -31,6 +31,10 @@ 2008 Behdad Esfahbod: Cleanup. Add fantasy and cursive. --> + + + + diff --git a/fonts/conf.avail/65-khmer.conf b/fonts/conf.avail/65-khmer.conf index f9d06f2..8985c0d 100644 --- a/fonts/conf.avail/65-khmer.conf +++ b/fonts/conf.avail/65-khmer.conf @@ -1,6 +1,10 @@ + + + + serif diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf index 7cedf3b..dcbb677 100644 --- a/fonts/conf.avail/65-nonlatin.conf +++ b/fonts/conf.avail/65-nonlatin.conf @@ -1,6 +1,11 @@ + + + + + Set preferable fonts for non-Latin serif diff --git a/fonts/conf.avail/69-unifont.conf b/fonts/conf.avail/69-unifont.conf index 177dec5..a3586f2 100644 --- a/fonts/conf.avail/69-unifont.conf +++ b/fonts/conf.avail/69-unifont.conf @@ -1,6 +1,10 @@ + + + + serif diff --git a/fonts/conf.avail/70-no-bitmaps.conf b/fonts/conf.avail/70-no-bitmaps.conf index 6b506e8..efb1bc0 100644 --- a/fonts/conf.avail/70-no-bitmaps.conf +++ b/fonts/conf.avail/70-no-bitmaps.conf @@ -1,6 +1,11 @@ + + + + + Reject bitmap fonts diff --git a/fonts/conf.avail/70-yes-bitmaps.conf b/fonts/conf.avail/70-yes-bitmaps.conf index c153aeb..0c70a53 100644 --- a/fonts/conf.avail/70-yes-bitmaps.conf +++ b/fonts/conf.avail/70-yes-bitmaps.conf @@ -1,6 +1,11 @@ + + + + + Accept bitmap fonts diff --git a/fonts/conf.avail/80-delicious.conf b/fonts/conf.avail/80-delicious.conf index 845647b..8cd01f9 100644 --- a/fonts/conf.avail/80-delicious.conf +++ b/fonts/conf.avail/80-delicious.conf @@ -1,6 +1,10 @@ + + + + diff --git a/fonts/conf.avail/90-synthetic.conf b/fonts/conf.avail/90-synthetic.conf index b8d1e85..e344e4a 100644 --- a/fonts/conf.avail/90-synthetic.conf +++ b/fonts/conf.avail/90-synthetic.conf @@ -1,6 +1,10 @@ + + + + @@ -40,11 +44,11 @@ - medium + regular - - medium + + bold + + + + + Default configuration file