X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.dtd;h=5f072ee44e37bec0ba16f075ee6e6a52cce4b5b9;hb=8c58dc276895cbeb0e9ae79718b1a38a082709d3;hp=6c9a33df41560db3f87efe68e81a0047cf5df4eb;hpb=4f27c1c0a383e891890ab27c74226957ed7067aa;p=fontconfig.git

diff --git a/fonts.dtd b/fonts.dtd
index 6c9a33d..5f072ee 100644
--- a/fonts.dtd
+++ b/fonts.dtd
@@ -1,6 +1,7 @@
 <!-- This is the Document Type Definition for font configuration files -->
 <!ELEMENT fontconfig (dir | 
 		      cache | 
+		      cachedir |
 		      include | 
 		      config |
 		      selectfont |
@@ -22,6 +23,18 @@
 <!ELEMENT cache (#PCDATA)>
 <!ATTLIST cache xml:space (default|preserve) 'preserve'>
 
+<!--
+    Add a directory that is searched for font cache files.
+    These hold per-directory cache data and are searched in
+    order for each directory. When writing cache files, the first
+    directory which allows the cache file to be created is used.
+
+    A leading '~' in a directory name is replaced with the users
+    home directory path.
+-->
+<!ELEMENT cachedir (#PCDATA)>
+<!ATTLIST cachedir xml:space (default|preserve) 'preserve'>
+
 <!--
     Reference another configuration file; note that this
     is another complete font configuration file and not
@@ -50,7 +63,7 @@
     the set of valid Unicode chars.  This idea
     was borrowed from Mozilla
  -->
-<!ELEMENT blank (int)*>
+<!ELEMENT blank (int|range)*>
 
 <!--
     Aliases are just a special case for multiple match elements
@@ -94,20 +107,22 @@
 
 <!ELEMENT pattern (patelt)*>
 
-<!ELEMENT patelt (constant)*>
+<!ENTITY % constant 'int|double|string|matrix|bool|charset|langset|const'>
+
+<!ELEMENT patelt (%constant;)*>
 <!ATTLIST patelt
 	  name CDATA	#REQUIRED>
 
-<!ELEMENT constant (int|double|string|matrix|bool|charset|const)>
-
 <!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ATTLIST alias
+	  binding (weak|strong|same) "weak">
 <!ELEMENT prefer (family)*>
 <!ELEMENT accept (family)*>
 <!ELEMENT default (family)*>
 <!ELEMENT family (#PCDATA)>
 <!ATTLIST family xml:space (default|preserve) 'preserve'>
 
-<!ENTITY % expr 'int|double|string|matrix|bool|charset
+<!ENTITY % expr 'int|double|string|matrix|bool|charset|langset
 		|name|const
 		|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
 		|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
@@ -121,7 +136,7 @@
 -->
 <!ELEMENT match (test*, edit*)>
 <!ATTLIST match
-	  target (pattern|font)	"pattern">
+	  target (pattern|font|scan) "pattern">
 
 <!--
     Match a field in a pattern
@@ -134,6 +149,10 @@
     For match elements with target=font, if test 'target' is 'pattern',
     then the test is applied to the pattern used in matching rather than
     to the resulting font.
+
+    Match elements with target=scan are applied as fonts are scanned.
+    They edit the pattern generated from the scanned font and affect
+    what the fontconfig database contains.
 -->
 <!ELEMENT test (%expr;)*>
 <!ATTLIST test 
@@ -177,8 +196,9 @@
 <!ATTLIST string xml:space (default|preserve) 'preserve'>
 <!ELEMENT matrix (double,double,double,double)>
 <!ELEMENT bool (#PCDATA)>
-<!ELEMENT charset (#PCDATA)>
-<!ATTLIST charset xml:space (default|preserve) 'preserve'>
+<!ELEMENT charset (int|range)*>
+<!ELEMENT range (int,int)>
+<!ELEMENT langset (string)*>
 <!ELEMENT name (#PCDATA)>
 <!ATTLIST name xml:space (default|preserve) 'preserve'>
 <!ELEMENT const (#PCDATA)>