# HG changeset patch
# User Patrick PIERRE
# Date 1373968542 -7200
# Node ID b5b9681596993f4528b9a46d5986e907e3e5bcee
# Parent  dbec7d0cb842e7e521fbecaf3bd3bab677daf49c
Ajout d'un attribut type à <hotspot>

diff -r dbec7d0cb842 -r b5b968159699 RelaxNG/Examples/Documents/torture_test.xml
--- a/RelaxNG/Examples/Documents/torture_test.xml	mar. juil. 16 11:23:37 2013 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml	mar. juil. 16 11:55:42 2013 +0200
@@ -645,21 +645,24 @@
             </p>
             <media>
               <image id="f-gcru">
-                <hotspot x="23.6%" y="49%" w="7.5%" h="14.2%" display="normal">
+                <hotspot x="23.6%" y="49%" w="7.5%" h="14.2%"
+                         display="normal" type="caption">
                   <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%" display="visible">
+                <hotspot x="68.2%" y="33%" w="7.5%" h="14.2%"
+                         display="visible" type="caption">
                   <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%" display="pulse">
+                <hotspot x="55.3%" y="67.8%" w="7.5%" h="14.2%"
+                         display="pulse" type="zoom">
                   <spot dx="-2.5%" dy="-6%" dw="5%">
                     <image id="zoom_oil"/>
                   </spot>
diff -r dbec7d0cb842 -r b5b968159699 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	mar. juil. 16 11:23:37 2013 +0200
+++ b/RelaxNG/publidoc.rnc	mar. juil. 16 11:55:42 2013 +0200
@@ -394,12 +394,14 @@
  & w.attribute
  & h.attribute?
  & hotspot.display.attribute?
+ & hotspot.type.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.display.attribute = attribute display { "normal" | "visible" | "pulse" }
+hotspot.type.attribute = attribute type { xsd:NCName }
    
 hotspot.content =
    ((link | p+ | hotspot.image | audio | video), (spot, scenario?)?)