RelaxNG/publidoc.rnc
changeset 43 5be33d03941a
parent 42 32381a87f807
child 44 ae64c01c37f1
--- a/RelaxNG/publidoc.rnc	mar. sept. 27 17:12:04 2011 +0200
+++ b/RelaxNG/publidoc.rnc	mar. sept. 27 23:30:00 2011 +0200
@@ -434,7 +434,7 @@
 
 media.content =
    block.head?,
-   image+,
+   (image | sound)+,
    caption?,
    link?
 
@@ -448,6 +448,12 @@
 image.content =
    copyright?
 
+# ~~~~~~ sound
+sound = element sound { sound.attributes }
+
+sound.attributes =
+   media.id.attribute
+
 
 # =============================================================================
 #                                 INLINE LEVEL
@@ -590,22 +596,15 @@
 
 link.attributes =
    (uri.attribute | idref.attribute)
- & anchor.attribute?
 uri.attribute = attribute uri { xsd:anyURI }
 idref.attribute = attribute idref { xsd:IDREF }
-anchor.attribute = attribute anchor { xsd:NCName }
 
 link.content = inlines
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ anchor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-anchor = element anchor {
-   ( anchor.attributes, anchor.content )
- | ( attribute startref { xsd:IDREF } )
-}
+anchor = element anchor { anchor.attributes }
 
 anchor.attributes =
    anchor.id.attribute
 anchor.id.attribute = attribute xml:id { xsd:ID }
-
-anchor.content = inlines