From: Frank Brehm Date: Thu, 7 Sep 2017 09:12:49 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=56d34b58527b8356d582c522fccc36eb1e06d864;p=config%2Fberta%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index 2a4ff6e..22c555b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -342,6 +342,10 @@ maybe chmod 0644 'filesystems' maybe chmod 0755 'fonts' maybe chmod 0755 'fonts/conf.avail' maybe chmod 0644 'fonts/conf.avail/10-autohint.conf' +maybe chmod 0644 'fonts/conf.avail/10-hinting-full.conf' +maybe chmod 0644 'fonts/conf.avail/10-hinting-medium.conf' +maybe chmod 0644 'fonts/conf.avail/10-hinting-none.conf' +maybe chmod 0644 'fonts/conf.avail/10-hinting-slight.conf' maybe chmod 0644 'fonts/conf.avail/10-no-sub-pixel.conf' maybe chmod 0644 'fonts/conf.avail/10-scale-bitmap-fonts.conf' maybe chmod 0644 'fonts/conf.avail/10-sub-pixel-bgr.conf' diff --git a/fonts/conf.avail/10-hinting-full.conf b/fonts/conf.avail/10-hinting-full.conf new file mode 100644 index 0000000..27d8229 --- /dev/null +++ b/fonts/conf.avail/10-hinting-full.conf @@ -0,0 +1,13 @@ + + + + + + hintfull + + diff --git a/fonts/conf.avail/10-hinting-medium.conf b/fonts/conf.avail/10-hinting-medium.conf new file mode 100644 index 0000000..e34ab5b --- /dev/null +++ b/fonts/conf.avail/10-hinting-medium.conf @@ -0,0 +1,13 @@ + + + + + + hintmedium + + diff --git a/fonts/conf.avail/10-hinting-none.conf b/fonts/conf.avail/10-hinting-none.conf new file mode 100644 index 0000000..0b3810d --- /dev/null +++ b/fonts/conf.avail/10-hinting-none.conf @@ -0,0 +1,13 @@ + + + + + + hintnone + + diff --git a/fonts/conf.avail/10-hinting-slight.conf b/fonts/conf.avail/10-hinting-slight.conf new file mode 100644 index 0000000..c244ac0 --- /dev/null +++ b/fonts/conf.avail/10-hinting-slight.conf @@ -0,0 +1,13 @@ + + + + + + hintslight + + diff --git a/fonts/conf.avail/10-scale-bitmap-fonts.conf b/fonts/conf.avail/10-scale-bitmap-fonts.conf index e3bcd46..b4e9cb4 100644 --- a/fonts/conf.avail/10-scale-bitmap-fonts.conf +++ b/fonts/conf.avail/10-scale-bitmap-fonts.conf @@ -2,8 +2,13 @@ + - + false @@ -13,10 +18,20 @@ + + + false + false + + true + @@ -30,20 +45,7 @@ - - - false - - - 64 - - - true - true @@ -55,7 +57,7 @@ If we *are* going to scale, go ahead and do it. --> - + false diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf index 08c8ba3..1f0778d 100644 --- a/fonts/conf.avail/30-metric-aliases.conf +++ b/fonts/conf.avail/30-metric-aliases.conf @@ -6,17 +6,17 @@ Alias similar/metric-compatible families from various sources: -PostScript fonts: URW fonts: GUST fonts: Windows fonts: -====================== ==================== ================= ================== -Helvetica Nimbus Sans L TeX Gyre Heros -Helvetica Condensed TeX Gyre Heros Cn -Times Nimbus Roman No9 L TeX Gyre Termes -Courier Nimbus Mono L TeX Gyre Cursor -ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor -ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style -ITC Zapf Chancery URW Chancery L TeX Gyre Chorus -Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype -New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook +PostScript fonts: URW fonts: GUST fonts: Windows fonts: +====================== ================== ================= ================== +Helvetica Nimbus Sans TeX Gyre Heros +Helvetica Narrow Nimbus Sans Narrow TeX Gyre Heros Cn +Times Nimbus Roman TeX Gyre Termes +Courier Nimbus Mono PS TeX Gyre Cursor +ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor +ITC Bookman URW Bookman TeX Gyre Bonum Bookman Old Style +ITC Zapf Chancery Z003 TeX Gyre Chorus +Palatino P052 TeX Gyre Pagella Palatino Linotype +New Century Schoolbook C059 TeX Gyre Schola Century Schoolbook Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: ================ ====================== ======================= ================= ============== @@ -56,6 +56,13 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Sans + + Helvetica + + + TeX Gyre Heros @@ -63,10 +70,17 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Sans Narrow + + Helvetica Narrow + + + TeX Gyre Heros Cn - Helvetica Condensed + Helvetica Narrow @@ -77,15 +91,19 @@ but in an order preferring similar designs first. We do this in three steps: - Nimbus Mono L @@ -94,6 +112,20 @@ but in an order preferring similar designs first. We do this in three steps: + + Nimbus Mono + + Courier + + + + + Nimbus Mono PS + + Courier + + + TeX Gyre Cursor @@ -115,6 +147,13 @@ but in an order preferring similar designs first. We do this in three steps: + + URW Gothic + + ITC Avant Garde Gothic + + + TeX Gyre Adventor @@ -136,6 +175,20 @@ but in an order preferring similar designs first. We do this in three steps: + + Bookman URW + + ITC Bookman + + + + + URW Bookman + + ITC Bookman + + + TeX Gyre Bonum @@ -164,6 +217,20 @@ but in an order preferring similar designs first. We do this in three steps: + + Chancery URW + + ITC Zapf Chancery + + + + + Z003 + + ITC Zapf Chancery + + + TeX Gyre Chorus @@ -178,6 +245,20 @@ but in an order preferring similar designs first. We do this in three steps: + + Palladio URW + + Palatino + + + + + P052 + + Palatino + + + TeX Gyre Pagella @@ -199,6 +280,20 @@ but in an order preferring similar designs first. We do this in three steps: + + Century SchoolBook URW + + New Century Schoolbook + + + + + C059 + + New Century Schoolbook + + + TeX Gyre Schola @@ -345,7 +440,7 @@ but in an order preferring similar designs first. We do this in three steps: - Helvetica Condensed + Helvetica Narrow Arial Narrow @@ -377,7 +472,7 @@ but in an order preferring similar designs first. We do this in three steps: Arial Narrow - Helvetica Condensed + Helvetica Narrow @@ -404,24 +499,24 @@ but in an order preferring similar designs first. We do this in three steps: Helvetica TeX Gyre Heros + Nimbus Sans Nimbus Sans L - Helvetica Condensed + Helvetica Narrow TeX Gyre Heros Cn + Nimbus Sans Narrow Times - + Nimbus Roman Nimbus Roman No9 L @@ -430,6 +525,8 @@ 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 @@ -438,6 +535,7 @@ 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 @@ -447,6 +545,8 @@ 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 @@ -455,6 +555,8 @@ 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 @@ -464,6 +566,8 @@ 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 @@ -473,6 +577,8 @@ 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/30-urw-aliases.conf b/fonts/conf.avail/30-urw-aliases.conf index e0d45da..cfde071 100644 --- a/fonts/conf.avail/30-urw-aliases.conf +++ b/fonts/conf.avail/30-urw-aliases.conf @@ -7,16 +7,25 @@ --> Zapf Dingbats - Dingbats + + D050000L + Dingbats + ITC Zapf Dingbats - Dingbats + + D050000L + Dingbats + Symbol + + Standard Symbols PS + Standard Symbols L diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf index aa62ed4..c6696f8 100644 --- a/fonts/conf.avail/45-latin.conf +++ b/fonts/conf.avail/45-latin.conf @@ -13,24 +13,32 @@ Bitstream Vera Serif serif + + Cambria + serif + + + Constantia + serif + DejaVu Serif serif - Liberation Serif + Elephant serif - Times New Roman + Garamond serif - Times + Georgia serif - Nimbus Roman No9 L + Liberation Serif serif @@ -38,151 +46,227 @@ serif - Thorndale AMT + MS Serif serif - Thorndale + Nimbus Roman No9 L serif - Georgia + Nimbus Roman serif - Garamond + Palatino Linotype serif - Palatino Linotype + Thorndale AMT serif - Trebuchet MS + Thorndale + serif + + + Times New Roman + serif + + + Times serif - Bitstream Vera Sans + Albany AMT sans-serif - DejaVu Sans + Albany sans-serif - Liberation Sans + Arial Unicode MS sans-serif Arial sans-serif + + Bitstream Vera Sans + sans-serif + + + Britannic + sans-serif + + + Calibri + sans-serif + + + Candara + sans-serif + + + Century Gothic + sans-serif + + + Corbel + sans-serif + + + DejaVu Sans + sans-serif + Helvetica sans-serif - Verdana + Haettenschweiler sans-serif - Albany AMT + Liberation Sans sans-serif - Albany + MS Sans Serif sans-serif Nimbus Sans L sans-serif + + Nimbus Sans + sans-serif + Luxi Sans sans-serif + + Tahoma + sans-serif + + + Trebuchet MS + sans-serif + + + Twentieth Century + sans-serif + + + Verdana + sans-serif + + + Andale Mono + monospace + Bitstream Vera Sans Mono monospace - DejaVu Sans Mono + Consolas monospace - Liberation Mono + Courier New monospace - Inconsolata + Courier monospace - Courier New + Cumberland AMT monospace - Courier + Cumberland monospace - Andale Mono + DejaVu Sans Mono monospace - Luxi Mono + Fixedsys monospace - Cumberland AMT + Inconsolata monospace - Cumberland + Liberation Mono + monospace + + + Luxi Mono monospace Nimbus Mono L monospace + + Nimbus Mono + monospace + + + Nimbus Mono PS + monospace + + + Terminal + monospace + - - Impact + + Bauhaus Std fantasy - Copperplate Gothic Std + Cooper Std fantasy - Cooper Std + Copperplate Gothic Std fantasy - Bauhaus Std + Impact fantasy - ITC Zapf Chancery Std + Comic Sans MS cursive - Zapfino + ITC Zapf Chancery Std cursive - Comic Sans MS + Zapfino cursive diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf index dc1205f..65063bb 100644 --- a/fonts/conf.avail/60-latin.conf +++ b/fonts/conf.avail/60-latin.conf @@ -4,43 +4,50 @@ serif + Liberation Serif DejaVu Serif - Bitstream Vera Serif Times New Roman - Thorndale AMT Luxi Serif Nimbus Roman No9 L + Nimbus Roman Times + Thorndale AMT + Bitstream Vera Serif sans-serif + Liberation Sans DejaVu Sans - Bitstream Vera Sans + Arial Luxi Sans Nimbus Sans L - Arial - Albany AMT + Nimbus Sans Helvetica - Verdana Lucida Sans Unicode BPG Glaho International + Verdana Tahoma + Albany AMT + Bitstream Vera Sans monospace + Liberation Mono DejaVu Sans Mono - Bitstream Vera Sans Mono Inconsolata - Luxi Mono - Nimbus Mono L Andale Mono Courier New - Cumberland AMT + Luxi Mono + Nimbus Mono L + Nimbus Mono + Nimbus Mono PS Courier + Cumberland AMT + Bitstream Vera Sans Mono - - 0x0020 - 0x00A0 - 0x00AD - 0x034F - 0x0600 - 0x0601 - 0x0602 - 0x0603 - 0x06DD - 0x070F - 0x115F - 0x1160 - 0x1680 - 0x17B4 - 0x17B5 - 0x180E - 0x2000 - 0x2001 - 0x2002 - 0x2003 - 0x2004 - 0x2005 - 0x2006 - 0x2007 - 0x2008 - 0x2009 - 0x200A - 0x200B - 0x200C - 0x200D - 0x200E - 0x200F - 0x2028 - 0x2029 - 0x202A - 0x202B - 0x202C - 0x202D - 0x202E - 0x202F - 0x205F - 0x2060 - 0x2061 - 0x2062 - 0x2063 - 0x206A - 0x206B - 0x206C - 0x206D - 0x206E - 0x206F - 0x2800 - 0x3000 - 0x3164 - 0xFEFF - 0xFFA0 - 0xFFF9 - 0xFFFA - 0xFFFB -