svn commit: r371677 - in /maven/maven-1/plugins/trunk/xdoc/src: dtd/maven-xdoc.dtd plugin-resources/dtd/maven-xdoc-1.10.dtd

[ltheussl]

Author: ltheussl
Date: Mon Jan 23 13:34:34 2006
New Revision: 371677

URL: http://svn.apache.org/viewcvs?rev=371677&view=rev
Log:
<source> should behave like <pre> and <sub/section> like <div>

Modified:
    maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd
    
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd

Modified: maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd?rev=371677&r1=371676&r2=371677&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/dtd/maven-xdoc.dtd Mon Jan 23 13:34:34 
2006
@@ -239,9 +239,11 @@
 <!ENTITY % block
     "p | %heading; | div | source | %lists; | %blocktext; | isindex |fieldset 
| table">
 
-<!ENTITY % block.section "(%block; | escapeXml | subsection)*">
-<!ENTITY % block.subsection "(%block; | escapeXml)*">
-
+<!ENTITY % block.section "(#PCDATA | %block; | form | %inline; | %misc; | 
escapeXml | subsection)*">
+<!ENTITY % block.subsection "(#PCDATA | %block; | form | %inline; | %misc; | 
escapeXml)*">
+<!ENTITY % block.source
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+       %inline.forms; | %misc.inline; | escapeXml)*">
 
 <!-- %Flow; mixes block and inline and is used for list items etc. -->
 <!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
@@ -1205,16 +1207,16 @@
 <!--======================= Xdoc Specific 
=======================================-->
 
 <!ELEMENT escapeXml ANY>
-<!ELEMENT source (#PCDATA | escapeXml)*>
+<!ELEMENT source %block.source;>
 
-<!ELEMENT section (%block.section;)*>
+<!ELEMENT section %block.section;>
 <!ATTLIST section
   %attrs;
   %TextAlign;
   name CDATA #REQUIRED
 >
 
-<!ELEMENT subsection (%block.subsection;)*>
+<!ELEMENT subsection %block.subsection;>
 <!ATTLIST subsection
   %attrs;
   %TextAlign;

Modified: 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd
URL: 
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd?rev=371677&r1=371676&r2=371677&view=diff
==============================================================================
--- 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd 
(original)
+++ 
maven/maven-1/plugins/trunk/xdoc/src/plugin-resources/dtd/maven-xdoc-1.10.dtd 
Mon Jan 23 13:34:34 2006
@@ -239,9 +239,11 @@
 <!ENTITY % block
     "p | %heading; | div | source | %lists; | %blocktext; | isindex |fieldset 
| table">
 
-<!ENTITY % block.section "(%block; | escapeXml | subsection)*">
-<!ENTITY % block.subsection "(%block; | escapeXml)*">
-
+<!ENTITY % block.section "(#PCDATA | %block; | form | %inline; | %misc; | 
escapeXml | subsection)*">
+<!ENTITY % block.subsection "(#PCDATA | %block; | form | %inline; | %misc; | 
escapeXml)*">
+<!ENTITY % block.source
+   "(#PCDATA | a | %special.basic; | %fontstyle.basic; | %phrase.basic; |
+       %inline.forms; | %misc.inline; | escapeXml)*">
 
 <!-- %Flow; mixes block and inline and is used for list items etc. -->
 <!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
@@ -1205,16 +1207,16 @@
 <!--======================= Xdoc Specific 
=======================================-->
 
 <!ELEMENT escapeXml ANY>
-<!ELEMENT source (#PCDATA | escapeXml)*>
+<!ELEMENT source %block.source;>
 
-<!ELEMENT section (%block.section;)*>
+<!ELEMENT section %block.section;>
 <!ATTLIST section
   %attrs;
   %TextAlign;
   name CDATA #REQUIRED
 >
 
-<!ELEMENT subsection (%block.subsection;)*>
+<!ELEMENT subsection %block.subsection;>
 <!ATTLIST subsection
   %attrs;
   %TextAlign;