From 7ed382a8c6070cafbd65ea29fd41ca996282ba21 Mon Sep 17 00:00:00 2001
From: johnnypops <johnnypops>
Date: Sat, 02 Jul 2011 06:20:14 +0000
Subject: Added new, removed old and updated existing win32 font and module config files.

---
diff --git a/win32/etc/fonts/conf.avail/10-autohint.conf b/win32/etc/fonts/conf.avail/10-autohint.conf
index 5406f4e..c597bf4 100644
--- a/win32/etc/fonts/conf.avail/10-autohint.conf
+++ b/win32/etc/fonts/conf.avail/10-autohint.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
 <fontconfig>
 <!--  Use the Autohinter --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-no-sub-pixel.conf b/win32/etc/fonts/conf.avail/10-no-sub-pixel.conf
index 5d64a0b..87ada4e 100644
--- a/win32/etc/fonts/conf.avail/10-no-sub-pixel.conf
+++ b/win32/etc/fonts/conf.avail/10-no-sub-pixel.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-sub-pixel-bgr.conf b/win32/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
index 2aba95e..e1f64fd 100644
--- a/win32/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
+++ b/win32/etc/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-sub-pixel-rgb.conf b/win32/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
index c4e8a42..2b49fe3 100644
--- a/win32/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
+++ b/win32/etc/fonts/conf.avail/10-sub-pixel-rgb.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf b/win32/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
index 0cdad2a..5947650 100644
--- a/win32/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
+++ b/win32/etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf b/win32/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
index 60239e0..84481bd 100644
--- a/win32/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
+++ b/win32/etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/10-unhinted.conf b/win32/etc/fonts/conf.avail/10-unhinted.conf
index fb0b375..025ae2a 100644
--- a/win32/etc/fonts/conf.avail/10-unhinted.conf
+++ b/win32/etc/fonts/conf.avail/10-unhinted.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
 <fontconfig>
 <!--  Disable hinting --> 
   <match target="font">
diff --git a/win32/etc/fonts/conf.avail/20-fix-globaladvance.conf b/win32/etc/fonts/conf.avail/20-fix-globaladvance.conf
index a62162c..2a9c063 100644
--- a/win32/etc/fonts/conf.avail/20-fix-globaladvance.conf
+++ b/win32/etc/fonts/conf.avail/20-fix-globaladvance.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--
   Some Asian fonts misadvertise themselves as monospaced when
diff --git a/win32/etc/fonts/conf.avail/20-unhint-small-vera.conf b/win32/etc/fonts/conf.avail/20-unhint-small-vera.conf
index 3078119..c4ebee9 100644
--- a/win32/etc/fonts/conf.avail/20-unhint-small-vera.conf
+++ b/win32/etc/fonts/conf.avail/20-unhint-small-vera.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!-- 
 	The Bitstream Vera fonts have GASP entries suggesting that hinting be
diff --git a/win32/etc/fonts/conf.avail/25-unhint-nonlatin.conf b/win32/etc/fonts/conf.avail/25-unhint-nonlatin.conf
new file mode 100644
index 0000000..ffb70c6
--- /dev/null
+++ b/win32/etc/fonts/conf.avail/25-unhint-nonlatin.conf
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
+
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Kochi Mincho</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Kochi Gothic</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Sazanami Mincho</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Sazanami Gothic</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Baekmuk Batang</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Baekmuk Dotum</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Baekmuk Gulim</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>Baekmuk Headline</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL Mingti2L Big5</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL ShanHeiSun Uni</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL KaitiM Big5</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL ZenKai Uni</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL SungtiL GB</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL KaitiM GB</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>ZYSong18030</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.avail/30-metric-aliases.conf b/win32/etc/fonts/conf.avail/30-metric-aliases.conf
new file mode 100644
index 0000000..702a495
--- /dev/null
+++ b/win32/etc/fonts/conf.avail/30-metric-aliases.conf
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<!-- Alias similar/metric-compatible families from various sources:
+
+		PostScript fonts:
+			Helvetica
+			Times
+			Courier
+		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
+			Cumberland
+		AMT fonts:
+			Albany AMT
+			Thorndale AMT
+			Cumberland AMT
+
+	     Of these, URW fonts are design compatible with PostScrict fonts,
+	     and the Liberation, StarOffice, and AMT ones are compatible with
+	     Microsoft fonts.
+
+	     We want for each of them to fallback to any of these
+	     available, but in an order preferring similar designs
+	     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 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>Albany</family>
+	  <family>Albany AMT</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Serif</family>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Mono</family>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  <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>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Times New Roman</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Courier New</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+
+
+<!-- Map generics to specifics -->
+
+
+	<!-- PostScript -->
+	<alias binding="same">
+	  <family>Helvetica</family>
+	  <accept>
+	  <family>Nimbus Sans L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times</family>
+	  <accept>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier</family>
+	  <accept>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+
+	<!-- Microsoft -->
+	<alias binding="same">
+	  <family>Arial</family>
+	  <accept>
+	  <family>Liberation Sans</family>
+	  <family>Albany</family>
+	  <family>Albany AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times New Roman</family>
+	  <accept>
+	  <family>Liberation Serif</family>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier New</family>
+	  <accept>
+	  <family>Liberation Mono</family>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  </accept>
+	</alias>
+
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.avail/30-urw-aliases.conf b/win32/etc/fonts/conf.avail/30-urw-aliases.conf
index cf90dd5..9d59203 100644
--- a/win32/etc/fonts/conf.avail/30-urw-aliases.conf
+++ b/win32/etc/fonts/conf.avail/30-urw-aliases.conf
@@ -1,43 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  URW provides metric and shape compatible fonts for some Adobe families.
+  Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
   -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <accept><family>URW Gothic L</family></accept>
 	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <accept><family>URW Bookman L</family></accept>
 	</alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept><family>Century Schoolbook L</family></accept>
 	</alias>
-        <alias>
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept><family>URW Palladio L</family></accept>
+	</alias>
+	<alias binding="same">
 	  <family>Zapf Chancery</family>
 	  <accept><family>URW Chancery L</family></accept>
 	</alias>
