# HG changeset patch # User Patrick PIERRE <patrick.pierre@prismallia.fr> # Date 1365250638 -7200 # Node ID b9fea8bd24122d6bcb1525fb7489550126f972c2 # Parent a22a3398b58eac9b94a02a36cad231d044e7615f dx avec % diff -r a22a3398b58e -r b9fea8bd2412 RelaxNG/Examples/Documents/torture_test.xml --- a/RelaxNG/Examples/Documents/torture_test.xml jeu. mars 28 12:44:20 2013 +0100 +++ b/RelaxNG/Examples/Documents/torture_test.xml sam. avril 06 14:17:18 2013 +0200 @@ -532,7 +532,7 @@ <media> <image id="f-gcru"> <hotspot x="23.5%" y="48.7%" w="7.5%" h="14.2%" type="normal" - dx="-1" dy="-4.1" dw="0"> + dx="-1%" dy="-4.1%" dw="0%"> <p>Directionnel</p> <scenario> <init action="hide"/> @@ -540,7 +540,7 @@ </scenario> </hotspot> <hotspot x="68.2%" y="33.2%" w="7.5%" h="14.2%" type="visible" - dx="-2.5" dy="-4.1" dw="0"> + dx="-2.5%" dy="-4.1%" dw="0%"> <p>Compte-tours</p> <scenario> <init action="hide"/> @@ -548,7 +548,7 @@ </scenario> </hotspot> <hotspot x="55.3%" y="67.8%" w="7.5%" type="pulse" - dx="-2.5" dy="-6" dw="5"> + dx="-2.5%" dy="-6%" dw="5%"> <image id="zoom_oil"/> <scenario> <init action="hide"/> diff -r a22a3398b58e -r b9fea8bd2412 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc jeu. mars 28 12:44:20 2013 +0100 +++ b/RelaxNG/publidoc.rnc sam. avril 06 14:17:18 2013 +0200 @@ -382,10 +382,10 @@ 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" } -dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,2}(\.\d{1,2})?"} } -dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,2}(\.\d{1,2})?"} } -dw.attribute = attribute dw { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?"} } -dh.attribute = attribute dh { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?"} } +dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,2}(\.\d{1,2})?%"} } +dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,2}(\.\d{1,2})?%"} } +dw.attribute = attribute dw { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} } +dh.attribute = attribute dh { xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} } hotspot.content = (p | link | image | audio | video),