--- a/RelaxNG/Examples/Documents/torture_test.xml lun. juil. 15 12:16:52 2013 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml mar. juil. 16 11:23:37 2013 +0200
@@ -620,7 +620,7 @@
<media>
<image id="cosette">
<copyright>Émile BAYARD</copyright>
- <hotspot x="35%" y="32%" w="34%" h="50%" type="visible">
+ <hotspot x="35%" y="32%" w="34%" h="50%" display="visible">
<link idref="cosette"/>
</hotspot>
</image>
@@ -645,21 +645,21 @@
</p>
<media>
<image id="f-gcru">
- <hotspot x="23.6%" y="49%" w="7.5%" h="14.2%" type="normal">
+ <hotspot x="23.6%" y="49%" w="7.5%" h="14.2%" display="normal">
<spot dx="-1.5%" dy="-4.1%"><p>Directionnel</p></spot>
<scenario>
<init action="hide" target="spot"/>
<onclick action="show" target="spot"/>
</scenario>
</hotspot>
- <hotspot x="68.2%" y="33%" w="7.5%" h="14.2%" type="visible">
+ <hotspot x="68.2%" y="33%" w="7.5%" h="14.2%" display="visible">
<spot dx="-2%" dy="-4.1%"><p>Compte-tours</p></spot>
<scenario>
<init action="hide" target="spot"/>
<onclick action="show" target="spot"/>
</scenario>
</hotspot>
- <hotspot x="55.3%" y="67.8%" w="7.5%" h="14.2%" type="pulse">
+ <hotspot x="55.3%" y="67.8%" w="7.5%" h="14.2%" display="pulse">
<spot dx="-2.5%" dy="-6%" dw="5%">
<image id="zoom_oil"/>
</spot>
--- a/RelaxNG/publidoc.rnc lun. juil. 15 12:16:52 2013 +0200
+++ b/RelaxNG/publidoc.rnc mar. juil. 16 11:23:37 2013 +0200
@@ -393,13 +393,13 @@
& y.attribute
& w.attribute
& h.attribute?
- & hotspot.type.attribute?
+ & hotspot.display.attribute?
& xmlid.attribute?
x.attribute = attribute x { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
y.attribute = attribute y { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
w.attribute = attribute w { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
h.attribute = attribute h { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
-hotspot.type.attribute = attribute type { "normal" | "visible" | "pulse" }
+hotspot.display.attribute = attribute display { "normal" | "visible" | "pulse" }
hotspot.content =
((link | p+ | hotspot.image | audio | video), (spot, scenario?)?)