saving uncommitted changes in /etc prior to emerge run

diff --git a/fonts/conf.avail/10-autohint.conf b/fonts/conf.avail/10-autohint.conf
index f9032ba3134c88f95a0a756c0beb0ad461e8baa5..50ec3b44e66e6822ca83367ec60542710901b1c3 100644 (file)
--- a/fonts/conf.avail/10-autohint.conf
+++ b/fonts/conf.avail/10-autohint.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable autohinter</description>
 <!--  Use the Autohinter --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-hinting-full.conf b/fonts/conf.avail/10-hinting-full.conf
index 27d8229195c647c3576383363632cb70cb053808..aff7976613c6dc36f9b8336f6e3251e82d39bada 100644 (file)
--- a/fonts/conf.avail/10-hinting-full.conf
+++ b/fonts/conf.avail/10-hinting-full.conf
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintfull to hintstyle</description>
+
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.

diff --git a/fonts/conf.avail/10-hinting-medium.conf b/fonts/conf.avail/10-hinting-medium.conf
index e34ab5b344dc12b7aa5377bc59d6b57af38d6a36..1d49f3a8cf520f90ec03a47eebf33ae479f9706d 100644 (file)
--- a/fonts/conf.avail/10-hinting-medium.conf
+++ b/fonts/conf.avail/10-hinting-medium.conf
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintmedium to hintstyle</description>
+
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.

diff --git a/fonts/conf.avail/10-hinting-none.conf b/fonts/conf.avail/10-hinting-none.conf
index 0b3810d948513bb8fd60ffd63f83ed5bdc8e415d..a134ed8dda5f863f0bd1f7ed5bff306558f74fc0 100644 (file)
--- a/fonts/conf.avail/10-hinting-none.conf
+++ b/fonts/conf.avail/10-hinting-none.conf
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintnone to hintstyle</description>
+
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.

diff --git a/fonts/conf.avail/10-hinting-slight.conf b/fonts/conf.avail/10-hinting-slight.conf
index c244ac0b0e856999d531ae8c7b014728ffdf77cc..f00bcd39568dbe1e8d00fa6bcaacdbdab55145f6 100644 (file)
--- a/fonts/conf.avail/10-hinting-slight.conf
+++ b/fonts/conf.avail/10-hinting-slight.conf
@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintslight to hintstyle</description>
+
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.

diff --git a/fonts/conf.avail/10-no-sub-pixel.conf b/fonts/conf.avail/10-no-sub-pixel.conf
index 635847c404490b3b8af6c3717d0bbfaa22c87166..4fd1776df7da3a023668eac2aacd3ee5a153155d 100644 (file)
--- a/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/fonts/conf.avail/10-no-sub-pixel.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable sub-pixel rendering</description>
 <!--  Disable sub-pixel rendering --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-scale-bitmap-fonts.conf b/fonts/conf.avail/10-scale-bitmap-fonts.conf
index b4e9cb4f233c9179a7a6361ddf82c45033aadc6e..ebb6c7b5e72a05a27919957017e452cf4246bb66 100644 (file)
--- a/fonts/conf.avail/10-scale-bitmap-fonts.conf
+++ b/fonts/conf.avail/10-scale-bitmap-fonts.conf
@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
 
+  <description>Bitmap scaling</description>
 <!--
   If font is bitmap, calculate scale factor.
   Note that color bitmap fonts have scalable=true, while

diff --git a/fonts/conf.avail/10-sub-pixel-bgr.conf b/fonts/conf.avail/10-sub-pixel-bgr.conf
index 1378195dd3d9d9ff1fff53bd355d0070b84066c3..241e589d8730c1d1896622da4d9b20324cf88273 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-bgr.conf
+++ b/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the BGR stripes layout</description>
 <!--  Enable sub-pixel rendering --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-sub-pixel-rgb.conf b/fonts/conf.avail/10-sub-pixel-rgb.conf
