--- a/RelaxNG/publiset.rng	dim. juin 05 12:02:50 2011 +0200
+++ b/RelaxNG/publiset.rng	dim. juin 05 16:26:16 2011 +0200
@@ -10,7 +10,6 @@
       <ref name="publiset.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="publiset.attributes">
     <ref name="version.attribute"/>
   </define>
@@ -19,7 +18,6 @@
       <value>1.0</value>
     </attribute>
   </define>
-  <!-- ~~~~~~ content -->
   <define name="publiset.content">
     <oneOrMore>
       <choice>
@@ -40,7 +38,6 @@
       <ref name="composition.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="composition.attributes">
     <interleave>
       <ref name="composition.id.attribute"/>
@@ -60,7 +57,6 @@
       <data type="anyURI"/>
     </attribute>
   </define>
-  <!-- ~~~~~~ content -->
   <define name="composition.content">
     <optional>
       <ref name="composition.metadata"/>
@@ -79,7 +75,6 @@
       <ref name="selection.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="selection.attributes">
     <optional>
       <ref name="base.attribute"/>
@@ -90,7 +85,6 @@
       <data type="ID"/>
     </attribute>
   </define>
-  <!-- ~~~~~~ content -->
   <define name="selection.content">
     <optional>
       <ref name="selection.metadata"/>
@@ -119,11 +113,9 @@
       <ref name="metadata.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="metadata.attributes">
     <ref name="remap.attributes"/>
   </define>
-  <!-- ~~~~~~ content -->
   <define name="metadata.content">
     <optional>
       <ref name="title"/>
@@ -150,6 +142,7 @@
     </element>
   </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ source ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- ~~~~~~ source -->
   <define name="source">
     <element name="source">
       <ref name="source.attributes"/>
@@ -166,7 +159,6 @@
       </choice>
     </element>
   </define>
-  <!-- ~~~~~~ Attributes -->
   <define name="source.attributes">
     <interleave>
       <optional>
@@ -180,7 +172,6 @@
       <data type="NMTOKEN"/>
     </attribute>
   </define>
-  <!-- ~~~~~~ Content -->
   <define name="source.content.book">
     <optional>
       <ref name="title"/>
@@ -189,6 +180,7 @@
       <ref name="pagenumber"/>
     </optional>
   </define>
+  <!-- ~~~~~~ pagenumber -->
   <define name="pagenumber">
     <element name="pagenumber">
       <ref name="pagenumber.attributes"/>
@@ -222,7 +214,6 @@
       <ref name="selection.division.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="composition.division.attributes">
     <interleave>
       <optional>
@@ -236,7 +227,6 @@
       <ref name="base.attribute"/>
     </optional>
   </define>
-  <!-- ~~~~~~ content -->
   <define name="composition.division.content">
     <optional>
       <ref name="composition.metadata"/>
@@ -268,17 +258,17 @@
   <define name="composition.file">
     <element name="file">
       <ref name="composition.file.attributes"/>
+      <ref name="file.content"/>
     </element>
   </define>
   <define name="selection.file">
     <element name="file">
       <ref name="selection.file.attributes"/>
+      <ref name="file.content"/>
     </element>
   </define>
-  <!-- ~~~~~~ attributes -->
   <define name="composition.file.attributes">
     <interleave>
-      <ref name="name.attribute"/>
       <optional>
         <ref name="xpath.attribute"/>
       </optional>
@@ -286,19 +276,16 @@
     </interleave>
   </define>
   <define name="selection.file.attributes">
-    <interleave>
-      <ref name="name.attribute"/>
-      <optional>
-        <ref name="xpath.attribute"/>
-      </optional>
-    </interleave>
-  </define>
-  <define name="name.attribute">
-    <attribute name="name"/>
+    <optional>
+      <ref name="xpath.attribute"/>
+    </optional>
   </define>
   <define name="xpath.attribute">
     <attribute name="xpath"/>
   </define>
+  <define name="file.content">
+    <data type="anyURI"/>
+  </define>
   <!--
     =============================================================================
                                     Inline level