# HG changeset patch
# User Coraline MARKWITZ
# Date 1449069747 -3600
# Node ID 39a1454aa364c378a9ffabf87783896ec4bd24fd
# Parent 4eeecb8b9f0bfee29a07ea665d7f331b71aec2c9
changement pip vers mip
diff -r 4eeecb8b9f0b -r 39a1454aa364 Data/Quiz/Audios/01.mp3
Binary file Data/Quiz/Audios/01.mp3 has changed
diff -r 4eeecb8b9f0b -r 39a1454aa364 Data/Quiz/Audios/02.mp3
Binary file Data/Quiz/Audios/02.mp3 has changed
diff -r 4eeecb8b9f0b -r 39a1454aa364 Data/Quiz/blanks-char.xml
--- a/Data/Quiz/blanks-char.xml ven. nov. 20 12:30:26 2015 +0100
+++ b/Data/Quiz/blanks-char.xml mer. déc. 02 16:22:27 2015 +0100
@@ -11,16 +11,13 @@
espaces manquants.</p>
</instructions>
- <blanks-char>
+ <blanks-char remove-space="true">
<intruders>
- <blank>? </blank>
+ <blank>?</blank>
</intruders>
- <p>
- <blank function="lowercase">L</blank>e<blank> </blank>petit<blank> </blank>chat<blank> </blank>est<blank> </blank>mort<blank>.</blank>
- </p>
- <p>
- <blank function="lowercase">C</blank><blank>'</blank>est<blank> </blank>dommage<blank> ; </blank>mais<blank> </blank>quoi<blank> !</blank>
- </p>
+ <p><blank function="uppercase">L</blank>e petit chat est mort<blank>.</blank></p>
+ <p><blank function="uppercase">C</blank><blank>'</blank>est dommage<blank> ; </blank>mais quoi !</p>
+ <p><blank function="uppercase">U</blank>n Anneau pour les amener tous et dans les t<blank function="accent">é</blank>n<blank function="accent">è</blank>bres les lier<blank>.</blank></p>
</blanks-char>
</quiz>
</publiquiz>
diff -r 4eeecb8b9f0b -r 39a1454aa364 Data/Quiz/mip_audio.xml
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Quiz/mip_audio.xml mer. déc. 02 16:22:27 2015 +0100
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- $Id$ -->
+<publiquiz version="1.0">
+ <quiz id="mip_audio" xml:lang="fr">
+ <head>
+ <title>Audios dans une image (AIP)</title>
+ </head>
+
+ <instructions>
+ <p>Entoure en vert les nombres multiples de 3 et en rouge ceux multiples
+ de 5.</p>
+ </instructions>
+
+ <mip multiple="true">
+ <image id="bingo">
+ <dropzone x="2.5%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="16.1%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="30.3%" y="28.3%" w="11%" h="11%"><audio id="01"/></dropzone>
+ <dropzone x="43.9%" y="28.3%" w="11%" h="11%"><audio id="02"/></dropzone>
+ <dropzone x="58.0%" y="28.3%" w="11%" h="11%"><audio id="02"/></dropzone>
+ <dropzone x="72.0%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="86.0%" y="28.3%" w="11%" h="11%"><audio id="01"/></dropzone>
+ </image>
+ </mip>
+ </quiz>
+</publiquiz>
diff -r 4eeecb8b9f0b -r 39a1454aa364 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:22:27 2015 +0100
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- $Id$ -->
+<publiquiz version="1.0">
+ <quiz id="mip_image" xml:lang="fr">
+ <head>
+ <title>Images dans une image (PIP)</title>
+ </head>
+
+ <instructions>
+ <p>Entoure en vert les nombres multiples de 3 et en rouge ceux multiples
+ de 5.</p>
+ </instructions>
+
+ <mip multiple="true">
+ <image id="bingo">
+ <dropzone x="2.5%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="16.1%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="30.3%" y="28.3%" w="11%" h="11%"><image id="bingo_green"/></dropzone>
+ <dropzone x="43.9%" y="28.3%" w="11%" h="11%"><image id="bingo_red"/></dropzone>
+ <dropzone x="58.0%" y="28.3%" w="11%" h="11%"><image id="bingo_red"/></dropzone>
+ <dropzone x="72.0%" y="28.3%" w="11%" h="11%"></dropzone>
+ <dropzone x="86.0%" y="28.3%" w="11%" h="11%"><image id="bingo_green"/></dropzone>
+ </image>
+ </mip>
+ </quiz>
+</publiquiz>
diff -r 4eeecb8b9f0b -r 39a1454aa364 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 @@
-<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
-<publiquiz version="1.0">
- <quiz id="pip" xml:lang="fr">
- <head>
- <title>Images dans une image (PIP)</title>
- </head>
-
- <instructions>
- <p>Entoure en vert les nombres multiples de 3 et en rouge ceux multiples
- de 5.</p>
- </instructions>
-
- <pip multiple="true">
- <image id="bingo">
- <dropzone x="2.5%" y="28.3%" w="11%" h="11%"></dropzone>
- <dropzone x="16.1%" y="28.3%" w="11%" h="11%"></dropzone>
- <dropzone x="30.3%" y="28.3%" w="11%" h="11%"><image id="bingo_green"/></dropzone>
- <dropzone x="43.9%" y="28.3%" w="11%" h="11%"><image id="bingo_red"/></dropzone>
- <dropzone x="58.0%" y="28.3%" w="11%" h="11%"><image id="bingo_red"/></dropzone>
- <dropzone x="72.0%" y="28.3%" w="11%" h="11%"></dropzone>
- <dropzone x="86.0%" y="28.3%" w="11%" h="11%"><image id="bingo_green"/></dropzone>
- </image>
- </pip>
- </quiz>
-</publiquiz>
diff -r 4eeecb8b9f0b -r 39a1454aa364 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:22:27 2015 +0100
@@ -29,7 +29,7 @@
<file>categories.xml</file>
<file argument="color">categories_multiple.xml</file>
<file>categories_image.xml</file>
- <file>pip.xml</file>
+ <file>mip.xml</file>
<file>production.xml</file>
<file>composite.xml</file>
</division>
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 {