Bug 41171 - Invalid use of memset

[fontconfig.git] / fonts.dtd

diff --git a/fonts.dtd b/fonts.dtd
index 06f1a1241a99434ba3e702de34954977e75dc4c7..5f072ee44e37bec0ba16f075ee6e6a52cce4b5b9 100644 (file)
--- 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 |
@@ -62,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
@@ -106,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'>
@@ -193,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)>