stefano 00/06/06 16:21:28
Modified: xdocs/dtd Tag: xml-cocoon2 document-v10.dtd
Log:
made markup tags nestable
Revision Changes Path
No revision
No revision
1.1.2.3 +8 -6 xml-cocoon/xdocs/dtd/document-v10.dtd
Index: document-v10.dtd
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/dtd/document-v10.dtd,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- document-v10.dtd 2000/05/24 23:11:00 1.1.2.2
+++ document-v10.dtd 2000/06/06 23:21:27 1.1.2.3
@@ -50,6 +50,7 @@
20000125 Added the "icon" image (SM)
20000126 Allowed "anchor" in all levels (SM)
20000404 Removed the "role" attribute from common-xxx.att (SM)
+ 20000606 Allowed nested markup tags (SM)
COPYRIGHT:
Copyright (c) 1999-2000 The Apache Software Foundation.
@@ -244,23 +245,23 @@
<!-- ==================================================== -->
<!-- Strong (typically bold) -->
- <!ELEMENT strong (%text;)>
+ <!ELEMENT strong (%text;|%markup;)*>
<!ATTLIST strong %common.att;>
<!-- Emphasis (typically italic) -->
- <!ELEMENT em (%text;)>
+ <!ELEMENT em (%text;|%markup;)*>
<!ATTLIST em %common.att;>
<!-- Code (typically monospaced) -->
- <!ELEMENT code (%text;)>
+ <!ELEMENT code (%text;|%markup;)*>
<!ATTLIST code %common.att;>
<!-- Superscript (typically smaller and higher) -->
- <!ELEMENT sup (%text;)>
+ <!ELEMENT sup (%text;|%markup;)*>
<!ATTLIST sup %common.att;>
<!-- Subscript (typically smaller and lower) -->
- <!ELEMENT sub (%text;)>
+ <!ELEMENT sub (%text;|%markup;)*>
<!ATTLIST sub %common.att;>
<!-- FIXME (SM): should we add these HTML 4.0 markups
@@ -288,7 +289,8 @@
<!-- Hard window replacing link (equivalent of <a ... target="_top">) -->
<!ELEMENT jump (%link-content.mix;)*>
- <!ATTLIST jump %common.att;
+ <!ATTLIST jump anchor CDATA #IMPLIED
+ %common.att;
%xlink-simple.att;
%xlink-user-new.att;>
