Update of /cvsroot/docstring/dps/spec
In directory usw-pr-cvs1:/tmp/cvs-serv17830/dps/spec
Modified Files:
gpdi.dtd
Log Message:
- Separated out %link.atts into constituent parts.
- Changed %structure.model for mandatory divisions.
- Added "refname" and "anonymous" attrbites to "target".
- Added "anonymous" attribute to "link".
Index: gpdi.dtd
===================================================================
RCS file: /cvsroot/docstring/dps/spec/gpdi.dtd,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gpdi.dtd 2001/10/18 03:32:58 1.17
--- gpdi.dtd 2001/10/20 03:02:05 1.18
***************
*** 36,39 ****
--- 36,42 ----
================================================================== -->
+ <!-- Boolean: no if zero(s), yes if any other value. -->
+ <!ENTITY % yesorno "NMTOKEN">
+
<!ENTITY % additional.basic.atts "">
<!--
***************
*** 52,77 ****
%additional.basic.atts; ">
! <!ENTITY % additional.link.atts "">
! <!--
! Hyperlink attributes.
! - `refuri` is used to refer to an external URI/URL.
! - `refid` is used to refer to the `id` attribute of another element.
! - `refname` is used to refer to the `name` attribute of another
! element.
! -->
<!ENTITY % link.atts
! " refuri CDATA #IMPLIED
! refid IDREF #IMPLIED
! refname CDATA #IMPLIED
%additional.link.atts; ">
<!-- XML standard attribute for whitespace-preserving elements. -->
<!ENTITY % fixedspace.att
" xml:space (default | preserve) #FIXED 'preserve' ">
- <!-- Boolean: no if zero(s), yes if any other value. -->
- <!ENTITY % yesorno 'NMTOKEN'>
-
<!-- Element OR-Lists
--- 55,86 ----
%additional.basic.atts; ">
! <!-- Reference to an external URI/URL. -->
! <!ENTITY % refuri.att
! " refuri CDATA #IMPLIED ">
! <!-- Reference to the `id` attribute of another element. -->
! <!ENTITY % refid.att
! " refid IDREF #IMPLIED ">
!
! <!-- Reference to the `name` attribute of another element. -->
! <!ENTITY % refname.att
! " refname CDATA #IMPLIED ">
!
! <!ENTITY % additional.link.atts "">
! <!-- Collected hyperlink attributes. -->
<!ENTITY % link.atts
! " %refuri.att;
! %refid.att;
! %refname.att;
%additional.link.atts; ">
+ <!-- Unnamed hyperlink. -->
+ <!ENTITY % anonymous.att
+ " anonymous %yesorno; #IMPLIED ">
+
<!-- XML standard attribute for whitespace-preserving elements. -->
<!ENTITY % fixedspace.att
" xml:space (default | preserve) #FIXED 'preserve' ">
<!-- Element OR-Lists
***************
*** 110,115 ****
<!ENTITY % structure.model
! " ( ((%body.elements;)+, division*, (%structural.elements;)*)
! | (division+, (%structural.elements;)*)
| (%structural.elements;)+ ) ">
--- 119,123 ----
<!ENTITY % structure.model
! " ( (division+, (%structural.elements;)*)
| (%structural.elements;)+ ) ">
***************
*** 340,344 ****
<!ELEMENT target (#PCDATA)>
! <!ATTLIST target %basic.atts;>
<!ELEMENT directive (%body.elements;)*>
--- 348,355 ----
<!ELEMENT target (#PCDATA)>
! <!ATTLIST target
! %basic.atts;
! %refname.att;
! %anonymous.att;>
<!ELEMENT directive (%body.elements;)*>
***************
*** 400,404 ****
<!ATTLIST link
%basic.atts;
! %link.atts;>
<!ELEMENT footnote_reference (#PCDATA)>
--- 411,416 ----
<!ATTLIST link
%basic.atts;
! %link.atts;
! %anonymous.att;>
<!ELEMENT footnote_reference (#PCDATA)>
|
