X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.dtd;h=cbdfdab3fb5675e159b482a1f5ed21f87e71156b;hb=caa4bec9459af0779d1d16ba66964593e5748e3c;hp=cd016d3ca9035a10750eccd58b16504bf739c003;hpb=7410e40bd93beb4ab1a577d084112413431cede2;p=fontconfig.git

diff --git a/fonts.dtd b/fonts.dtd
index cd016d3..cbdfdab 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 |
@@ -106,13 +107,15 @@
 
 <!ELEMENT pattern (patelt)*>
 
-<!ELEMENT patelt (constant)*>
+<!ENTITY % constant 'int|double|string|matrix|bool|charset|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)*>
@@ -133,7 +136,7 @@
 -->
 <!ELEMENT match (test*, edit*)>
 <!ATTLIST match
-	  target (pattern|font)	"pattern">
+	  target (pattern|font|scan) "pattern">
 
 <!--
     Match a field in a pattern
@@ -146,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