forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: xml-forrest/schemas/DTD document-v11.dtd
Date Sun, 17 Feb 2002 06:17:10 GMT
crossley    02/02/16 22:17:10

  Modified:    schemas/DTD document-v11.dtd
  Log:
  - Moved empty placeholder entity declarations up front
  - Corrected content model of content.mix parameter entity
  Submitted by: Steven Noels <stevenn@outerthought.org>
  
  Revision  Changes    Path
  1.4       +15 -17    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- document-v11.dtd	10 Feb 2002 11:57:23 -0000	1.3
  +++ document-v11.dtd	17 Feb 2002 06:17:10 -0000	1.4
  @@ -67,6 +67,7 @@
     
   AUTHORS:
     Stefano Mazzocchi <stefano@apache.org>
  +  Steven Noels <stevenn@outerthought.org>
   
   FIXME:
     - should "form" tags be included?
  @@ -94,6 +95,8 @@
     20011218 Added "section" element. (SM)  
     20011218 Allowed "body" to have blocks without a section. (SM)
     20011218 Removed "sl" since not really different from "ul". (SM)
  +  20020214 Moved empty placeholder entity declarations up front (SNS)
  +  20020214 Corrected content model of content.mix parameter entity (SNS)
   
   COPYRIGHT:
     Copyright (c) @year@ The Apache Software Foundation.
  @@ -143,6 +146,16 @@
   
   <!ENTITY % text "#PCDATA">
   
  +<!-- Entities referred to later on are defined up front -->
  +
  +<!ENTITY % markup "strong|em|code|sub|sup">
  +<!ENTITY % special-inline "br|img|icon">
  +<!ENTITY % links "link|jump|fork">
  +<!ENTITY % paragraphs "p|source|note|warning|fixme">
  +<!ENTITY % tables "table">
  +<!ENTITY % lists "ol|ul|dl">
  +<!ENTITY % special-blocks "figure|anchor">
  +
   
   <!-- =============================================================== -->
   <!-- Entities for general XML compliance -->
  @@ -256,7 +269,6 @@
   
   
   
  -
   <!-- =============================================================== -->
   <!-- Content definitions -->
   <!-- =============================================================== -->
  @@ -265,14 +277,12 @@
   
   <!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
   
  -<!ENTITY % content.mix "%links;|%link-content.mix;">
  +<!ENTITY % content.mix "%link-content.mix;|%links;">
   
       <!-- ==================================================== -->
       <!-- Phrase Markup -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % markup "strong|em|code|sub|sup">
  -
       <!-- Strong (typically bold) -->
       <!ELEMENT strong (%text;|code)*>
       <!ATTLIST strong %common.att;>
  @@ -297,8 +307,6 @@
       <!-- Hypertextual Links -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % links "link|jump|fork">
  -
       <!-- hyperlink (equivalent of <a ...>) -->
       <!ELEMENT link (%link-content.mix;)*>
       <!ATTLIST link %common.att;
  @@ -318,8 +326,6 @@
       <!-- Specials -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % special-inline "br|img|icon">
  -
       <!-- Breakline Object (typically forces line break) -->
       <!ELEMENT br EMPTY>
       <!ATTLIST br %common.att;>
  @@ -355,8 +361,6 @@
       <!-- Paragraphs -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % paragraphs "p|source|note|warning|fixme">
  -    
       <!-- Text Paragraph (normally vertically space delimited) -->
       <!ELEMENT p (%content.mix;)*>
       <!ATTLIST p %common.att;>
  @@ -383,8 +387,6 @@
       <!-- Tables -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % tables "table">
  -
       <!-- Attributes that indicate the spanning of the table cell -->
       <!ENTITY % cell.span 
           'colspan CDATA "1"
  @@ -416,8 +418,6 @@
       <!-- Lists -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % lists "ol|ul|dl">
  -
       <!-- List item -->
       <!ELEMENT li (%content.mix;|%lists;)*>
       <!ATTLIST li %common.att;>
  @@ -458,8 +458,6 @@
       <!-- Special Blocks -->
       <!-- ==================================================== -->
   
  -    <!ENTITY % special-blocks "figure|anchor">
  -
       <!-- Image Block (typically a separated and centered image) -->
       <!ELEMENT figure EMPTY>
       <!ATTLIST figure src    CDATA  #REQUIRED
  @@ -519,7 +517,7 @@
   
       <!ENTITY % local.sections "">
   
  -    <!ENTITY % sections "section|%local.sections;">
  +    <!ENTITY % sections "section %local.sections;">
   
       <!ELEMENT body (%sections;|%blocks;)+>
       <!ATTLIST body %common.att;>
  
  
  

Mime
View raw message