diff -r bd4ff455b83f -r fb3173d57512 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc mer. juin 06 18:16:53 2012 +0200 +++ b/RelaxNG/publidoc.rnc mar. juin 12 11:39:05 2012 +0200 @@ -47,7 +47,7 @@ document.attributes = document.id.attribute & lang.attribute? -document.id.attribute = attribute xml:id { xsd:ID } +document.id.attribute = attribute id { xsd:NMTOKEN } lang.attribute = attribute xml:lang { xsd:language } document.content = @@ -62,7 +62,7 @@ topic.id.attribute & topic.type.attribute? & lang.attribute? -topic.id.attribute = attribute xml:id { xsd:ID } +topic.id.attribute = attribute id { xsd:NMTOKEN } topic.type.attribute = attribute type { xsd:NCName } top.topic.content = @@ -111,9 +111,10 @@ topic = element topic { topic.attributes, topic.content } topic.attributes = - topic.id.attribute? + topic.xmlid.attribute? & topic.type.attribute? & lang.attribute? +topic.xmlid.attribute = attribute xml:id { xsd:ID } topic.content = component.head?,