--- a/Makefile	Thu Jan 26 16:51:42 2006 -0500
+++ b/Makefile	Fri Feb 03 16:28:04 2006 -0500
@@ -45,8 +45,8 @@
 DTD=$(addprefix $(DTD_DIR)/,poetry.dtd)
 SGML_CATALOG_FILES=$(TOP)/catalog
 export SGML_CATALOG_FILES
-xml_validate=xmllint --catalogs --xinclude --postvalid --noout $(1)
-html_validate=true
+xml_validate=xmllint --catalogs --xinclude --valid --noout $(1)
+html_validate=xmllint --xinclude --valid --noout $(1)
 
 #REMOTE_DIR=o:public_html/poesie
 # FOP=xmlto pdf

--- a/plonger.xml	Thu Jan 26 16:51:42 2006 -0500
+++ b/plonger.xml	Fri Feb 03 16:28:04 2006 -0500
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE poetry PUBLIC "-//Fabien Ninoles//DTD Poetry XML V1.0//EN"
-  "http://www.tzone.org/~fabien/dtd/poetry.dtd" >
+  "http://www.tzone.org/~fabien/dtd/poetry.dtd" [
+  <!ENTITY poetry SYSTEM "poetry.xml" NDATA SGML>
+]>
 <poetry id="pplonger" lang="fr">
   <docinfo>
     <title>L'amour, c'est de plonger tête première...</title>
@@ -65,7 +67,7 @@
       toujours facile que de croire...  et la peur est
       contagieuse.</para>
 
-    <para>Bien que j'ai mis ce poème dans la section <xref
+    <para>Bien que j'ai mis ce poème dans la section <oref objent="poetry"
       linkend="srouge" endterm="strouge" />, c'est plus à cause de sa
       source d'inspiration (des amours décevants) que pour son thème
       car, ne vous y trompez pas : l'eau chez moi, en particulier la
@@ -76,7 +78,7 @@
 </poetry>
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode: xml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-namecase-general:t
@@ -85,9 +87,9 @@
 sgml-always-quote-attributes:t
 sgml-indent-step:2
 sgml-indent-data:t
-sgml-parent-document:("poetry.xml" "SECTION" "SUBSECTION" ("TITLE"))
+sgml-parent-document:
 sgml-exposed-tags:nil
-sgml-local-catalogs:nil
+sgml-local-catalogs:("catalog" "../catalog")
 sgml-local-ecat-files:nil
 sgml-default-dtd-file:"~/.sgml/poetry/poetry.ced"
 End:

--- a/poetry.xml	Thu Jan 26 16:51:42 2006 -0500
+++ b/poetry.xml	Fri Feb 03 16:28:04 2006 -0500
@@ -1,6 +1,13 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//Fabien Ninoles//DTD Poetry XML V1.0//EN"
-  "http://www.tzone.org/~fabien/dtd/poetry.dtd" >
+  "http://www.tzone.org/~fabien/dtd/poetry.dtd" [
+  <!ELEMENT xi:include EMPTY>
+  <!ATTLIST xi:include href CDATA #REQUIRED>
+  <!ENTITY % local.common.attrib
+             "xmlns:xi CDATA #IMPLIED
+             xml:base CDATA #IMPLIED" >
+  <!ENTITY % local.section.alt "|xi:include">
+]>
 <book id="bpoemes" lang="fr"
   xmlns:xi="http://www.w3.org/2003/XInclude">
   <docinfo>