--- a/RelaxNG/publiquiz.rnc lun. oct. 27 11:18:38 2014 +0100
+++ b/RelaxNG/publiquiz.rnc lun. oct. 27 16:39:09 2014 +0100
@@ -143,7 +143,7 @@
blanks-fill.content =
(blanks.block+ | blanks.section+)
blanks-select.content =
- blanks.wrongs?,
+ blanks.intruders?,
(blanks.block+ | blanks.section+)
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -238,7 +238,7 @@
multiple.attribute?
categories.content =
- category.item*,
+ category.intruders?,
category,
category+
@@ -509,18 +509,18 @@
inlines
| ((p | image | (audio, image?) | video), help?, answer?)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blanks.wrongs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blanks.intruders ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~ blanks.wrongs
-blanks.wrongs = element wrongs { blanks.wrongs.content }
+# ~~~~~~ blanks.intruders
+blanks.intruders = element intruders { blanks.intruders.content }
-blanks.wrongs.content =
- wrongs.wrong+
+blanks.intruders.content =
+ intruders.blank+
-# ~~~~~~ wrongs.wrong
-wrongs.wrong = element wrong { wrongs.wrong.content }
+# ~~~~~~ intruders.blank
+intruders.blank = element blank { intruders.blank.content }
-wrongs.wrong.content = text
+intruders.blank.content = text
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ match.item ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -548,8 +548,15 @@
inlines
| (p, help?, answer?)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ category.item ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~ category.intruders, category.item ~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~ category.intruders
+category.intruders = element intruders { category.intruders.content }
+
+category.intruders.content =
+ category.item+
+
+# ~~~~~~ category.item
category.item = element item { category.item.content }
category.item.content =