vmassol 01/04/07 00:17:41
Modified: cactus/docs/framework/xdocs/dtd document-v10.dtd
Removed: cactus/docs/framework/xdocs/dtd XMLSchema.dtd datatypes.dtd
faq-v10.dtd javadoc-v04draft.dtd
specification-v10.dtd
cactus/docs/framework/xdocs news.xml support.xml
Log:
moved from XML Apache skin to jakarta skin
Revision Changes Path
1.2 +31 -31
jakarta-commons-sandbox/cactus/docs/framework/xdocs/dtd/document-v10.dtd
Index: document-v10.dtd
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/cactus/docs/framework/xdocs/dtd/document-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document-v10.dtd 2001/03/31 20:22:39 1.1
+++ document-v10.dtd 2001/04/07 07:17:38 1.2
@@ -30,6 +30,7 @@
AUTHORS:
Stefano Mazzocchi <[EMAIL PROTECTED]>
+ Berin Loritsch <[EMAIL PROTECTED]>
FIXME:
- how can we include char entities without hardwiring them?
@@ -44,13 +45,14 @@
19991124 Added "fork" element for window forking behavior. (SM)
19991124 Added "img-inline" element to separate from "img". (SM)
19991129 Removed "affiliation" from "author". (SM)
- 19991129 Made "author" empty and moved "name|email" as attributes. (SM)
- 19991215 Simplified table section. (SM)
- 19991215 Changed "img-block" in more friendly "figure". (SM)
- 20000125 Added the "icon" image. (SM)
- 20000126 Allowed "anchor" in all levels. (SM)
- 20000404 Removed the "role" attribute from common-xxx.att. (SM)
- 20000815 Allowed "code" inside "strong" and "em". (SM)
+ 19991129 Made "author" empty and moved "name|email" as attributes (SM)
+ 19991215 Simplified table section (SM)
+ 19991215 Changed "img-block" in more friendly "figure" (SM)
+ 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)
+ 20000911 Allowed link tags inside markup (BL)
COPYRIGHT:
Copyright (c) 1999-2000 The Apache Software Foundation.
@@ -232,9 +234,9 @@
<!ENTITY % markup "strong|em|code|sub|sup">
-<!ENTITY % links "link|jump|fork|anchor">
+<!ENTITY % links "link|connect|jump|fork|anchor">
-<!ENTITY % special "br|img|icon|img-external">
+<!ENTITY % special "br|img|icon">
<!ENTITY % link-content.mix "%text;|%markup;|%special;%local.content.mix;">
@@ -244,24 +246,24 @@
<!-- Phrase Markup -->
<!-- ==================================================== -->
- <!-- Code (typically monospaced) -->
- <!ELEMENT code (%text;)>
- <!ATTLIST code %common.att;>
-
<!-- Strong (typically bold) -->
- <!ELEMENT strong (%text;|code)*>
+ <!ELEMENT strong (%text;|%markup;|%links;)*>
<!ATTLIST strong %common.att;>
<!-- Emphasis (typically italic) -->
- <!ELEMENT em (%text;|code)*>
+ <!ELEMENT em (%text;|%markup;|%links;)*>
<!ATTLIST em %common.att;>
+ <!-- Code (typically monospaced) -->
+ <!ELEMENT code (%text;|%markup;|%links;)*>
+ <!ATTLIST code %common.att;>
+
<!-- Superscript (typically smaller and higher) -->
- <!ELEMENT sup (%text;)>
+ <!ELEMENT sup (%text;|%markup;|%links;)*>
<!ATTLIST sup %common.att;>
<!-- Subscript (typically smaller and lower) -->
- <!ELEMENT sub (%text;)>
+ <!ELEMENT sub (%text;|%markup;|%links;)*>
<!ATTLIST sub %common.att;>
<!-- FIXME (SM): should we add these HTML 4.0 markups
@@ -289,7 +291,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;>
@@ -303,6 +306,13 @@
<!ELEMENT anchor EMPTY>
<!ATTLIST anchor %common-idreq.att;>
+ <!-- Soft link between processed pages (no equivalent in HTML) -->
+ <!ELEMENT connect (%link-content.mix;)*>
+ <!ATTLIST connect %common.att;
+ %xlink-simple.att;
+ %xlink-user-replace.att;
+ %xlink-soft.att;>
+
<!-- ==================================================== -->
<!-- Specials -->
<!-- ==================================================== -->
@@ -323,16 +333,6 @@
ismap (ismap) #IMPLIED
%common.att;>
- <!-- External Image Object -->
- <!ELEMENT img-external EMPTY>
- <!ATTLIST img-external src CDATA #REQUIRED
- alt CDATA #REQUIRED
- height CDATA #IMPLIED
- width CDATA #IMPLIED
- usemap CDATA #IMPLIED
- ismap (ismap) #IMPLIED
- %common.att;>
-
<!-- Image Icon (typically an inlined image placed as graphical item) -->
<!-- FIXME (SM): should we have the notion of soft links even here
for inlined objects? -->
@@ -352,13 +352,13 @@
<!ENTITY % local.blocks "">
-<!ENTITY % local.lists "">
-
<!ENTITY % paragraphs "p|source|note|fixme|figure">
+<!ENTITY % local.lists "%paragraphs;">
+
<!ENTITY % tables "table">
-<!ENTITY % lists "ol|ul|sl|dl %local.lists;">
+<!ENTITY % lists "ol|ul|sl|dl|%local.lists;">
<!ENTITY % blocks "anchor|%paragraphs;|%tables;|%lists; %local.blocks;">
