New attributes for ht:* elements proposed by Nijmegen.

All the attributes are IMPLIED and the default value for all of them
is backward compatible.

diff --git a/helm/dtd/maththeory.dtd b/helm/dtd/maththeory.dtd
index c424b032428f2990791892761d25efe453d63f4c..7158611ed0849754681bca3fe664346c2405e08f 100644 (file)
--- a/helm/dtd/maththeory.dtd
+++ b/helm/dtd/maththeory.dtd
@@ -49,22 +49,64 @@
 <!ELEMENT ht:AXIOM EMPTY>
 <!ATTLIST ht:AXIOM
           uri CDATA #REQUIRED
-          as (Axiom|Declaration) #REQUIRED>
+          as (Axiom|Declaration) #REQUIRED
+          typesetting ( paragraph | inline ) 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 EMPTY>
 <!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 EMPTY>
 <!ATTLIST ht:THEOREM
           uri CDATA #REQUIRED
-          as (Theorem|Lemma|Corollary|Fact|Remark) #REQUIRED>
+          as (Theorem|Lemma|Corollary|Fact|Remark) #REQUIRED
+          typesetting ( paragraph | inline ) 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 EMPTY>
 <!ATTLIST ht:VARIABLE
           uri CDATA #REQUIRED
-          as (Assumption|Hypothesis|LocalDefinition) #REQUIRED>
+          as (Assumption|Hypothesis|LocalDefinition|LocalFact) #REQUIRED
+          typesetting ( paragraph | inline ) 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 >
 
 <!ELEMENT ht:SECTION (%mathstructure;)>
 <!ATTLIST ht:SECTION

diff --git a/helm/dtd/theoryobject.dtd b/helm/dtd/theoryobject.dtd
index 0d0d9c7138356590d552fddeb898d489ee9bccab..1a8cb131d190ec09313e6e1bcb770f5f71d7b75f 100644 (file)
--- a/helm/dtd/theoryobject.dtd
+++ b/helm/dtd/theoryobject.dtd
@@ -49,20 +49,61 @@
 <!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|InteractiveDefinition|Inductive|CoInductive
-             |Record) #REQUIRED>
+             |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|LocalFact) #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 >