--- a/RelaxNG/publidoc.rnc	mer. mars 06 16:02:01 2013 +0100
+++ b/RelaxNG/publidoc.rnc	lun. mars 11 14:54:12 2013 +0100
@@ -351,8 +351,7 @@
 
 image.content =
    copyright?,
-   hotspot*,
-   tooltip*
+   hotspot*
 
 # ~~~~~~ audio
 audio = element audio { audio.attributes }
@@ -374,30 +373,22 @@
 hotspot.attributes =
    x.attribute
  & y.attribute
+ & dx.attribute?
+ & dy.attribute?
  & (width.attribute & height.attribute)?
+ & hidden.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})?%"} }
+dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,2}(\.\d)?"} }
+dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,2}(\.\d)?"} }
 width.attribute = attribute width {
    xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
 height.attribute = attribute height {
    xsd:token {pattern = "\d{1,2}(\.\d{1,2})?%"} }
-
+hidden.attribute = attribute hidden { xsd:boolean }
+   
 hotspot.content =
-   (link | audio | video)
-   
-# ~~~~~~ tooltip
-tooltip = element tooltip { tooltip.attributes, tooltip.content }
-
-tooltip.attributes =
-   x.attribute
- & y.attribute
- & dx.attribute?
- & dy.attribute?
-dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,2}(\.\d)?"} }
-dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,2}(\.\d)?"} }
-
-tooltip.content =
-   (p+ | image)
+   (p | link | image | audio | video)
    
 # ~~~~~~ media.caption
 media.caption = element caption { caption.attributes, caption.content }