XeTeX fontconfig weeding now done

git-svn-id: svn://tug.org/texlive/trunk@26401 c570f23f-e606-0410-a88d-b1316a301751

24 files changed, 0 insertions, 1120 deletions

diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-autohint.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-autohint.conf
deleted file mode 100644
index 5406f4eddb2..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-autohint.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/autohint.conf -->
-<fontconfig>
-<!--  Use the Autohinter --> 
-  <match target="font">
-    <edit name="autohint" mode="assign"><bool>true</bool></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-no-sub-pixel.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-no-sub-pixel.conf
deleted file mode 100644
index 5d64a0b4333..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-no-sub-pixel.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba" mode="assign"><const>none</const></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-bgr.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-bgr.conf
deleted file mode 100644
index 2aba95e13dd..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-bgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba" mode="assign"><const>bgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-rgb.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-rgb.conf
deleted file mode 100644
index c4e8a42e1c1..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-rgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba" mode="assign"><const>rgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vbgr.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vbgr.conf
deleted file mode 100644
index 0cdad2a700c..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vbgr.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba" mode="assign"><const>vbgr</const></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vrgb.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vrgb.conf
deleted file mode 100644
index 60239e0254b..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-sub-pixel-vrgb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--  Enable sub-pixel rendering --> 
-  <match target="font">
-    <edit name="rgba" mode="assign"><const>vrgb</const></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-unhinted.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-unhinted.conf
deleted file mode 100644
index fb0b375acda..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/10-unhinted.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- debian/unhinted.conf -->
-<fontconfig>
-<!--  Disable hinting --> 
-  <match target="font">
-    <edit name="hinting" mode="assign"><bool>false</bool></edit>
-  </match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-fix-globaladvance.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-fix-globaladvance.conf
deleted file mode 100644
index a62162ca0f1..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-fix-globaladvance.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--
-  Some Asian fonts misadvertise themselves as monospaced when
-  in fact they are dual-spaced (half and full).  This makes
-  FreeType very confused as it forces all widths to match.
-  Undo this magic by disabling the width forcing code -->
-	<match target="font">
-		<test name="family"><string>GulimChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>DotumChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>BatangChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-
-	<match target="font">
-		<test name="family"><string>GungsuhChe</string></test>
-		<edit name="globaladvance"><bool>false</bool></edit>
-	</match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-lohit-gujarati.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-lohit-gujarati.conf
deleted file mode 100644
index 1c29d0d0ad5..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-lohit-gujarati.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-<!-- Available Gujarti fonts look much better without hinting -->
-
-	<match target="font">
-		<test name="family"><string>Lohit Gujarati</string></test>
-		<edit name="hinting"><bool>false</bool></edit>
-	</match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-unhint-small-vera.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-unhint-small-vera.conf
deleted file mode 100644
index 3078119803a..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/20-unhint-small-vera.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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
-	disabled below 8 ppem, but FreeType ignores those, preferring to use
-	the data found in the instructed hints.  The initial Vera release
-	didn't include the right instructions in the 'prep' table. Fix this
-	by disabling hinting manually at smaller sizes (< 8ppem)
- -->
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Serif</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Bitstream Vera Sans Mono</string>
-		</test>
-		<test name="pixelsize" compare="less">
-			<double>7.5</double>
-		</test>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-amt-aliases.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-amt-aliases.conf
deleted file mode 100644
index d6df67e0551..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-amt-aliases.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/sub-pixel.conf -->
-<fontconfig>
-<!--
- AMT provides metric and shape compatible fonts for these three web font
- families.
- -->
- 	<alias>
-		<family>Times New Roman</family>
-		<accept><family>Thorndale AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Arial</family>
-		<accept><family>Albany AMT</family></accept>
-	</alias>
- 	<alias>
-		<family>Courier New</family>
-		<accept><family>Cumberland AMT</family></accept>
-	</alias>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-urw-aliases.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-urw-aliases.conf
deleted file mode 100644
index cf90dd5466f..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/30-urw-aliases.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-<?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.
-  -->
-        <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>
-        <alias>
-	  <family>Helvetica</family>
-	  <accept><family>Nimbus Sans 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>
-        <alias>
-	  <family>Zapf Chancery</family>
-	  <accept><family>URW Chancery L</family></accept>
-	</alias>
-        <alias>
-	  <family>Zapf Dingbats</family>
-	  <accept><family>Dingbats</family></accept>
-	</alias>
-	<match target="pattern">
-	  <test name="family">
-	    <string>Symbol</string>
-	  </test>
-	  <edit name="family" mode="append" binding="same">
-	    <string>Standard Symbols L</string>
-	  </edit>
-	</match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/40-generic.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/40-generic.conf
deleted file mode 100644
index 84e85e44bbd..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/40-generic.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-<?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>Times New Roman</family>
-		<family>Times</family>
-		<family>Nimbus Roman No9 L</family>
-		<family>Luxi Serif</family>
-		<family>Kochi Mincho</family>
-		<family>AR PL SungtiL GB</family>
-		<family>AR PL Mingti2L Big5</family>
-		<family>ＭＳ 明朝</family>
-		<family>Baekmuk Batang</family>
-		<family>FreeSerif</family>
-		<family>MgOpen Canonica</family>
-		<default><family>serif</family></default>
-	</alias>
-<!--
-  Sans-serif faces
- -->
-	<alias>
-		<family>Bitstream Vera Sans</family>
-		<family>DejaVu Sans</family>
-		<family>Helvetica</family>
-		<family>Arial</family>
-		<family>Verdana</family>
-		<family>Albany AMT</family>
-		<family>Nimbus Sans L</family>
-		<family>Luxi Sans</family>
-		<family>Kochi Gothic</family>
-		<family>AR PL KaitiM GB</family>
-		<family>AR PL KaitiM Big5</family>
-		<family>ＭＳ ゴシック</family>
-		<family>Baekmuk Dotum</family>
-		<family>SimSun</family>
-		<family>FreeSans</family>
-		<family>MgOpen Modata</family>
-		<default><family>sans-serif</family></default>
-	</alias>
-<!--
-  Monospace faces
- -->
- 	<alias>
-		<family>Bitstream Vera Sans Mono</family>
-		<family>DejaVu Sans Mono</family>
-		<family>Courier</family>
-		<family>Courier New</family>
-		<family>Andale Mono</family>
-		<family>Luxi Mono</family>
-		<family>Cumberland AMT</family>
-		<family>Nimbus Mono L</family>
-		<family>NSimSun</family>
-		<family>FreeMono</family>
-		<default><family>monospace</family></default>
-	</alias>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/49-sansserif.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/49-sansserif.conf
deleted file mode 100644
index c6209a7d315..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/49-sansserif.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!--
-  If the font still has no generic name, add sans-serif
- -->
-	<match target="pattern">
-		<test qual="all" name="family" compare="not_eq">
-			<string>sans-serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>serif</string>
-		</test>
-		<test qual="all" name="family" compare="not_eq">
-			<string>monospace</string>
-		</test>
-		<edit name="family" mode="append_last">
-			<string>sans-serif</string>
-		</edit>
-	</match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/50-user.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/50-user.conf
deleted file mode 100644
index 9a38a40ad9b..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/50-user.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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</include>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/60-latin.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/60-latin.conf
deleted file mode 100644
index 06cdd7e6c76..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/60-latin.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Bitstream Vera Serif</family>
-			<family>DejaVu Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Times</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Bitstream Vera Sans</family>
-			<family>DejaVu Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Helvetica</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>DejaVu Sans Mono</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Courier</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-fonts-persian.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-fonts-persian.conf
deleted file mode 100644
index e30c4d96911..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-fonts-persian.conf
+++ /dev/null
@@ -1,539 +0,0 @@
-<?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.
-
-  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
-  advertising or publicity pertaining to distribution of the software without
-  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
-  representations about the suitability of this software for any purpose.  It
-  is provided "as is" without express or implied warranty.
-
-  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
-  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
-  PERFORMANCE OF THIS SOFTWARE.
-
-  ChangeLog:
-    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.
-  -->
-<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-->
-
-<!-- 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>
-
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- 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>
-
-	<!-- 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>
-
-	<!-- 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>
-
-<!-- Register the fonts that we actually do have -->
-
-	<match target="font">
-		<test name="family">
-			<string>Elham</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Homa</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Koodak</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Nazli</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Roya</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Terafik</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-	<match target="font">
-		<test name="family">
-			<string>Titr</string>
-		</test>
-		<edit name="foundry">
-			<string>farsiweb</string>
-		</edit>
-	</match>
-
-
-<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
-
-	<match target="font">
-		<test name="foundry">
-			<!--string>farsiweb</string-->
-			<string>TURNED-OFF</string>
-		</test>
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>-0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<edit name="slant" mode="assign">
-			<const>oblique</const>
-		</edit>
-	</match>
-
-
-<!--
-  We can't hint our fonts well, so turn off hinting.
-  Moreover, the bitmaps we have designed (well, they
-  have designed), suck, so disable them too.
-  -->
-
-	<match target="font">
-		<test name="foundry">
-			<string>farsiweb</string>
-		</test>
-		<edit name="autohint">
-			<bool>false</bool>
-		</edit>
-		<edit name="hinting">
-			<bool>false</bool>
-		</edit>
- 		<edit name="embeddedbitmap">
- 			<bool>false</bool>
- 		</edit>
-	</match>
-
-
-<!-- Alias our fonts to common families -->
-
-	<!-- Persian serif fonts -->
-	<alias>
-		<family>serif</family>
-		<accept>
-			<family>Nazli</family>
-			<family>Lotoos</family>
-			<family>Mitra</family>
-			<family>Ferdosi</family>
-			<family>Badr</family>
-			<family>Zar</family>
-		</accept>
-	</alias>
-
-	<!-- Persian sans-serif fonts -->
-	<alias>
-		<family>sans-serif</family>
-		<accept>
-			<family>Roya</family>
-			<family>Koodak</family>
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-	<!-- Persian monospace fonts -->
-	<alias>
-		<family>monospace</family>
-		<accept>
-			<!-- Not really monospace -->
-			<family>Terafik</family>
-		</accept>
-	</alias>
-
-
-<!-- Use Titr in titles -->
-
-	<!-- Both serif... -->
-	<match>
-		<test name="family">
-			<string>serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and sans-serif. -->
-	<match>
-		<test name="family">
-			<string>sans-serif</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-	<!-- and more. -->
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<test name="weight" compare="more_eq">
-			<int>200</int>
-		</test>
-		<test name="size" compare="more_eq">
-			<double>24</double>
-		</test>
-		<edit name="family" mode="prepend" binding="same">
-			<string>Titr</string>
-		</edit>
-	</match>
-
-
-<!-- Default substituted for deprecated sans-serif fonts -->
-
-	<match>
-		<test name="family">
-			<string>Persian_sansserif_default</string>
-		</test>
-		<edit name="family" mode="assign" binding="same">
-			<string>Roya</string>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-nonlatin.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-nonlatin.conf
deleted file mode 100644
index f8dbb64fc41..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/65-nonlatin.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Frank Ruehl</family>
-			<family>MgOpen Canonica</family>
-			<family>Kochi Mincho</family>
-			<family>AR PL SungtiL GB</family>
-			<family>AR PL Mingti2L Big5</family>
-			<family>ＭＳ 明朝</family>
-			<family>Baekmuk Batang</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Nachlieli</family>
-			<family>MgOpen Modata</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>AR PL KaitiM Big5</family>
-			<family>ＭＳ ゴシック</family>
-			<family>Baekmuk Dotum</family>
-			<family>SimSun</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Miriam Mono</family>
-			<family>Kochi Gothic</family>
-			<family>AR PL KaitiM GB</family>
-			<family>Baekmuk Dotum</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/69-unifont.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/69-unifont.conf
deleted file mode 100644
index a784af920d0..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/69-unifont.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>FreeSerif</family>
-			<family>Code2000</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>FreeSans</family>
-			<family>Arial Unicode MS</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>FreeMono</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-no-bitmaps.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-no-bitmaps.conf
deleted file mode 100644
index e8fb6a947fb..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-no-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/no-bitmaps.conf -->
-<fontconfig>
-<!-- Reject bitmap fonts -->
- <selectfont>
-  <rejectfont>
-   <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </rejectfont>
- </selectfont>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-yes-bitmaps.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-yes-bitmaps.conf
deleted file mode 100644
index c539c70ac34..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/70-yes-bitmaps.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- conf.d/yes-bitmaps.conf -->
-<fontconfig>
-<!-- Accept bitmap fonts -->
- <selectfont>
-  <acceptfont>
-   <pattern>
-     <patelt name="scalable"><bool>false</bool></patelt>
-   </pattern>
-  </acceptfont>
- </selectfont>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/80-delicious.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/80-delicious.conf
deleted file mode 100644
index 701429bcc41..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/80-delicious.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<!-- /etc/fonts/conf.d/60-delicious.conf -->
-<fontconfig>
-<!-- Fix-ups for Delicious family -->
-
-<!-- Delicious 'heavy' variant says its Medium weight -->
-<match target="scan">
-	<test name="family">
-		<string>Delicious</string>
-	</test>
-	<test name="style">
-		<string>Heavy</string>
-	</test>
-	<edit name="weight">
-		<const>heavy</const>
-	</edit>
-</match>
-
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/90-synthetic.conf b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/90-synthetic.conf
deleted file mode 100644
index 63d9b891b37..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/90-synthetic.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-<!-- 
- Artificial oblique for fonts without an italic or oblique version
- -->
- 
-	<match target="font">
-		<!-- check to see if the font is roman -->
-		<test name="slant">
-			<const>roman</const>
-		</test>
-		<!-- check to see if the pattern requested non-roman -->
-		<test target="pattern" name="slant" compare="not_eq">
-			<const>roman</const>
-		</test>
-		<!-- multiply the matrix to slant the font -->
-		<edit name="matrix" mode="assign">
-			<times>
-				<name>matrix</name>
-				<matrix><double>1</double><double>0.2</double>
-					<double>0</double><double>1</double>
-				</matrix>
-			</times>
-		</edit>
-		<!-- pretend the font is oblique now -->
-		<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>
-	</match>
-
-<!--
- Synthetic emboldening for fonts that do not have bold face available
- -->
-
-	<match target="font">
-		<!-- check to see if the font is just regular -->
-		<test name="weight" compare="less_eq">
-			<const>medium</const>
-		</test>
-		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more">
-			<const>medium</const>
-		</test>
-		<!--
-		  set the embolden flag
-		  needed for applications using cairo, e.g. gucharmap, gedit, ...
-		-->
-		<edit name="embolden" mode="assign">
-			<bool>true</bool>
-		</edit>
-		<!--
-		 set weight to bold
-		 needed for applications using Xft directly, e.g. Firefox, ...
-		-->
-		<edit name="weight" mode="assign">
-			<const>bold</const>
-		</edit>
-	</match>
-</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/README b/Master/tlpkg/tlpostcode/xetex/conf/conf.d/README
deleted file mode 100644
index dbcfe2135f8..00000000000
--- a/Master/tlpkg/tlpostcode/xetex/conf/conf.d/README
+++ /dev/null
@@ -1,48 +0,0 @@
-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]*. 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)
-	10-autohint.conf
-	10-no-sub-pixel.conf
- 	10-sub-pixel-bgr.conf
- 	10-sub-pixel-rgb.conf
- 	10-sub-pixel-vbgr.conf
- 	10-sub-pixel-vrgb.conf
-	10-unhinted.conf
- 20 through 29		font rendering options
- 	20-fix-globaladvance.conf
-	20-lohit-gujarati.conf
-	20-unhint-small-vera.conf
- 30 through 39		family substitution
- 	30-urw-aliases.conf
-	30-amt-aliases.conf
- 40 through 49		generic identification, map family->generic
- 	40-generic-id.conf
-	49-sansserif.conf
- 50 through 59		alternate config file loading
- 	50-user.conf	Load ~/.fonts.conf
-	51-local.conf	Load local.conf
- 60 through 69		generic aliases
- 	60-latin.conf
-	65-fonts-persian.conf
-	65-nonlatin.conf
-	69-unifont.conf
- 70 through 79		select font (adjust which fonts are available)
- 	70-no-bitmaps.conf
-	70-yes-bitmaps.conf
- 80 through 89		match target="scan" (modify scanned patterns)
- 	80-delicious.conf
- 90 through 98		font synthesis
- 	90-synthetic.conf
-