# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1337854975 -7200
# Node ID 2db7cb9721c07dbf15c4956c76fb5798aba58206
# Parent  b45b3d1a9350423a1133a6938b09d6dfda43fd5c
Ajout du type de son

diff -r b45b3d1a9350 -r 2db7cb9721c0 RelaxNG/Examples/Documents/torture_test.xml
--- a/RelaxNG/Examples/Documents/torture_test.xml	sam. mai 19 00:38:14 2012 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml	jeu. mai 24 12:22:55 2012 +0200
@@ -427,7 +427,7 @@
           </head>
           <section>
             <media>
-              <audio id="brahms_lullaby"/>
+              <audio id="brahms_lullaby" type="music"/>
               <caption>
                 Johannes Brahms – Op.49 No.4 Wiegenlied / Lullaby
               </caption>
diff -r b45b3d1a9350 -r 2db7cb9721c0 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	sam. mai 19 00:38:14 2012 +0200
+++ b/RelaxNG/publidoc.rnc	jeu. mai 24 12:22:55 2012 +0200
@@ -314,8 +314,8 @@
 image = element image { image.attributes, image.content }
 
 image.attributes =
-   media.id.attribute,
-   image.type?
+   media.id.attribute
+ & image.type?
 media.id.attribute = attribute id { xsd:NMTOKEN }
 image.type = attribute type { "cover" | "thumbnail" | "icon" }
 
@@ -327,6 +327,8 @@
 
 audio.attributes =
    media.id.attribute
+ & audio.type?
+audio.type = attribute type { "music" | "voice" | "ambiance" }
 
 
 # =============================================================================