# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1347875908 -7200
# Node ID 98124166003a7b9df1002d95e6f82e95f5796ef3
# Parent  a3a9e8edb4ff17b58e13d7bf11756b30a66fa79c
Modification des thèmes (subject)

diff -r a3a9e8edb4ff -r 98124166003a RelaxNG/Examples/Documents/torture_test.xml
--- a/RelaxNG/Examples/Documents/torture_test.xml	jeu. sept. 13 12:47:35 2012 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml	lun. sept. 17 11:58:28 2012 +0200
@@ -42,8 +42,8 @@
         <keyword>météo</keyword>
       </keywordset>
       <subjectset>
-        <subject id="test"/>
-        <subject id="littérature"/>
+        <subject>test</subject>
+        <subject>littérature</subject>
       </subjectset>
       <abstract>
         <p>
diff -r a3a9e8edb4ff -r 98124166003a RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	jeu. sept. 13 12:47:35 2012 +0200
+++ b/RelaxNG/publidoc.rnc	lun. sept. 17 11:58:28 2012 +0200
@@ -476,7 +476,7 @@
 
 pagenumber.content = xsd:positiveInteger
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ keyword & subject ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~ keyword & subject ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~ keywordset
 keywordset = element keywordset { keywordset.content }
@@ -494,11 +494,9 @@
 subjectset.content = subject+
 
 # ~~~~~~ subject
-subject = element subject { subject.attributes }
+subject = element subject { subject.content }
 
-subject.attributes =
-   subject.id.attribute
-subject.id.attribute = attribute id { xsd:NMTOKEN }
+subject.content = xsd:NMTOKEN
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ abstract ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~