Update fonts.dtd for fontconfig 2.10.92.

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

2 files changed, 161 insertions, 202 deletions

diff --git a/Master/tlpkg/tlpostcode/xetex/conf/fonts.conf b/Master/tlpkg/tlpostcode/xetex/conf/fonts.conf
index 4eb1724d40a..9c6af3b4598 100644
--- a/Master/tlpkg/tlpostcode/xetex/conf/fonts.conf
+++ b/Master/tlpkg/tlpostcode/xetex/conf/fonts.conf
@@ -1,195 +1,146 @@
-<?xml version="1.0"?>

-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">

-<!-- /etc/fonts/fonts.conf file to configure system font access -->

-<fontconfig>

-<!--

-	Find fonts in these directories

-

-        You can add other directories if you have additional fonts.

-        Example:

-<dir>c:/windows/fonts</dir>

-<dir>c:/usr/local/share/texmf/fonts/opentype/dnscreen/hiragino</dir>

-<dir>c:/usr/local/share/texmf/fonts/opentype/adobe/kozuka</dir>

-

--->

-

-<dir>c:/windows/fonts</dir>

-<dir>c:/Program Files/texlive/YYYY/texmf-dist/fonts/opentype</dir>

-<dir>c:/Program Files/texlive/YYYY/texmf-dist/fonts/truetype</dir>

-

-

-<!-- Font cache directory list

-        example:

-	<cachedir>c:/etc/fccache</cachedir>

-        You don't need to set this section.

--->

-

-

-<!--

-	Accept deprecated 'mono' alias, replacing it with 'monospace'

--->

-<match target="pattern">

-   <test qual="any" name="family"><string>mono</string></test>

-   <edit name="family" mode="assign"><string>monospace</string></edit>

-</match>

-

-<!--

-  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'

--->

-<match target="pattern">

-  <test qual="any" name="family">

-    <string>sans serif</string>

-  </test>

-  <edit name="family" mode="assign">

-    <string>sans-serif</string>

-  </edit>

-</match>

-

-

-<!--

-  Accept deprecated 'sans' alias, replacing it with 'sans-serif'

--->

-<match target="pattern">

-  <test qual="any" name="family">

-    <string>sans</string>

-  </test>

-  <edit name="family" mode="assign">

-    <string>sans-serif</string>

-  </edit>

-</match>

-

-<!--

-	Names not including any well known alias are given 'sans'

--->

-<match target="pattern">

- <test qual="all" name="family" mode="not_eq"><string>sans</string></test>

- <test qual="all" name="family" mode="not_eq"><string>serif</string></test>

- <test qual="all" name="family" mode="not_eq"><string>monospace</string></test>

- <edit name="family" mode="append_last"><string>sans</string></edit>

-</match>

-

-<!--

-	Load local customization files, but don't complain

-	if there aren't any

--->

-<include ignore_missing="yes">conf.d</include>

-<include ignore_missing="yes">local.conf</include>

-

-<!--

-	Alias well known font names to available TrueType fonts.

-	These substitute TrueType faces for similar Type1

-	faces to improve screen appearance.

--->

-<alias>

-	<family>Times</family>

-	<prefer><family>Times New Roman</family></prefer>

-	<default><family>serif</family></default>

-</alias>

-<alias>

-	<family>Helvetica</family>

-	<prefer><family>Arial</family></prefer>

-	<default><family>sans</family></default>

-</alias>

-<alias>

-	<family>Courier</family>

-	<prefer><family>Courier New</family></prefer>

-	<default><family>monospace</family></default>

-</alias>

-

-<!--

-	Provide required aliases for standard names

-	Do these after the users configuration file so that

-	any aliases there are used preferentially

--->

-<alias>

-	<family>serif</family>

-	<prefer><family>Times New Roman</family></prefer>

-</alias>

-<alias>

-	<family>sans</family>

-	<prefer><family>Arial</family></prefer>

-</alias>

-<alias>

-	<family>monospace</family>

-	<prefer><family>Andale Mono</family></prefer>

-</alias>

-

-<config>

-<!--

-  These are the default Unicode chars that are expected to be blank

-  in fonts.  All other blank chars are assumed to be broken and

-  won't appear in the resulting charsets

--->

-  <blank>

-    <int>0x0020</int>  <!-- SPACE -->

-    <int>0x00A0</int>  <!-- NO-BREAK SPACE -->

-    <int>0x00AD</int>  <!-- SOFT HYPHEN -->

-    <int>0x034F</int>  <!-- COMBINING GRAPHEME JOINER -->

-    <int>0x0600</int>  <!-- ARABIC NUMBER SIGN -->

-    <int>0x0601</int>  <!-- ARABIC SIGN SANAH -->

