# HG changeset patch # User Patrick PIERRE # Date 1308383243 -7200 # Node ID 0bd36d3b6a5a04336297f2348c991403461f3d28 # Parent 29c17c272cea70b530eba5c851f77b884496245a Exemple de sélection diff -r 29c17c272cea -r 0bd36d3b6a5a RelaxNG/publiset.rnc --- 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 diff -r 29c17c272cea -r 0bd36d3b6a5a RelaxNG/publiset.rng --- a/RelaxNG/publiset.rng sam. juin 18 09:09:04 2011 +0200 +++ b/RelaxNG/publiset.rng sam. juin 18 09:47:23 2011 +0200 @@ -41,6 +41,15 @@ + + + + + + + + + @@ -49,6 +58,19 @@ + + + + + + + + + + + + + @@ -68,9 +90,15 @@ - - - + + + + + + + + + @@ -295,31 +323,23 @@ - + - + - - - - - - - - - - - - - - - - + + + + + + + + @@ -364,23 +384,18 @@ - + - + - - - - - - - - + + + diff -r 29c17c272cea -r 0bd36d3b6a5a Xml/Sets/composition.xml --- a/Xml/Sets/composition.xml sam. juin 18 09:09:04 2011 +0200 +++ b/Xml/Sets/composition.xml sam. juin 18 09:47:23 2011 +0200 @@ -1,6 +1,6 @@ + - diff -r 29c17c272cea -r 0bd36d3b6a5a Xml/Sets/selection.xml --- /dev/null jeu. janv. 01 00:00:00 1970 +0000 +++ b/Xml/Sets/selection.xml sam. juin 18 09:47:23 2011 +0200 @@ -0,0 +1,39 @@ + + + + + + + Exemple de sélection de sujets + + + + + + + Les événements + + centre_pompidou.xml + chasseurs.xml + + + + + + Les brèves + + ../Topics/portugal_ue.xml + + + + + + Les photos avec légende + + + roi_belge.xml + + + + +