# HG changeset patch # User Coraline MARKWITZ # Date 1449069965 -3600 # Node ID de00a458739de5a7c25785ec5027a4e03decec42 # Parent 4eeecb8b9f0bfee29a07ea665d7f331b71aec2c9 changement pip vers mip diff -r 4eeecb8b9f0b -r de00a458739d Data/Quiz/mip_image.xml --- /dev/null jeu. janv. 01 00:00:00 1970 +0000 +++ b/Data/Quiz/mip_image.xml mer. déc. 02 16:26:05 2015 +0100 @@ -0,0 +1,26 @@ + + + + + + Images dans une image (PIP) + + + +

Entoure en vert les nombres multiples de 3 et en rouge ceux multiples + de 5.

+ + + + + + + + + + + + + + + diff -r 4eeecb8b9f0b -r de00a458739d Data/Quiz/pip.xml --- a/Data/Quiz/pip.xml ven. nov. 20 12:30:26 2015 +0100 +++ /dev/null jeu. janv. 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - Images dans une image (PIP) - - - -

Entoure en vert les nombres multiples de 3 et en rouge ceux multiples - de 5.

- - - - - - - - - - - - - - - diff -r 4eeecb8b9f0b -r de00a458739d Data/Sets/quiz.xml --- a/Data/Sets/quiz.xml ven. nov. 20 12:30:26 2015 +0100 +++ b/Data/Sets/quiz.xml mer. déc. 02 16:26:05 2015 +0100 @@ -29,7 +29,7 @@ categories.xml categories_multiple.xml categories_image.xml - pip.xml + mip.xml production.xml composite.xml diff -r 4eeecb8b9f0b -r de00a458739d RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc ven. nov. 20 12:30:26 2015 +0100 +++ b/RelaxNG/publiquiz.rnc mer. déc. 02 16:26:05 2015 +0100 @@ -106,7 +106,7 @@ | matching | sort | categories - | pip + | mip | production # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ choices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -136,7 +136,8 @@ blanks-fill.attributes, blanks-fill.content } blanks-select = element blanks-select { blanks-select.attributes, blanks-select.content } -blanks-char = element blanks-char { blanks-select.content } +blanks-char = element blanks-char { + blanks-char.attributes, blanks-select.content } blanks-fill.attributes = success.attribute? @@ -157,6 +158,10 @@ blanks.intruders?, (blanks.block+ | blanks.section+) +blanks-char.attributes = + remove-space.attribute? +remove-space.attribute = attribute remove-space { xsd:boolean } + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing = element pointing { pointing.attributes, pointing.content } @@ -269,16 +274,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 +491,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 +516,9 @@ blanks.dropzone.content = blank -pip.dropzone.content = - image? +mip.dropzone.content = + image?, + audio? # ~~~~~~ media.caption blanks.media.caption = element caption { @@ -663,7 +669,7 @@ & long.attribute? & function.attribute? area.attribute = attribute area { xsd:boolean } -function.attribute = attribute function { 'lowercase' | 'uppercase' } +function.attribute = attribute function { 'accent' | 'uppercase' } blank.content = text