X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fwww%2Flambdadelta%2Fxml%2Fld.dtd;h=0fb547e45bf00fbc2557662ca92ebb488f9c65a2;hb=87f57ddc367303c33e19c83cd8989cd561f3185b;hp=4cb01e225959b5b02b064a1c1e01feb418684734;hpb=7562d9781dc4f351ddc3b2f8edd21f4976621948;p=helm.git

diff --git a/helm/www/lambdadelta/xml/ld.dtd b/helm/www/lambdadelta/xml/ld.dtd
index 4cb01e225..0fb547e45 100644
--- a/helm/www/lambdadelta/xml/ld.dtd
+++ b/helm/www/lambdadelta/xml/ld.dtd
@@ -6,11 +6,11 @@
 
 <!ENTITY % leaf '(Sort|LRef|GRef)'>
 
-<!ENTITY % node '(Cast|Appl|Abst|Abbr|Void)'>
+<!ENTITY % node '(Proj|Cast|Appl|Abst|Abbr|Void)'>
 
 <!ENTITY % term '(%node;*,%leaf;)'>
 
-<!ENTITY % terms '(%term;*)'>
+<!ENTITY % nodes '(%node;*)'>
 
 <!ELEMENT Sort EMPTY>
 <!ATTLIST Sort
@@ -26,25 +26,31 @@
 
 <!ELEMENT GRef EMPTY>
 <!ATTLIST GRef
-          uri  CDATA   #REQUIRED
-          name NMTOKEN #IMPLIED
+          uri      CDATA   #REQUIRED
+          position NMTOKEN #REQUIRED
+          name     NMTOKEN #IMPLIED
 >
 
 <!ELEMENT Cast %term;>
 <!ATTLIST Cast
 >
 
-<!ELEMENT Appl %terms;>
+<!ELEMENT Appl %term;>
 <!ATTLIST Appl
 >
 
-<!ELEMENT Abst %terms;>
+<!ELEMENT Proj %nodes;>
+<!ATTLIST Proj
+>
+
+<!ELEMENT Abst %term;>
 <!ATTLIST Abst
-          level NMTOKEN #IMPLIED
-	  name  NMTOKEN #IMPLIED
+          layer    NMTOKEN #IMPLIED
+          position NMTOKEN #REQUIRED
+	  name     NMTOKEN #IMPLIED
 >
 
-<!ELEMENT Abbr %terms;>
+<!ELEMENT Abbr %term;>
 <!ATTLIST Abbr
           name  NMTOKEN #IMPLIED
 >
@@ -56,60 +62,31 @@
 
 <!-- ENVIRONMENT ENTRIES -->
 
-<!ENTITY % entity '(GDec|GDef)'> 
+<!ENTITY % constant '(GDec|GDef)'> 
 
 <!ELEMENT GDec %term;>
 <!ATTLIST GDec
-          uri   CDATA    #REQUIRED
-          name  NMTOKEN  #IMPLIED
-	  meta  NMTOKENS #IMPLIED
-	  lang  NMTOKEN  "en-US"
-	  info  CDATA    #IMPLIED
+          uri      CDATA    #REQUIRED
+          position NMTOKEN  #REQUIRED
+          name     NMTOKEN  #IMPLIED
+	  meta     NMTOKENS #IMPLIED
+	  lang     NMTOKEN  "en-US"
+	  info     CDATA    #IMPLIED
 >
 
 <!ELEMENT GDef %term;>
 <!ATTLIST GDef
-          uri  CDATA    #REQUIRED
-          name NMTOKEN  #IMPLIED
-	  meta NMTOKENS #IMPLIED
-	  lang NMTOKEN  "en-US"
-	  info CDATA    #IMPLIED
+          uri      CDATA    #REQUIRED
+          position NMTOKEN  #REQUIRED
+          name     NMTOKEN  #IMPLIED
+	  meta     NMTOKENS #IMPLIED
+	  lang     NMTOKEN  "en-US"
+	  info     CDATA    #IMPLIED
 >
 
-<!ELEMENT ENTITY %entity;>
-<!ATTLIST ENTITY
+<!ELEMENT CONSTANT %constant;>
+<!ATTLIST CONSTANT
           xmlns     CDATA    #FIXED    "http://lambdadelta.info/"
 	  hierarchy NMTOKEN  #REQUIRED
           options   NMTOKENS #IMPLIED
 >
-
-<!-- CONVERSION CONSTRAINT SYSTEM -->
-
-<!ENTITY % cc '(ToPositive|ToOne|ToNext)'> 
-
-<!ENTITY % ccs '(%cc;*)'>
-
-<!ELEMENT ToPositive EMPTY>
-<!ATTLIST ToPositive
-          arity NMTOKEN  #IMPLIED
-          mark  NMTOKENS #IMPLIED
->
-
-<!ELEMENT ToOne EMPTY>
-<!ATTLIST ToOne
-          arity NMTOKEN  #IMPLIED
-          mark  NMTOKENS #IMPLIED
->
-
-<!ELEMENT ToNext EMPTY>
-<!ATTLIST ToNext
-          arity NMTOKEN  #IMPLIED
-          prec  NMTOKENS #IMPLIED
-          next  NMTOKENS #IMPLIED
->
-
-<!ELEMENT CCS %ccs;>
-<!ATTLIST CCS
-          xmlns CDATA #FIXED    "http://lambdadelta.info/"
-          uri   CDATA #REQUIRED
->