index 757c3b6a775de75451189aa3695be46ce5be0dda..1cb103db75b7c9c0feec5562bee9ab590498976d 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-rgb.conf
+++ b/fonts/conf.avail/10-sub-pixel-rgb.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the RGB stripes layout</description>
 <!--  Enable sub-pixel rendering --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-sub-pixel-vbgr.conf b/fonts/conf.avail/10-sub-pixel-vbgr.conf
index c807e5c0550603dd36cd1715a3fbca244c457517..1a0690af454ca157a91441214f82f9e31478a81f 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-vbgr.conf
+++ b/fonts/conf.avail/10-sub-pixel-vbgr.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the vertical BGR stripes layout</description>
 <!--  Enable sub-pixel rendering --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-sub-pixel-vrgb.conf b/fonts/conf.avail/10-sub-pixel-vrgb.conf
index b5985e03c32481809d2c11738387184260622221..61bc66325d4dd92f9c6c4debd01f50a72bdfe833 100644 (file)
--- a/fonts/conf.avail/10-sub-pixel-vrgb.conf
+++ b/fonts/conf.avail/10-sub-pixel-vrgb.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Enable sub-pixel rendering with the vertical RGB stripes layout</description>
 <!--  Enable sub-pixel rendering --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/10-unhinted.conf b/fonts/conf.avail/10-unhinted.conf
index a25e3b1dc9d8e7481ff056ef8b4ff4bf92f00269..f92df0c67e3fd467c9921f65b753cf2b75103d36 100644 (file)
--- a/fonts/conf.avail/10-unhinted.conf
+++ b/fonts/conf.avail/10-unhinted.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable hinting</description>
 <!--  Disable hinting --> 
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/11-lcdfilter-default.conf b/fonts/conf.avail/11-lcdfilter-default.conf
index 9d7d11f90ad786877efc7597a0e84d3c8c29630c..929caaa20806d09e86f3741184eafad9d501901c 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-default.conf
+++ b/fonts/conf.avail/11-lcdfilter-default.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcddefault as default for LCD filter</description>
 <!--  Use lcddefault as default for LCD filter -->
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/11-lcdfilter-legacy.conf b/fonts/conf.avail/11-lcdfilter-legacy.conf
index 7e2b25675576925adbc9aab04b53aec4d7a4ed0f..25c363510feb6a96eff06253987291224012fe51 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-legacy.conf
+++ b/fonts/conf.avail/11-lcdfilter-legacy.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcdlegacy as default for LCD filter</description>
 <!--  Use lcdlegacy as default for LCD filter -->
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/11-lcdfilter-light.conf b/fonts/conf.avail/11-lcdfilter-light.conf
index 0dd0a9007a0b6991964ea493109fc261c823a00c..6f1eb3deb7d0e874ad030be8dc05510553317715 100644 (file)
--- a/fonts/conf.avail/11-lcdfilter-light.conf
+++ b/fonts/conf.avail/11-lcdfilter-light.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Use lcdlight as default for LCD filter</description>
 <!--  Use lcdlight as default for LCD filter -->
   <match target="pattern">
     <!--

diff --git a/fonts/conf.avail/20-unhint-small-vera.conf b/fonts/conf.avail/20-unhint-small-vera.conf
index c9505ca8e46893b1cecae8bed449bae8ebe1fd33..7b3d7bdf82bcc768a2bd4f513ed5b8ed3389820e 100644 (file)
--- a/fonts/conf.avail/20-unhint-small-vera.conf
+++ b/fonts/conf.avail/20-unhint-small-vera.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable hinting for Bitstream Vera fonts when the size is less than 8ppem</description>
 <!-- 
        The Bitstream Vera fonts have GASP entries suggesting that hinting be
        disabled below 8 ppem, but FreeType ignores those, preferring to use

diff --git a/fonts/conf.avail/25-unhint-nonlatin.conf b/fonts/conf.avail/25-unhint-nonlatin.conf
index 9adffa71a729b5bac53be23c5eb1412c54455538..78cc7a3c78e4b6e6d93533dc3343ddf31faff385 100644 (file)
--- a/fonts/conf.avail/25-unhint-nonlatin.conf
+++ b/fonts/conf.avail/25-unhint-nonlatin.conf
@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
 
