--- a/RelaxNG/publiquiz.rnc ven. nov. 20 12:30:26 2015 +0100
+++ b/RelaxNG/publiquiz.rnc mer. déc. 02 16:26:05 2015 +0100
@@ -106,7 +106,7 @@
| matching
| sort
| categories
- | pip
+ | mip
| production
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ choices ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -136,7 +136,8 @@
blanks-fill.attributes, blanks-fill.content }
blanks-select = element blanks-select {
blanks-select.attributes, blanks-select.content }
-blanks-char = element blanks-char { blanks-select.content }
+blanks-char = element blanks-char {
+ blanks-char.attributes, blanks-select.content }
blanks-fill.attributes =
success.attribute?
@@ -157,6 +158,10 @@
blanks.intruders?,
(blanks.block+ | blanks.section+)
+blanks-char.attributes =
+ remove-space.attribute?
+remove-space.attribute = attribute remove-space { xsd:boolean }
+
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
pointing = element pointing { pointing.attributes, pointing.content }
@@ -269,16 +274,16 @@
category.head,
category.item*
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-pip = element pip { pip.attributes, pip.content }
+mip = element mip { mip.attributes, mip.content }
-pip.attributes =
+mip.attributes =
success.attribute?
& multiple.attribute?
-pip.content =
- pip.image
+mip.content =
+ mip.image
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -486,24 +491,24 @@
# ~~~~~~ blanks.image
blanks.image = element image { image.attributes, blanks.image.content }
-pip.image = element image { image.attributes, pip.image.content }
+mip.image = element image { image.attributes, mip.image.content }
blanks.image.content =
copyright?,
blanks.dropzone*
-pip.image.content =
- pip.dropzone+
+mip.image.content =
+ mip.dropzone+
# ~~~~~~ dropzone
blanks.dropzone = element dropzone {
blanks.dropzone.attributes, blanks.dropzone.content }
-pip.dropzone = element dropzone {
- pip.dropzone.attributes, pip.dropzone.content }
+mip.dropzone = element dropzone {
+ mip.dropzone.attributes, mip.dropzone.content }
blanks.dropzone.attributes =
x.attribute
& y.attribute
-pip.dropzone.attributes =
+mip.dropzone.attributes =
x.attribute
& y.attribute
& w.attribute
@@ -511,8 +516,9 @@
blanks.dropzone.content =
blank
-pip.dropzone.content =
- image?
+mip.dropzone.content =
+ image?,
+ audio?
# ~~~~~~ media.caption
blanks.media.caption = element caption {
@@ -663,7 +669,7 @@
& long.attribute?
& function.attribute?
area.attribute = attribute area { xsd:boolean }
-function.attribute = attribute function { 'lowercase' | 'uppercase' }
+function.attribute = attribute function { 'accent' | 'uppercase' }
blank.content =
text