X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgschema.dtd;h=00e3a1653917932aea449a0ed7255062b31fa0f5;hb=174ebaefcc2b1b94f4a628e60f150b7209230dbf;hp=249dd7d0e7cf5c3c50b8ebb467b5e504d8a39c79;hpb=c7816005f99c5293b608c70d4b341d410cb5aea4;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gschema.dtd b/gio/gschema.dtd
index 249dd7d..00e3a16 100644
--- a/gio/gschema.dtd
+++ b/gio/gschema.dtd
@@ -1,29 +1,37 @@
 <!ELEMENT schemalist (schema|enum)* >
-<!ATTLIST schemalist gettext-domain #IMPLIED >
+<!ATTLIST schemalist gettext-domain CDATA #IMPLIED >
 
-<!ELEMENT schema (key|child)* >
+<!ELEMENT schema (key|child|override)* >
 <!ATTLIST schema id             CDATA #REQUIRED
                  path           CDATA #IMPLIED
-                 gettext-domain CDATA #IMPLIED >
+                 gettext-domain CDATA #IMPLIED
+                 extends        CDATA #IMPLIED
+                 list-of        CDATA #IMPLIED >
 
-<!-- defines an enumerated type -->
+<!-- enumerated and flags types -->
 <!-- each value element maps a nick to a numeric value -->
 <!ELEMENT enum (value*) >
 <!ATTLIST enum id CDATA #REQUIRED >
+
+<!ELEMENT flags (value*) >
+<!ATTLIST flags id CDATA #REQUIRED >
+
 <!ELEMENT value EMPTY >
 <!-- nick must be at least 2 characters long -->
 <!-- value must be parsable as a 32-bit integer -->
-<!ELEMENT value nick  #REQUIRED
-                value #REQUIRED >
+<!ATTLIST value nick  CDATA #REQUIRED
+                value CDATA #REQUIRED >
 
-<!ELEMENT key (default|summary?|description?|range?|choices?|aliases?) >
+<!ELEMENT key (default|summary?|description?|range?|choices?|aliases?)* >
 <!-- name can only contain lowercase letters, numbers and '-' -->
 <!-- type must be a GVariant type string -->
-<!-- enum must be the id of an enum that has been defined earlier -->
-<!-- exactly one of enum or type must be given -->
-<!ATTLIST key name CDATA #REQUIRED
-              type CDATA #IMPLIED
-              enum CDATA #IMPLIED >
+<!-- enum must be the id of an enum type that has been defined earlier -->
+<!-- flags must be the id of a flags type that has been defined earlier -->
+<!-- exactly one of type, enum or flags must be given -->
+<!ATTLIST key name  CDATA #REQUIRED
+              type  CDATA #IMPLIED
+              enum  CDATA #IMPLIED
+              flags CDATA #IMPLIED >
 
 <!-- the default value is specified a a serialized GVariant,
      i.e. you have to include the quotes when specifying a string -->
@@ -58,3 +66,8 @@
 <!ELEMENT child EMPTY >
 <!ATTLIST child name   CDATA #REQUIRED
                 schema CDATA #REQUIRED >
+
+<!ELEMENT override (#PCDATA) >
+<!ATTLIST override name    CDATA #REQUIRED
+                   l10n    CDATA #IMPLIED
+                   context CDATA #IMPLIED >