X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fonts.dtd;h=cd016d3ca9035a10750eccd58b16504bf739c003;hb=af180c40376690b7ced5262156fbe13c9ebba1e2;hp=4233b732bffa1283fec247699c610ea96e212b1e;hpb=47d4f9501fe21603feb5f3f233ea3bc6ec15f494;p=fontconfig.git

diff --git a/fonts.dtd b/fonts.dtd
index 4233b73..cd016d3 100644
--- a/fonts.dtd
+++ b/fonts.dtd
@@ -3,6 +3,7 @@
 		      cache | 
 		      include | 
 		      config |
+		      selectfont |
 		      match | 
 		      alias)* >
 
@@ -21,6 +22,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
@@ -80,6 +93,24 @@
  -->
 <!ELEMENT rescan (int)>
 
+<!--
+    Edit list of available fonts at startup/reload time
+ -->
+<!ELEMENT selectfont (rejectfont | acceptfont)* >
+
+<!ELEMENT rejectfont (glob | pattern)*>
+
+<!ELEMENT acceptfont (glob | pattern)*>
+
+<!ELEMENT glob (#PCDATA)>
+
+<!ELEMENT pattern (patelt)*>
+
+<!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)*>
@@ -91,7 +122,7 @@
 <!ENTITY % expr 'int|double|string|matrix|bool|charset
 		|name|const
 		|or|and|eq|not_eq|less|less_eq|more|more_eq|contains|not_contains
-		|plus|minus|times|divide|not|if'>
+		|plus|minus|times|divide|not|if|floor|ceil|round|trunc'>
 
 <!--
     Match and edit patterns.
@@ -145,7 +176,7 @@
 <!ATTLIST edit
 	  name CDATA	    #REQUIRED
 	  mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
-	  binding (weak|strong) "weak">
+	  binding (weak|strong|same) "weak">
 
 <!--
     Elements of expressions follow
@@ -157,7 +188,7 @@
 <!ELEMENT string (#PCDATA)>
 <!ATTLIST string xml:space (default|preserve) 'preserve'>
 <!ELEMENT matrix (double,double,double,double)>
-<!ELEMENT bool (true|false)>
+<!ELEMENT bool (#PCDATA)>
 <!ELEMENT charset (#PCDATA)>
 <!ATTLIST charset xml:space (default|preserve) 'preserve'>
 <!ELEMENT name (#PCDATA)>
@@ -180,3 +211,7 @@
 <!ELEMENT divide (%expr;)*>
 <!ELEMENT not (%expr;)>
 <!ELEMENT if ((%expr;), (%expr;), (%expr;))>
+<!ELEMENT floor (%expr;)>
+<!ELEMENT ceil (%expr;)>
+<!ELEMENT round (%expr;)>
+<!ELEMENT trunc (%expr;)>