+  <description>Disable hinting for CJK fonts</description>
 <!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
 
        <match target="font">

diff --git a/fonts/conf.avail/30-metric-aliases.conf b/fonts/conf.avail/30-metric-aliases.conf
index c755c5e96ca0dfd7610c4524b4e96201f201bab6..147fde6b1c6ac48eed22a2a8bf47593f8e0a77e9 100644 (file)
--- a/fonts/conf.avail/30-metric-aliases.conf
+++ b/fonts/conf.avail/30-metric-aliases.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for similar/metric-compatible families</description>
 
 <!--
 

diff --git a/fonts/conf.avail/40-nonlatin.conf b/fonts/conf.avail/40-nonlatin.conf
index c900fd4e7f9a110afaca195050834350e83c4c5e..0af8832fa63abdd4a78a4741dfdd678960eba621 100644 (file)
--- a/fonts/conf.avail/40-nonlatin.conf
+++ b/fonts/conf.avail/40-nonlatin.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for non-Latin fonts</description>
 <!--
   Mark common families with their generics so we'll get
   something reasonable

diff --git a/fonts/conf.avail/45-generic.conf b/fonts/conf.avail/45-generic.conf
index f6076bb3e55c5e05a9952b3b464b99a56a9f53bd..e8d19789c667ccd4183d875d935c8909c3a30be0 100644 (file)
--- a/fonts/conf.avail/45-generic.conf
+++ b/fonts/conf.avail/45-generic.conf
@@ -1,36 +1,44 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for emoji/math fonts</description>
+
 <!-- Keep in sync with 60-generic.conf -->
 
 <!-- Emoji -->
 
+       <!-- System emoji -->
        <alias binding="same">
-               <family>Emoji Two</family>
+               <family>Noto Color Emoji</family> <!-- Google -->
                <default><family>emoji</family></default>
        </alias>
        <alias binding="same">
-               <family>Emoji One</family>
+               <family>Apple Color Emoji</family> <!-- Apple -->
                <default><family>emoji</family></default>
        </alias>
        <alias binding="same">
-               <family>Noto Color Emoji</family> <!-- Google -->
+               <family>Segoe UI Emoji</family> <!-- Microsoft -->
                <default><family>emoji</family></default>
        </alias>
        <alias binding="same">
-               <family>Apple Color Emoji</family> <!-- Apple -->
+               <family>Twitter Color Emoji</family> <!-- Twitter -->
                <default><family>emoji</family></default>
        </alias>
        <alias binding="same">
-               <family>Segoe UI Emoji</family> <!-- Microsoft -->
+               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
                <default><family>emoji</family></default>
        </alias>
+       <!-- Third-party emoji -->
        <alias binding="same">
-               <family>Twitter Color Emoji</family> <!-- Twitter -->
+               <family>Emoji Two</family>
                <default><family>emoji</family></default>
        </alias>
        <alias binding="same">
-               <family>EmojiOne Mozilla</family> <!-- Mozilla -->
+               <family>Emoji One</family>
                <default><family>emoji</family></default>
        </alias>
        <!-- B&W -->

diff --git a/fonts/conf.avail/45-latin.conf b/fonts/conf.avail/45-latin.conf
index c6696f8d6f24213dbeb36d76b36b686cd5d5f32a..a9240b94353cdfe5bc28a8a596488d313dd9542f 100644 (file)
--- a/fonts/conf.avail/45-latin.conf
+++ b/fonts/conf.avail/45-latin.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for Latin fonts</description>
 <!--
   Mark common families with their generics so we'll get
   something reasonable

diff --git a/fonts/conf.avail/49-sansserif.conf b/fonts/conf.avail/49-sansserif.conf
index c6209a7d3157390b784b51d0afed0491e2b54289..8b587b00a2a6eeac4783365ad5e7487c69642470 100644 (file)
--- a/fonts/conf.avail/49-sansserif.conf
+++ b/fonts/conf.avail/49-sansserif.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Add sans-serif to the family when no generic name</description>
 <!--
   If the font still has no generic name, add sans-serif
  -->

