# HG changeset patch
# User Patrick PIERRE
# Date 1432308952 -7200
# Node ID 156ce0e2f94345bdeddebcb9a893107f6d19b5d7
# Parent 429101cc5d266b8f2ffce6c5859ed658b92576ec
1 seul sous-element piur publiset
diff -r 429101cc5d26 -r 156ce0e2f943 Data/Sets/composition.xml
--- a/Data/Sets/composition.xml mar. mai 19 18:32:20 2015 +0200
+++ b/Data/Sets/composition.xml ven. mai 22 17:35:52 2015 +0200
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- $Id$ -->
<publiset version="1.0">
- <composition id="composition" xml:lang="fr" pi-source="true"
+ <composition xml:lang="fr" pi-source="true"
as="publidoc" attributes="version=1.0">
<division as="document" attributes="id=composition xml:lang=fr">
<head transform="composition.xsl">
diff -r 429101cc5d26 -r 156ce0e2f943 Data/Sets/quiz.xml
--- a/Data/Sets/quiz.xml mar. mai 19 18:32:20 2015 +0200
+++ b/Data/Sets/quiz.xml ven. mai 22 17:35:52 2015 +0200
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- $Id$ -->
<publiset version="1.0">
- <composition id="quiz" xml:lang="fr" as="publiquiz" attributes="version=1.0">
+ <composition xml:lang="fr" as="publiquiz" attributes="version=1.0">
<division as="document" attributes="id=quiz xml:lang=fr"
path="../Quiz" xpath="//quiz">
<head>
diff -r 429101cc5d26 -r 156ce0e2f943 Data/Sets/selection.xml
--- a/Data/Sets/selection.xml mar. mai 19 18:32:20 2015 +0200
+++ /dev/null jeu. janv. 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
-<publiset version="1.0">
- <!-- ============================ SÉLECTION 1 =========================== -->
- <selection id="selection1" xml:lang="fr">
- <head>
- <title>Sélection de textes</title>
- </head>
- <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~ Événements ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <division path="../Topics">
- <head>
- <title>Les événements</title>
- </head>
- <file>centre_pompidou.xml</file>
- <file>chasseurs.xml</file>
- <link uri="centre_pompidou.html">Un nouveau Centre Pompidou</link>
- <link uri="chasseurs.html">Les chasseurs contestent la loi</link>
- </division>
- <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Brèves ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <division path="../Topics">
- <head>
- <title>Les brèves</title>
- </head>
- <file>portugal_ue.xml</file>
- <link uri="portugal_ue.html">Lisbonne, samedi 1<sup>er</sup></link>
- </division>
- </selection>
-
- <!-- ============================ SÉLECTION 2 =========================== -->
- <selection id="selection2" xml:lang="fr">
- <head>
- <title>Sélection de textes et de pages Web</title>
- </head>
- <file path="../Topics">a380.xml</file>
- <link uri="a380.html">Naissance de l'A380</link>
- <link uri="http://www.prismallia.fr">Prismallia</link>
- </selection>
-</publiset>
diff -r 429101cc5d26 -r 156ce0e2f943 Data/Sets/selection1.xml
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Sets/selection1.xml ven. mai 22 17:35:52 2015 +0200
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- $Id$ -->
+<publiset version="1.0">
+ <selection xml:lang="fr">
+ <head>
+ <title>Sélection de textes</title>
+ </head>
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~ Événements ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <division path="../Topics">
+ <head>
+ <title>Les événements</title>
+ </head>
+ <file>centre_pompidou.xml</file>
+ <file>chasseurs.xml</file>
+ <link uri="centre_pompidou.html">Un nouveau Centre Pompidou</link>
+ <link uri="chasseurs.html">Les chasseurs contestent la loi</link>
+ </division>
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Brèves ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <division path="../Topics">
+ <head>
+ <title>Les brèves</title>
+ </head>
+ <file>portugal_ue.xml</file>
+ <link uri="portugal_ue.html">Lisbonne, samedi 1<sup>er</sup></link>
+ </division>
+ </selection>
+</publiset>
diff -r 429101cc5d26 -r 156ce0e2f943 Data/Sets/selection2.xml
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Sets/selection2.xml ven. mai 22 17:35:52 2015 +0200
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- $Id$ -->
+<publiset version="1.0">
+ <selection id="selection2" xml:lang="fr">
+ <head>
+ <title>Sélection de textes et de pages Web</title>
+ </head>
+ <file path="../Topics">a380.xml</file>
+ <link uri="a380.html">Naissance de l'A380</link>
+ <link uri="http://www.prismallia.fr">Prismallia</link>
+ </selection>
+</publiset>
diff -r 429101cc5d26 -r 156ce0e2f943 RelaxNG/publiset.rnc
--- a/RelaxNG/publiset.rnc mar. mai 19 18:32:20 2015 +0200
+++ b/RelaxNG/publiset.rnc ven. mai 22 17:35:52 2015 +0200
@@ -13,7 +13,8 @@
version.attribute = attribute version { "1.0" }
publiset.content =
- (composition | selection)+
+ composition
+ | selection
# =============================================================================
@@ -211,7 +212,7 @@
}
composition.attributes =
- composition.id.attribute
+ composition.id.attribute?
& lang.attribute?
& path.attribute?
& pi-source.attribute?
@@ -259,7 +260,7 @@
}
selection.attributes =
- selection.id.attribute
+ selection.id.attribute?
& lang.attribute?
& path.attribute?
selection.id.attribute = attribute id { xsd:NMTOKEN }