# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1307284816 -7200
# Node ID 59e42ac69f8f2a80665e87eae20a74d69083479d
# Parent  417bb62f2a77254945060a934b18145f25d8ff5d
Nettoyage de la présentation

diff -r 417bb62f2a77 -r 59e42ac69f8f RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	dim. juin 05 16:26:16 2011 +0200
+++ b/RelaxNG/publidoc.rnc	dim. juin 05 16:40:16 2011 +0200
@@ -224,12 +224,6 @@
 
 media.id.attribute = attribute id { xsd:NMTOKEN }
 
-# ~~~~~~ caption
-media.caption = element caption { media.caption.content }
-
-media.caption.content =
-   parag+
-
 # ~~~~~~ image
 image = element image { image.attributes, image.content }
 
@@ -239,8 +233,15 @@
 image.content =
    copyright?
 
+# ~~~~~~ caption
+media.caption = element caption { media.caption.content }
+
+media.caption.content =
+   parag+
+
 # ~~~~~~ copyright
 copyright = element copyright { copyright.content }
+
 copyright.content = inlines
 
 
@@ -275,7 +276,8 @@
 
 date = element date { date.attributes, date.content }
 
-date.attributes = date.of.attribute
+date.attributes =
+   date.of.attribute
 date.of.attribute = attribute of { date.of.enumeration }
 date.of.enumeration = "event" | "birth" | "death"
 
diff -r 417bb62f2a77 -r 59e42ac69f8f RelaxNG/publidoc.rng
--- a/RelaxNG/publidoc.rng	dim. juin 05 16:26:16 2011 +0200
+++ b/RelaxNG/publidoc.rng	dim. juin 05 16:40:16 2011 +0200
@@ -417,17 +417,6 @@
       <data type="NMTOKEN"/>
     </attribute>
   </define>
-  <!-- ~~~~~~ caption -->
-  <define name="media.caption">
-    <element name="caption">
-      <ref name="media.caption.content"/>
-    </element>
-  </define>
-  <define name="media.caption.content">
-    <oneOrMore>
-      <ref name="parag"/>
-    </oneOrMore>
-  </define>
   <!-- ~~~~~~ image -->
   <define name="image">
     <element name="image">
@@ -443,6 +432,17 @@
       <ref name="copyright"/>
     </optional>
   </define>
+  <!-- ~~~~~~ caption -->
+  <define name="media.caption">
+    <element name="caption">
+      <ref name="media.caption.content"/>
+    </element>
+  </define>
+  <define name="media.caption.content">
+    <oneOrMore>
+      <ref name="parag"/>
+    </oneOrMore>
+  </define>
   <!-- ~~~~~~ copyright -->
   <define name="copyright">
     <element name="copyright">