# HG changeset patch # User iinov # Date 1542725163 -3600 # Node ID 021552e09b34f7ee51631059a7bd22cef870efa3 # Parent 0c91f8f62b7b85823fc87bc2ad6e9a77631d1b03 dictation = media + p diff -r 0c91f8f62b7b -r 021552e09b34 Data/Quiz/dictation.xml --- a/Data/Quiz/dictation.xml jeu. nov. 08 16:21:04 2018 +0100 +++ b/Data/Quiz/dictation.xml mar. nov. 20 15:46:03 2018 +0100 @@ -10,7 +10,9 @@ </instructions> <dictation case-insensitive="false"> - <audio id="houston"/> + <media> + <audio id="houston"/> + </media> <p> This is <hint> diff -r 0c91f8f62b7b -r 021552e09b34 RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc jeu. nov. 08 16:21:04 2018 +0100 +++ b/RelaxNG/publiquiz.rnc mar. nov. 20 15:46:03 2018 +0100 @@ -441,7 +441,7 @@ case_insensitive.attribute = attribute case-insensitive { xsd:boolean } dictation.content = - audio, + dictation.media, dictation.p # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -779,6 +779,7 @@ blanks-c.media = element media { media.attributes, blanks-c.media.content } correct.media = element media { media.attributes, correct.media.content } pointing.media = element media { media.attributes, pointing.media.content } +dictation.media = element media { media.attributes, dictation.media.content } blanks.media.content = block.head?, @@ -805,6 +806,8 @@ (image | audio | video)+, pointing.media.caption?, link? +dictation.media.content = + audio # ~~~~~~ blanks.image blanks.image = element image { image.attributes, blanks.image.content }