Simplify/improve 30-metric-aliases.conf

diff --git a/conf.d/30-metric-aliases.conf b/conf.d/30-metric-aliases.conf
index fa6908fde6fda94d5b0c1147361d476c304fe11a..87e44938b60a64e338cc8b48c802ae0769d3f8f8 100644 (file)
--- a/conf.d/30-metric-aliases.conf
+++ b/conf.d/30-metric-aliases.conf
@@ -8,14 +8,19 @@
                        Helvetica
                        Times
                        Courier
-               Microsoft fonts:
-                       Arial
-                       Times New Roman
-                       Courier New
                URW fonts:
                        Nimbus Sans L
                        Nimbus Roman No9 L
                        Nimbus Mono L
+
+               Microsoft fonts:
+                       Arial
+                       Times New Roman
+                       Courier New
+               Liberation fonts:
+                       Liberation Sans
+                       Liberation Serif
+                       Liberation Mono
                StarOffice fonts:
                        Albany
                        Thorndale
@@ -24,10 +29,6 @@
                        Albany AMT
                        Thorndale AMT
                        Cumberland AMT
-               Liberation fonts:
-                       Liberation Sans
-                       Liberation Serif
-                       Liberation Mono
 
             Of these, URW fonts are design compatible with PostScrict fonts,
             and the Liberation, StarOffice, and AMT ones are compatible with
@@ -35,151 +36,176 @@
 
             We want for each of them to fallback to any of these
             available, but in an order preferring similar designs
-            first.
-            
-            We don't alias URW and Liberation fonts though, given that
-            they are free and less probable to appear in documents by
-            name.
+            first.  We do this in three steps:
+
+               1) Alias each specific to it's generic family.
+                  eg. Liberation Sans to Arial
+
+               2) Weak alias each generic to the other generic of its family.
+                  eg. Arial to Helvetica
+
+               3) Alias each generic to its specifics.
+                  eg. Arial to Liberation Sans, Albany, and Albany AMT
        -->
 
+<!-- Map specifics to generics -->
+
        <!-- PostScript -->
-        <alias>
-         <family>Helvetica</family>
-         <accept>
+        <alias binding="same">
          <family>Nimbus Sans L</family>
+         <default>
+         <family>Helvetica</family>
+         </default>
+       </alias>
+
+        <alias binding="same">
+         <family>Nimbus Roman No9 L</family>
+         <default>
+         <family>Times</family>
+         </default>
+       </alias>
+
+        <alias binding="same">
+         <family>Nimbus Mono L</family>
+         <default>
+         <family>Courier</family>
+         </default>
+       </alias>
+
+
+       <!-- Microsoft -->
+        <alias binding="same">
           <family>Liberation Sans</family>
-         <family>Arial</family>
          <family>Albany</family>
          <family>Albany AMT</family>
-         </accept>
+         <default>
+         <family>Arial</family>
+         </default>
        </alias>
 
-        <alias>
-         <family>Times</family>
-         <accept>
-         <family>Nimbus Roman No9 L</family>
+        <alias binding="same">
           <family>Liberation Serif</family>
-         <family>Times New Roman</family>
          <family>Thorndale</family>
          <family>Thorndale AMT</family>
-         </accept>
+         <default>
+         <family>Times New Roman</family>
+         </default>
        </alias>
 
-        <alias>
-         <family>Courier</family>
-         <accept>
-         <family>Nimbus Mono L</family>
+        <alias binding="same">
           <family>Liberation Mono</family>
-         <family>Courier New</family>
          <family>Cumberland</family>
          <family>Cumberland AMT</family>
-         </accept>
+         <default>
+         <family>Courier New</family>
+         </default>
        </alias>
 
 
 
+<!-- Accept the other group as fallback -->
+
+
+       <!-- PostScript -->
+        <alias>
+         <family>Helvetica</family>
+         <default>
+         <family>Arial</family>
+         </default>
+       </alias>
+
+        <alias>
+         <family>Times</family>
+         <default>
+         <family>Times New Roman</family>
+         </default>
+       </alias>
+
+        <alias>
+         <family>Courier</family>
+         <default>
+         <family>Courier New</family>
+         </default>
+       </alias>
+
+
        <!-- Microsoft -->
         <alias>
          <family>Arial</family>
-         <accept>
-          <family>Liberation Sans</family>
-         <family>Albany</family>
-         <family>Albany AMT</family>
+         <default>
          <family>Helvetica</family>
-         <family>Nimbus Sans L</family>
-         </accept>
+         </default>
        </alias>
 
         <alias>
          <family>Times New Roman</family>
-         <accept>
-          <family>Liberation Serif</family>
-         <family>Thorndale</family>
-         <family>Thorndale AMT</family>
+         <default>
          <family>Times</family>
-         <family>Nimbus Roman No9 L</family>
-         </accept>
+         </default>
        </alias>
 
         <alias>
          <family>Courier New</family>
-         <accept>
-          <family>Liberation Mono</family>
-         <family>Cumberland</family>
-         <family>Cumberland AMT</family>
+         <default>
          <family>Courier</family>
-         <family>Nimbus Mono L</family>
-         </accept>
+         </default>
        </alias>
 
 
-       <!-- StarOffice -->
-        <alias>
-         <family>Albany</family>
-         <accept>
-          <family>Liberation Sans</family>
-         <family>Arial</family>
-         <family>Albany AMT</family>
+
+<!-- Map generics to specifics -->
+
+
+       <!-- PostScript -->
+        <alias binding="same">
          <family>Helvetica</family>
+         <accept>
          <family>Nimbus Sans L</family>
          </accept>
        </alias>
 
-        <alias>
-         <family>Thorndale</family>
-         <accept>
-          <family>Liberation Serif</family>
-         <family>Times New Roman</family>
-         <family>Thorndale AMT</family>
+        <alias binding="same">
          <family>Times</family>
+         <accept>
          <family>Nimbus Roman No9 L</family>
          </accept>
        </alias>
 
-        <alias>
-         <family>Cumberland</family>
-         <accept>
-          <family>Liberation Mono</family>
-         <family>Courier New</family>
-         <family>Cumberland AMT</family>
+        <alias binding="same">
          <family>Courier</family>
+         <accept>
          <family>Nimbus Mono L</family>
          </accept>
        </alias>
 
 
-       <!-- AMT -->
-        <alias>
-         <family>Albany AMT</family>
+       <!-- Microsoft -->
+        <alias binding="same">
+         <family>Arial</family>
          <accept>
           <family>Liberation Sans</family>
-         <family>Arial</family>
          <family>Albany</family>
-         <family>Helvetica</family>
-         <family>Nimbus Sans L</family>
+         <family>Albany AMT</family>
          </accept>
        </alias>
 
-        <alias>
-         <family>Thorndale AMT</family>
+        <alias binding="same">
+         <family>Times New Roman</family>
          <accept>
           <family>Liberation Serif</family>
-         <family>Times New Roman</family>
          <family>Thorndale</family>
-         <family>Times</family>
-         <family>Nimbus Roman No9 L</family>
+         <family>Thorndale AMT</family>
          </accept>
        </alias>
 
-        <alias>
-         <family>Cumberland AMT</family>
+        <alias binding="same">
+         <family>Courier New</family>
          <accept>
           <family>Liberation Mono</family>
-         <family>Courier New</family>
          <family>Cumberland</family>
-         <family>Courier</family>
-         <family>Nimbus Mono L</family>
+         <family>Cumberland AMT</family>
          </accept>
        </alias>
 
+
 </fontconfig>