-        <alias>
+	<alias binding="same">
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
diff --git a/win32/etc/fonts/conf.avail/40-nonlatin.conf b/win32/etc/fonts/conf.avail/40-nonlatin.conf
new file mode 100644
index 0000000..a875db0
--- /dev/null
+++ b/win32/etc/fonts/conf.avail/40-nonlatin.conf
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Nazli</family>
+		<family>Lotoos</family>
+		<family>Mitra</family>
+		<family>Ferdosi</family>
+		<family>Badr</family>
+		<family>Zar</family>
+		<family>Titr</family>
+		<family>Jadid</family>
+		<family>Kochi Mincho</family>
+		<family>AR PL SungtiL GB</family>
+		<family>AR PL Mingti2L Big5</family>
+		<family>ＭＳ 明朝</family>
+		<family>UnBatang</family>
+		<family>Baekmuk Batang</family>
+		<family>MgOpen Canonica</family>
+		<family>Sazanami Mincho</family>
+		<family>AR PL ZenKai Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSerif</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Arshia</family>
+		<family>Elham</family>
+		<family>Farnaz</family>
+		<family>Nasim</family>
+		<family>Sina</family>
+		<family>Roya</family>
+		<family>Koodak</family>
+		<family>Terafik</family>
+		<family>Kochi Gothic</family>
+		<family>AR PL KaitiM GB</family>
+		<family>AR PL KaitiM Big5</family>
+		<family>ＭＳ ゴシック</family>
+		<family>UnDotum</family>
+		<family>Baekmuk Dotum</family>
+		<family>SimSun</family>
+		<family>MgOpen Modata</family>
+		<family>Sazanami Gothic</family>
+		<family>AR PL ShanHeiSun Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+ 	<alias>
+		<family>NSimSun</family>
+		<family>ZYSong18030</family>
+		<family>FreeMono</family>
+		<default><family>monospace</family></default>
+	</alias>
+
+<!--
+  Fantasy faces
+ -->
+	<alias>
+		<family>Homa</family>
+		<family>Kamran</family>
+		<family>Fantezi</family>
+		<family>Tabassom</family>
+		<default><family>fantasy</family></default>
+	</alias>
+
+<!--
+  Cursive faces
+ -->
+	<alias>
+		<family>IranNastaliq</family>
+		<family>Nafees Nastaleeq</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.avail/45-latin.conf b/win32/etc/fonts/conf.avail/45-latin.conf
new file mode 100644
index 0000000..7e41264
--- /dev/null
+++ b/win32/etc/fonts/conf.avail/45-latin.conf
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Bitstream Vera Serif</family>
+		<family>DejaVu Serif</family>
+		<family>Liberation Serif</family>
+		<family>Times New Roman</family>
+		<family>Times</family>
+		<family>Nimbus Roman No9 L</family>
+		<family>Luxi Serif</family>
+		<family>Thorndale AMT</family>
+		<family>Thorndale</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Bitstream Vera Sans</family>
+		<family>DejaVu Sans</family>
+		<family>Liberation Sans</family>
+		<family>Arial</family>
+		<family>Helvetica</family>
+		<family>Verdana</family>
+		<family>Albany AMT</family>
+		<family>Albany</family>
+		<family>Nimbus Sans L</family>
+		<family>Luxi Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+ 	<alias>
+		<family>Bitstream Vera Sans Mono</family>
+		<family>DejaVu Sans Mono</family>
+		<family>Liberation Mono</family>
+		<family>Inconsolata</family>
+		<family>Courier New</family>
+		<family>Courier</family>
+		<family>Andale Mono</family>
+		<family>Luxi Mono</family>
+		<family>Cumberland AMT</family>
+		<family>Cumberland</family>
+		<family>Nimbus Mono L</family>
+		<default><family>monospace</family></default>
+	</alias>
+<!--
+  Fantasy faces
+ -->
+ 	<alias>
+		<family>Impact</family>
+		<family>Copperplate Gothic Std</family>
+		<family>Cooper Std</family>
+		<family>Bauhaus Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>ITC Zapf Chancery Std</family>
+		<family>Zapfino</family>
+		<family>Comic Sans MS</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.avail/50-user.conf b/win32/etc/fonts/conf.avail/50-user.conf
index 9a38a40..3f89012 100644
--- a/win32/etc/fonts/conf.avail/50-user.conf
+++ b/win32/etc/fonts/conf.avail/50-user.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access -->
 <fontconfig>
 	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf.d</include>
 	<include ignore_missing="yes">~/.fonts.conf</include>
 </fontconfig>
diff --git a/win32/etc/fonts/conf.avail/51-local.conf b/win32/etc/fonts/conf.avail/51-local.conf
index d35046e..ca9fbe1 100644
--- a/win32/etc/fonts/conf.avail/51-local.conf
+++ b/win32/etc/fonts/conf.avail/51-local.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
 <fontconfig>
 	<!-- Load local system customization file -->
 	<include ignore_missing="yes">local.conf</include>
diff --git a/win32/etc/fonts/conf.avail/60-latin.conf b/win32/etc/fonts/conf.avail/60-latin.conf
index 06cdd7e..2107e31 100644
--- a/win32/etc/fonts/conf.avail/60-latin.conf
+++ b/win32/etc/fonts/conf.avail/60-latin.conf
@@ -24,6 +24,9 @@
 			<family>Luxi Sans</family>
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
+			<family>Lucida Sans Unicode</family>
+			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
 		</prefer>
 	</alias>
 	<alias>
@@ -31,6 +34,7 @@
 		<prefer>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>DejaVu Sans Mono</family>
+			<family>Inconsolata</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
@@ -39,4 +43,28 @@
 			<family>Courier</family>
 		</prefer>
 	</alias>
+<!--
+  Fantasy faces
+ -->
+ 	<alias>
+		<family>fantasy</family>
+		<prefer>
+			<family>Impact</family>
+			<family>Copperplate Gothic Std</family>
+			<family>Cooper Std</family>
+			<family>Bauhaus Std</family>
+		</prefer>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>cursive</family>
+		<prefer>
+			<family>ITC Zapf Chancery Std</family>
+			<family>Zapfino</family>
+			<family>Comic Sans MS</family>
+		</prefer>
+	</alias>
+
 </fontconfig>
diff --git a/win32/etc/fonts/conf.avail/65-fonts-persian.conf b/win32/etc/fonts/conf.avail/65-fonts-persian.conf
index e30c4d9..0033675 100644
--- a/win32/etc/fonts/conf.avail/65-fonts-persian.conf
+++ b/win32/etc/fonts/conf.avail/65-fonts-persian.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
 <!--
   fonts-persian.conf
   To configure Persian fonts from The FarsiWeb Project.
@@ -19,7 +18,7 @@
 
   SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
   TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -29,297 +28,159 @@
     2005-04-03  Behdad Esfahbod:  Initial revision.
     2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
     2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
-
-  Todo:
-    Add generic font "fantasy".  Add some fonts into that category.
-    Maybe add a "cursive" generic font.
+    2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
   -->
 <fontconfig>
 
 
