Author: crossley
Date: Wed Aug 6 22:25:17 2008
New Revision: 683511
URL: http://svn.apache.org/viewvc?rev=683511&view=rev
Log:
Enable use of XInclude in document-v20 xdoc DTD.
Issue: FOR-1032
Thanks to assistance from Jim Dixon and Brolin Empey.
Modified:
forrest/trunk/main/webapp/resources/schema/dtd/document-v20.mod
forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml
forrest/trunk/site-author/status.xml
Modified: forrest/trunk/main/webapp/resources/schema/dtd/document-v20.mod
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v20.mod?rev=683511&r1=683510&r2=683511&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/schema/dtd/document-v20.mod (original)
+++ forrest/trunk/main/webapp/resources/schema/dtd/document-v20.mod Wed Aug 6
22:25:17 2008
@@ -117,6 +117,9 @@
<!ENTITY % link.att 'href CDATA #REQUIRED
title CDATA #IMPLIED
rel CDATA #IMPLIED'>
+
+<!ENTITY % xinclude-ns.att 'xmlns:xi CDATA #FIXED
"http://www.w3.org/2001/XInclude";'>
+
<!-- =============================================================== -->
<!-- General definitions -->
<!-- =============================================================== -->
@@ -131,7 +134,7 @@
<!-- Content definitions -->
<!-- =============================================================== -->
<!ENTITY % local.inline "">
-<!ENTITY % link-content.mix "%text;|%markup;|%special-inline; %local.inline;">
+<!ENTITY % link-content.mix "%text;|%markup;|%special-inline;|xi:include
%local.inline;">
<!ENTITY % content.mix "%link-content.mix;|%links;">
<!-- ==================================================== -->
<!-- Phrase Markup -->
@@ -221,6 +224,13 @@
%common.att;
>
+<!ELEMENT xi:include EMPTY>
+<!ATTLIST xi:include
+ parse (text|xml) "xml"
+ href CDATA #REQUIRED
+ encoding CDATA #IMPLIED
+>
+
<!-- =============================================================== -->
<!-- Blocks definitions -->
<!-- =============================================================== -->
@@ -366,6 +376,7 @@
<!ELEMENT document (header, body, footer?)>
<!ATTLIST document
%common.att;
+ %xinclude-ns.att;
>
<!-- ==================================================== -->
<!-- Header -->
@@ -420,7 +431,7 @@
<!-- ==================================================== -->
<!ENTITY % local.sections "">
<!ENTITY % sections "section %local.sections;">
-<!ELEMENT body (%sections; | %blocks;)+>
+<!ELEMENT body (%sections; | %blocks; | xi:include)+>
<!ATTLIST body
%common.att;
>
Modified: forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml?rev=683511&r1=683510&r2=683511&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml (original)
+++ forrest/trunk/site-author/content/xdocs/dtdx/document-v20.xml Wed Aug 6
22:25:17 2008
@@ -428,6 +428,9 @@
<strong><a></strong> element. See demonstration
<a href="#link-class">using class attribute on links</a>.
</li>
+ <li>
+ Enabled use of XInclude. See example in the 'forrest seed sample'
site.
+ </li>
</ul>
</section>
<section id="changes-13">
Modified: forrest/trunk/site-author/status.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/site-author/status.xml?rev=683511&r1=683510&r2=683511&view=diff
==============================================================================
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Wed Aug 6 22:25:17 2008
@@ -151,6 +151,11 @@
Added document to facilitate
<link href="site:upgrading_09">upgrading to v0.9</link>
</action>
+<!-- 2008-08 -->
+ <action context="code" type="update" dev="DC" fixes-bug="FOR-1032">
+ Added ability to use XInclude to the document-v20 xdoc DTD.
+ See an example in a 'forrest seed sample' site.
+ </action>
<!-- 2008-03 -->
<action context="code" type="add" dev="DC" fixes-bug="FOR-1071"
importance="high">
