diff -r 32381a87f807 -r 5be33d03941a RelaxNG/publidoc.rng
--- a/RelaxNG/publidoc.rng	mar. sept. 27 17:12:04 2011 +0200
+++ b/RelaxNG/publidoc.rng	mar. sept. 27 23:30:00 2011 +0200
@@ -935,7 +935,10 @@
       <ref name="block.head"/>
     </optional>
     <oneOrMore>
-      <ref name="image"/>
+      <choice>
+        <ref name="image"/>
+        <ref name="sound"/>
+      </choice>
     </oneOrMore>
     <optional>
       <ref name="caption"/>
@@ -964,6 +967,15 @@
       <ref name="copyright"/>
     </optional>
   </define>
+  <!-- ~~~~~~ sound -->
+  <define name="sound">
+    <element name="sound">
+      <ref name="sound.attributes"/>
+    </element>
+  </define>
+  <define name="sound.attributes">
+    <ref name="media.id.attribute"/>
+  </define>
   <!--
     =============================================================================
                                     INLINE LEVEL
@@ -1285,15 +1297,10 @@
     </element>
   </define>
   <define name="link.attributes">
-    <interleave>
-      <choice>
-        <ref name="uri.attribute"/>
-        <ref name="idref.attribute"/>
-      </choice>
-      <optional>
-        <ref name="anchor.attribute"/>
-      </optional>
-    </interleave>
+    <choice>
+      <ref name="uri.attribute"/>
+      <ref name="idref.attribute"/>
+    </choice>
   </define>
   <define name="uri.attribute">
     <attribute name="uri">
@@ -1305,26 +1312,13 @@
       <data type="IDREF"/>
     </attribute>
   </define>
-  <define name="anchor.attribute">
-    <attribute name="anchor">
-      <data type="NCName"/>
-    </attribute>
-  </define>
   <define name="link.content">
     <ref name="inlines"/>
   </define>
   <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ anchor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
   <define name="anchor">
     <element name="anchor">
-      <choice>
-        <group>
-          <ref name="anchor.attributes"/>
-          <ref name="anchor.content"/>
-        </group>
-        <attribute name="startref">
-          <data type="IDREF"/>
-        </attribute>
-      </choice>
+      <ref name="anchor.attributes"/>
     </element>
   </define>
   <define name="anchor.attributes">
@@ -1335,7 +1329,4 @@
       <data type="ID"/>
     </attribute>
   </define>
-  <define name="anchor.content">
-    <ref name="inlines"/>
-  </define>
 </grammar>