Return-Path: <stefano@apache.org>
Mailing-List: contact forrest-dev-help@xml.apache.org; run by ezmlm
Delivered-To: mailing list forrest-dev@xml.apache.org
Received: (qmail 16572 invoked by uid 500); 10 Feb 2002 11:57:23 -0000
Delivered-To: apmail-xml-forrest-cvs@apache.org
Received: (qmail 16569 invoked from network); 10 Feb 2002 11:57:23 -0000
Received: from icarus.apache.org (64.125.133.21)
  by daedalus.apache.org with SMTP; 10 Feb 2002 11:57:23 -0000
Received: (qmail 86391 invoked by uid 1010); 10 Feb 2002 11:57:23 -0000
Date: 10 Feb 2002 11:57:23 -0000
Message-ID: <20020210115723.86390.qmail@icarus.apache.org>
From: stefano@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/schemas/DTD document-v11.dtd
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

stefano     02/02/10 03:57:23

  Modified:    schemas/DTD document-v11.dtd
  Log:
  fixed a number of problems and cleaned up the local.* entities and documented them a little
  
  Revision  Changes    Path
  1.3       +78 -42    xml-forrest/schemas/DTD/document-v11.dtd
  
  Index: document-v11.dtd
  ===================================================================
  RCS file: /home/cvs/xml-forrest/schemas/DTD/document-v11.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document-v11.dtd	8 Feb 2002 09:06:03 -0000	1.2
  +++ document-v11.dtd	10 Feb 2002 11:57:23 -0000	1.3
  @@ -27,6 +27,44 @@
     names to reduce learning efforts and to allow HTML editors to be
     used for complex authorings like tables and lists.
   
  +EXTENSIBILITY:
  +  This DTD includes several empty placeholders that can be used to
  +  extend it. These placeholders are implemented with empty entities. Here
  +  is the list of those empty entities and what they are used for:
  +  
  +    - local.inline: this entity should contain extended definitions of 
  +                    elements that can be used 'inline', or directly inside
  +                    the content. An example for this entity could be 
  +
  +                        <!ENTITY % local.inline "|citation">
  +
  +    - local.blocks: this entity should contain extended definitions of
  +                    elements that behave as 'blocks', thus can be visually
  +                    rendered as areas on the canvas. An example for this
  +                    entity could be:
  +
  +                        <!ENTITY % local.blocks "|poem">
  +
  +    - local.sections: this entity should contain extended definitions of
  +                      elements that behave as 'sections', thus can be considered
  +                      containers of block-level elements. An example for
  +                      this entity could be:
  +
  +                        <!ENTITY % local.sections "|chapter">
  +
  +    - local.headers: this entity should contain extended definitions of
  +                     elements that behave as parts of the document header.
  +                     An example for this header could be:
  +
  +                        <!ENTITY % local.headers ", notes?">
  +
  +    - local.footers: this entity should contain extended definitions of
  +                     elements that behave as parts of the document footer.
  +                     An example for this header could be:
  +
  +                        <!ENTITY % local.footers ", annotations*">
  +  
  +  
   AUTHORS:
     Stefano Mazzocchi <stefano@apache.org>
   
  @@ -173,7 +211,7 @@
   
   
   <!-- Title attributes ==================================================
  -        Indicates that the element requires to have a title.
  +        Indicates that the element requires to have a title attribute.
   ==================================================================== -->
   <!ENTITY % title.att
           'title                  CDATA           #REQUIRED'>
  @@ -181,7 +219,7 @@
   
   
   <!-- Name attributes ==================================================
  -        Indicates that the element requires to have a name.
  +        Indicates that the element requires to have a name attribute.
   ==================================================================== -->
   <!ENTITY % name.att
           'name                   CDATA           #REQUIRED'>
  @@ -189,17 +227,14 @@
   
   
   <!-- Email attributes ==================================================
  -        Indicates that the element requires to have an email.
  +        Indicates that the element requires to have an email attribute.
   ==================================================================== -->
   <!ENTITY % email.att
           'email                  CDATA           #REQUIRED'>
   
   
   <!-- Link attributes ===================================================
  -        Points to the element where more information can be found,
  -        using the IDREF mechanism.  %ref.att; is for optional
  -        ref attributes, and %ref-req.att; is for required ref
  -        attributes.
  +        Indicates that the element requires to have hyperlink attributes.
   ==================================================================== -->
   
   <!ENTITY % link.att
  @@ -226,25 +261,17 @@
   <!-- Content definitions -->
   <!-- =============================================================== -->
   
  -<!ENTITY % local.content.mix "">
  -
  -<!ENTITY % markup "strong|em|code|sub|sup">
  +<!ENTITY % local.inline "">
   
  -<!ENTITY % links "link|connect|jump|fork|anchor">
  +<!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
   
  -<!ENTITY % special "br|img|icon">
  -
  -<!ENTITY % link-content.mix "%text;|%markup;|%special;%local.content.mix;">
  -
  -<!ENTITY % content.mix "%link-content.mix;|%links;">
  +<!ENTITY % content.mix "%links;|%link-content.mix;">
   
       <!-- ==================================================== -->
       <!-- Phrase Markup -->
       <!-- ==================================================== -->
   
  -    <!-- Code (typically monospaced) -->
  -    <!ELEMENT code (%text;)>
  -    <!ATTLIST code %common.att;>
  +    <!ENTITY % markup "strong|em|code|sub|sup">
   
       <!-- Strong (typically bold) -->
       <!ELEMENT strong (%text;|code)*>
  @@ -253,6 +280,10 @@
       <!-- Emphasis (typically italic) -->
       <!ELEMENT em (%text;|code)*>
       <!ATTLIST em %common.att;>
  +    
  +    <!-- Code (typically monospaced) -->
  +    <!ELEMENT code (%text;)>
  +    <!ATTLIST code %common.att;>
   
       <!-- Superscript (typically smaller and higher) -->
       <!ELEMENT sup (%text;)>
  @@ -266,35 +297,35 @@
       <!-- Hypertextual Links -->
       <!-- ==================================================== -->
   
  -    <!-- hard replacing link (equivalent of <a ...>) -->
  +    <!ENTITY % links "link|jump|fork">
  +
  +    <!-- hyperlink (equivalent of <a ...>) -->
       <!ELEMENT link (%link-content.mix;)*>
       <!ATTLIST link %common.att;
                      %link.att;>
   
  -    <!-- Hard window replacing link (equivalent of <a ... target="_top">) -->
  +    <!-- windows-replacing link (equivalent of <a ... target="_top">) -->
       <!ELEMENT jump (%link-content.mix;)*>
       <!ATTLIST jump %common.att;
                      %link.att;>
   
  -    <!-- Hard window forking link (equivalent of <a ... target="_new">) -->
  +    <!-- window-forking link (equivalent of <a ... target="_new">) -->
       <!ELEMENT fork (%link-content.mix;)*>
       <!ATTLIST fork %common.att;
                      %link.att;>
   
  -    <!-- Anchor point (equivalent of <a name="...">) -->
  -    <!ELEMENT anchor EMPTY>
  -    <!ATTLIST anchor %common-idreq.att;>
  -
  -
       <!-- ==================================================== -->
       <!-- Specials -->
       <!-- ==================================================== -->
   
  +    <!ENTITY % special-inline "br|img|icon">
  +
       <!-- Breakline Object (typically forces line break) -->
       <!ELEMENT br EMPTY>
       <!ATTLIST br %common.att;>
   
       <!-- Image Object (typically an inlined image) -->
  +    <!ELEMENT img EMPTY>
       <!ATTLIST img src    CDATA  #REQUIRED
                     alt    CDATA  #REQUIRED
                     height CDATA  #IMPLIED
  @@ -304,7 +335,6 @@
                     %common.att;>
   
       <!-- Image Icon (typically an inlined image placed as graphical item) -->
  -
       <!ELEMENT icon EMPTY>
       <!ATTLIST icon src    CDATA  #REQUIRED
                      alt    CDATA  #REQUIRED
  @@ -313,28 +343,20 @@
                      %common.att;>
   
   
  -
  -
   <!-- =============================================================== -->
   <!-- Blocks definitions -->
   <!-- =============================================================== -->
   
   <!ENTITY % local.blocks "">
   
  -<!ENTITY % local.lists "">
  -
  -<!ENTITY % paragraphs "p|source|note|warning|fixme|figure">
  -
  -<!ENTITY % tables "table">
  -
  -<!ENTITY % lists "ol|ul|dl %local.lists;">
  -
  -<!ENTITY % blocks "anchor|%paragraphs;|%tables;|%lists; %local.blocks;">
  +<!ENTITY % blocks "%paragraphs;|%tables;|%lists;|%special-blocks; %local.blocks;">
   
       <!-- ==================================================== -->
       <!-- Paragraphs -->
       <!-- ==================================================== -->
   
  +    <!ENTITY % paragraphs "p|source|note|warning|fixme">
  +    
       <!-- Text Paragraph (normally vertically space delimited) -->
       <!ELEMENT p (%content.mix;)*>
       <!ATTLIST p %common.att;>
  @@ -349,8 +371,8 @@
       <!ATTLIST note %common.att;>
   
       <!-- Warning Paragraph (normally shown with eye-catching colors) -->
  -    <!ELEMENT note (%content.mix;)*>
  -    <!ATTLIST note %common.att;>
  +    <!ELEMENT warning (%content.mix;)*>
  +    <!ATTLIST warning %common.att;>
   
       <!-- Fixme Paragraph (normally not shown) -->
       <!ELEMENT fixme (%content.mix;)*>
  @@ -361,6 +383,8 @@
       <!-- Tables -->
       <!-- ==================================================== -->
   
  +    <!ENTITY % tables "table">
  +
       <!-- Attributes that indicate the spanning of the table cell -->
       <!ENTITY % cell.span 
           'colspan CDATA "1"
  @@ -392,6 +416,12 @@
       <!-- Lists -->
       <!-- ==================================================== -->
   
  +    <!ENTITY % lists "ol|ul|dl">
  +
  +    <!-- List item -->
  +    <!ELEMENT li (%content.mix;|%lists;)*>
  +    <!ATTLIST li %common.att;>
  +    
       <!-- Unordered list (typically bulleted) -->
       <!ELEMENT ul (li|%lists;)+>
       <!--    spacing attribute:
  @@ -428,6 +458,8 @@
       <!-- Special Blocks -->
       <!-- ==================================================== -->
   
  +    <!ENTITY % special-blocks "figure|anchor">
  +
       <!-- Image Block (typically a separated and centered image) -->
       <!ELEMENT figure EMPTY>
       <!ATTLIST figure src    CDATA  #REQUIRED
  @@ -438,6 +470,10 @@
                        ismap  (ismap) #IMPLIED
                        %common.att;>
   
  +    <!-- anchor point (equivalent of <a name="...">, typically not rendered) -->
  +    <!ELEMENT anchor EMPTY>
  +    <!ATTLIST anchor %common-idreq.att;>
  +
   
   <!-- =============================================================== -->
   <!-- Document -->
  @@ -488,7 +524,7 @@
       <!ELEMENT body (%sections;|%blocks;)+>
       <!ATTLIST body %common.att;>
   
  -    <!ELEMENT section (section|%blocks;)*>
  +    <!ELEMENT section (%sections;|%blocks;)*>
       <!ATTLIST section %title.att; %common.att;>
   
       <!-- ==================================================== -->