From: Keith Packard <keithp@neko.keithp.com>
Date: Sun, 10 Sep 2006 04:29:08 +0000 (-0700)
Subject: Include cachedir in fonts.dtd.
X-Git-Tag: 2.4.0~3
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d08feb851a585b6cfe3ef1f390d60dd8886249b2;p=fontconfig.git

Include cachedir in fonts.dtd.

Fonts.dtd <fontconfig> element was missing the new cachedir element.
---

diff --git a/fonts.dtd b/fonts.dtd
index 06f1a12..a5c54f9 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,12 +107,12 @@
 
 <!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?)>
 <!ELEMENT prefer (family)*>
 <!ELEMENT accept (family)*>