--- 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"