--- a/RelaxNG/publiset.rng dim. juin 12 17:21:39 2011 +0200
+++ b/RelaxNG/publiset.rng dim. juin 12 19:35:31 2011 +0200
@@ -41,9 +41,6 @@
<define name="composition.attributes">
<interleave>
<ref name="composition.id.attribute"/>
- <optional>
- <ref name="base.attribute"/>
- </optional>
<ref name="remap.attributes"/>
</interleave>
</define>
@@ -52,11 +49,6 @@
<data type="ID"/>
</attribute>
</define>
- <define name="base.attribute">
- <attribute name="xml:base">
- <data type="anyURI"/>
- </attribute>
- </define>
<define name="composition.content">
<optional>
<ref name="composition.head"/>
@@ -302,6 +294,12 @@
<optional>
<ref name="base.attribute"/>
</optional>
+ <optional>
+ <ref name="xslt.attribute"/>
+ </optional>
+ <optional>
+ <ref name="xpath.attribute"/>
+ </optional>
<ref name="remap.attributes"/>
</interleave>
</define>
@@ -310,6 +308,19 @@
<ref name="base.attribute"/>
</optional>
</define>
+ <define name="base.attribute">
+ <attribute name="base">
+ <data type="anyURI"/>
+ </attribute>
+ </define>
+ <define name="xslt.attribute">
+ <attribute name="xslt">
+ <data type="anyURI"/>
+ </attribute>
+ </define>
+ <define name="xpath.attribute">
+ <attribute name="xpath"/>
+ </define>
<define name="composition.division.content">
<optional>
<ref name="composition.head"/>
@@ -353,10 +364,10 @@
<define name="composition.file.attributes">
<interleave>
<optional>
- <ref name="xpath.attribute"/>
+ <ref name="xslt.attribute"/>
</optional>
<optional>
- <ref name="transform.attribute"/>
+ <ref name="xpath.attribute"/>
</optional>
<ref name="remap.attributes"/>
</interleave>
@@ -367,24 +378,10 @@
<ref name="xpath.attribute"/>
</optional>
<optional>
- <ref name="transform.attribute"/>
+ <ref name="xslt.attribute"/>
</optional>
</interleave>
</define>
- <define name="xpath.attribute">
- <attribute name="xpath"/>
- </define>
- <define name="transform.attribute">
- <attribute name="transform">
- <list>
- <oneOrMore>
- <data type="token">
- <param name="pattern">(xsl|regex):\S+</param>
- </data>
- </oneOrMore>
- </list>
- </attribute>
- </define>
<define name="file.content">
<data type="anyURI"/>
</define>