[Docstring-checkins] CVS: dps/spec gpdi.dtd,1.35,1.36

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Removed "abstract"
  - Added "topic".
  - Added "pending".
  - Added "citation" and "citation_reference".

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** gpdi.dtd	1 Mar 2002 03:15:18 -0000	1.35
--- gpdi.dtd	4 Mar 2002 04:43:25 -0000	1.36
***************
*** 111,120 ****
  <!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 | attention | caution
!     | danger | important
!     | target | substitution_definition | comment | system_message
      %additional.body.elements; ">
  
--- 111,121 ----
  <!ENTITY % body.elements
    " paragraph | literal_block | block_quote | doctest_block| table
!     | figure | image | footnote | citation
      | bullet_list | enumerated_list | definition_list | field_list
      | option_list
!     | attention | caution | danger | error | hint | important | note
!     | tip | warning
!     | target | substitution_definition | comment | pending
!     | system_message
      %additional.body.elements; ">
  
***************
*** 122,127 ****
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | footnote_reference | substitution_reference
!     | target | image | problematic
      %additional.inline.elements; ">
  
--- 123,128 ----
  <!ENTITY % inline.elements
    " emphasis | strong | interpreted | literal
!     | reference | footnote_reference | citation_reference
!     | substitution_reference | target | image | problematic
      %additional.inline.elements; ">
  
***************
*** 130,134 ****
  
  <!ENTITY % structure.model
!   " ( ((%body.elements; | transition)+, (%structural.elements;)*)
      | (%structural.elements;)+ ) ">
  
--- 131,137 ----
  
  <!ENTITY % structure.model
!   " ( ( (%body.elements; | topic)+,
!         (transition, (%body.elements; | topic)+ )*,
!         (%structural.elements;)* )
      | (%structural.elements;)+ ) ">
  
***************
*** 169,173 ****
  <!-- Optional elements may be generated by internal processing. -->
  <!ELEMENT document
!     ((title, subtitle?)?, docinfo?, abstract?, %structure.model;)>
  <!ATTLIST document %basic.atts;>
  
--- 172,176 ----
  <!-- Optional elements may be generated by internal processing. -->
  <!ELEMENT document
!     ((title, subtitle?)?, docinfo?, %structure.model;)>
  <!ATTLIST document %basic.atts;>
  
***************
*** 230,239 ****
  -->
  
- <!ELEMENT abstract (%body.elements;)+>
- <!ATTLIST abstract %basic.atts;>
- 
  <!ELEMENT section (title, %structure.model;)>
  <!ATTLIST section %basic.atts;>
  
  <!ELEMENT transition EMPTY>
  <!ATTLIST transition %basic.atts;>
--- 233,242 ----
  -->
  
  <!ELEMENT section (title, %structure.model;)>
  <!ATTLIST section %basic.atts;>
  
+ <!ELEMENT topic (title, (%body.elements;)+)>
+ <!ATTLIST topic %basic.atts;>
+ 
  <!ELEMENT transition EMPTY>
  <!ATTLIST transition %basic.atts;>
***************
*** 340,357 ****
      %fixedspace.att;>
  
! <!ELEMENT note (%body.elements;)+>
! <!ATTLIST note %basic.atts;>
! 
! <!ELEMENT tip (%body.elements;)+>
! <!ATTLIST tip %basic.atts;>
! 
! <!ELEMENT hint (%body.elements;)+>
! <!ATTLIST hint %basic.atts;>
! 
! <!ELEMENT warning (%body.elements;)+>
! <!ATTLIST warning %basic.atts;>
! 
! <!ELEMENT error (%body.elements;)+>
! <!ATTLIST error %basic.atts;>
  
  <!ELEMENT caution (%body.elements;)+>
--- 343,348 ----
      %fixedspace.att;>
  
! <!ELEMENT attention (%body.elements;)+>
! <!ATTLIST attention %basic.atts;>
  
  <!ELEMENT caution (%body.elements;)+>
***************
*** 361,367 ****
--- 352,373 ----
  <!ATTLIST danger %basic.atts;>
  
+ <!ELEMENT error (%body.elements;)+>
+ <!ATTLIST error %basic.atts;>
+ 
+ <!ELEMENT hint (%body.elements;)+>
+ <!ATTLIST hint %basic.atts;>
+ 
  <!ELEMENT important (%body.elements;)+>
  <!ATTLIST important %basic.atts;>
  
+ <!ELEMENT note (%body.elements;)+>
+ <!ATTLIST note %basic.atts;>
+ 
+ <!ELEMENT tip (%body.elements;)+>
+ <!ATTLIST tip %basic.atts;>
+ 
+ <!ELEMENT warning (%body.elements;)+>
+ <!ATTLIST warning %basic.atts;>
+ 
  <!ELEMENT footnote (label?, (%body.elements;)+)>
  <!ATTLIST footnote
***************
*** 369,372 ****
--- 375,381 ----
      %auto.att;>
  
+ <!ELEMENT citation (label, (%body.elements;)+)>
+ <!ATTLIST citation %basic.atts;>
+ 
  <!ELEMENT label (#PCDATA)>
  <!ATTLIST label %basic.atts;>
***************
*** 387,390 ****
--- 396,404 ----
      %fixedspace.att;>
  
+ <!ELEMENT pending (field_list)>
+ <!ATTLIST pending
+     %basic.atts;
+     directive  CDATA    #REQUIRED>
+ 
  <!ELEMENT figure (image, ((caption, legend?) | legend) >
  <!ATTLIST figure %basic.atts;>
***************
*** 461,464 ****
--- 475,483 ----
      %reference.atts;
      %auto.att;>
+ 
+ <!ELEMENT citation_reference (#PCDATA)>
+ <!ATTLIST citation_reference
+     %basic.atts;
+     %reference.atts;>
  
  <!ELEMENT substitution_reference (%text.model;)>