--- a/RelaxNG/publidoc.rnc mer. sept. 28 14:29:11 2011 +0200
+++ b/RelaxNG/publidoc.rnc ven. sept. 30 10:13:18 2011 +0200
@@ -446,7 +446,7 @@
media.content =
block.head?,
- (image | sound)+,
+ (image | audio)+,
caption?,
link?
@@ -460,10 +460,10 @@
image.content =
copyright?
-# ~~~~~~ sound
-sound = element sound { sound.attributes }
+# ~~~~~~ audio
+audio = element audio { audio.attributes }
-sound.attributes =
+audio.attributes =
media.id.attribute
--- a/RelaxNG/publidoc.rng mer. sept. 28 14:29:11 2011 +0200
+++ b/RelaxNG/publidoc.rng ven. sept. 30 10:13:18 2011 +0200
@@ -956,7 +956,7 @@
<oneOrMore>
<choice>
<ref name="image"/>
- <ref name="sound"/>
+ <ref name="audio"/>
</choice>
</oneOrMore>
<optional>
@@ -986,13 +986,13 @@
<ref name="copyright"/>
</optional>
</define>
- <!-- ~~~~~~ sound -->
- <define name="sound">
- <element name="sound">
- <ref name="sound.attributes"/>
+ <!-- ~~~~~~ audio -->
+ <define name="audio">
+ <element name="audio">
+ <ref name="audio.attributes"/>
</element>
</define>
- <define name="sound.attributes">
+ <define name="audio.attributes">
<ref name="media.id.attribute"/>
</define>
<!--
--- a/Xml/Documents/torture_test.xml mer. sept. 28 14:29:11 2011 +0200
+++ b/Xml/Documents/torture_test.xml ven. sept. 30 10:13:18 2011 +0200
@@ -284,7 +284,7 @@
<link uri="http://www.prismallia.fr"/>
</media>
<media>
- <sound id="6channels"/>
+ <audiox id="6channels"/>
<caption>Son 5.1</caption>
</media>
</section>