diff --git a/fonts/conf.avail/50-user.conf b/fonts/conf.avail/50-user.conf
index 07c9182e788c244f561138134948046907f9510b..681ed6da0f50d6e61bc84ae9ef09be559939f4ab 100644 (file)
--- a/fonts/conf.avail/50-user.conf
+++ b/fonts/conf.avail/50-user.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Load per-user customization files</description>
        <!--
            Load per-user customization files where stored on XDG Base Directory
            specification compliant places. it should be usually:

diff --git a/fonts/conf.avail/51-local.conf b/fonts/conf.avail/51-local.conf
index ca9fbe1959241d60ea1ae3c122ce9ab3bffbe54b..885c3576c021447d5fbbe9d0cc3b5e94ebe69cbe 100644 (file)
--- a/fonts/conf.avail/51-local.conf
+++ b/fonts/conf.avail/51-local.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Load local customization file</description>
        <!-- Load local system customization file -->
        <include ignore_missing="yes">local.conf</include>
 </fontconfig>

diff --git a/fonts/conf.avail/60-generic.conf b/fonts/conf.avail/60-generic.conf
index 2a2b809db14c5c2b958dc443e280322f3e489bb9..be7b52b3afd3e97e86b040f3463d96fee62d7ddf 100644 (file)
--- a/fonts/conf.avail/60-generic.conf
+++ b/fonts/conf.avail/60-generic.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for emoji/math fonts</description>
 <!-- Keep in sync with 45-generic.conf -->
 
 <!-- Emoji -->
@@ -29,14 +34,15 @@
        <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 -->
+                       <!-- Third-Party fonts -->
+                       <family>Emoji Two</family>
+                       <family>Emoji One</family>
                        <!-- Non-color -->
                        <family>Noto Emoji</family> <!-- Google -->
                        <family>Android Emoji</family> <!-- Google -->

diff --git a/fonts/conf.avail/60-latin.conf b/fonts/conf.avail/60-latin.conf
index 65063bbe9df0410707d8c6f3da7855b5a09b97ac..6c598ee9a6563e32392d5f9546b0ba56b139e9d9 100644 (file)
--- a/fonts/conf.avail/60-latin.conf
+++ b/fonts/conf.avail/60-latin.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for Latin</description>
        <alias>
                <family>serif</family>
                <prefer>

diff --git a/fonts/conf.avail/65-fonts-persian.conf b/fonts/conf.avail/65-fonts-persian.conf
index ea00661208a1831aae067603879543b1f55dc1cb..5591486ee44eff50d53f777898c9857a1e978439 100644 (file)
--- 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.
   -->
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
 
 
 <!-- Deprecated fonts are discouraged -->

diff --git a/fonts/conf.avail/65-khmer.conf b/fonts/conf.avail/65-khmer.conf
index f9d06f2a97ade12a7dfac4be6c91b4746e0c2041..8985c0debe5d789e5c0572eab8003120fff427f6 100644 (file)
--- a/fonts/conf.avail/65-khmer.conf
+++ b/fonts/conf.avail/65-khmer.conf
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
        <alias>
                <family>serif</family>
                <prefer>

diff --git a/fonts/conf.avail/65-nonlatin.conf b/fonts/conf.avail/65-nonlatin.conf
index 7cedf3bd3962112e007ddedd74464ac1fb8ae248..dcbb677075ea6dd0e3eaf86c9958d726a3e3650a 100644 (file)
--- a/fonts/conf.avail/65-nonlatin.conf
+++ b/fonts/conf.avail/65-nonlatin.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set preferable fonts for non-Latin</description>
        <alias>
                <family>serif</family>
                <prefer>

diff --git a/fonts/conf.avail/69-unifont.conf b/fonts/conf.avail/69-unifont.conf
index 177dec5d4ed0d0990566c5a97edab630bbaffa35..a3586f295361f0d34dc57feae37edba28d281027 100644 (file)
--- a/fonts/conf.avail/69-unifont.conf
+++ b/fonts/conf.avail/69-unifont.conf
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
        <alias>
                <family>serif</family>
                <prefer>

