[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.21,1.22

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Added 'hint' admonition element.
  - Changed the content model of "reference" to allow inline elements,
    specifically images and substitution references.
  - Added 'substitution' and 'substitution_reference'.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gpdi.dtd	2001/10/31 05:56:04	1.21
--- gpdi.dtd	2001/11/06 01:05:33	1.22
***************
*** 104,115 ****
  <!ENTITY % additional.body.elements "">
  <!ENTITY % body.elements
!   " paragraph
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | literal_block | block_quote | doctest_block | table
!     | figure | image
!     | note | tip | warning | error | caution | danger | important
!     | footnote | target | directive | comment
!     | system_warning
      %additional.body.elements; ">
  
--- 104,114 ----
  <!ENTITY % additional.body.elements "">
  <!ENTITY % body.elements
!   " paragraph | literal_block | block_quote | doctest_block| table
!     | figure | image | footnote 
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | note | tip | hint | warning | error | caution | danger
!     | important
!     | target | substitution | directive | comment | system_warning
      %additional.body.elements; ">
  
***************
*** 117,121 ****
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | target | footnote_reference | image
      %additional.inline.elements; ">
  
--- 116,121 ----
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | footnote_reference | substitution_reference
!     | target | image
      %additional.inline.elements; ">
  
***************
*** 336,339 ****
--- 336,342 ----
  <!ATTLIST tip %basic.atts;>
  
+ <!ELEMENT hint (%body.elements;)+>
+ <!ATTLIST hint %basic.atts;>
+ 
  <!ELEMENT warning (%body.elements;)+>
  <!ATTLIST warning %basic.atts;>
***************
*** 366,369 ****
--- 369,375 ----
      %anonymous.att;>
  
+ <!ELEMENT substitution (%text.model;)>
+ <!ATTLIST substitution %basic.atts;>
+ 
  <!ELEMENT directive (%body.elements;)*>
  <!ATTLIST directive
***************
*** 430,434 ****
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT reference (#PCDATA)>
  <!ATTLIST reference
      %basic.atts;
--- 436,440 ----
  <!ATTLIST literal %basic.atts;>
  
! <!ELEMENT reference (%text.model;)>
  <!ATTLIST reference
      %basic.atts;
***************
*** 441,444 ****
--- 447,456 ----
      %reference.atts;
      %auto.att;>
+ 
+ <!ELEMENT substitution_reference (#PCDATA)>
+ <!ATTLIST substitution_reference
+     %basic.atts;
+     %refname.att;>
+ 
  
  <!--