diff -r aaa57397763e -r 44de27e5c6cf RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc mer. mai 30 01:18:50 2012 +0200 +++ b/RelaxNG/publidoc.rnc mer. mai 30 21:32:58 2012 +0200 @@ -318,11 +318,11 @@ media.id.attribute & image.type? media.id.attribute = attribute id { xsd:NMTOKEN } -image.type = attribute type { "cover" | "thumbnail" | "icon" } +image.type = attribute type { "thumbnail" | "icon" } image.content = - tooltip*, - copyright? + copyright?, + tooltip* # ~~~~~~ audio audio = element audio { audio.attributes } @@ -341,10 +341,10 @@ & y.attribute & dx.attribute? & dy.attribute? -x.attribute = attribute x { xsd:token {pattern = "\d{1,3}%"} } -y.attribute = attribute y { xsd:token {pattern = "\d{1,3}%"} } -dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,3}%"} } -dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,3}%"} } +x.attribute = attribute x { xsd:token {pattern = "\d{1,2}%"} } +y.attribute = attribute y { xsd:token {pattern = "\d{1,2}%"} } +dx.attribute = attribute dx { xsd:token {pattern = "-?\d{1,2}"} } +dy.attribute = attribute dy { xsd:token {pattern = "-?\d{1,2}"} } tooltip.content = (p | image)+