X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fdtd%2Ftheoryobject.dtd;h=1a8cb131d190ec09313e6e1bcb770f5f71d7b75f;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=c6a43d17d9cf64a820abbd9e59cf775cb5587540;hpb=693937ecc156f6670572d555330b825652d35671;p=helm.git

diff --git a/helm/dtd/theoryobject.dtd b/helm/dtd/theoryobject.dtd
index c6a43d17d..1a8cb131d 100644
--- a/helm/dtd/theoryobject.dtd
+++ b/helm/dtd/theoryobject.dtd
@@ -31,11 +31,6 @@
 <!-- Third draft: May 3 2001, Irene Schena                           -->
 <!--*****************************************************************-->
 
-<!-- DA AGGIUNGERE: 
-CONJECTURE (teo da dim)
-EXERCISE
-EXAMPLE -->
-
 <!ENTITY % cicobj SYSTEM "cicobject.dtd">
 
 %cicobj;
@@ -45,7 +40,7 @@ EXAMPLE -->
 
 <!ELEMENT ht:SECTION (%theorystructure;)>
 <!ATTLIST ht:SECTION
-          name CDATA #REQUIRED>
+          uri CDATA #REQUIRED>
 
 <!ELEMENT ht:MUTUAL (ht:DEFINITION,ht:DEFINITION+)>
 
@@ -54,29 +49,61 @@ EXAMPLE -->
 <!ELEMENT ht:AXIOM (Axiom)>
 <!ATTLIST ht:AXIOM
           uri CDATA #REQUIRED
-          as (Axiom|Declaration) #REQUIRED>
+          as (Axiom|Declaration) #REQUIRED
+          typesetting ( paragraph | in-line ) paragraph
+          heading ( true | false ) true
+          uri_base ( true | false ) true
+          notation ( true | false ) false
+          params ( true | false ) false
+          type ( true | false ) true >
 
 <!ELEMENT ht:DEFINITION (Definition|InductiveDefinition)>
 <!ATTLIST ht:DEFINITION
           uri CDATA #REQUIRED
-          as (Definition|Inductive|CoInductive|Record) #REQUIRED>
+          as (Definition|InteractiveDefinition|Inductive|CoInductive
+             |Record) #REQUIRED
+          <!-- Should the definition take a whole new paragraph
+               or be integrated in the sentence? -->
+          typesetting ( paragraph | inline ) paragraph
+          <!-- Include the text "Definition "? -->
+          heading ( true | false ) true
+          <!-- Include the name of the definition, i.e.
+               the non-path part of its URI? -->
+          uri_base ( true | false ) true
+          <!-- Include the notation for this object? -->
+          notation ( true | false ) false
+          <!-- Include the section parameters / variables of
+               this definition? -->
+          params ( true | false ) false
+          <!-- For parametrised (co)inductive definitions,
+               include the parameters of the definition? -->
+          Params ( true | false ) true
+          <!-- Show the type?  -->
+          type ( true | false ) true
+          <!-- Show the body?  -->
+          body ( true | false ) true >
 
 <!ELEMENT ht:THEOREM (type)>
 <!ATTLIST ht:THEOREM
           uri CDATA #REQUIRED
-          as (Theorem|Lemma|Corollary|Fact|Remark) #REQUIRED>
+          as (Theorem|Lemma|Corollary|Fact|Remark) #REQUIRED
+          typesetting ( paragraph | in-line ) paragraph
+          heading ( true | false ) true
+          uri_base ( true | false ) true
+          notation ( true | false ) false
+          params ( true | false ) false
+          type ( true | false ) true
+          body ( true | false ) true >
 
 <!ELEMENT ht:VARIABLE (Variable)>
 <!ATTLIST ht:VARIABLE
           uri CDATA #REQUIRED
-          as (Assumption|Hypothesis|LocalDefinition) #REQUIRED>
-
-
-
-
-
-
-
-
-
-
+          as (Assumption|Hypothesis|LocalDefinition|LocalFact) #REQUIRED
+          typesetting ( paragraph | in-line ) paragraph
+          heading ( true | false ) true
+          uri_base ( true | false ) true
+          notation ( true | false ) false
+          params ( true | false ) false
+          Params ( true | false ) true
+          type ( true | false ) true
+          body ( true | false ) true >