RelaxNG/publiset.rnc
changeset 29 0bd36d3b6a5a
parent 27 31bda0a55c4d
child 30 c0f9e813c039
--- a/RelaxNG/publiset.rnc	sam. juin 18 09:09:04 2011 +0200
+++ b/RelaxNG/publiset.rnc	sam. juin 18 09:47:23 2011 +0200
@@ -29,8 +29,14 @@
 
 composition.attributes =
    composition.id.attribute
+ & path.attribute?
+ & xpath.attribute?
+ & xslt.attribute?
  & remap.attributes
 composition.id.attribute = attribute xml:id { xsd:ID }
+path.attribute = attribute path { xsd:anyURI }
+xslt.attribute = attribute xslt { xsd:anyURI }
+xpath.attribute = attribute xpath { text }
 
 composition.content =
    composition.head?,
@@ -44,7 +50,9 @@
 }
 
 selection.attributes =
-   path.attribute?
+   selection.id.attribute
+ & path.attribute?
+ & xpath.attribute?
 selection.id.attribute = attribute xml:id { xsd:ID }
 
 selection.content =
@@ -155,14 +163,12 @@
 
 composition.division.attributes =
    path.attribute?
+ & xpath.attribute?
  & xslt.attribute?
- & xpath.attribute?
  & remap.attributes
 selection.division.attributes =
    path.attribute?
-path.attribute = attribute path { xsd:anyURI }
-xslt.attribute = attribute xslt { xsd:anyURI }
-xpath.attribute = attribute xpath { text }
+ & xpath.attribute?
 
 composition.division.content =
    composition.head?,
@@ -182,12 +188,11 @@
 selection.file = element file { selection.file.attributes, file.content }
 
 composition.file.attributes =
-   xslt.attribute?
- & xpath.attribute?
+   xpath.attribute?
+ & xslt.attribute?
  & remap.attributes
 selection.file.attributes =
    xpath.attribute?
- & xslt.attribute?
 
 file.content = xsd:anyURI