--- 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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<document id="les_miserables" xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publidoc version="1.0">
<document type="example" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<glossary>
<entry>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publimeta version="1.0">
<metadatas>
<!-- ================================================================== -->
Binary file Data/Quiz/Images/orgue.jpg has changed
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-fill" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-fill_strict" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-fill_variant" xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiquiz version="1.0">
- <quiz id="mip_image" xml:lang="fr">
+ <quiz id="blanks-media" xml:lang="fr">
<head>
- <title>Images dans une image (PIP)</title>
+ <title>Media dans une image (MIP)</title>
</head>
<instructions>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-select" xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-select_dropzone" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-select_multiple" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="categories" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="categories_image" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="categories_multiple" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="choices-check" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="choices-check_audio" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="choices-radio" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="choices-radio_image" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<document id="choices" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="composite" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="blanks-char" xml:lang="fr">
<head>
--- /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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<publiquiz version="1.0">
+ <quiz id="flashcard" xml:lang="fr">
+ <head>
+ <title>Jeu de cartes mémoire</title>
+ </head>
+
+ <instructions>
+ <p>Quel est cet instrument ?</p>
+ </instructions>
+
+ <flashcard>
+ <side1>
+ <media>
+ <image id="orgue"/>
+ </media>
+ <media>
+ <audio id="orgue"/>
+ </media>
+ </side1>
+
+ <side2>
+ <instructions>
+ <p>Écrivez le nom de l'instrument.</p>
+ </instructions>
+ <blanks-fill>
+ <p>C'est un <blank>orgue</blank>.</p>
+ </blanks-fill>
+ </side2>
+ </flashcard>
+ </quiz>
+</publiquiz>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="matching" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="matching_image" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="matching_multiple" xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="pointing-categories" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="pointing" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="pointing_radio" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="production" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="sort" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publiquiz version="1.0">
<quiz id="sort_image" xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiset version="1.0">
<composition xml:lang="fr" pi-fid="true" pi-source="true"
as="publidoc" attributes="version=1.0">
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiset version="1.0">
<composition id="proba" xml:lang="fr" as="publiquiz" attributes="version=1.0">
<division as="document" attributes="id=proba xml:lang=fr">
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiset version="1.0">
<composition xml:lang="fr" as="publiquiz" attributes="version=1.0">
<division as="document" attributes="id=quiz xml:lang=fr"
@@ -30,6 +29,8 @@
<file argument="grid" mode="correct2">categories.xml</file>
<file argument="color">categories_multiple.xml</file>
<file>categories_image.xml</file>
+ <file>wordsearch.xml</file>
+ <file>flashcard.xml</file>
<file>production.xml</file>
<file>composite.xml</file>
</division>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiset version="1.0">
<selection xml:lang="fr">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publiset version="1.0">
<selection id="selection2" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic type="event" id="chrq_an2003_0005_e04">
<head>
--- 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 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="a380" type="photo" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="cals" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="centre_pompidou" type="event" xml:lang="fr-FR">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="chasseurs" type="event" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="maths" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="portugal_ue" type="flash" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic id="proba01" xml:lang="fr">
<head>
--- 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Id$ -->
<publidoc version="1.0">
<topic type="article" id="usa_faucons" xml:lang="fr">
<head>
--- 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
--- 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
--- 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 }
--- 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