-<!--
-  We don't want weak bindings.  So got to use the syntactical expansion
-  of alias tag to do binding=same :(.  Please support that in alias.
-  -->
-
-
 <!-- Deprecated fonts are discouraged -->
 
 	<!-- Nesf[2] is officially deprecated and has problematic tables -->
-	<match>
-		<test name="family">
-			<string>Nesf</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nesf2</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nesf2</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match>
-
-	<!-- Tahoma looks awful (TURNED-OFF) -->
-	<!--match>
-		<test name="family">
-			<string>Tahoma</string>
-		</test>
-		<edit name="family" mode="prepend" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match-->
+	<alias binding="same">
+	  <family>Nesf</family>
+	  <accept><family>Nesf2</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nesf2</family>
+	  <accept><family>Persian_sansserif_default</family></accept>
+	</alias>
 
 <!-- Name changes and spelling variant aliases -->
 
-	<!-- Changed due to trademark problems -->
-	<match>
-		<test name="family">
-			<string>Nazanin</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nazli</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Lotus</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Lotoos</string>
-		</edit>
-	</match>
-
-	<!-- Changed due to transcription orthography -->
-	<match>
-		<test name="family">
-			<string>Yaqut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yagut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yaghut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Traffic</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Terafik</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Ferdowsi</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Ferdosi</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezy</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Fantezi</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Nazanin</family>
+	  <accept><family>Nazli</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Lotus</family>
+	  <accept><family>Lotoos</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaqut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaghut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Traffic</family>
+	  <accept><family>Terafik</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Ferdowsi</family>
+	  <accept><family>Ferdosi</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezy</family>
+	  <accept><family>Fantezi</family></accept>
+	</alias>
 
 
 <!-- Classify fonts. -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Jadid</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Jadid</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Titr</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Kamran</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezi</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Tabassom</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Kamran</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Homa</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Homa</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Kamran</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezi</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Tabassom</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Arshia</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nasim</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Farnaz</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Sina</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Arshia</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nasim</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Elham</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Farnaz</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Farnaz</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Elham</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Sina</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
 
 <!-- Font ordering per class -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Persian_title</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Jadid</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_title</family>
+	  <accept>
+	  <family>Titr</family>
+	  <family>Jadid</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Persian_fantasy</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Tabassom</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Fantezi</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_fantasy</family>
+	  <accept>
+	  <family>Homa</family>
+	  <family>Kamran</family>
+	  <family>Fantezi</family>
+	  <family>Tabassom</family>
+	  <family>Persian_square</family>
+	  </accept>
+	</alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Persian_square</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Sina</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Nasim</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Arshia</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_square</family>
+	  <accept>
+	  <family>Arshia</family>
+	  <family>Elham</family>
+	  <family>Farnaz</family>
+	  <family>Nasim</family>
+	  <family>Sina</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
 
 <!-- Register the fonts that we actually do have -->
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Elham</string>
 		</test>
@@ -328,7 +189,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Homa</string>
 		</test>
@@ -337,7 +198,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Koodak</string>
 		</test>
@@ -346,7 +207,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Nazli</string>
 		</test>
@@ -355,7 +216,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Roya</string>
 		</test>
@@ -364,7 +225,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Terafik</string>
 		</test>
@@ -373,7 +234,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Titr</string>
 		</test>
@@ -473,6 +334,25 @@
 		</accept>
 	</alias>
 
+	<!-- Persian fantasy fonts -->
+	<alias>
+		<family>fantasy</family>
+		<accept>
+			<family>Homa</family>
+			<family>Kamran</family>
+			<family>Fantezi</family>
+			<family>Tabassom</family>
+		</accept>
+	</alias>
+
+	<!-- Persian (and Urdu) Nastaliq/cursive fonts -->
+	<alias>
+		<family>cursive</family>
+		<accept>
+			<family>IranNastaliq</family>
+			<family>Nafees Nastaleeq</family>
+		</accept>
+	</alias>
 
 <!-- Use Titr in titles -->
 
diff --git a/win32/etc/fonts/conf.avail/65-khmer.conf b/win32/etc/fonts/conf.avail/65-khmer.conf
new file mode 100644
index 0000000..f9d06f2
--- /dev/null
+++ b/win32/etc/fonts/conf.avail/65-khmer.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Khmer OS"</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Khmer OS"</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/win32/etc/fonts/conf.avail/65-nonlatin.conf b/win32/etc/fonts/conf.avail/65-nonlatin.conf
index f8dbb64..53ac064 100644
--- a/win32/etc/fonts/conf.avail/65-nonlatin.conf
+++ b/win32/etc/fonts/conf.avail/65-nonlatin.conf
@@ -4,35 +4,192 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>Frank Ruehl</family>
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Kinnari</family> <!-- thai -->
+			<family>Norasi</family> <!-- thai -->
+			<family>Frank Ruehl</family> <!-- hebrew -->
+			<family>Dror</family>  <!-- hebrew -->
+			<family>JG LaoTimes</family>  <!-- lao -->
+			<family>Saysettha Unicode</family>  <!-- lao -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family>  <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Canonica</family>
+			<family>Sazanami Mincho</family>
+			<family>IPAMonaMincho</family>
+			<family>IPAMincho</family>
 			<family>Kochi Mincho</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+ 			<family>AR PL Zenkai Uni</family>
 			<family>ＭＳ 明朝</family>
+ 			<family>ZYSong18030</family>
+			<family>UnBatang</family>
 			<family>Baekmuk Batang</family>
+ 			<family>KacstQura</family>
+ 			<family>Frank Ruehl CLM</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>Nachlieli</family>
+			<family>Nachlieli</family> <!-- hebrew -->
+			<family>Lucida Sans Unicode</family>
+			<family>Yudit Unicode</family>
+			<family>Kerkis</family> <!-- greek -->
+			<family>ArmNet Helvetica</family> <!-- armenian -->
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Waree</family> <!-- thai -->
+			<family>Loma</family> <!-- thai -->
+			<family>Garuda</family> <!-- thai -->
+			<family>Umpush</family> <!-- thai -->
+			<family>Saysettha Unicode</family> <!-- lao? -->
+			<family>JG Lao Old Arial</family> <!-- lao -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family> <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<!-- chinese fonts are actually serifed -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Modata</family>
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
 			<family>AR PL KaitiM Big5</family>
+ 			<family>AR PL ShanHeiSun Uni</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
 			<family>ＭＳ ゴシック</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>TSCu_Paranar</family> <!-- tamil -->
+			<family>UnDotum</family>
 			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
+ 			<family>Baekmuk Gulim</family>
+ 			<family>KacstQura</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+ 			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Miriam Mono</family>
+			<family>Miriam Mono</family> <!-- hebrew -->
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus Gothic</family> <!-- han (ja) -->
+			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MingLiu</family> <!-- han (zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn) -->
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>UnBatang</family>
+			<family>UnDotum</family>
+			<family>Baekmuk Batang</family> <!-- hangul -->
 			<family>Baekmuk Dotum</family>
+			<family>Baekmuk Gulim</family>
+			<family>TlwgTypo</family> <!-- thai -->
+			<family>TlwgTypist</family> <!-- thai -->
+			<family>TlwgTypewriter</family> <!-- thai -->
+			<family>TlwgMono</family> <!-- thai -->
+			<family>Hasida</family> <!-- hebrew -->
+			<family>Mitra Mono</family> <!-- bengali -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+			<family>Lohit Kannada</family>
+			<family>Lohit Telugu</family>
+			<family>Lohit Oriya</family>
+			<family>LKLUG</family>
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/win32/etc/fonts/conf.avail/69-unifont.conf b/win32/etc/fonts/conf.avail/69-unifont.conf
index a784af9..177dec5 100644
--- a/win32/etc/fonts/conf.avail/69-unifont.conf
+++ b/win32/etc/fonts/conf.avail/69-unifont.conf
@@ -6,6 +6,7 @@
 		<prefer>
 			<family>FreeSerif</family>
 			<family>Code2000</family>
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
@@ -13,6 +14,9 @@
 		<prefer>
 			<family>FreeSans</family>
 			<family>Arial Unicode MS</family>
+			<family>Arial Unicode</family>
+			<family>Code2000</family> <!-- almost everything; serif actually -->
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
diff --git a/win32/etc/fonts/conf.avail/70-no-bitmaps.conf b/win32/etc/fonts/conf.avail/70-no-bitmaps.conf
index e8fb6a9..6b506e8 100644
--- a/win32/etc/fonts/conf.avail/70-no-bitmaps.conf
+++ b/win32/etc/fonts/conf.avail/70-no-bitmaps.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
 <fontconfig>
 <!-- Reject bitmap fonts -->
  <selectfont>
diff --git a/win32/etc/fonts/conf.avail/70-yes-bitmaps.conf b/win32/etc/fonts/conf.avail/70-yes-bitmaps.conf
index c539c70..c153aeb 100644
--- a/win32/etc/fonts/conf.avail/70-yes-bitmaps.conf
+++ b/win32/etc/fonts/conf.avail/70-yes-bitmaps.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
 <fontconfig>
 <!-- Accept bitmap fonts -->
  <selectfont>
diff --git a/win32/etc/fonts/conf.avail/80-delicious.conf b/win32/etc/fonts/conf.avail/80-delicious.conf
index 701429b..728f50c 100644
--- a/win32/etc/fonts/conf.avail/80-delicious.conf
+++ b/win32/etc/fonts/conf.avail/80-delicious.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-delicious.conf -->
 <fontconfig>
 <!-- Fix-ups for Delicious family -->
 
diff --git a/win32/etc/fonts/conf.avail/90-synthetic.conf b/win32/etc/fonts/conf.avail/90-synthetic.conf
index 63d9b89..b8d1e85 100644
--- a/win32/etc/fonts/conf.avail/90-synthetic.conf
+++ b/win32/etc/fonts/conf.avail/90-synthetic.conf
@@ -27,10 +27,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
-                <!-- and disable embedded bitmaps for artificial oblique -->
-                <edit name="embeddedbitmap" mode="assign">
-                        <bool>false</bool>
-                </edit>
+		<!-- and disable embedded bitmaps for artificial oblique -->
+		<edit name="embeddedbitmap" mode="assign">
+			<bool>false</bool>
+		</edit>
 	</match>
 
 <!--
diff --git a/win32/etc/fonts/conf.d/20-fix-globaladvance.conf b/win32/etc/fonts/conf.d/20-fix-globaladvance.conf
index a62162c..2a9c063 100644
--- a/win32/etc/fonts/conf.d/20-fix-globaladvance.conf
+++ b/win32/etc/fonts/conf.d/20-fix-globaladvance.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--
   Some Asian fonts misadvertise themselves as monospaced when
diff --git a/win32/etc/fonts/conf.d/20-unhint-small-vera.conf b/win32/etc/fonts/conf.d/20-unhint-small-vera.conf
index 3078119..c4ebee9 100644
--- a/win32/etc/fonts/conf.d/20-unhint-small-vera.conf
+++ b/win32/etc/fonts/conf.d/20-unhint-small-vera.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!-- 
 	The Bitstream Vera fonts have GASP entries suggesting that hinting be
diff --git a/win32/etc/fonts/conf.d/30-metric-aliases.conf b/win32/etc/fonts/conf.d/30-metric-aliases.conf
new file mode 100644
index 0000000..702a495
--- /dev/null
+++ b/win32/etc/fonts/conf.d/30-metric-aliases.conf
@@ -0,0 +1,211 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<!-- Alias similar/metric-compatible families from various sources:
+
+		PostScript fonts:
+			Helvetica
+			Times
+			Courier
+		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
+			Cumberland
+		AMT fonts:
+			Albany AMT
+			Thorndale AMT
+			Cumberland AMT
+
+	     Of these, URW fonts are design compatible with PostScrict fonts,
+	     and the Liberation, StarOffice, and AMT ones are compatible with
+	     Microsoft fonts.
+
+	     We want for each of them to fallback to any of these
+	     available, but in an order preferring similar designs
+	     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 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>Albany</family>
+	  <family>Albany AMT</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Serif</family>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Mono</family>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  <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>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Times New Roman</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Courier New</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+
+
+<!-- Map generics to specifics -->
+
+
+	<!-- PostScript -->
+	<alias binding="same">
+	  <family>Helvetica</family>
+	  <accept>
+	  <family>Nimbus Sans L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times</family>
+	  <accept>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier</family>
+	  <accept>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+
+	<!-- Microsoft -->
+	<alias binding="same">
+	  <family>Arial</family>
+	  <accept>
+	  <family>Liberation Sans</family>
+	  <family>Albany</family>
+	  <family>Albany AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times New Roman</family>
+	  <accept>
+	  <family>Liberation Serif</family>
+	  <family>Thorndale</family>
+	  <family>Thorndale AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier New</family>
+	  <accept>
+	  <family>Liberation Mono</family>
+	  <family>Cumberland</family>
+	  <family>Cumberland AMT</family>
+	  </accept>
+	</alias>
+
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.d/30-urw-aliases.conf b/win32/etc/fonts/conf.d/30-urw-aliases.conf
index cf90dd5..9d59203 100644
--- a/win32/etc/fonts/conf.d/30-urw-aliases.conf
+++ b/win32/etc/fonts/conf.d/30-urw-aliases.conf
@@ -1,43 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
 <fontconfig>
 <!--
-  URW provides metric and shape compatible fonts for these 10 Adobe families.
+  URW provides metric and shape compatible fonts for some Adobe families.
+  Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
   -->
-        <alias>
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias>
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias>
-	  <family>Courier</family>
-	  <accept><family>Nimbus Mono L</family></accept>
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <accept><family>URW Gothic L</family></accept>
 	</alias>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans L</family></accept>
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <accept><family>URW Bookman L</family></accept>
 	</alias>
-        <alias>
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias>
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias>
-	  <family>Times</family>
-	  <accept><family>Nimbus Roman No9 L</family></accept>
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept><family>Century Schoolbook L</family></accept>
 	</alias>
-        <alias>
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept><family>URW Palladio L</family></accept>
+	</alias>
+	<alias binding="same">
 	  <family>Zapf Chancery</family>
 	  <accept><family>URW Chancery L</family></accept>
 	</alias>
-        <alias>
+	<alias binding="same">
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
diff --git a/win32/etc/fonts/conf.d/40-nonlatin.conf b/win32/etc/fonts/conf.d/40-nonlatin.conf
new file mode 100644
index 0000000..a875db0
--- /dev/null
+++ b/win32/etc/fonts/conf.d/40-nonlatin.conf
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Nazli</family>
+		<family>Lotoos</family>
+		<family>Mitra</family>
+		<family>Ferdosi</family>
+		<family>Badr</family>
+		<family>Zar</family>
+		<family>Titr</family>
+		<family>Jadid</family>
+		<family>Kochi Mincho</family>
+		<family>AR PL SungtiL GB</family>
+		<family>AR PL Mingti2L Big5</family>
+		<family>ＭＳ 明朝</family>
+		<family>UnBatang</family>
+		<family>Baekmuk Batang</family>
+		<family>MgOpen Canonica</family>
+		<family>Sazanami Mincho</family>
+		<family>AR PL ZenKai Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSerif</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Arshia</family>
+		<family>Elham</family>
+		<family>Farnaz</family>
+		<family>Nasim</family>
+		<family>Sina</family>
+		<family>Roya</family>
+		<family>Koodak</family>
+		<family>Terafik</family>
+		<family>Kochi Gothic</family>
+		<family>AR PL KaitiM GB</family>
+		<family>AR PL KaitiM Big5</family>
+		<family>ＭＳ ゴシック</family>
+		<family>UnDotum</family>
+		<family>Baekmuk Dotum</family>
+		<family>SimSun</family>
+		<family>MgOpen Modata</family>
+		<family>Sazanami Gothic</family>
+		<family>AR PL ShanHeiSun Uni</family>
+		<family>ZYSong18030</family>
+		<family>FreeSans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+ 	<alias>
+		<family>NSimSun</family>
+		<family>ZYSong18030</family>
+		<family>FreeMono</family>
+		<default><family>monospace</family></default>
+	</alias>
+
+<!--
+  Fantasy faces
+ -->
+	<alias>
+		<family>Homa</family>
+		<family>Kamran</family>
+		<family>Fantezi</family>
+		<family>Tabassom</family>
+		<default><family>fantasy</family></default>
+	</alias>
+
+<!--
+  Cursive faces
+ -->
+	<alias>
+		<family>IranNastaliq</family>
+		<family>Nafees Nastaleeq</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.d/45-latin.conf b/win32/etc/fonts/conf.d/45-latin.conf
new file mode 100644
index 0000000..7e41264
--- /dev/null
+++ b/win32/etc/fonts/conf.d/45-latin.conf
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Bitstream Vera Serif</family>
+		<family>DejaVu Serif</family>
+		<family>Liberation Serif</family>
+		<family>Times New Roman</family>
+		<family>Times</family>
+		<family>Nimbus Roman No9 L</family>
+		<family>Luxi Serif</family>
+		<family>Thorndale AMT</family>
+		<family>Thorndale</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Bitstream Vera Sans</family>
+		<family>DejaVu Sans</family>
+		<family>Liberation Sans</family>
+		<family>Arial</family>
+		<family>Helvetica</family>
+		<family>Verdana</family>
+		<family>Albany AMT</family>
+		<family>Albany</family>
+		<family>Nimbus Sans L</family>
+		<family>Luxi Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+ 	<alias>
+		<family>Bitstream Vera Sans Mono</family>
+		<family>DejaVu Sans Mono</family>
+		<family>Liberation Mono</family>
+		<family>Inconsolata</family>
+		<family>Courier New</family>
+		<family>Courier</family>
+		<family>Andale Mono</family>
+		<family>Luxi Mono</family>
+		<family>Cumberland AMT</family>
+		<family>Cumberland</family>
+		<family>Nimbus Mono L</family>
+		<default><family>monospace</family></default>
+	</alias>
+<!--
+  Fantasy faces
+ -->
+ 	<alias>
+		<family>Impact</family>
+		<family>Copperplate Gothic Std</family>
+		<family>Cooper Std</family>
+		<family>Bauhaus Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>ITC Zapf Chancery Std</family>
+		<family>Zapfino</family>
+		<family>Comic Sans MS</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>
diff --git a/win32/etc/fonts/conf.d/50-user.conf b/win32/etc/fonts/conf.d/50-user.conf
index 9a38a40..3f89012 100644
--- a/win32/etc/fonts/conf.d/50-user.conf
+++ b/win32/etc/fonts/conf.d/50-user.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access -->
 <fontconfig>
 	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf.d</include>
 	<include ignore_missing="yes">~/.fonts.conf</include>
 </fontconfig>
diff --git a/win32/etc/fonts/conf.d/51-local.conf b/win32/etc/fonts/conf.d/51-local.conf
index d35046e..ca9fbe1 100644
--- a/win32/etc/fonts/conf.d/51-local.conf
+++ b/win32/etc/fonts/conf.d/51-local.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
 <fontconfig>
 	<!-- Load local system customization file -->
 	<include ignore_missing="yes">local.conf</include>
diff --git a/win32/etc/fonts/conf.d/60-latin.conf b/win32/etc/fonts/conf.d/60-latin.conf
index 06cdd7e..2107e31 100644
--- a/win32/etc/fonts/conf.d/60-latin.conf
+++ b/win32/etc/fonts/conf.d/60-latin.conf
@@ -24,6 +24,9 @@
 			<family>Luxi Sans</family>
 			<family>Nimbus Sans L</family>
 			<family>Helvetica</family>
+			<family>Lucida Sans Unicode</family>
+			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
 		</prefer>
 	</alias>
 	<alias>
@@ -31,6 +34,7 @@
 		<prefer>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>DejaVu Sans Mono</family>
+			<family>Inconsolata</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
@@ -39,4 +43,28 @@
 			<family>Courier</family>
 		</prefer>
 	</alias>
+<!--
+  Fantasy faces
+ -->
+ 	<alias>
+		<family>fantasy</family>
+		<prefer>
+			<family>Impact</family>
+			<family>Copperplate Gothic Std</family>
+			<family>Cooper Std</family>
+			<family>Bauhaus Std</family>
+		</prefer>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>cursive</family>
+		<prefer>
+			<family>ITC Zapf Chancery Std</family>
+			<family>Zapfino</family>
+			<family>Comic Sans MS</family>
+		</prefer>
+	</alias>
+
 </fontconfig>
diff --git a/win32/etc/fonts/conf.d/65-fonts-persian.conf b/win32/etc/fonts/conf.d/65-fonts-persian.conf
index e30c4d9..0033675 100644
--- a/win32/etc/fonts/conf.d/65-fonts-persian.conf
+++ b/win32/etc/fonts/conf.d/65-fonts-persian.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/10-fonts-persian.conf -->
 <!--
   fonts-persian.conf
   To configure Persian fonts from The FarsiWeb Project.
@@ -19,7 +18,7 @@
 
   SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
   TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -29,297 +28,159 @@
     2005-04-03  Behdad Esfahbod:  Initial revision.
     2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
     2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
-
-  Todo:
-    Add generic font "fantasy".  Add some fonts into that category.
-    Maybe add a "cursive" generic font.
+    2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
   -->
 <fontconfig>
 
 
-<!--
-  We don't want weak bindings.  So got to use the syntactical expansion
-  of alias tag to do binding=same :(.  Please support that in alias.
-  -->
-
-
 <!-- Deprecated fonts are discouraged -->
 
 	<!-- Nesf[2] is officially deprecated and has problematic tables -->
-	<match>
-		<test name="family">
-			<string>Nesf</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nesf2</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nesf2</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match>
-
-	<!-- Tahoma looks awful (TURNED-OFF) -->
-	<!--match>
-		<test name="family">
-			<string>Tahoma</string>
-		</test>
-		<edit name="family" mode="prepend" binding="same">
-			<string>Persian_sansserif_default</string>
-		</edit>
-	</match-->
+	<alias binding="same">
+	  <family>Nesf</family>
+	  <accept><family>Nesf2</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nesf2</family>
+	  <accept><family>Persian_sansserif_default</family></accept>
+	</alias>
 
 <!-- Name changes and spelling variant aliases -->
 
-	<!-- Changed due to trademark problems -->
-	<match>
-		<test name="family">
-			<string>Nazanin</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Nazli</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Lotus</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Lotoos</string>
-		</edit>
-	</match>
-
-	<!-- Changed due to transcription orthography -->
-	<match>
-		<test name="family">
-			<string>Yaqut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yagut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Yaghut</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Yaghoot</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Traffic</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Terafik</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Ferdowsi</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Ferdosi</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezy</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Fantezi</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Nazanin</family>
+	  <accept><family>Nazli</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Lotus</family>
+	  <accept><family>Lotoos</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaqut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaghut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Traffic</family>
+	  <accept><family>Terafik</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Ferdowsi</family>
+	  <accept><family>Ferdosi</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezy</family>
+	  <accept><family>Fantezi</family></accept>
+	</alias>
 
 
 <!-- Classify fonts. -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Jadid</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_title</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Jadid</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Titr</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Kamran</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Fantezi</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Tabassom</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_fantasy</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Kamran</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Homa</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Homa</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Kamran</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezi</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Tabassom</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Arshia</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Nasim</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Farnaz</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
-	<match>
-		<test name="family">
-			<string>Sina</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Arshia</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nasim</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Elham</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Farnaz</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Farnaz</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Elham</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Sina</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
 
 <!-- Font ordering per class -->
 
 	<!-- Persian_title class -->
-	<match>
-		<test name="family">
-			<string>Persian_title</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Jadid</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_title</family>
+	  <accept>
+	  <family>Titr</family>
+	  <family>Jadid</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-	<match>
-		<test name="family">
-			<string>Persian_fantasy</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_square</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Tabassom</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Fantezi</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Kamran</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Homa</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_fantasy</family>
+	  <accept>
+	  <family>Homa</family>
+	  <family>Kamran</family>
+	  <family>Fantezi</family>
+	  <family>Tabassom</family>
+	  <family>Persian_square</family>
+	  </accept>
+	</alias>
 
 	<!-- Persian_square class -->
-	<match>
-		<test name="family">
-			<string>Persian_square</string>
-		</test>
-		<edit name="family" mode="append" binding="same">
-			<string>Persian_serif</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Sina</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Nasim</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Farnaz</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Elham</string>
-		</edit>
-		<edit name="family" mode="append" binding="same">
-			<string>Arshia</string>
-		</edit>
-	</match>
+	<alias binding="same">
+	  <family>Persian_square</family>
+	  <accept>
+	  <family>Arshia</family>
+	  <family>Elham</family>
+	  <family>Farnaz</family>
+	  <family>Nasim</family>
+	  <family>Sina</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
 
 <!-- Register the fonts that we actually do have -->
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Elham</string>
 		</test>
@@ -328,7 +189,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Homa</string>
 		</test>
@@ -337,7 +198,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Koodak</string>
 		</test>
@@ -346,7 +207,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Nazli</string>
 		</test>
@@ -355,7 +216,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Roya</string>
 		</test>
@@ -364,7 +225,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Terafik</string>
 		</test>
@@ -373,7 +234,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Titr</string>
 		</test>
@@ -473,6 +334,25 @@
 		</accept>
 	</alias>
 
+	<!-- Persian fantasy fonts -->
+	<alias>
+		<family>fantasy</family>
+		<accept>
+			<family>Homa</family>
+			<family>Kamran</family>
+			<family>Fantezi</family>
+			<family>Tabassom</family>
+		</accept>
+	</alias>
+
+	<!-- Persian (and Urdu) Nastaliq/cursive fonts -->
+	<alias>
+		<family>cursive</family>
+		<accept>
+			<family>IranNastaliq</family>
+			<family>Nafees Nastaleeq</family>
+		</accept>
+	</alias>
 
 <!-- Use Titr in titles -->
 
diff --git a/win32/etc/fonts/conf.d/65-nonlatin.conf b/win32/etc/fonts/conf.d/65-nonlatin.conf
index f8dbb64..53ac064 100644
--- a/win32/etc/fonts/conf.d/65-nonlatin.conf
+++ b/win32/etc/fonts/conf.d/65-nonlatin.conf
@@ -4,35 +4,192 @@
 	<alias>
 		<family>serif</family>
 		<prefer>
-			<family>Frank Ruehl</family>
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Kinnari</family> <!-- thai -->
+			<family>Norasi</family> <!-- thai -->
+			<family>Frank Ruehl</family> <!-- hebrew -->
+			<family>Dror</family>  <!-- hebrew -->
+			<family>JG LaoTimes</family>  <!-- lao -->
+			<family>Saysettha Unicode</family>  <!-- lao -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family>  <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Canonica</family>
+			<family>Sazanami Mincho</family>
+			<family>IPAMonaMincho</family>
+			<family>IPAMincho</family>
 			<family>Kochi Mincho</family>
 			<family>AR PL SungtiL GB</family>
 			<family>AR PL Mingti2L Big5</family>
+ 			<family>AR PL Zenkai Uni</family>
 			<family>ＭＳ 明朝</family>
+ 			<family>ZYSong18030</family>
+			<family>UnBatang</family>
 			<family>Baekmuk Batang</family>
+ 			<family>KacstQura</family>
+ 			<family>Frank Ruehl CLM</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
-			<family>Nachlieli</family>
+			<family>Nachlieli</family> <!-- hebrew -->
+			<family>Lucida Sans Unicode</family>
+			<family>Yudit Unicode</family>
+			<family>Kerkis</family> <!-- greek -->
+			<family>ArmNet Helvetica</family> <!-- armenian -->
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Waree</family> <!-- thai -->
+			<family>Loma</family> <!-- thai -->
+			<family>Garuda</family> <!-- thai -->
+			<family>Umpush</family> <!-- thai -->
+			<family>Saysettha Unicode</family> <!-- lao? -->
+			<family>JG Lao Old Arial</family> <!-- lao -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family> <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<!-- chinese fonts are actually serifed -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Modata</family>
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
 			<family>AR PL KaitiM Big5</family>
+ 			<family>AR PL ShanHeiSun Uni</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
 			<family>ＭＳ ゴシック</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>TSCu_Paranar</family> <!-- tamil -->
+			<family>UnDotum</family>
 			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
+ 			<family>Baekmuk Gulim</family>
+ 			<family>KacstQura</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+ 			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
 		</prefer>
 	</alias>
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Miriam Mono</family>
+			<family>Miriam Mono</family> <!-- hebrew -->
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
 			<family>Kochi Gothic</family>
 			<family>AR PL KaitiM GB</family>
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus Gothic</family> <!-- han (ja) -->
+			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MingLiu</family> <!-- han (zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn) -->
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>UnBatang</family>
+			<family>UnDotum</family>
+			<family>Baekmuk Batang</family> <!-- hangul -->
 			<family>Baekmuk Dotum</family>
+			<family>Baekmuk Gulim</family>
+			<family>TlwgTypo</family> <!-- thai -->
+			<family>TlwgTypist</family> <!-- thai -->
+			<family>TlwgTypewriter</family> <!-- thai -->
+			<family>TlwgMono</family> <!-- thai -->
+			<family>Hasida</family> <!-- hebrew -->
+			<family>Mitra Mono</family> <!-- bengali -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+			<family>Lohit Kannada</family>
+			<family>Lohit Telugu</family>
+			<family>Lohit Oriya</family>
+			<family>LKLUG</family>
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/win32/etc/fonts/conf.d/69-unifont.conf b/win32/etc/fonts/conf.d/69-unifont.conf
index a784af9..177dec5 100644
--- a/win32/etc/fonts/conf.d/69-unifont.conf
+++ b/win32/etc/fonts/conf.d/69-unifont.conf
@@ -6,6 +6,7 @@
 		<prefer>
 			<family>FreeSerif</family>
 			<family>Code2000</family>
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
@@ -13,6 +14,9 @@
 		<prefer>
 			<family>FreeSans</family>
 			<family>Arial Unicode MS</family>
+			<family>Arial Unicode</family>
+			<family>Code2000</family> <!-- almost everything; serif actually -->
+			<family>Code2001</family> <!-- plane1 and beyond -->
 		</prefer>
 	</alias>
 	<alias>
diff --git a/win32/etc/fonts/conf.d/80-delicious.conf b/win32/etc/fonts/conf.d/80-delicious.conf
index 701429b..728f50c 100644
--- a/win32/etc/fonts/conf.d/80-delicious.conf
+++ b/win32/etc/fonts/conf.d/80-delicious.conf
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-delicious.conf -->
 <fontconfig>
 <!-- Fix-ups for Delicious family -->
 
diff --git a/win32/etc/fonts/conf.d/90-synthetic.conf b/win32/etc/fonts/conf.d/90-synthetic.conf
index 63d9b89..b8d1e85 100644
--- a/win32/etc/fonts/conf.d/90-synthetic.conf
+++ b/win32/etc/fonts/conf.d/90-synthetic.conf
@@ -27,10 +27,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
-                <!-- and disable embedded bitmaps for artificial oblique -->
-                <edit name="embeddedbitmap" mode="assign">
-                        <bool>false</bool>
-                </edit>
+		<!-- and disable embedded bitmaps for artificial oblique -->
+		<edit name="embeddedbitmap" mode="assign">
+			<bool>false</bool>
+		</edit>
 	</match>
 
 <!--
diff --git a/win32/etc/fonts/conf.d/README b/win32/etc/fonts/conf.d/README
new file mode 100644
index 0000000..c2fb52c
--- /dev/null
+++ b/win32/etc/fonts/conf.d/README
@@ -0,0 +1,23 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*.conf.
+These files are normally installed in ../conf.avail and then symlinked here,
+allowing them to be easily installed and then enabled/disabled by adjusting
+the symlinks.
+
+The files are loaded in numeric order, the structure of the configuration
+has led to the following conventions in usage:
+
+ Files begining with:	Contain:
+ 
+ 00 through 09		Font directories
+ 10 through 19		system rendering defaults (AA, etc)
+ 20 through 29		font rendering options
+ 30 through 39		family substitution
+ 40 through 49		generic identification, map family->generic
+ 50 through 59		alternate config file loading
+ 60 through 69		generic aliases, map generic->family
+ 70 through 79		select font (adjust which fonts are available)
+ 80 through 89		match target="scan" (modify scanned patterns)
+ 90 through 99		font synthesis
diff --git a/win32/etc/fonts/fonts.conf b/win32/etc/fonts/fonts.conf
index df31883..6f5fe4b 100644
--- a/win32/etc/fonts/fonts.conf
+++ b/win32/etc/fonts/fonts.conf
@@ -27,11 +27,6 @@
 	
 	<dir>~/.fonts</dir>
 
-<!-- Font cache directory list -->
-
-	<cachedir>WINDOWSTEMPDIR_FONTCONFIG_CACHE</cachedir>
-	<cachedir>~/.fontconfig</cachedir>
-
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
 -->
@@ -73,6 +68,11 @@
 -->
 	<include ignore_missing="yes">conf.d</include>
 
+<!-- Font cache directory list -->
+
+	<cachedir>WINDOWSTEMPDIR_FONTCONFIG_CACHE</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
+
 	<config>
 <!--
   These are the default Unicode chars that are expected to be blank
@@ -131,6 +131,7 @@
 			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
 			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
 			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
 			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
 			<int>0x3164</int>	<!-- HANGUL FILLER -->
 			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->
diff --git a/win32/etc/fonts/fonts.dtd b/win32/etc/fonts/fonts.dtd
index a5c54f9..cbdfdab 100644
--- a/win32/etc/fonts/fonts.dtd
+++ b/win32/etc/fonts/fonts.dtd
@@ -114,6 +114,8 @@
 	  name CDATA	#REQUIRED>
 
 <!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ATTLIST alias
+	  binding (weak|strong|same) "weak">
 <!ELEMENT prefer (family)*>
 <!ELEMENT accept (family)*>
 <!ELEMENT default (family)*>
diff --git a/win32/etc/gtk-2.0/gdk-pixbuf.loaders b/win32/etc/gtk-2.0/gdk-pixbuf.loaders
index f4691c6..8ed6dd2 100644
--- a/win32/etc/gtk-2.0/gdk-pixbuf.loaders
+++ b/win32/etc/gtk-2.0/gdk-pixbuf.loaders
@@ -1,42 +1,48 @@
 # GdkPixbuf Image Loader Modules file
 # Automatically generated file, do not edit
-# Created by gdk-pixbuf-query-loaders.exe from gtk+-2.10.14
+# Created by gdk-pixbuf-query-loaders.exe from gdk-pixbuf-2.22.1
 #
-# LoaderDir = D:\msys\1.0\local/lib/gtk-2.0/2.10.0/loaders
+# LoaderDir = lib/gdk-pixbuf-2.0/2.10.0/loaders
 #
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
-"ani" 4 "gtk20" "The ANI image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.dll"
+"ani" 4 "gdk-pixbuf" "The ANI image format" "LGPL"
 "application/x-navi-animation" ""
 "ani" ""
 "RIFF    ACON" "    xxxx    " 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
-"bmp" 5 "gtk20" "The BMP image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.dll"
+"bmp" 5 "gdk-pixbuf" "The BMP image format" "LGPL"
 "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
 "bmp" ""
 "BM" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
-"gif" 4 "gtk20" "The GIF image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.dll"
+"gif" 4 "gdk-pixbuf" "The GIF image format" "LGPL"
 "image/gif" ""
 "gif" ""
 "GIF8" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
-"ico" 5 "gtk20" "The ICO image format"
-"image/x-icon" "image/x-ico" ""
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.dll"
+"icns" 4 "gdk-pixbuf" "The ICNS image format" "GPL"
+"image/x-icns" ""
+"icns" ""
+"icns" "" 100
+
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.dll"
+"ico" 5 "gdk-pixbuf" "The ICO image format" "LGPL"
+"image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
 "ico" "cur" ""
 "  \001   " "zz znz" 100
 "  \002   " "zz znz" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
-"jpeg" 5 "gtk20" "The JPEG image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.dll"
+"jpeg" 5 "gdk-pixbuf" "The JPEG image format" "LGPL"
 "image/jpeg" ""
 "jpeg" "jpe" "jpg" ""
 "\377\330" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
-"pcx" 4 "gtk20" "The PCX image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.dll"
+"pcx" 4 "gdk-pixbuf" "The PCX image format" "LGPL"
 "image/x-pcx" ""
 "pcx" ""
 "\n \001" "" 100
@@ -45,14 +51,14 @@
 "\n\004\001" "" 100
 "\n\005\001" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.dll"
-"png" 5 "gtk20" "The PNG image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.dll"
+"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL"
 "image/png" ""
 "png" ""
 "\211PNG\r\n\032\n" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
-"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.dll"
+"pnm" 4 "gdk-pixbuf" "The PNM/PBM/PGM/PPM image format family" "LGPL"
 "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
 "pnm" "pbm" "pgm" "ppm" ""
 "P1" "" 100
@@ -62,14 +68,21 @@
 "P5" "" 100
 "P6" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
-"ras" 4 "gtk20" "The Sun raster image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.dll"
+"qtif" 4 "gdk-pixbuf" "The QTIF image format" "LGPL"
+"image/x-quicktime" "image/qtif" ""
+"qtif" "qif" ""
+"abcdidsc" "xxxx    " 100
+"abcdidat" "xxxx    " 100
+
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.dll"
+"ras" 4 "gdk-pixbuf" "The Sun raster image format" "LGPL"
 "image/x-cmu-raster" "image/x-sun-raster" ""
 "ras" ""
 "Y\246j\225" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
-"tga" 4 "gtk20" "The Targa image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.dll"
+"tga" 4 "gdk-pixbuf" "The Targa image format" "LGPL"
 "image/x-tga" ""
 "tga" "targa" ""
 " \001\001" "x  " 100
@@ -79,36 +92,34 @@
 "  \n" "xz " 100
 "  \013" "xz " 100
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
-"tiff" 1 "gtk20" "The TIFF image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.dll"
+"tiff" 1 "gdk-pixbuf" "The TIFF image format" "LGPL"
 "image/tiff" ""
 "tiff" "tif" ""
 "MM *" "  z " 100
 "II* " "   z" 100
+"II* \020   CR\002 " "   z zzz   z" 0
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
-"wbmp" 4 "gtk20" "The WBMP image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.dll"
+"wbmp" 4 "gdk-pixbuf" "The WBMP image format" "LGPL"
 "image/vnd.wap.wbmp" ""
 "wbmp" ""
-" " "z" 1
+"  " "zz" 1
+" `" "z " 1
+" @" "z " 1
+"  " "z " 1
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
-"xbm" 4 "gtk20" "The XBM image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.dll"
+"xbm" 4 "gdk-pixbuf" "The XBM image format" "LGPL"
 "image/x-xbitmap" ""
 "xbm" ""
 "#define " "" 100
 "/*" "" 50
 
-"lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
-"xpm" 4 "gtk20" "The XPM image format"
+"lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.dll"
+"xpm" 4 "gdk-pixbuf" "The XPM image format" "LGPL"
 "image/x-xpixmap" ""
 "xpm" ""
 "/* XPM */" "" 100
 
-"lib/gtk-2.0/2.10.0/loaders/svg_loader.dll"
-"svg" 2 "gtk20" "Scalable Vector Graphics"
-"image/svg+xml" "image/svg" "image/svg-xml" "image/vnd.adobe.svg+xml" "text/xml-svg" "image/svg+xml-compressed" ""
-"svg" "svgz" "svg.gz" ""
-" <svg" "*    " 100
-" <!DOCTYPE svg" "*             " 100
 
diff --git a/win32/etc/gtk-2.0/gtk.immodules b/win32/etc/gtk-2.0/gtk.immodules
deleted file mode 100644
index 824ff0b..0000000
--- a/win32/etc/gtk-2.0/gtk.immodules
+++ /dev/null
@@ -1,6 +0,0 @@
-# GTK+ Input Method Modules file
-# Automatically generated file, do not edit
-# Created by d:\dev\gtk+-2.10.14\gtk\.libs\gtk-query-immodules-2.0.exe from gtk+-2.10.14
-#
-# ModulesPath = d:\home\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;d:\home\.gtk-2.0\2.10.0\immodules;d:\home\.gtk-2.0\i686-pc-mingw32\immodules;d:\home\.gtk-2.0\immodules;d:\dev\gtk+-2.10.14\gtk\.libs\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;d:\dev\gtk+-2.10.14\gtk\.libs\lib\gtk-2.0\2.10.0\immodules;d:\dev\gtk+-2.10.14\gtk\.libs\lib\gtk-2.0\i686-pc-mingw32\immodules;d:\dev\gtk+-2.10.14\gtk\.libs\lib\gtk-2.0\immodules
-#
diff --git a/win32/etc/pango/pango.modules b/win32/etc/pango/pango.modules
index 47ff721..68a6d9e 100644
--- a/win32/etc/pango/pango.modules
+++ b/win32/etc/pango/pango.modules
@@ -1,7 +1,7 @@
 # Pango Modules file
 # Automatically generated file, do not edit
 #
-# ModulesPath = lib\pango\1.6.0\modules
+# ModulesPath = lib/pango/1.6.0/modules
 #
 "lib\\pango\\1.6.0\\modules\\pango-arabic-fc.dll" ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:*
 "lib\\pango\\1.6.0\\modules\\pango-arabic-lang.dll" ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:*
--
cgit v0.9.1