[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.11,1.12

[David G. <go...@us...>]

Update of /cvsroot/docstring/dps/spec
In directory usw-pr-cvs1:/tmp/cvs-serv29185/dps/spec

Modified Files:
	gpdi.dtd 
Log Message:
  - Made document subtitle dependent on the existence of a title.
  - Moved 'abstract' into the bibliographic elements section.
  - Added "auto" attribute to footnotes after all.
    Because it's explicit, and the right thing to do.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gpdi.dtd	2001/09/01 15:02:06	1.11
--- gpdi.dtd	2001/09/07 01:51:58	1.12
***************
*** 148,152 ****
  <!-- Optional elements may be generated by internal processing. -->
  <!ELEMENT document
!     (title?, subtitle?, (%bibliographic.elements;)*, abstract?,
       %structure.model;)>
  <!ATTLIST document %basic.atts;>
--- 148,152 ----
  <!-- Optional elements may be generated by internal processing. -->
  <!ELEMENT document
!     ((title, subtitle?)?, (%bibliographic.elements;)*, abstract?,
       %structure.model;)>
  <!ATTLIST document %basic.atts;>
***************
*** 192,196 ****
--- 192,199 ----
  <!ATTLIST copyright %basic.atts;>
  
+ <!ELEMENT abstract (%body.elements;)+>
+ <!ATTLIST abstract %basic.atts;>
  
+ 
  <!--
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
***************
*** 199,205 ****
  -->
  
- <!ELEMENT abstract (%body.elements;)+>
- <!ATTLIST abstract %basic.atts;>
- 
  <!ELEMENT section (title, %structure.model;)>
  <!ATTLIST section %basic.atts;>
--- 202,205 ----
***************
*** 320,326 ****
  <!ATTLIST important %basic.atts;>
  
- <!-- A footnote with no label is auto-numbered. -->
  <!ELEMENT footnote (label?, (%body.elements;)+)>
! <!ATTLIST footnote %basic.atts;>
  
  <!ELEMENT label (#PCDATA)>
--- 320,327 ----
  <!ATTLIST important %basic.atts;>
  
  <!ELEMENT footnote (label?, (%body.elements;)+)>
! <!ATTLIST footnote
!     %basic.atts;
!     auto      %yesorno; #IMPLIED>
  
  <!ELEMENT label (#PCDATA)>