--- a/RelaxNG/publiquiz.rnc lun. avril 04 19:13:42 2016 +0200
+++ b/RelaxNG/publiquiz.rnc jeu. avril 14 17:33:15 2016 +0200
@@ -113,7 +113,6 @@
| matching
| sort
| categories
- | mip
| production
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ choices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -145,7 +144,7 @@
blanks-select.attributes, blanks-select.content }
blanks-media = element blanks-media {
blanks-select.attributes, blanks-media.content }
-blanks-char = element blanks-char {
+blanks-char = element blanks-char {
blanks-char.attributes, blanks-select.content }
blanks-fill.attributes =
@@ -302,18 +301,6 @@
category.head,
category.item*
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-mip = element mip { mip.attributes, mip.content }
-
-mip.attributes =
- success.attribute?
- & multiple.attribute?
- & orientation.attribute?
-
-mip.content =
- mip.image
-
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
production = element production { production.content }
@@ -577,7 +564,6 @@
# ~~~~~~ blanks.image
blanks.image = element image { image.attributes, blanks.image.content }
blanks-m.image = element image { image.attributes, blanks-m.image.content }
-mip.image = element image { image.attributes, mip.image.content }
blanks.image.content =
copyright?,
@@ -585,21 +571,17 @@
blanks-m.image.content =
copyright?,
blanks-m.dropzone*
-mip.image.content =
- mip.dropzone+
# ~~~~~~ dropzone
blanks.dropzone = element dropzone {
blanks.dropzone.attributes, blanks.dropzone.content }
blanks-m.dropzone = element dropzone {
- blanks.dropzone.attributes, blanks-m.dropzone.content }
-mip.dropzone = element dropzone {
- mip.dropzone.attributes, mip.dropzone.content }
+ blanks-m.dropzone.attributes, blanks-m.dropzone.content }
blanks.dropzone.attributes =
x.attribute
& y.attribute
-mip.dropzone.attributes =
+blanks-m.dropzone.attributes =
x.attribute
& y.attribute
& w.attribute
@@ -609,9 +591,6 @@
blank
blanks-m.dropzone.content =
blank-m
-mip.dropzone.content =
- image?,
- audio?
# ~~~~~~ media.caption
blanks.media.caption = element caption {
@@ -804,7 +783,12 @@
# ~~~~~~ blank-m
blank-m = element blank { blank-m.content }
-blank-m.content = math | image | audio | s-m+
+blank-m.content =
+ p
+ | math
+ | image
+ | audio
+ | (s-m+, help?, answer?)
# ~~~~~~ s
s = element s { s.content }
@@ -812,7 +796,11 @@
# ~~~~~~ s-m
s-m = element s { s-m.content }
-s-m.content = math | image | audio
+s-m.content =
+ p
+ | math
+ | image
+ | audio
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ point ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~