diff --git a/fonts/conf.avail/70-no-bitmaps.conf b/fonts/conf.avail/70-no-bitmaps.conf
index 6b506e82a0ad713bad18e422682e72f9c9355960..efb1bc00aaa72c8e86acf8e5ee9b5e56a1ed0cd3 100644 (file)
--- a/fonts/conf.avail/70-no-bitmaps.conf
+++ b/fonts/conf.avail/70-no-bitmaps.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Reject bitmap fonts</description>
 <!-- Reject bitmap fonts -->
  <selectfont>
   <rejectfont>

diff --git a/fonts/conf.avail/70-yes-bitmaps.conf b/fonts/conf.avail/70-yes-bitmaps.conf
index c153aebdca9279c0ed870c77bc3cf07b047f27b6..0c70a5343327a0c5e572399dfa3ff019b7817cba 100644 (file)
--- a/fonts/conf.avail/70-yes-bitmaps.conf
+++ b/fonts/conf.avail/70-yes-bitmaps.conf
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Accept bitmap fonts</description>
 <!-- Accept bitmap fonts -->
  <selectfont>
   <acceptfont>

diff --git a/fonts/conf.avail/80-delicious.conf b/fonts/conf.avail/80-delicious.conf
index 845647bed44a105c4fc79455c1fbc1ec4bca667a..8cd01f98927552298909faa0d9221d47d7b9a11e 100644 (file)
--- a/fonts/conf.avail/80-delicious.conf
+++ b/fonts/conf.avail/80-delicious.conf
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
 <!-- Fix-ups for Delicious family -->
 
 <!-- Delicious 'heavy' variant says its Medium weight -->

diff --git a/fonts/conf.avail/90-synthetic.conf b/fonts/conf.avail/90-synthetic.conf
index b8d1e85e1fb4526e1fd0111e5ec104c20db067c6..e344e4a5b6fbcc3183c5411bd6e4cc093acb1b1a 100644 (file)
--- a/fonts/conf.avail/90-synthetic.conf
+++ b/fonts/conf.avail/90-synthetic.conf
@@ -1,6 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
 <!-- 
  Artificial oblique for fonts without an italic or oblique version
  -->
@@ -40,11 +44,11 @@
        <match target="font">
                <!-- check to see if the font is just regular -->
                <test name="weight" compare="less_eq">
-                       <const>medium</const>
+                       <const>regular</const>
                </test>
                <!-- check to see if the pattern requests bold -->
-               <test target="pattern" name="weight" compare="more">
-                       <const>medium</const>
+               <test target="pattern" name="weight" compare="more_eq">
+                       <const>bold</const>
                </test>
                <!--
                  set the embolden flag

diff --git a/fonts/conf.d/45-generic.conf b/fonts/conf.d/45-generic.conf
index f1878058a77434d7b661a52ca200a06f6d7681ed..1f25c2ca4a8625176ec81e32bbaae18f56c322af 120000 (symlink)
--- a/fonts/conf.d/45-generic.conf
+++ b/fonts/conf.d/45-generic.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/45-generic.conf
\ No newline at end of file
+../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
index 4fa65b59ea78661b71d062937396bfa842de40c8..aba0e095c4870ed90ba00953656583e496f93085 120000 (symlink)
--- a/fonts/conf.d/60-generic.conf
+++ b/fonts/conf.d/60-generic.conf
@@ -1 +1 @@
-/etc/fonts/conf.avail/60-generic.conf
\ No newline at end of file
+../conf.avail/60-generic.conf
\ No newline at end of file

diff --git a/fonts/fonts.conf b/fonts/fonts.conf
index a1e4b53c2ca8c5936955f3b7095f6689bfb5b0a0..8033ccf48fdd0189426f09eaf2b99e0299e7da69 100644 (file)
--- a/fonts/fonts.conf
+++ b/fonts/fonts.conf
@@ -2,6 +2,11 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/fonts.conf file to configure system font access -->
 <fontconfig>
+       <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+               <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+       </its:rules>
+
+       <description>Default configuration file</description>
 
 <!--
        DO NOT EDIT THIS FILE.