Return-Path: 
 <forrest-cvs-return-856-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 33021 invoked by uid 500); 24 Apr 2003 05:52:43 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 33008 invoked from network); 24 Apr 2003 05:52:43 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 24 Apr 2003 05:52:43 -0000
Received: (qmail 21921 invoked by uid 1352); 24 Apr 2003 05:52:42 -0000
Date: 24 Apr 2003 05:52:42 -0000
Message-ID: <20030424055242.21920.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/schema/dtd document-v12.dtd
 document-v12.mod
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/04/23 22:52:41

  Modified:    src/resources/schema/dtd document-v12.dtd document-v12.mod
  Log:
  Make the DTD significantly less annoying by loosening constraints on li, dd,
  td, th.  These can now contain inline or block elements, defined as a new
  'flow' entity.  These changes were made with reference to the xhtml1-strict DTD
  (http://www.w3.org/TR/xhtml1/#a_dtd_XHTML-1.0-Strict), which does the same
  thing with a 'Flow' entity.
  
  Changes summarized as:
  
  20030419 Allow paragraphs (p|source|note|warning|fixme), table and figure|anchor inside li. (JT)
  20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside dd. (JT)
  20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside tables (td|dh). (JT)
  
  Revision  Changes    Path
  1.2       +4 -2      xml-forrest/src/resources/schema/dtd/document-v12.dtd
  
  Index: document-v12.dtd
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v12.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document-v12.dtd	24 Apr 2003 04:27:23 -0000	1.1
  +++ document-v12.dtd	24 Apr 2003 05:52:41 -0000	1.2
  @@ -102,10 +102,12 @@
     20020613 Move the declarations of ISO character entity sets to module (DC)
   [Version 1.2]
     20030320 Make @href required for link elements. (SNS)
  -  20030320 Allow paragraphs (p|source|note|warning|fixme) inside li. (SNS)
  -  20030320 Allow paragraphs (p|source|note|warning|fixme) and lists (ol|ul|dl) inside dd. (SNS)
     20030320 Allow links (link|jump|fork) and inline elements (br|img|icon|acronym) inside title. (SNS)
     20030419 Allow inline content (strong|em|code|sub|sup|br|img|icon|acronym|link|jump|fork) in strong and em. (JT)
  +  20030419 Allow paragraphs (p|source|note|warning|fixme), table and figure|anchor inside li. (JT)
  +  20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside dd. (JT)
  +  20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl), table, figure|anchor inside tables (td|dh). (JT)
  +
   
   COPYRIGHT:
     Copyright (c) 2002,2003 The Apache Software Foundation.
  
  
  
  1.2       +8 -4      xml-forrest/src/resources/schema/dtd/document-v12.mod
  
  Index: document-v12.mod
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/schema/dtd/document-v12.mod,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- document-v12.mod	24 Apr 2003 04:27:23 -0000	1.1
  +++ document-v12.mod	24 Apr 2003 05:52:41 -0000	1.2
  @@ -219,6 +219,10 @@
   <!-- =============================================================== -->
   <!ENTITY % local.blocks "">
   <!ENTITY % blocks "%paragraphs;|%tables;|%lists;|%special-blocks; %local.blocks;">
  +
  +<!-- Flow mixes block and inline -->
  +<!ENTITY % flow "%content.mix;|%blocks;">
  +
   <!-- ==================================================== -->
   <!-- Paragraphs -->
   <!-- ==================================================== -->
  @@ -272,13 +276,13 @@
     %common.att; 
   >
   <!-- The table row header element -->
  -<!ELEMENT th (%content.mix;)*>
  +<!ELEMENT th (%flow;)*>
   <!ATTLIST th
     %common.att; 
     %cell.span; 
   >
   <!-- The table row description element -->
  -<!ELEMENT td (%content.mix;)*>
  +<!ELEMENT td (%flow;)*>
   <!ATTLIST td
     %common.att; 
     %cell.span; 
  @@ -287,7 +291,7 @@
   <!-- Lists -->
   <!-- ==================================================== -->
   <!-- List item -->
  -<!ELEMENT li (%content.mix; | %lists; | %paragraphs; )*>
  +<!ELEMENT li (%flow;)*>
   <!ATTLIST li
     %common.att; 
   >
  @@ -322,7 +326,7 @@
     %common.att; 
   >
   <!-- Definition description -->
  -<!ELEMENT dd (%content.mix; | %lists; | %paragraphs; )*>
  +<!ELEMENT dd (%flow; )*>
   <!ATTLIST dd
     %common.att; 
   >