RelaxNG/publiset.rnc
changeset 23 814ea44c2469
parent 21 7c09024d5634
child 26 cc3ab0784a7b
--- a/RelaxNG/publiset.rnc	dim. juin 12 17:21:39 2011 +0200
+++ b/RelaxNG/publiset.rnc	dim. juin 12 19:35:31 2011 +0200
@@ -29,10 +29,8 @@
 
 composition.attributes =
    composition.id.attribute
- & base.attribute?
  & remap.attributes
 composition.id.attribute = attribute xml:id { xsd:ID }
-base.attribute = attribute xml:base { xsd:anyURI }
 
 composition.content =
    composition.head?,
@@ -157,9 +155,14 @@
 
 composition.division.attributes =
    base.attribute?
+ & xslt.attribute?
+ & xpath.attribute?
  & remap.attributes
 selection.division.attributes =
    base.attribute?
+base.attribute = attribute base { xsd:anyURI }
+xslt.attribute = attribute xslt { xsd:anyURI }
+xpath.attribute = attribute xpath { text }
 
 composition.division.content =
    composition.head?,
@@ -179,15 +182,12 @@
 selection.file = element file { selection.file.attributes, file.content }
 
 composition.file.attributes =
-   xpath.attribute?
- & transform.attribute?
+   xslt.attribute?
+ & xpath.attribute?
  & remap.attributes
 selection.file.attributes =
    xpath.attribute?
- & transform.attribute?
-xpath.attribute = attribute xpath { text }
-transform.attribute =
-   attribute transform {list { (xsd:token {pattern = "(xsl|regex):\S+"})+ }}
+ & xslt.attribute?
 
 file.content = xsd:anyURI