Updated to V7 after V6-2 tag creation

diff --git a/helm/dtd/cic.dtd b/helm/dtd/cic.dtd
index e16b10287fb612c16f20a2dfd84404573e49b243..a0071070e3a2bc1f4d5741f9fb044dad9cbfb8e6 100644 (file)
--- a/helm/dtd/cic.dtd
+++ b/helm/dtd/cic.dtd
@@ -12,7 +12,12 @@
 <!-- CIC term declaration -->
 
 <!ENTITY % term '(LAMBDA|CAST|PROD|REL|SORT|APPLY|VAR|META|IMPLICIT|CONST|
-                  ABST|MUTIND|MUTCONSTRUCT|MUTCASE|FIX|COFIX)'>
+                  LETIN|MUTIND|MUTCONSTRUCT|MUTCASE|FIX|COFIX)'>
+
+<!-- CIC sorts -->
+
+<!ENTITY % sort '(Prop|Set|Type)'>
+
 
 <!-- CIC objects: -->
 
@@ -40,7 +45,7 @@
           params   CDATA   #REQUIRED
           id       ID      #REQUIRED>
 
-<!ELEMENT Variable (type)>
+<!ELEMENT Variable (body?,type)>
 <!ATTLIST Variable
           name CDATA #REQUIRED
           id   ID    #REQUIRED>
@@ -64,7 +69,13 @@
 
 <!ELEMENT LAMBDA (source,target)>
 <!ATTLIST LAMBDA
-          id ID #REQUIRED>
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
+
+<!ELEMENT LETIN (term,letintarget)>
+<!ATTLIST LETIN
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT PROD (source,target)>
 <!ATTLIST PROD
@@ -72,13 +83,15 @@
 
 <!ELEMENT CAST (term,type)>
 <!ATTLIST CAST
-          id ID #REQUIRED>
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT REL EMPTY>
 <!ATTLIST REL
           value  NMTOKEN #REQUIRED
           binder CDATA   #REQUIRED
-          id     ID      #REQUIRED>
+          id     ID      #REQUIRED
+          sort   %sort;  #REQUIRED>
 
 <!ELEMENT SORT EMPTY>
 <!ATTLIST SORT
@@ -87,17 +100,20 @@
 
 <!ELEMENT APPLY (%term;)+>
 <!ATTLIST APPLY
-          id ID #REQUIRED>
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT VAR EMPTY>
 <!ATTLIST VAR
-          relUri CDATA #REQUIRED
-          id     ID    #REQUIRED>
+          relUri CDATA  #REQUIRED
+          id     ID     #REQUIRED
+          sort   %sort; #REQUIRED>
 
 <!ELEMENT META EMPTY>
 <!ATTLIST META
-          no NMTOKEN #REQUIRED
-          id ID      #REQUIRED>
+          no   NMTOKEN #REQUIRED
+          id   ID      #REQUIRED
+          sort %sort;  #REQUIRED>
 
 <!ELEMENT IMPLICIT EMPTY>
 <!ATTLIST IMPLICIT
@@ -105,13 +121,9 @@
 
 <!ELEMENT CONST EMPTY>
 <!ATTLIST CONST
-          uri CDATA #REQUIRED
-          id  ID    #REQUIRED>
-
-<!ELEMENT ABST EMPTY>
-<!ATTLIST ABST
-          uri CDATA #REQUIRED
-          id  ID    #REQUIRED>
+          uri  CDATA  #REQUIRED
+          id   ID     #REQUIRED
+          sort %sort; #REQUIRED>
 
 <!ELEMENT MUTIND EMPTY>
 <!ATTLIST MUTIND
@@ -124,23 +136,27 @@
           uri      CDATA   #REQUIRED
           noType   NMTOKEN #REQUIRED
           noConstr NMTOKEN #REQUIRED
-          id       ID      #REQUIRED>
+          id       ID      #REQUIRED
+          sort     %sort;  #REQUIRED>
 
 <!ELEMENT MUTCASE (patternsType,inductiveTerm,pattern*)>
 <!ATTLIST MUTCASE
           uriType CDATA   #REQUIRED
           noType  NMTOKEN #REQUIRED
-          id      ID      #REQUIRED>
+          id      ID      #REQUIRED
+          sort    %sort;  #REQUIRED>
 
 <!ELEMENT FIX (FixFunction+)>
 <!ATTLIST FIX
           noFun NMTOKEN #REQUIRED
-          id    ID      #REQUIRED>
+          id    ID      #REQUIRED
+          sort  %sort;  #REQUIRED>
 
 <!ELEMENT COFIX (CofixFunction+)>
 <!ATTLIST COFIX
           noFun NMTOKEN #REQUIRED
-          id    ID      #REQUIRED>
+          id    ID      #REQUIRED
+          sort  %sort;  #REQUIRED>
 
 <!-- Elements used in CIC terms: -->
 
@@ -161,6 +177,10 @@
 <!ATTLIST target
           binder CDATA #IMPLIED>
 
+<!ELEMENT letintarget %term;>
+<!ATTLIST letintarget
+          binder CDATA #REQUIRED>
+
 <!ELEMENT term %term;>
 
 <!ELEMENT type  %term;>

diff --git a/helm/dtd/cictypes.dtd b/helm/dtd/cictypes.dtd
index 73d459263ebcd01906a7996ba8ac7b4f38c702d4..7d9581782821c6f9780e63f1f4a08212771246cd 100644 (file)
--- a/helm/dtd/cictypes.dtd
+++ b/helm/dtd/cictypes.dtd
@@ -9,8 +9,10 @@
 
 %cicdtd;
 
-<!ELEMENT ALLTYPES (TYPE*)>
+<!ELEMENT InnerTypes (TYPE*)>
+<!ATTLIST InnerTypes
+          of  CDATA      #REQUIRED>
 
 <!ELEMENT TYPE (%term;)>
 <!ATTLIST TYPE
-          id  NMTOKEN #REQUIRED>
+          of  NMTOKEN #REQUIRED>