diff options
Diffstat (limited to 'doc/introspect.dtd')
| -rw-r--r-- | doc/introspect.dtd | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/doc/introspect.dtd b/doc/introspect.dtd index 5e1c96df..fd6aa472 100644 --- a/doc/introspect.dtd +++ b/doc/introspect.dtd @@ -4,32 +4,33 @@ <!-- see D-BUS specification for documentation --> -<!ELEMENT node (interface,node)> +<!ELEMENT node (interface*,node*)> <!ATTLIST node name CDATA #REQUIRED> -<!ELEMENT interface (method,signal,property)> +<!ELEMENT interface (annotation*,method*,signal*,property*)> <!ATTLIST interface name CDATA #REQUIRED> -<!ATTLIST interface deprecated CDATA "no"> +<!ELEMENT method (annotation*,arg*)> <!ATTLIST method name CDATA #REQUIRED> -<!ATTLIST method deprecated #IMPLIED> <!ELEMENT arg EMPTY> -<!ATTLIST arg name CDATA #REQUIRED> +<!ATTLIST arg name CDATA #IMPLIED> <!ATTLIST arg type CDATA #REQUIRED> <!-- Method arguments SHOULD include "direction", while signal and error arguments SHOULD not (since there's no point). The DTD format can't express that subtlety. --> -<!ATTLIST arg direction "in|out" #IMPLIED> +<!ATTLIST arg direction (in|out) "in"> -<!ELEMENT signal (arg)> +<!ELEMENT signal (arg,annotation)> <!ATTLIST signal name CDATA #REQUIRED> -<!ATTLIST signal deprecated #IMPLIED> -<!ELEMENT property> <!-- AKA "attribute" --> +<!ELEMENT property (annotation)> <!-- AKA "attribute" --> <!ATTLIST property name CDATA #REQUIRED> <!ATTLIST property type CDATA #REQUIRED> -<!ATTLIST property access "read|write|readwrite" #REQUIRED> -<!ATTLIST property deprecated #IMPLIED> +<!ATTLIST property access (read|write|readwrite) #REQUIRED> + +<!ELEMENT annotation EMPTY> <!-- Generic metadata --> +<!ATTLIST annotation name CDATA #REQUIRED> +<!ATTLIST annotation value CDATA #REQUIRED> |