[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.5,1.6

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

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

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

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gpdi.dtd	2001/08/14 03:52:29	1.5
--- gpdi.dtd	2001/08/17 01:56:09	1.6
***************
*** 3,12 ****
      Generic 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: gpdi.dtd
  
  More information about this DTD (document type definition) and the
--- 3,12 ----
      Generic 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: gpdi.dtd
  
  More information about this DTD (document type definition) and the
***************
*** 91,95 ****
    " paragraph
      | bullet_list | enumerated_list | definition_list | field_list
!     | literal_block | block_quote | table | figure
      | note | tip | warning | caution | danger | important
      | footnote | target | directive | comment
--- 91,96 ----
    " paragraph
      | bullet_list | enumerated_list | definition_list | field_list
!     | option_list
!     | literal_block | block_quote | doctest_block | table | figure
      | note | tip | warning | caution | danger | important
      | footnote | target | directive | comment
***************
*** 257,260 ****
--- 258,282 ----
  <!ATTLIST field_body %basic.atts;>
  
+ <!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 literal_block (#PCDATA)>
  <!ATTLIST literal_block
***************
*** 264,267 ****
--- 286,294 ----
  <!ELEMENT block_quote (%body.elements;)+>
  <!ATTLIST block_quote %basic.atts;>
+ 
+ <!ELEMENT doctest_block (#PCDATA)>
+ <!ATTLIST doctest_block
+     %basic.atts;
+     %fixedspace.att;>
  
  <!ELEMENT note (%body.elements;)+>