-    <int>0x0602</int>  <!-- ARABIC FOOTNOTE MARKER -->

-    <int>0x0603</int>  <!-- ARABIC SIGN SAFHA -->

-    <int>0x06DD</int>  <!-- ARABIC END OF AYAH -->

-    <int>0x070F</int>  <!-- SYRIAC ABBREVIATION MARK -->

-    <int>0x115F</int>  <!-- HANGUL CHOSEONG FILLER -->

-    <int>0x1160</int>  <!-- HANGUL JUNGSEONG FILLER -->

-    <int>0x1680</int>  <!-- OGHAM SPACE MARK -->

-    <int>0x17B4</int>  <!-- KHMER VOWEL INHERENT AQ -->

-    <int>0x17B5</int>  <!-- KHMER VOWEL INHERENT AA -->

-    <int>0x180E</int>  <!-- MONGOLIAN VOWEL SEPARATOR -->

-    <int>0x2000</int>  <!-- EN QUAD -->

-    <int>0x2001</int>  <!-- EM QUAD -->

-    <int>0x2002</int>  <!-- EN SPACE -->

-    <int>0x2003</int>  <!-- EM SPACE -->

-    <int>0x2004</int>  <!-- THREE-PER-EM SPACE -->

-    <int>0x2005</int>  <!-- FOUR-PER-EM SPACE -->

-    <int>0x2006</int>  <!-- SIX-PER-EM SPACE -->

-    <int>0x2007</int>  <!-- FIGURE SPACE -->

-    <int>0x2008</int>  <!-- PUNCTUATION SPACE -->

-    <int>0x2009</int>  <!-- THIN SPACE -->

-    <int>0x200A</int>  <!-- HAIR SPACE -->

-    <int>0x200B</int>  <!-- ZERO WIDTH SPACE -->

-    <int>0x200C</int>  <!-- ZERO WIDTH NON-JOINER -->

-    <int>0x200D</int>  <!-- ZERO WIDTH JOINER -->

-    <int>0x200E</int>  <!-- LEFT-TO-RIGHT MARK -->

-    <int>0x200F</int>  <!-- RIGHT-TO-LEFT MARK -->

-    <int>0x2028</int>  <!-- LINE SEPARATOR -->

-    <int>0x2029</int>  <!-- PARAGRAPH SEPARATOR -->

-    <int>0x202A</int>  <!-- LEFT-TO-RIGHT EMBEDDING -->

-    <int>0x202B</int>  <!-- RIGHT-TO-LEFT EMBEDDING -->

-    <int>0x202C</int>  <!-- POP DIRECTIONAL FORMATTING -->

-    <int>0x202D</int>  <!-- LEFT-TO-RIGHT OVERRIDE -->

-    <int>0x202E</int>  <!-- RIGHT-TO-LEFT OVERRIDE -->

-    <int>0x202F</int>  <!-- NARROW NO-BREAK SPACE -->

-    <int>0x205F</int>  <!-- MEDIUM MATHEMATICAL SPACE -->

-    <int>0x2060</int>  <!-- WORD JOINER -->

-    <int>0x2061</int>  <!-- FUNCTION APPLICATION -->

-    <int>0x2062</int>  <!-- INVISIBLE TIMES -->

-    <int>0x2063</int>  <!-- INVISIBLE SEPARATOR -->

-    <int>0x206A</int>  <!-- INHIBIT SYMMETRIC SWAPPING -->

-    <int>0x206B</int>  <!-- ACTIVATE SYMMETRIC SWAPPING -->

-    <int>0x206C</int>  <!-- INHIBIT ARABIC FORM SHAPING -->

-    <int>0x206D</int>  <!-- ACTIVATE ARABIC FORM SHAPING -->

-    <int>0x206E</int>  <!-- NATIONAL DIGIT SHAPES -->

-    <int>0x206F</int>  <!-- NOMINAL DIGIT SHAPES -->

-    <int>0x3000</int>  <!-- IDEOGRAPHIC SPACE -->

-    <int>0x3164</int>  <!-- HANGUL FILLER -->

-    <int>0xFEFF</int>  <!-- ZERO WIDTH NO-BREAK SPACE -->

-    <int>0xFFA0</int>  <!-- HALFWIDTH HANGUL FILLER -->

-    <int>0xFFF9</int>  <!-- INTERLINEAR ANNOTATION ANCHOR -->

-    <int>0xFFFA</int>  <!-- INTERLINEAR ANNOTATION SEPARATOR -->

-    <int>0xFFFB</int>  <!-- INTERLINEAR ANNOTATION TERMINATOR -->

-  </blank>

-<!--

-  Rescan configuration every 60 seconds when FcFontSetList is called

-  (commented out)

