cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon/dtd document-v10.dtd specification-v10.dtd
Date Fri, 03 Dec 1999 23:47:50 GMT
stefano     99/12/03 15:47:50

  Modified:    dtd      document-v10.dtd specification-v10.dtd
  Log:
  the problem was that Xerces is messing up with EMPTY being an Entity so I removed it and
works fine. Sounds like a Xerces bug, but it doesn't happen all the time. Weird.
  
  Revision  Changes    Path
  1.2       +77 -79    xml-cocoon/dtd/document-v10.dtd
  
  Index: document-v10.dtd
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/dtd/document-v10.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document-v10.dtd	1999/11/30 16:29:57	1.1
  +++ document-v10.dtd	1999/12/03 23:47:50	1.2
  @@ -1,11 +1,11 @@
   <!-- ===================================================================
  -     
  +
        Apache Documentation DTD (Version 1.0)
   
   PURPOSE:
  -  This DTD was developed to create a simple yet powerful document 
  -  type for software documentation for use with the Apache projects.  
  -  It is an XML-compliant DTD and it's maintained by the Apache XML 
  +  This DTD was developed to create a simple yet powerful document
  +  type for software documentation for use with the Apache projects.
  +  It is an XML-compliant DTD and it's maintained by the Apache XML
     project.
   
   TYPICAL INVOCATION:
  @@ -13,24 +13,24 @@
     <!DOCTYPE document PUBLIC
          "-//APACHE//DTD Documentation Vx.yz//EN"
          "http://xml.apache.org/DTD/document-vxyz.dtd">
  +
  +  where
   
  -  where 
  -  
       x := major version
       y := minor version
       z := status identifier (optional)
  -      
  -NOTES:  
  -  Many of the design patterns used in this DTD were take from the 
  +
  +NOTES:
  +  Many of the design patterns used in this DTD were take from the
     W3C XML Specification DTD edited by Eve Maler <elm@arbortext.com>.
  -  
  -  Where possible, great care has been used to reutilize HTML tag 
  -  names to reduce learning efforts and to allow HTML editors to be 
  +
  +  Where possible, great care has been used to reutilize HTML tag
  +  names to reduce learning efforts and to allow HTML editors to be
     used for complex authorings like tables and lists.
   
   AUTHORS:
     Stefano Mazzocchi <stefano@apache.org>
  -  
  +
   FIXME:
     - how can we include char entities without hardwiring them?
     - should "form" tags be included?
  @@ -45,15 +45,15 @@
     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)
  -    
  +
   COPYRIGHT:
     Copyright (c) 1999 The Apache Software Foundation.
  -  
  -  Permission to copy in any form is granted provided this notice is 
  -  included in all copies. Permission to redistribute is granted 
  -  provided this file is distributed untouched in all its parts and 
  +
  +  Permission to copy in any form is granted provided this notice is
  +  included in all copies. Permission to redistribute is granted
  +  provided this file is distributed untouched in all its parts and
     included files.
  -  
  +
   ==================================================================== -->
   
   
  @@ -76,22 +76,20 @@
   <!-- =============================================================== -->
   
   <!ENTITY % text "#PCDATA">
  -<!ENTITY % empty "EMPTY">
  -
   
   
   <!-- =============================================================== -->
   <!-- Entities for general XML compliance -->
   <!-- =============================================================== -->
   
  -<!-- Common attributes 
  +<!-- Common attributes
           Every element has an ID attribute (sometimes required,
           but usually optional) for links, and a Role attribute
           for extending the useful life of the DTD by allowing
           authors to make subclasses for any element. %common.att;
           is for common attributes where the ID is optional, and
           %common-idreq.att; is for common attributes where the
  -        ID is required. 
  +        ID is required.
   -->
   <!ENTITY % common.att
           'id                     ID              #IMPLIED
  @@ -111,7 +109,7 @@
   <!ENTITY % xmlspace.att
           'xml:space (default|preserve) #FIXED "preserve"'>
   
  -        
  +
   <!-- def attribute =====================================================
           Points to the element where the relevant definition can be
           found, using the IDREF mechanism.  %def.att; is for optional
  @@ -142,12 +140,12 @@
   <!-- =============================================================== -->
   
   <!ENTITY % xlink-simple.att
  -        'type      (simple|extended|locator|arc) #FIXED "simple" 
  +        'type      (simple|extended|locator|arc) #FIXED "simple"
            href      CDATA                         #IMPLIED
            role      CDATA                         #IMPLIED
            title     CDATA                         #IMPLIED '>
   <!--    'xmlns     CDATA                         #FIXED "http://www.w3.org/XML/XLink/0.9"
