Update of /cvsroot/docstring/dps/spec
In directory usw-pr-cvs1:/tmp/cvs-serv11648/dps/spec
Modified Files:
gpdi.dtd
Log Message:
- 'image' as body element; 'target' as inline element.
- 'division' gone; 'transition' added.
- 'authors' content expanded.
- 'figure' content clarified.
Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gpdi.dtd 2001/10/20 03:02:05 1.18
--- gpdi.dtd 2001/10/27 05:36:17 1.19
***************
*** 79,82 ****
--- 79,86 ----
" anonymous %yesorno; #IMPLIED ">
+ <!-- Auto-numbered footnote. -->
+ <!ENTITY % auto.att
+ " auto %yesorno; #IMPLIED ">
+
<!-- XML standard attribute for whitespace-preserving elements. -->
<!ENTITY % fixedspace.att
***************
*** 103,107 ****
| bullet_list | enumerated_list | definition_list | field_list
| option_list
! | literal_block | block_quote | doctest_block | table | figure
| note | tip | warning | error | caution | danger | important
| footnote | target | directive | comment
--- 107,112 ----
| 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
***************
*** 112,116 ****
<!ENTITY % inline.elements
" emphasis | strong | interpreted | literal
! | link | footnote_reference | image
%additional.inline.elements; ">
--- 117,121 ----
<!ENTITY % inline.elements
" emphasis | strong | interpreted | literal
! | link | target | footnote_reference | image
%additional.inline.elements; ">
***************
*** 119,123 ****
<!ENTITY % structure.model
! " ( (division+, (%structural.elements;)*)
| (%structural.elements;)+ ) ">
--- 124,128 ----
<!ENTITY % structure.model
! " ( ((%body.elements; | transition)+, (%structural.elements;)*)
| (%structural.elements;)+ ) ">
***************
*** 163,167 ****
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Bibliographic Elements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
--- 168,172 ----
<!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Title Elements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
***************
*** 173,176 ****
--- 178,188 ----
<!ATTLIST subtitle %basic.atts;>
+
+ <!--
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ Bibliographic Elements
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -->
+
<!-- Container for bibliographic elements. May not be empty. -->
<!ELEMENT docinfo
***************
*** 181,185 ****
<!ATTLIST author %basic.atts;>
! <!ELEMENT authors (author+)>
<!ATTLIST authors %basic.atts;>
--- 193,197 ----
<!ATTLIST author %basic.atts;>
! <!ELEMENT authors ((author, organization?, contact?)+)>
<!ATTLIST authors %basic.atts;>
***************
*** 218,223 ****
<!ATTLIST section %basic.atts;>
! <!ELEMENT division (%body.elements;)+>
! <!ATTLIST division %basic.atts;>
--- 230,235 ----
<!ATTLIST section %basic.atts;>
! <!ELEMENT transition EMPTY>
! <!ATTLIST transition %basic.atts;>
***************
*** 342,350 ****
<!ATTLIST footnote
%basic.atts;
! auto %yesorno; #IMPLIED>
<!ELEMENT label (#PCDATA)>
<!ATTLIST label %basic.atts;>
<!ELEMENT target (#PCDATA)>
<!ATTLIST target
--- 354,363 ----
<!ATTLIST footnote
%basic.atts;
! %auto.att;>
<!ELEMENT label (#PCDATA)>
<!ATTLIST label %basic.atts;>
+ <!-- Also an inline element. -->
<!ELEMENT target (#PCDATA)>
<!ATTLIST target
***************
*** 364,370 ****
%fixedspace.att;>
! <!ELEMENT figure (image, caption?, legend?)>
<!ATTLIST figure %basic.atts;>
<!ELEMENT caption %text.model;>
<!ATTLIST caption %basic.atts;>
--- 377,392 ----
%fixedspace.att;>
! <!ELEMENT figure (image, ((caption, legend?) | legend) >
<!ATTLIST figure %basic.atts;>
+ <!-- Also an inline element. -->
+ <!ELEMENT image EMPTY>
+ <!ATTLIST image
+ %basic.atts;
+ uri CDATA #REQUIRED
+ height NMTOKEN #IMPLIED
+ width NMTOKEN #IMPLIED
+ scale NMTOKEN #IMPLIED>
+
<!ELEMENT caption %text.model;>
<!ATTLIST caption %basic.atts;>
***************
*** 418,431 ****
%basic.atts;
%link.atts;
! auto %yesorno; #IMPLIED>
!
! <!-- Also used in `figure`. -->
! <!ELEMENT image EMPTY>
! <!ATTLIST image
! %basic.atts;
! uri CDATA #REQUIRED
! height NMTOKEN #IMPLIED
! width NMTOKEN #IMPLIED
! scale NMTOKEN #IMPLIED>
<!--
--- 440,444 ----
%basic.atts;
%link.atts;
! %auto.att;>
<!--
|