--->

-

-<!--

-  <rescan>

-    <int>60</int>

-  </rescan>

--->

-

-</config>

-</fontconfig>

+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+<!-- 
+	Find fonts in these directories
+
+        You can add other directories if you have additional fonts.
+        Example:
+<dir>c:/windows/fonts</dir>
+<dir>c:/usr/local/share/texmf/fonts/opentype/dnscreen/hiragino</dir>
+<dir>c:/usr/local/share/texmf/fonts/opentype/adobe/kozuka</dir>
+  To use "local.conf" for additional directories is recommended.
+-->
+
+<dir>c:/windows/fonts</dir>
+<dir>c:/Program Files/texlive/YYYY/texmf-dist/fonts/opentype</dir>
+<dir>c:/Program Files/texlive/YYYY/texmf-dist/fonts/truetype</dir>
+
+
+<!-- Font cache directory list
+        example:
+	<cachedir>c:/etc/fccache</cachedir>
+        You don't need to set this section.
+-->
+
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Load local system customization file
+-->
+	<include ignore_missing="yes">conf.d</include>
+
+<!-- Font cache directory list -->
+
+  <config>
+<!--
+  These are the default Unicode chars that are expected to be blank
+  in fonts.  All other blank chars are assumed to be broken and
+  won't appear in the resulting charsets
+ -->
+		<blank>
+			<int>0x0020</int>	<!-- SPACE -->
+			<int>0x00A0</int>	<!-- NO-BREAK SPACE -->
+			<int>0x00AD</int>	<!-- SOFT HYPHEN -->
+			<int>0x034F</int>	<!-- COMBINING GRAPHEME JOINER -->
+			<int>0x0600</int>	<!-- ARABIC NUMBER SIGN -->
+			<int>0x0601</int>	<!-- ARABIC SIGN SANAH -->
+			<int>0x0602</int>	<!-- ARABIC FOOTNOTE MARKER -->
+			<int>0x0603</int>	<!-- ARABIC SIGN SAFHA -->
+			<int>0x06DD</int>	<!-- ARABIC END OF AYAH -->
+			<int>0x070F</int>	<!-- SYRIAC ABBREVIATION MARK -->
+			<int>0x115F</int>	<!-- HANGUL CHOSEONG FILLER -->
+			<int>0x1160</int>	<!-- HANGUL JUNGSEONG FILLER -->
+			<int>0x1680</int>	<!-- OGHAM SPACE MARK -->
+			<int>0x17B4</int>	<!-- KHMER VOWEL INHERENT AQ -->
+			<int>0x17B5</int>	<!-- KHMER VOWEL INHERENT AA -->
+			<int>0x180E</int>	<!-- MONGOLIAN VOWEL SEPARATOR -->
+			<int>0x2000</int>	<!-- EN QUAD -->
+			<int>0x2001</int>	<!-- EM QUAD -->
+			<int>0x2002</int>	<!-- EN SPACE -->
+			<int>0x2003</int>	<!-- EM SPACE -->
+			<int>0x2004</int>	<!-- THREE-PER-EM SPACE -->
+			<int>0x2005</int>	<!-- FOUR-PER-EM SPACE -->
+			<int>0x2006</int>	<!-- SIX-PER-EM SPACE -->
+			<int>0x2007</int>	<!-- FIGURE SPACE -->
+			<int>0x2008</int>	<!-- PUNCTUATION SPACE -->
+			<int>0x2009</int>	<!-- THIN SPACE -->
+			<int>0x200A</int>	<!-- HAIR SPACE -->
+			<int>0x200B</int>	<!-- ZERO WIDTH SPACE -->
+			<int>0x200C</int>	<!-- ZERO WIDTH NON-JOINER -->
+			<int>0x200D</int>	<!-- ZERO WIDTH JOINER -->
+			<int>0x200E</int>	<!-- LEFT-TO-RIGHT MARK -->
+			<int>0x200F</int>	<!-- RIGHT-TO-LEFT MARK -->
+			<int>0x2028</int>	<!-- LINE SEPARATOR -->
+			<int>0x2029</int>	<!-- PARAGRAPH SEPARATOR -->
+			<int>0x202A</int>	<!-- LEFT-TO-RIGHT EMBEDDING -->
+			<int>0x202B</int>	<!-- RIGHT-TO-LEFT EMBEDDING -->
+			<int>0x202C</int>	<!-- POP DIRECTIONAL FORMATTING -->
+			<int>0x202D</int>	<!-- LEFT-TO-RIGHT OVERRIDE -->
+			<int>0x202E</int>	<!-- RIGHT-TO-LEFT OVERRIDE -->
+			<int>0x202F</int>	<!-- NARROW NO-BREAK SPACE -->
+			<int>0x205F</int>	<!-- MEDIUM MATHEMATICAL SPACE -->
+			<int>0x2060</int>	<!-- WORD JOINER -->
+			<int>0x2061</int>	<!-- FUNCTION APPLICATION -->
+			<int>0x2062</int>	<!-- INVISIBLE TIMES -->
+			<int>0x2063</int>	<!-- INVISIBLE SEPARATOR -->
+			<int>0x206A</int>	<!-- INHIBIT SYMMETRIC SWAPPING -->
+			<int>0x206B</int>	<!-- ACTIVATE SYMMETRIC SWAPPING -->
+			<int>0x206C</int>	<!-- INHIBIT ARABIC FORM SHAPING -->
+			<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 -->
+			<int>0xFFA0</int>	<!-- HALFWIDTH HANGUL FILLER -->
+			<int>0xFFF9</int>	<!-- INTERLINEAR ANNOTATION ANCHOR -->
+			<int>0xFFFA</int>	<!-- INTERLINEAR ANNOTATION SEPARATOR -->
+			<int>0xFFFB</int>	<!-- INTERLINEAR ANNOTATION TERMINATOR -->
+		</blank>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>
diff --git a/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd b/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
index 5f072ee44e3..4c38e77f08f 100644
--- a/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
+++ b/Master/tlpkg/tlpostcode/xetex/conf/fonts.dtd
@@ -12,7 +12,9 @@
     Add a directory that provides fonts
 -->
 <!ELEMENT dir (#PCDATA)>
-<!ATTLIST dir xml:space (default|preserve) 'preserve'>
+<!ATTLIST dir
+	  prefix    CDATA       "default"
+	  xml:space (default|preserve) 'preserve'>
 
 <!--
     Define the per-user file that holds cache font information.
@@ -33,7 +35,9 @@
     home directory path.
 -->
 <!ELEMENT cachedir (#PCDATA)>
-<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
+<!ATTLIST cachedir
+	  prefix    CDATA      "default"
+	  xml:space (default|preserve) 'preserve'>
 
 <!--
     Reference another configuration file; note that this
@@ -48,6 +52,8 @@
 <!ELEMENT include (#PCDATA)>
 <!ATTLIST include
 	  ignore_missing    (no|yes)		"no"
+	  prefix	    CDATA               "default"
+	  deprecated	    (yes|no)		"no"
 	  xml:space	    (default|preserve)	"preserve">
 
 <!--
@@ -113,7 +119,7 @@
 <!ATTLIST patelt
 	  name CDATA	#REQUIRED>
 
-<!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ELEMENT alias (test?, family*, prefer?, accept?, default?)>
 <!ATTLIST alias
 	  binding (weak|strong|same) "weak">
 <!ELEMENT prefer (family)*>
@@ -134,7 +140,7 @@
     if 'target' is 'font', execute the match on the result of a font
     selection.
 -->
-<!ELEMENT match (test*, edit*)>
+<!ELEMENT match (test*, edit*)+>
 <!ATTLIST match
 	  target (pattern|font|scan) "pattern">
 
@@ -159,6 +165,7 @@
 	  qual (any|all|first|not_first)    "any"
 	  name CDATA	    #REQUIRED
 	  target (pattern|font|default)		"default"
+	  ignore-blanks (true|false)	"false"
 	  compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains)	"eq">
 
 <!--
@@ -182,7 +189,7 @@
 <!ELEMENT edit (%expr;)*>
 <!ATTLIST edit
 	  name CDATA	    #REQUIRED
-	  mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
+	  mode (assign|assign_replace|prepend|append|prepend_first|append_last|delete|delete_all) "assign"
 	  binding (weak|strong|same) "weak">
 
 <!--
@@ -194,13 +201,14 @@
 <!ATTLIST double xml:space (default|preserve) 'preserve'>
 <!ELEMENT string (#PCDATA)>
 <!ATTLIST string xml:space (default|preserve) 'preserve'>
-<!ELEMENT matrix (double,double,double,double)>
+<!ELEMENT matrix ((%expr;), (%expr;), (%expr;), (%expr;))>
 <!ELEMENT bool (#PCDATA)>
 <!ELEMENT charset (int|range)*>
 <!ELEMENT range (int,int)>
 <!ELEMENT langset (string)*>
 <!ELEMENT name (#PCDATA)>
-<!ATTLIST name xml:space (default|preserve) 'preserve'>
+<!ATTLIST name xml:space (default|preserve) 'preserve'
+	  target (default|font|pattern) 'default'>
 <!ELEMENT const (#PCDATA)>
 <!ATTLIST const xml:space (default|preserve) 'preserve'>
 <!ELEMENT or (%expr;)*>