Reimplement FC_LANG as FcTypeLang, freeze patterns, other cleanup

[fontconfig.git] / fonts.dtd

diff --git a/fonts.dtd b/fonts.dtd
index a3c987b23e1f9f34acdd86f30e984b8fd3f5d442..9cbff4b67a4e29f1a811899183a78d0711b15346 100644 (file)
--- a/fonts.dtd
+++ b/fonts.dtd
@@ -39,7 +39,7 @@
 <!--
     Global library configuration data
  -->
-<!ELEMENT config (blanks)*>
+<!ELEMENT config (blank|rescan)*>
 
 <!--
     Specify the set of Unicode encoding values which
@@ -49,7 +49,7 @@
     the set of valid Unicode chars.  This idea
     was borrowed from Mozilla
  -->
-<!ELEMENT blanks (int)*>
+<!ELEMENT blank (int)*>
 
 <!--
     Aliases are just a special case for multiple match elements
@@ -74,7 +74,14 @@
        </edit>
     </match>
 -->
-<!ELEMENT alias (family, prefer?, accept?, default?)>
+<!--
+    Periodically rescan the font configuration and
+    directories to synch internal state with filesystem
+ -->
+<!ELEMENT rescan (int)>
+
+
+<!ELEMENT alias (family*, prefer?, accept?, default?)>
 <!ELEMENT prefer (family)*>
 <!ELEMENT accept (family)*>
 <!ELEMENT default (family)*>
@@ -102,11 +109,18 @@
 
     if 'qual' is 'any', then the match succeeds if any value in the field matches.
     if 'qual' is 'all', then the match succeeds only if all values match.
+    if 'qual' is 'first', then the match succeeds only if the first value matches.
+    if 'qual' is 'not_first', then the match succeeds only if any value other than
+       the first matches.
+    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.
 -->
-<!ELEMENT test (%expr;)>
+<!ELEMENT test (%expr;)*>
 <!ATTLIST test 
-         qual (any|all)    "any"
+         qual (any|all|first|not_first)    "any"
          name CDATA        #REQUIRED
+         target (pattern|font|default)         "default"
          compare (eq|not_eq|less|less_eq|more|more_eq) "eq">
 
 <!--
@@ -130,7 +144,8 @@
 <!ELEMENT edit (%expr;)*>
 <!ATTLIST edit
          name CDATA        #REQUIRED
-         mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign">
+         mode (assign|assign_replace|prepend|append|prepend_first|append_last) "assign"
+         binding (weak|strong) "weak">
 
 <!--
     Elements of expressions follow