X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fxml%2Fld.dtd;h=83cfc0596e0e8fdf96ce1d47859c482f3a5f5241;hb=0920a5755553774f5b41d7603318ea997ecbdca5;hp=00ea552390957f679b48be29da32b26143e170ba;hpb=cca5f6b7431b846b7bdcbf813632cb79580d5874;p=helm.git

diff --git a/helm/software/lambda-delta/xml/ld.dtd b/helm/software/lambda-delta/xml/ld.dtd
index 00ea55239..83cfc0596 100644
--- a/helm/software/lambda-delta/xml/ld.dtd
+++ b/helm/software/lambda-delta/xml/ld.dtd
@@ -12,73 +12,77 @@
 
 <!ELEMENT Sort EMPTY>
 <!ATTLIST Sort
-          position NMTOKEN #REQUIRED
-          name     CDATA   #IMPLIED
+          position NMTOKEN  #REQUIRED
+          name     NMTOKENS #IMPLIED
+          mark     NMTOKENS #IMPLIED
 >
 
 <!ELEMENT LRef EMPTY>
 <!ATTLIST LRef
-          position NMTOKEN #REQUIRED
-          name     CDATA   #IMPLIED
+          position NMTOKEN  #REQUIRED
+          name     NMTOKENS #IMPLIED
+          mark     NMTOKENS #IMPLIED
 >
 
 <!ELEMENT GRef EMPTY>
 <!ATTLIST GRef
-          uri  CDATA #REQUIRED
-          name CDATA #IMPLIED
+          uri  CDATA    #REQUIRED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT Cast %term;>
 <!ATTLIST Cast
-          name CDATA #IMPLIED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT Appl %term;>
 <!ATTLIST Appl
-          name CDATA #IMPLIED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT Abst %term;>
 <!ATTLIST Abst
-          name CDATA #IMPLIED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT Abbr %term;>
 <!ATTLIST Abbr
-          name CDATA #IMPLIED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT Void EMPTY>
 <!ATTLIST Void
-          name CDATA #IMPLIED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!-- ENVIRONMENT ENTRIES -->
 
-<!ENTITY % entry '(ABST|ABBR|VOID)'> 
+<!ENTITY % entity '(ABST|ABBR)'> 
 
 <!ELEMENT ABST %term;>
 <!ATTLIST ABST
-          uri  CDATA #REQUIRED
-          name CDATA #IMPLIED
+          uri  CDATA    #REQUIRED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!ELEMENT ABBR %term;>
 <!ATTLIST ABBR
-          uri  CDATA #REQUIRED
-          name CDATA #IMPLIED
->
-
-<!ELEMENT VOID EMPTY>
-<!ATTLIST VOID
-          uri  CDATA #REQUIRED
-          name CDATA #IMPLIED
+          uri  CDATA    #REQUIRED
+          name NMTOKENS #IMPLIED
+          mark NMTOKENS #IMPLIED
 >
 
 <!-- ROOT -->
 
-<!ELEMENT ENTRY %entry;>
-<!ATTLIST ENTRY
+<!ELEMENT ENTITY %entity;>
+<!ATTLIST ENTITY
           hierarchy NMTOKEN  #REQUIRED
           options   NMTOKENS #IMPLIED
 >