diff -r 4eeecb8b9f0b -r 39a1454aa364 RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc ven. nov. 20 12:30:26 2015 +0100 +++ b/RelaxNG/publiquiz.rnc mer. déc. 02 16:22:27 2015 +0100 @@ -106,7 +106,7 @@ | matching | sort | categories - | pip + | mip | production # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ choices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -269,16 +269,16 @@ category.head, category.item* -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -pip = element pip { pip.attributes, pip.content } +mip = element mip { mip.attributes, mip.content } -pip.attributes = +mip.attributes = success.attribute? & multiple.attribute? -pip.content = - pip.image +mip.content = + mip.image # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -486,24 +486,24 @@ # ~~~~~~ blanks.image blanks.image = element image { image.attributes, blanks.image.content } -pip.image = element image { image.attributes, pip.image.content } +mip.image = element image { image.attributes, mip.image.content } blanks.image.content = copyright?, blanks.dropzone* -pip.image.content = - pip.dropzone+ +mip.image.content = + mip.dropzone+ # ~~~~~~ dropzone blanks.dropzone = element dropzone { blanks.dropzone.attributes, blanks.dropzone.content } -pip.dropzone = element dropzone { - pip.dropzone.attributes, pip.dropzone.content } +mip.dropzone = element dropzone { + mip.dropzone.attributes, mip.dropzone.content } blanks.dropzone.attributes = x.attribute & y.attribute -pip.dropzone.attributes = +mip.dropzone.attributes = x.attribute & y.attribute & w.attribute @@ -511,8 +511,9 @@ blanks.dropzone.content = blank -pip.dropzone.content = - image? +mip.dropzone.content = + image?, + audio? # ~~~~~~ media.caption blanks.media.caption = element caption {