# HG changeset patch
# User Patrick PIERRE
# Date 1414424349 -3600
# Node ID 852860c3d9c98e420bd096cfeaefd6420e3b1eb4
# Parent b9e71a8ec71f5b1fe86e1fe2ac7096fa4614780b
Utilisation de intruders
diff -r b9e71a8ec71f -r 852860c3d9c9 Data/Quiz/blanks-char.xml
--- a/Data/Quiz/blanks-char.xml lun. oct. 27 11:18:38 2014 +0100
+++ b/Data/Quiz/blanks-char.xml lun. oct. 27 16:39:09 2014 +0100
@@ -12,9 +12,9 @@
</instructions>
<blanks-char>
- <wrongs>
- <wrong>? </wrong>
- </wrongs>
+ <intruders>
+ <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>
diff -r b9e71a8ec71f -r 852860c3d9c9 Data/Quiz/blanks-select.xml
--- a/Data/Quiz/blanks-select.xml lun. oct. 27 11:18:38 2014 +0100
+++ b/Data/Quiz/blanks-select.xml lun. oct. 27 16:39:09 2014 +0100
@@ -11,10 +11,10 @@
</instructions>
<blanks-select>
- <wrongs>
- <wrong>la bergère</wrong>
- <wrong>« Au feu ! »</wrong>
- </wrongs>
+ <intruders>
+ <blank>la bergère</blank>
+ <blank>« Au feu ! »</blank>
+ </intruders>
<p>
Un berger aime faire croire que le loup attaque <blank>son
troupeau</blank>. À chaque fois qu'il crie « Au loup ! », tous les gens
diff -r b9e71a8ec71f -r 852860c3d9c9 Data/Quiz/blanks-select_multiple.xml
--- a/Data/Quiz/blanks-select_multiple.xml lun. oct. 27 11:18:38 2014 +0100
+++ b/Data/Quiz/blanks-select_multiple.xml lun. oct. 27 16:39:09 2014 +0100
@@ -12,10 +12,10 @@
</instructions>
<blanks-select multiple="true">
- <wrongs>
- <wrong>1 169,73</wrong>
- <wrong>848,78</wrong>
- </wrongs>
+ <intruders>
+ <blank>1 169,73</blank>
+ <blank>848,78</blank>
+ </intruders>
<list>
<item>369 x 31,7 = <blank>11 697,3</blank></item>
<item>738 x 1,15 = <blank>848,7</blank></item>
diff -r b9e71a8ec71f -r 852860c3d9c9 Data/Quiz/categories.xml
--- a/Data/Quiz/categories.xml lun. oct. 27 11:18:38 2014 +0100
+++ b/Data/Quiz/categories.xml lun. oct. 27 16:39:09 2014 +0100
@@ -11,7 +11,9 @@
</instructions>
<categories>
- <item>assez</item>
+ <intruders>
+ <item>assez</item>
+ </intruders>
<category>
<head>
<title>Verbes du premier groupe</title>
diff -r b9e71a8ec71f -r 852860c3d9c9 Data/Quiz/composite.xml
--- a/Data/Quiz/composite.xml lun. oct. 27 11:18:38 2014 +0100
+++ b/Data/Quiz/composite.xml lun. oct. 27 16:39:09 2014 +0100
@@ -51,10 +51,10 @@
<p>albatros</p>
</instructions>
<blanks-select>
- <wrongs>
- <wrong>reptile</wrong>
- <wrong>oiseaux</wrong>
- </wrongs>
+ <intruders>
+ <blank>reptile</blank>
+ <blank>oiseaux</blank>
+ </intruders>
<p>Catégorie : <blank>mammifère</blank></p>
</blanks-select>
</subquiz>
diff -r b9e71a8ec71f -r 852860c3d9c9 RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc lun. oct. 27 11:18:38 2014 +0100
+++ b/RelaxNG/publiquiz.rnc lun. oct. 27 16:39:09 2014 +0100
@@ -143,7 +143,7 @@
blanks-fill.content =
(blanks.block+ | blanks.section+)
blanks-select.content =
- blanks.wrongs?,
+ blanks.intruders?,
(blanks.block+ | blanks.section+)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -238,7 +238,7 @@
multiple.attribute?
categories.content =
- category.item*,
+ category.intruders?,
category,
category+
@@ -509,18 +509,18 @@
inlines
| ((p | image | (audio, image?) | video), help?, answer?)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blanks.wrongs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blanks.intruders ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~ blanks.wrongs
-blanks.wrongs = element wrongs { blanks.wrongs.content }
+# ~~~~~~ blanks.intruders
+blanks.intruders = element intruders { blanks.intruders.content }
-blanks.wrongs.content =
- wrongs.wrong+
+blanks.intruders.content =
+ intruders.blank+
-# ~~~~~~ wrongs.wrong
-wrongs.wrong = element wrong { wrongs.wrong.content }
+# ~~~~~~ intruders.blank
+intruders.blank = element blank { intruders.blank.content }
-wrongs.wrong.content = text
+intruders.blank.content = text
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ match.item ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -548,8 +548,15 @@
inlines
| (p, help?, answer?)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ category.item ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~ category.intruders, category.item ~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~ category.intruders
+category.intruders = element intruders { category.intruders.content }
+
+category.intruders.content =
+ category.item+
+
+# ~~~~~~ category.item
category.item = element item { category.item.content }
category.item.content =