-->
  -<!-- FIXME: brain-dead IE5 has broken support for 
  +<!-- FIXME: brain-dead IE5 has broken support for
        namespace validation and since I use it for editing
        I remove this for now -->
   
  @@ -182,11 +180,11 @@
   ==================================================================== -->
   <!ENTITY % key.att
           'key                    CDATA           #IMPLIED'>
  +
   
  -                                
   
   <!-- Title attributes ==================================================
  -        Indicates that the element requires to have a title. 
  +        Indicates that the element requires to have a title.
   ==================================================================== -->
   <!ENTITY % title.att
           'title                  CDATA           #REQUIRED'>
  @@ -194,7 +192,7 @@
   
   
   <!-- Name attributes ==================================================
  -        Indicates that the element requires to have a name. 
  +        Indicates that the element requires to have a name.
   ==================================================================== -->
   <!ENTITY % name.att
           'name                   CDATA           #REQUIRED'>
  @@ -202,7 +200,7 @@
   
   
   <!-- Email attributes ==================================================
  -        Indicates that the element requires to have an email. 
  +        Indicates that the element requires to have an email.
   ==================================================================== -->
   <!ENTITY % email.att
           'email                  CDATA           #REQUIRED'>
  @@ -216,7 +214,7 @@
   <!-- =============================================================== -->
   
   <!-- A person is a general human entity -->
  -<!ELEMENT person %empty;>
  +<!ELEMENT person EMPTY>
   <!ATTLIST person %common.att;
                    %name.att;
                    %email.att;>
  @@ -251,7 +249,7 @@
       <!-- Emphasis (typically italic) -->
       <!ELEMENT em (%text;)>
       <!ATTLIST em %common.att;>
  -    
  +
       <!-- Code (typically monospaced) -->
       <!ELEMENT code (%text;)>
       <!ATTLIST code %common.att;>
  @@ -264,9 +262,9 @@
       <!ELEMENT sub (%text;)>
       <!ATTLIST sub %common.att;>
   
  -    <!-- FIXME (SM): should we add these HTML 4.0 markups 
  +    <!-- FIXME (SM): should we add these HTML 4.0 markups
            which are style-free?
  -    
  +
             -dfn
             -samp
             -kbd
  @@ -274,7 +272,7 @@
             -cite
             -abbr
             -acronym
  -          
  +
        -->
   
       <!-- ==================================================== -->
  @@ -283,19 +281,19 @@
   
       <!-- hard replacing link (equivalent of <a ...>) -->
       <!ELEMENT link (%link-content.mix;)*>
  -    <!ATTLIST link %common.att; 
  +    <!ATTLIST link %common.att;
                      %xlink-simple.att;
                      %xlink-user-replace.att;>
   
       <!-- Hard window replacing link (equivalent of <a ... target="_top">) -->
       <!ELEMENT jump (%link-content.mix;)*>
  -    <!ATTLIST jump %common.att; 
  +    <!ATTLIST jump %common.att;
                      %xlink-simple.att;
                      %xlink-user-new.att;>
   
       <!-- Hard window forking link (equivalent of <a ... target="_new">) -->
       <!ELEMENT fork (%link-content.mix;)*>
  -    <!ATTLIST fork %common.att; 
  +    <!ATTLIST fork %common.att;
                      %xlink-simple.att;
                      %xlink-user-new.att;>
   
  @@ -305,7 +303,7 @@
   
       <!-- Soft link between processed pages (no equivalent in HTML) -->
       <!ELEMENT connect (%link-content.mix;)*>
  -    <!ATTLIST connect %common.att; 
  +    <!ATTLIST connect %common.att;
                         %xlink-simple.att;
                         %xlink-user-replace.att;
                         %xlink-soft.att;>
  @@ -315,26 +313,26 @@
       <!-- ==================================================== -->
   
       <!-- Breakline Object (typically forces line break) -->
  -    <!ELEMENT br %empty;>
  +    <!ELEMENT br EMPTY>
       <!ATTLIST br %common.att;>
   
       <!-- Image Object (typically an inlined image) -->
  -    <!-- FIXME (SM): should we have the notion of soft links even here 
  +    <!-- FIXME (SM): should we have the notion of soft links even here
            for inlined objects? -->
  -    <!ELEMENT img %empty;>
  +    <!ELEMENT img EMPTY>
       <!ATTLIST img src    CDATA  #REQUIRED
                     alt    CDATA  #REQUIRED
                     height CDATA  #IMPLIED
                     width  CDATA  #IMPLIED
                     usemap CDATA  #IMPLIED
                     ismap  (ismap) #IMPLIED
  -                  %common.att;>    
  +                  %common.att;>
  +
   
   
   
   
   
  -        
   <!-- =============================================================== -->
   <!-- Blocks definitions -->
   <!-- =============================================================== -->
  @@ -354,7 +352,7 @@
       <!-- ==================================================== -->
       <!-- Paragraphs -->
       <!-- ==================================================== -->
  -    
  +
       <!-- Text Paragraph (normally vertically space delimited) -->
       <!ELEMENT p (%content.mix;)*>
       <!ATTLIST p %common.att;>
  @@ -385,12 +383,12 @@
                               |char)          #IMPLIED
               char            CDATA           #IMPLIED
               charoff         CDATA           #IMPLIED'>
  -    
  +
       <!ENTITY % cellvalign.att
               'valign         (top|middle
                               |bottom
                               |baseline)      #IMPLIED'>
  -    
  +
       <!ENTITY % thtd.att
               'abbr           CDATA           #IMPLIED
               axis            CDATA           #IMPLIED
  @@ -401,10 +399,10 @@
                               |colgroup)      #IMPLIED
               rowspan         NMTOKEN         "1"
               colspan         NMTOKEN         "1"'>
  -    
  +
       <!ENTITY % width.att
               'width          CDATA           #IMPLIED'>
  -    
  +
       <!ENTITY % span.att
               'span           NMTOKEN         "1"'>
   
  @@ -428,10 +426,10 @@
                               |all)           #IMPLIED
               cellspacing     CDATA           #IMPLIED
               cellpadding     CDATA           #IMPLIED>
  -    
  +
           <!ELEMENT caption (%content.mix;)*>
           <!ATTLIST caption %common.att;>
  -             
  +
           <!ELEMENT colgroup (col)*>
           <!ATTLIST colgroup
                   %common.att;
  @@ -439,46 +437,46 @@
                   %width.att;
                   %cellhalign.att;
                   %cellvalign.att;>
  -     
  -            <!ELEMENT col %empty;>
  +
  +            <!ELEMENT col EMPTY>
               <!ATTLIST col
                       %common.att;
                       %span.att;
                       %width.att;
                       %cellhalign.att;
  -                    %cellvalign.att;>        
  +                    %cellvalign.att;>
   
           <!ELEMENT thead (tr)+>
           <!ATTLIST thead
                   %common.att;
                   %cellhalign.att;
                   %cellvalign.att;>
  -        
  +
           <!ELEMENT tfoot (tr)+>
           <!ATTLIST tfoot
                   %common.att;
                   %cellhalign.att;
                   %cellvalign.att;>
  -        
  +
           <!ELEMENT tbody (tr)+>
           <!ATTLIST tbody
                   %common.att;
                   %cellhalign.att;
                   %cellvalign.att;>
  -    
  +
               <!ELEMENT tr (th|td)+>
               <!ATTLIST tr
                       %common.att;
                       %cellhalign.att;
                       %cellvalign.att;>
  -            
  +
                   <!ELEMENT th (%content.mix;)*>
                   <!ATTLIST th
                           %common.att;
                           %thtd.att;
                           %cellhalign.att;
                           %cellvalign.att;>
  -                
  +
                   <!ELEMENT td (%content.mix;)*>
                   <!ATTLIST td
                           %common.att;
  @@ -499,7 +497,7 @@
       <!ATTLIST ul
               %common.att;
               spacing         (normal|compact)        #IMPLIED>
  -    
  +
       <!-- Ordered list (typically numbered) -->
       <!ELEMENT ol (li|%lists;)+>
       <!--    spacing attribute:
  @@ -517,7 +515,7 @@
           <!-- List item -->
           <!ELEMENT li (%content.mix;|%lists;)*>
           <!ATTLIST li %common.att;>
  -    
  +
       <!-- Definition list (typically two-column) -->
       <!ELEMENT dl (dt,dd)+>
       <!ATTLIST dl %common.att;>
  @@ -525,26 +523,26 @@
           <!-- Definition term -->
           <!ELEMENT dt (%content.mix;)*>
           <!ATTLIST dt %common.att;>
  -    
  +
           <!-- Definition description -->
           <!ELEMENT dd (%content.mix;)*>
           <!ATTLIST dd %common.att;>
  -    
  +
       <!-- ==================================================== -->
       <!-- Special Blocks -->
       <!-- ==================================================== -->
   
       <!-- Image Block (typically a separated and centered image) -->
  -    <!-- FIXME (SM): should we have the notion of soft links even here 
  +    <!-- FIXME (SM): should we have the notion of soft links even here
            for inlined objects? -->
  -    <!ELEMENT img-block %empty;>
  +    <!ELEMENT img-block EMPTY>
       <!ATTLIST img-block src    CDATA  #REQUIRED
                           alt    CDATA  #REQUIRED
                           height CDATA  #IMPLIED
                           width  CDATA  #IMPLIED
                           usemap CDATA  #IMPLIED
                           ismap  (ismap) #IMPLIED
  -                        %common.att;>    
  +                        %common.att;>
   
   
   
  @@ -562,29 +560,29 @@
       <!-- ==================================================== -->
   
       <!ENTITY % local.headers "">
  -    
  +
       <!ELEMENT header (title, subtitle?, version?, type?, authors,
                         notice*, abstract? %local.headers;)>
       <!ATTLIST header %common.att;>
  -    
  +
       <!ELEMENT title (%text;)>
       <!ATTLIST title %common.att;>
  -    
  +
       <!ELEMENT subtitle (%text;)>
       <!ATTLIST subtitle %common.att;>
  -    
  +
       <!ELEMENT version (%text;)>
       <!ATTLIST version %common.att;>
  -    
  +
       <!ELEMENT type (%text;)>
       <!ATTLIST type %common.att;>
  -    
  +
       <!ELEMENT authors (person+)>
       <!ATTLIST authors %common.att;>
   
       <!ELEMENT notice (%content.mix;)*>
       <!ATTLIST notice %common.att;>
  -    
  +
       <!ELEMENT abstract (%content.mix;)*>
       <!ATTLIST abstract %common.att;>
   
  @@ -598,16 +596,16 @@
   
       <!ELEMENT body (%sections;)+>
       <!ATTLIST body %common.att;>
  -    
  +
           <!ELEMENT s1 (s2|%blocks;)*>
           <!ATTLIST s1 %title.att; %common.att;>
  -    
  +
               <!ELEMENT s2 (s3|%blocks;)*>
               <!ATTLIST s2 %title.att; %common.att;>
  -    
  +
                   <!ELEMENT s3 (s4|%blocks;)*>
                   <!ATTLIST s3 %title.att; %common.att;>
  -    
  +
                       <!ELEMENT s4 (%blocks;)*>
                       <!ATTLIST s4 %title.att; %common.att;>
   
  @@ -618,10 +616,10 @@
       <!ENTITY % local.footers "">
   
       <!ELEMENT footer (legal %local.footers;)>
  -    
  +
           <!ELEMENT legal (%content.mix;)*>
           <!ATTLIST legal %common.att;>
  -        
  +
   <!-- =============================================================== -->
   <!-- End of DTD -->
   <!-- =============================================================== -->
  
  
  
  1.2       +1 -1      xml-cocoon/dtd/specification-v10.dtd
  
  Index: specification-v10.dtd
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/dtd/specification-v10.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- specification-v10.dtd	1999/11/30 16:29:57	1.1
  +++ specification-v10.dtd	1999/12/03 23:47:50	1.2
  @@ -71,7 +71,7 @@
       <!ATTLIST bl %common.att;>
   
           <!-- Book item -->
  -        <!ELEMENT bi %empty;>
  +        <!ELEMENT bi EMPTY>
           <!ATTLIST bi %common.att;
                        %name.att;
                        %title.att;
  
  
  

Mime
View raw message