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

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

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

Modified Files:
	gpdi.dtd 
Log Message:
  - Changed content model 'directive' to PCDATA.
  - Changed content models of most inline elements to %text.model,
    allowing nested inline elements.

Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** gpdi.dtd	2001/11/06 01:05:33	1.22
--- gpdi.dtd	2001/11/09 23:10:37	1.23
***************
*** 362,367 ****
  <!ATTLIST label %basic.atts;>
  
! <!-- Also an inline element; empty otherwise. -->
! <!ELEMENT target (#PCDATA)>
  <!ATTLIST target
      %basic.atts;
--- 362,367 ----
  <!ATTLIST label %basic.atts;>
  
! <!-- Empty except when used as an inline element. -->
! <!ELEMENT target (%text.model;)>
  <!ATTLIST target
      %basic.atts;
***************
*** 372,378 ****
  <!ATTLIST substitution %basic.atts;>
  
! <!ELEMENT directive (%body.elements;)*>
  <!ATTLIST directive
      %basic.atts;
      type      CDATA     #IMPLIED
      data      CDATA     #IMPLIED>
--- 372,379 ----
  <!ATTLIST substitution %basic.atts;>
  
! <!ELEMENT directive (#PCDATA)*>
  <!ATTLIST directive
      %basic.atts;
+     %fixedspace.att;
      type      CDATA     #IMPLIED
      data      CDATA     #IMPLIED>
***************
*** 419,432 ****
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
! Inline elements occur within the PCDATA of body elements.
  -->
  
! <!ELEMENT emphasis (#PCDATA)>
  <!ATTLIST emphasis %basic.atts;>
  
! <!ELEMENT strong (#PCDATA)>
  <!ATTLIST strong %basic.atts;>
  
! <!ELEMENT interpreted (#PCDATA)>
  <!ATTLIST interpreted
      %basic.atts;
--- 420,442 ----
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
! Inline elements occur within the text contents of body elements. Some
! nesting of inline elements is allowed by these definitions, with the
! following caveats:
! 
! - An inline element may not contain a nested element of the same type
!   (e.g. <strong> may not contain another <strong>).
! - Nested inline elements may or may not be supported by individual
!   applications using this DTD.
! - The inline elements <footnote_reference>, <literal>, and <image> do
!   not support nesting.
  -->
  
! <!ELEMENT emphasis (%text.model;)>
  <!ATTLIST emphasis %basic.atts;>
  
! <!ELEMENT strong (%text.model;)>
  <!ATTLIST strong %basic.atts;>
  
! <!ELEMENT interpreted (%text.model;)>
  <!ATTLIST interpreted
      %basic.atts;
***************
*** 448,452 ****
      %auto.att;>
  
! <!ELEMENT substitution_reference (#PCDATA)>
  <!ATTLIST substitution_reference
      %basic.atts;
--- 458,462 ----
      %auto.att;>
  
! <!ELEMENT substitution_reference (%text.model;)>
  <!ATTLIST substitution_reference
      %basic.atts;