# HG changeset patch
# User iinov
# Date 1540130536 -7200
# Node ID 4e3338f519f9a1533e8ecbac186abf409bf31147
# Parent 968d3380597e7d26d774d2762e99b78d5869416f
Dictée
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/01.mp3
Binary file Data/Quiz/Audios/01.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/01.ogg
Binary file Data/Quiz/Audios/01.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/02.mp3
Binary file Data/Quiz/Audios/02.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/02.ogg
Binary file Data/Quiz/Audios/02.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/accordeon.mp3
Binary file Data/Quiz/Audios/accordeon.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/accordeon.ogg
Binary file Data/Quiz/Audios/accordeon.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/cornemuse.mp3
Binary file Data/Quiz/Audios/cornemuse.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/cornemuse.ogg
Binary file Data/Quiz/Audios/cornemuse.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/harmonica.mp3
Binary file Data/Quiz/Audios/harmonica.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/harmonica.ogg
Binary file Data/Quiz/Audios/harmonica.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/houston.ogg
Binary file Data/Quiz/Audios/houston.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/orgue.mp3
Binary file Data/Quiz/Audios/orgue.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/orgue.ogg
Binary file Data/Quiz/Audios/orgue.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/piano.mp3
Binary file Data/Quiz/Audios/piano.mp3 has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Audios/piano.ogg
Binary file Data/Quiz/Audios/piano.ogg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Images/instruments.jpg
Binary file Data/Quiz/Images/instruments.jpg has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/Images/instruments.png
Binary file Data/Quiz/Images/instruments.png has changed
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/blanks-media.xml
--- a/Data/Quiz/blanks-media.xml ven. oct. 19 18:19:27 2018 +0200
+++ /dev/null jeu. janv. 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<publiquiz version="1.0">
- <quiz id="blanks-media" xml:lang="fr">
- <head>
- <title>Media dans une image (MIP)</title>
- </head>
-
- <instructions>
- <p>Entoure en vert les nombres multiples de 3 et en rouge ceux multiples
- de 5.</p>
- </instructions>
-
- <blanks-media multiple="true">
- <section>
- <media>
- <image id="bingo">
- <dropzone x="30.3%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_green"/></blank></dropzone>
- <dropzone x="43.9%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_red"/></blank></dropzone>
- <dropzone x="58.0%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_red"/></blank></dropzone>
- <dropzone x="86.0%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_green"/></blank></dropzone>
- </image>
- </media>
- <media>
- <image id="instruments">
- <dropzone x="20%" y="18%" w="11%" h="9%"><blank><audio id="harmonica"/></blank></dropzone>
- <dropzone x="62%" y="30%" w="11%" h="9%"><blank><audio id="accordeon"/></blank></dropzone>
- <dropzone x="8%" y="80%" w="11%" h="9%"><blank><audio id="cornemuse"/></blank></dropzone>
- <dropzone x="50%" y="85%" w="11%" h="9%"><blank><audio id="orgue"/></blank></dropzone>
- <dropzone x="92%" y="65%" w="11%" h="9%"><blank><audio id="piano"/></blank></dropzone>
- </image>
- </media>
- </section>
- </blanks-media>
- </quiz>
-</publiquiz>
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/blanks-media_audio.xml
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Quiz/blanks-media_audio.xml dim. oct. 21 16:02:16 2018 +0200
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<publiquiz version="1.0">
+ <quiz id="blanks-media_audio" xml:lang="fr">
+ <head>
+ <title>Sons dans une image</title>
+ </head>
+
+ <instructions>
+ <p>Associe les sons avec le bon instrument.</p>
+ </instructions>
+
+ <blanks-media multiple="true">
+ <section>
+ <media>
+ <image id="instruments">
+ <dropzone x="20%" y="18%" w="11%" h="9%"><blank><audio id="harmonica"/></blank></dropzone>
+ <dropzone x="62%" y="30%" w="11%" h="9%"><blank><audio id="accordeon"/></blank></dropzone>
+ <dropzone x="8%" y="80%" w="11%" h="9%"><blank><audio id="cornemuse"/></blank></dropzone>
+ <dropzone x="50%" y="85%" w="11%" h="9%"><blank><audio id="orgue"/></blank></dropzone>
+ <dropzone x="92%" y="65%" w="11%" h="9%"><blank><audio id="piano"/></blank></dropzone>
+ </image>
+ </media>
+ </section>
+ </blanks-media>
+ </quiz>
+</publiquiz>
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/blanks-media_image.xml
--- /dev/null jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Quiz/blanks-media_image.xml dim. oct. 21 16:02:16 2018 +0200
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='utf-8'?>
+<publiquiz version="1.0">
+ <quiz id="blanks-media_image" xml:lang="fr">
+ <head>
+ <title>Images dans une image</title>
+ </head>
+
+ <instructions>
+ <p>Entoure en vert les nombres multiples de 3 et en rouge ceux multiples
+ de 5.</p>
+ </instructions>
+
+ <blanks-media multiple="true">
+ <section>
+ <media>
+ <image id="bingo">
+ <dropzone x="30.3%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_green"/></blank></dropzone>
+ <dropzone x="43.9%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_red"/></blank></dropzone>
+ <dropzone x="58.0%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_red"/></blank></dropzone>
+ <dropzone x="86.0%" y="28.3%" w="11%" h="11%"><blank><image id="bingo_green"/></blank></dropzone>
+ </image>
+ </media>
+ </section>
+ </blanks-media>
+ </quiz>
+</publiquiz>
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/composite.xml
--- a/Data/Quiz/composite.xml ven. oct. 19 18:19:27 2018 +0200
+++ b/Data/Quiz/composite.xml dim. oct. 21 16:02:16 2018 +0200
@@ -52,9 +52,9 @@
<blanks-select>
<intruders>
<blank>reptile</blank>
- <blank>oiseaux</blank>
+ <blank>mammifère</blank>
</intruders>
- <p>Catégorie : <blank>mammifère</blank></p>
+ <p>Catégorie : <blank>oiseau</blank></p>
</blanks-select>
</subquiz>
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/correct-line.xml
--- a/Data/Quiz/correct-line.xml ven. oct. 19 18:19:27 2018 +0200
+++ b/Data/Quiz/correct-line.xml dim. oct. 21 16:02:16 2018 +0200
@@ -16,7 +16,7 @@
</intruders>
<p><char function="uppercase">L</char>e petit chat est mort<char>.</char></p>
<p><char function="uppercase">C</char><char>'</char>est dommage<char> ; </char>mais quoi !</p>
- <p><char function="uppercase">U</char>n Anneau pour les amener tous et dans les t<char function="accent">é</char>n<char function="accent">è</char>bres les lier<char>.</char></p>
+ <p><char function="uppercase">U</char>n anneau pour les amener tous et dans les t<char function="accent">é</char>n<char function="accent">è</char>bres les lier<char>.</char></p>
</correct-line>
</quiz>
</publiquiz>
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/dictation.xml
--- a/Data/Quiz/dictation.xml ven. oct. 19 18:19:27 2018 +0200
+++ b/Data/Quiz/dictation.xml dim. oct. 21 16:02:16 2018 +0200
@@ -9,7 +9,7 @@
<p>Écoute attentivement le texte et écris-le.</p>
</instructions>
- <dictation>
+ <dictation case-insensitive="false">
<audio id="houston"/>
<p>
This is
@@ -20,17 +20,7 @@
<mistake is="Youston"><emphasis>Houston</emphasis> ne s'écrit pas
comme il se prononce.</mistake>
</hint>,
- say again please.
- </p>
- <p>
- <hint>
- <w>Houston</w>
- <mistake is="houston"><emphasis>Houston</emphasis> est une ville : il
- faut une majuscule.</mistake>
- <mistake is="Youston"><emphasis>Houston</emphasis> ne s'écrit pas
- comme il se prononce.</mistake>
- </hint>
- we
+ say again please. Houston we
<hint>
<w>have</w>
<mistake is="has"><emphasis>has</emphasis> est la troisième personne
diff -r 968d3380597e -r 4e3338f519f9 Data/Quiz/wordsearch.xml
--- a/Data/Quiz/wordsearch.xml ven. oct. 19 18:19:27 2018 +0200
+++ b/Data/Quiz/wordsearch.xml dim. oct. 21 16:02:16 2018 +0200
@@ -5,7 +5,7 @@
<title>Word Search (Tolkien Universe)</title>
</head>
<instructions>
- <p>Find the words of the list</p>
+ <p>Find the words of the list.</p>
</instructions>
<wordsearch strict="true" wordlist="right">
<words>
diff -r 968d3380597e -r 4e3338f519f9 Data/Sets/quiz.xml
--- a/Data/Sets/quiz.xml ven. oct. 19 18:19:27 2018 +0200
+++ b/Data/Sets/quiz.xml dim. oct. 21 16:02:16 2018 +0200
@@ -18,6 +18,8 @@
<file>blanks-select.xml</file>
<file>blanks-select_multiple.xml</file>
<file>blanks-select_dropzone.xml</file>
+ <file>blanks-media_image.xml</file>
+ <file>blanks-media_audio.xml</file>
<file>pointing.xml</file>
<file>pointing_radio.xml</file>
<file argument="link">matching.xml</file>
@@ -32,6 +34,7 @@
<file>wordsearch.xml</file>
<file>flashcard.xml</file>
<file>production.xml</file>
+ <file>dictation.xml</file>
<file>composite.xml</file>
</division>
</composition>
diff -r 968d3380597e -r 4e3338f519f9 RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc ven. oct. 19 18:19:27 2018 +0200
+++ b/RelaxNG/publiquiz.rnc dim. oct. 21 16:02:16 2018 +0200
@@ -434,11 +434,15 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dictation ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-dictation = element dictation { dictation.content }
+dictation = element dictation { dictation.attributes, dictation.content }
+
+dictation.attributes =
+ case_insensitive.attribute?
+case_insensitive.attribute = attribute case-insensitive { xsd:boolean }
dictation.content =
audio,
- dictation.block+
+ dictation.p
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -507,7 +511,6 @@
pointing.block = (
pointing.p | pointing.list | pointing.blockquote | pointing.speech
| pointing.table | media)
-dictation.block = dictation.p
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~