[Docstring-checkins] CVS: dps/spec ppdi.dtd,1.4,1.5

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

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

Modified Files:
	ppdi.dtd 
Log Message:
  - Moved option_list and doctest_block from ppdi.dtd to gpdi.dtd.

Index: ppdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/ppdi.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ppdi.dtd	2001/07/27 04:08:11	1.4
--- ppdi.dtd	2001/08/17 01:56:30	1.5
***************
*** 3,22 ****
      Python Plaintext Document Interface DTD
  ===========================================================================
! Author: David Goodger
! Contact: dgo...@bi...
! Revision: $Revision$
! Date: $Date$
! Copyright: This DTD has been placed in the public domain.
! Filename: ppdi.dtd
  
! This DTD (document type definition) extends the Generic DTD (see below).
  
! More information about this DTD and the Python Docstring Processing System
! project can be found at http://docstring.sf.net/. The latest version of this
! DTD is available from http://docstring.sf.net/spec/ppdi.dtd.
  
  The proposed formal public identifier for this DTD is::
  
!     +//IDN python.org//DTD Python Plaintext Document Interface 1.0a1//EN//XML
  -->
  
--- 3,25 ----
      Python Plaintext Document Interface DTD
  ===========================================================================
! :Author: David Goodger
! :Contact: dgo...@bi...
! :Revision: $Revision$
! :Date: $Date$
! :Copyright: This DTD has been placed in the public domain.
! :Filename: ppdi.dtd
  
! This DTD (document type definition) extends the Generic DTD (see
! below).
  
! More information about this DTD and the Python Docstring Processing
! System project can be found at http://docstring.sourceforge.net/. The
! latest version of this DTD is available from
! http://docstring.sourceforge.net/spec/ppdi.dtd.
  
  The proposed formal public identifier for this DTD is::
  
!     +//IDN python.org//DTD Python Plaintext Document Interface
!         1.0a1//EN//XML
  -->
  
***************
*** 33,39 ****
      | class_attribute_section | instance_attribute_section ">
  
- <!ENTITY % additional.body.elements
-   " | option_list | doctest_block ">
- 
  <!ENTITY % additional.inline.elements
    " | package | module | class | method | function
--- 36,39 ----
***************
*** 49,53 ****
  
  This DTD extends the Generic DTD, available from
! http://docstring.sf.net/spec/gpdi.dtd.
  -->
  
--- 49,53 ----
  
  This DTD extends the Generic DTD, available from
! http://docstring.sourceforge.net/spec/gpdi.dtd.
  -->
  
***************
*** 113,149 ****
  <!ELEMENT initial_value (#PCDATA)>
  <!ATTLIST initial_value %basic.atts;>
- 
- 
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     Additonal Body Elements
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- 
- <!ELEMENT option_list (option_list_item+)>
- <!ATTLIST option_list %basic.atts;>
- 
- <!ELEMENT option_list_item (option+, description)>
- <!ATTLIST option_list_item %basic.atts;>
- 
- <!ELEMENT option ((short_option | long_option), option_argument?)>
- <!ATTLIST option %basic.atts;>
- 
- <!ELEMENT short_option (#PCDATA)>
- <!ATTLIST short_option %basic.atts;>
- 
- <!ELEMENT long_option (#PCDATA)>
- <!ATTLIST long_option %basic.atts;>
- 
- <!ELEMENT option_argument (#PCDATA)>
- <!ATTLIST option_argument %basic.atts;>
- 
- <!ELEMENT description (%body.elements;)+>
- <!ATTLIST description %basic.atts;>
- 
- <!ELEMENT doctest_block (#PCDATA)>
- <!ATTLIST doctest_block
-     %basic.atts;
-     %fixedspace.att;>
  
  
--- 113,116 ----