Images dans une image (PIP)

# HG changeset patch # User Patrick PIERRE # Date 1511707025 -3600 # Node ID 9bc794bf36b0ca409d57b772dde64e7358896cc1 # Parent c00766638a7b4af16366759803e7eb60be4746fa Jeu de cartes mémoire diff -r c00766638a7b -r 9bc794bf36b0 Data/Documents/les_miserables.xml --- a/Data/Documents/les_miserables.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Documents/les_miserables.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Documents/torture_test.xml --- a/Data/Documents/torture_test.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Documents/torture_test.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Glossary/english.xml --- a/Data/Glossary/english.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Glossary/english.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Metadata/metadatas.xml --- a/Data/Metadata/metadatas.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Metadata/metadatas.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/Images/orgue.jpg Binary file Data/Quiz/Images/orgue.jpg has changed diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-fill.xml --- a/Data/Quiz/blanks-fill.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-fill.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-fill_strict.xml --- a/Data/Quiz/blanks-fill_strict.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-fill_strict.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-fill_variant.xml --- a/Data/Quiz/blanks-fill_variant.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-fill_variant.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-media.xml --- a/Data/Quiz/blanks-media.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-media.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,9 +1,8 @@ - - + - Images dans une image (PIP) + Media dans une image (MIP) diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-select.xml --- a/Data/Quiz/blanks-select.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-select.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-select_dropzone.xml --- a/Data/Quiz/blanks-select_dropzone.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-select_dropzone.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/blanks-select_multiple.xml --- a/Data/Quiz/blanks-select_multiple.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/blanks-select_multiple.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/categories.xml --- a/Data/Quiz/categories.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/categories.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/categories_image.xml --- a/Data/Quiz/categories_image.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/categories_image.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/categories_multiple.xml --- a/Data/Quiz/categories_multiple.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/categories_multiple.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/choices-check.xml --- a/Data/Quiz/choices-check.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/choices-check.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/choices-check_audio.xml --- a/Data/Quiz/choices-check_audio.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/choices-check_audio.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/choices-radio.xml --- a/Data/Quiz/choices-radio.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/choices-radio.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/choices-radio_image.xml --- a/Data/Quiz/choices-radio_image.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/choices-radio_image.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/choices.xml --- a/Data/Quiz/choices.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/choices.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/composite.xml --- a/Data/Quiz/composite.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/composite.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/correct-line.xml --- a/Data/Quiz/correct-line.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/correct-line.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/flashcard.xml --- /dev/null jeu. janv. 01 00:00:00 1970 +0000 +++ b/Data/Quiz/flashcard.xml dim. nov. 26 15:37:05 2017 +0100 @@ -0,0 +1,32 @@ + + + + + Jeu de cartes mémoire + + + +

Quel est cet instrument ?

+ + + + + + + + +

+ + + + +

Écrivez le nom de l'instrument.

+ + +

C'est un orgue.

+ + + + + diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/matching.xml --- a/Data/Quiz/matching.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/matching.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/matching_image.xml --- a/Data/Quiz/matching_image.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/matching_image.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/matching_multiple.xml --- a/Data/Quiz/matching_multiple.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/matching_multiple.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/pointing-categories.xml --- a/Data/Quiz/pointing-categories.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/pointing-categories.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/pointing.xml --- a/Data/Quiz/pointing.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/pointing.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/pointing_radio.xml --- a/Data/Quiz/pointing_radio.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/pointing_radio.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/production.xml --- a/Data/Quiz/production.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/production.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/sort.xml --- a/Data/Quiz/sort.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/sort.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Quiz/sort_image.xml --- a/Data/Quiz/sort_image.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Quiz/sort_image.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Sets/composition.xml --- a/Data/Sets/composition.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Sets/composition.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Sets/proba.xml --- a/Data/Sets/proba.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Sets/proba.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Sets/quiz.xml --- a/Data/Sets/quiz.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Sets/quiz.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - categories.xml categories_multiple.xml categories_image.xml + wordsearch.xml + flashcard.xml production.xml composite.xml diff -r c00766638a7b -r 9bc794bf36b0 Data/Sets/selection1.xml --- a/Data/Sets/selection1.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Sets/selection1.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Sets/selection2.xml --- a/Data/Sets/selection2.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Sets/selection2.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/Alternatives/rolls_phantom.xml --- a/Data/Topics/Alternatives/rolls_phantom.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/Alternatives/rolls_phantom.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/a380.xml --- a/Data/Topics/a380.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/a380.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/cals.xml --- a/Data/Topics/cals.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/cals.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/centre_pompidou.xml --- a/Data/Topics/centre_pompidou.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/centre_pompidou.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/chasseurs.xml --- a/Data/Topics/chasseurs.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/chasseurs.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/maths.xml --- a/Data/Topics/maths.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/maths.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/portugal_ue.xml --- a/Data/Topics/portugal_ue.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/portugal_ue.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/proba01.xml --- a/Data/Topics/proba01.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/proba01.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 Data/Topics/états-unis_les faucons.xml --- a/Data/Topics/états-unis_les faucons.xml sam. sept. 23 18:04:05 2017 +0200 +++ b/Data/Topics/états-unis_les faucons.xml dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,4 @@ - diff -r c00766638a7b -r 9bc794bf36b0 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc sam. sept. 23 18:04:05 2017 +0200 +++ b/RelaxNG/publidoc.rnc dim. nov. 26 15:37:05 2017 +0100 @@ -1,8 +1,6 @@ -# $Id$ start = publidoc - publidoc = element publidoc { publidoc.attributes, publidoc.content diff -r c00766638a7b -r 9bc794bf36b0 RelaxNG/publimeta.rnc --- a/RelaxNG/publimeta.rnc sam. sept. 23 18:04:05 2017 +0200 +++ b/RelaxNG/publimeta.rnc dim. nov. 26 15:37:05 2017 +0100 @@ -1,4 +1,3 @@ -# $Id$ start = publimeta diff -r c00766638a7b -r 9bc794bf36b0 RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc sam. sept. 23 18:04:05 2017 +0200 +++ b/RelaxNG/publiquiz.rnc dim. nov. 26 15:37:05 2017 +0100 @@ -1,5 +1,3 @@ -# $Id$ - include "publidoc.rnc" { start = publiquiz @@ -128,6 +126,7 @@ | sort | categories | wordsearch + | flashcard | production # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ choices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -189,8 +188,8 @@ (blanks-c.block+ | blanks-c.section+) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ correct-line ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -correct-line = element correct-line { - correct.attributes, correct.content } + +correct-line = element correct-line { correct.attributes, correct.content } correct.attributes = remove-space.attribute? @@ -317,6 +316,7 @@ category.item* # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ wordsearch ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + wordsearch = element wordsearch {wordsearch.attributes, wordsearch.content } wordsearch.attributes = @@ -343,6 +343,38 @@ cell = element cell {cell.content} cell.content = xsd:token {pattern = "."} +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ flashcard ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# ~~~~~~ flashcard +flashcard = element flashcard { flashcard.content } + +flashcard.content = + side1, + side2 + +# ~~~~~~ side1 +side1 = element side1 { side1.content } + +side1.content = + section+ | block+ + +# ~~~~~~ side2 +side2 = element side2 { side2.content } + +side2.content = + instructions?, + flashcard.engine, + help?, + answer? + +# ~~~~~~ flashcard.engine +flashcard.engine = + choices-radio + | choices-check + | blanks-fill + | blanks-select + | sort + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production = element production { production.content } diff -r c00766638a7b -r 9bc794bf36b0 RelaxNG/publiset.rnc --- a/RelaxNG/publiset.rnc sam. sept. 23 18:04:05 2017 +0200 +++ b/RelaxNG/publiset.rnc dim. nov. 26 15:37:05 2017 +0100 @@ -1,4 +1,3 @@ -# $Id$ start = publiset