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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~