Publidoc: comparison RelaxNG/publiquiz.rnc

equal deleted inserted replaced

-:eef3c4d7bfe7
+:2b94d6c7fe0c
 division.head?,
 front?,
 (division | topic | quiz)+
 nowrap.content =
-inlines | blanks.inlines | blanks-m.inlines | pointing.inlines
+inlines | blanks.inlines | blanks-m.inlines | blanks-c.inlines
+| pointing.inlines
 }
 publiquiz = element publiquiz {
 publiquiz.attributes,
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 blanks.section = element section { section.attributes, blanks.section.content }
 blanks-m.section = element section {
 section.attributes, blanks-m.section.content }
+blanks-c.section = element section {
+section.attributes, blanks-c.section.content }
 pointing.section = element section {
 section.attributes, pointing.section.content }
 blanks.section.content =
 section.head?,
 (blanks.section+ | blanks.block+)
 blanks-m.section.content =
 section.head?,
 (blanks-m.section+ | blanks-m.block+)
+blanks-c.section.content =
+section.head?,
+(blanks-c.section+ | blanks-c.block+)
 pointing.section.content =
 section.head?,
 (pointing.section+ | pointing.block+)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ instructions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 choices-radio
 | choices-check
 | blanks-fill
 | blanks-select
 | blanks-media
+| blanks-choices
 | blanks-char
 | pointing
 | pointing-categories
-| pip
 | matching
 | sort
 | categories
 | wordsearch
 | production
 blanks-fill.attributes, blanks-fill.content }
 blanks-select = element blanks-select {
 blanks-select.attributes, blanks-select.content }
 blanks-media = element blanks-media {
 blanks-select.attributes, blanks-media.content }
+blanks-choices = element blanks-choices {
+blanks-choices.content }
 blanks-char = element blanks-char {
 blanks-char.attributes, blanks-select.content }
 blanks-fill.attributes =
 success.attribute?
 blanks.intruders?,
 (blanks.block+ | blanks.section+)
 blanks-media.content =
 blanks-m.intruders?,
 (blanks-m.block+ | blanks-m.section+)
+blanks-choices.content =
+(blanks-c.block+ | blanks-c.section+)
 blanks-char.attributes =
 remove-space.attribute?
 remove-space.attribute = attribute remove-space { xsd:boolean }
 pointing-c.category5 = element category {
 attribute id { "5" }, pointing-c.category.content }
 pointing-c.category.content = inlines
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pip ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-pip = element pip { pip.content }
-pip.content =
-pip.image
-pip.image = element image { image.attributes, pip.image.content }
-pip.image.content =
-pip.point+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ matching ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~ matching
 matching = element matching { matching.attributes, matching.content }
 blanks.p | blanks.list | blanks.blockquote | blanks.speech | blanks.table
 | blanks.media)
 blanks-m.block = (
 blanks-m.p | blanks-m.list | blanks-m.blockquote | blanks-m.speech
 | blanks-m.table | blanks-m.media)
+blanks-c.block = (
+blanks-c.p | blanks-c.list | blanks-c.blockquote | blanks-c.speech
+| blanks-c.table | blanks-c.media)
 pointing.block = (
 pointing.p | pointing.list | pointing.blockquote | pointing.speech
 | pointing.table | media)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 blanks.p = element p { blanks.p.content }
 blanks-m.p = element p { blanks-m.p.content }
+blanks-c.p = element p { blanks-c.p.content }
 pointing.p = element p { pointing.p.content }
 blanks.p.content =
 blanks.inlines
 blanks-m.p.content =
 blanks-m.inlines
+blanks-c.p.content =
+blanks-c.inlines
 pointing.p.content =
 pointing.inlines
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 (  (attribute type {"ordered"}?, blanks.item, blanks.item+)
 | (attribute type {"glossary"}, item.glossary+) )
 }
 blanks-m.list = element list {
 block.head?,
+(  (attribute type {"ordered"}?, blanks-m.item, blanks-m.item+)
+| (attribute type {"glossary"}, item.glossary+) )
+}
+blanks-c.list = element list {
+block.head?,
 (  (attribute type {"ordered"}?, blanks.item, blanks.item+)
 | (attribute type {"glossary"}, item.glossary+) )
 }
 pointing.list = element list {
 block.head?,
 | (attribute type {"glossary"}, item.glossary+) )
 }
 # ~~~~~~ item
 blanks.item = element item { blanks.item.content }
-blanks-m.item = element item { blanks.item.content }
+blanks-m.item = element item { blanks-m.item.content }
+blanks-c.item = element item { blanks-c.item.content }
 pointing.item = element item { pointing.item.content }
 blanks.item.content =
 blanks.inlines
 | blanks.block+
 blanks-m.item.content =
 blanks-m.inlines
 | blanks-m.block+
+blanks-c.item.content =
+blanks-c.inlines
+| blanks-c.block+
 pointing.item.content =
 pointing.inlines
 | pointing.block+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blockquote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 blanks.blockquote = element blockquote {
 blockquote.attributes, blanks.blockquote.content }
 blanks-m.blockquote = element blockquote {
 blockquote.attributes, blanks-m.blockquote.content }
+blanks-c.blockquote = element blockquote {
+blockquote.attributes, blanks-c.blockquote.content }
 pointing.blockquote = element blockquote {
 blockquote.attributes, pointing.blockquote.content }
 blanks.blockquote.content =
 block.head?,
 attribution?
 blanks-m.blockquote.content =
 block.head?,
 (blanks-m.p | speech | blanks-m.list)+,
 attribution?
+blanks-c.blockquote.content =
+block.head?,
+(blanks-c.p | speech | blanks-c.list)+,
+attribution?
 pointing.blockquote.content =
 block.head?,
 (pointing.p | speech | pointing.list)+,
 attribution?
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ speech ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~ speech
 blanks.speech = element speech { blanks.speech.content }
 blanks-m.speech = element speech { blanks-m.speech.content }
+blanks-c.speech = element speech { blanks-c.speech.content }
 pointing.speech = element speech { pointing.speech.content }
 blanks.speech.content =
 blanks.speaker?,
 stage?,
 (blanks.p | blanks.blockquote)+
 blanks-m.speech.content =
 blanks-m.speaker?,
 stage?,
 (blanks-m.p | blanks-m.blockquote)+
+blanks-c.speech.content =
+blanks-c.speaker?,
+stage?,
+(blanks-c.p | blanks-c.blockquote)+
 pointing.speech.content =
 pointing.speaker?,
 stage?,
 (pointing.p | pointing.blockquote)+
 # ~~~~~~ speaker
 blanks.speaker = element speaker { blanks.speaker.content }
 blanks-m.speaker = element speaker { blanks-m.speaker.content }
+blanks-c.speaker = element speaker { blanks-c.speaker.content }
 pointing.speaker = element speaker { pointing.speaker.content }
 blanks.speaker.content = blanks.inlines
 blanks-m.speaker.content = blanks-m.inlines
+blanks-c.speaker.content = blanks-c.inlines
 pointing.speaker.content = pointing.inlines
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~ table
 blanks.table = element table { table.attributes, blanks.table.content }
 blanks-m.table = element table { table.attributes, blanks-m.table.content }
+blanks-c.table = element table { table.attributes, blanks-m.table.content }
 pointing.table = element table { table.attributes, pointing.table.content }
 blanks.table.content =
 block.head?,
 ((thead?, blanks.tbody+) | blanks.tr+),
 blanks.table.caption?
 blanks-m.table.content =
 block.head?,
 ((thead?, blanks-m.tbody+) | blanks-m.tr+),
 blanks-m.table.caption?
+blanks-c.table.content =
+block.head?,
+((thead?, blanks-c.tbody+) | blanks-c.tr+),
+blanks-c.table.caption?
 pointing.table.content =
 block.head?,
 ((thead?, pointing.tbody+) | pointing.tr+),
 pointing.table.caption?
 # ~~~~~~ tbody
 blanks.tbody = element tbody { blanks.tbody.content }
 blanks-m.tbody = element tbody { blanks-m.tbody.content }
+blanks-c.tbody = element tbody { blanks-m.tbody.content }
 pointing.tbody = element tbody { pointing.tbody.content }
 blanks.tbody.content =
 blanks.tr+
 blanks-m.tbody.content =
 blanks-m.tr+
+blanks-c.tbody.content =
+blanks-c.tr+
 pointing.tbody.content =
 pointing.tr+
 # ~~~~~~ tr
 blanks.tr = element tr { tr.attributes, blanks.tr.content }
 blanks-m.tr = element tr { tr.attributes, blanks-m.tr.content }
+blanks-c.tr = element tr { tr.attributes, blanks-c.tr.content }
 pointing.tr = element tr { tr.attributes, pointing.tr.content }
 blanks.tr.content =
 (blanks.td | blanks.th)+
 blanks-m.tr.content =
 (blanks-m.td | blanks-m.th)+
+blanks-c.tr.content =
+(blanks-c.td | blanks-c.th)+
 pointing.tr.content =
 (pointing.td | pointing.th)+
 # ~~~~~~ td, th
 blanks.td = element td { td.attributes, blanks.td.content }
 blanks.th = element th { td.attributes, blanks.td.content }
 blanks-m.td = element td { td.attributes, blanks-m.td.content }
 blanks-m.th = element th { td.attributes, blanks-m.td.content }
+blanks-c.td = element td { td.attributes, blanks-c.td.content }
+blanks-c.th = element th { td.attributes, blanks-c.td.content }
 pointing.td = element td { td.attributes, pointing.td.content }
 pointing.th = element th { td.attributes, pointing.td.content }
 blanks.td.content =
 blanks.inlines
 | (blanks.p | blanks.media)+
 blanks-m.td.content =
 blanks-m.inlines
 | (blanks-m.p | blanks-m.media)+
+blanks-c.td.content =
+blanks-c.inlines
+| (blanks-c.p | blanks-c.media)+
 pointing.td.content =
 pointing.inlines
 | (pointing.p | media)+
 # ~~~~~~ table.caption
 blanks.table.caption = element caption { blanks.caption.content }
 blanks-m.table.caption = element caption { blanks-m.caption.content }
+blanks-c.table.caption = element caption { blanks-c.caption.content }
 pointing.table.caption = element caption { pointing.caption.content }
 blanks.caption.content =
 blanks.inlines
 | (blanks.p | speech | blanks.list | blockquote)+
 blanks-m.caption.content =
 blanks-m.inlines
 | (blanks-m.p | speech | blanks-m.list | blockquote)+
+blanks-c.caption.content =
+blanks-c.inlines
+| (blanks-c.p | speech | blanks-c.list | blockquote)+
 pointing.caption.content =
 pointing.inlines
 | (pointing.p | speech | pointing.list | blockquote)+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~ media
 blanks.media = element media { media.attributes, blanks.media.content }
 blanks-m.media = element media { media.attributes, blanks-m.media.content }
+blanks-c.media = element media { media.attributes, blanks-c.media.content }
 pointing.media = element media { media.attributes, pointing.media.content }
 blanks.media.content =
 block.head?,
 (blanks.image | audio | video)+,
 link?
 blanks-m.media.content =
 block.head?,
 (blanks-m.image | audio | video)+,
 blanks-m.media.caption?,
+link?
+blanks-c.media.content =
+block.head?,
+(image | audio | video)+,
+blanks-c.media.caption?,
 link?
 pointing.media.content =
 block.head?,
 (image | audio | video)+,
 pointing.media.caption?,
 # ~~~~~~ media.caption
 blanks.media.caption = element caption {
 caption.attributes, blanks.caption.content }
 blanks-m.media.caption = element caption {
 caption.attributes, blanks-m.caption.content }
+blanks-c.media.caption = element caption {
+caption.attributes, blanks-c.caption.content }
 pointing.media.caption = element caption {
 caption.attributes, pointing.caption.content }
 # ~~~~~~~~~~~~~~~~~~~~~~~~ choices.right, choices.wrong ~~~~~~~~~~~~~~~~~~~~~~~
 & nowrap*
 & blank-m*
 }
-pointing.inlines = mixed {
+blanks-c.inlines = mixed {
 sup*
 & sub*
 & var*
 & number*
 & acronym*
 & image*
 & audio*
 & smil*
 & nowrap*
+& blank-c*
+}
+pointing.inlines = mixed {
+sup*
+& sub*
+& var*
+& number*
+& acronym*
+& warning*
+& highlight*
+& emphasis*
+& mentioned*
+& literal*
+& term*
+& stage*
+& name*
+& foreign*
+& date*
+& math*
+& quote*
+& initial*
+& note*
+& link*
+& anchor*
+& index*
+& image*
+& audio*
+& smil*
+& nowrap*
 & point*
 }
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blank, blank-m ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~ blank, blank-m, blank-c ~~~~~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~ blank
 blank = element blank { blank.attributes, blank.content }
 blank.attributes =
 p
 | math
 | image
 | audio
 | (s-m+, help?, answer?)
+# ~~~~~~ blank-c
+blank-c = element blank { blank-c.attributes, blank-c.content }
+blank-c.attributes = form.attribute?
+form.attribute = attribute form { 'radio' | 'check' }
+blank-c.content = (blank-c.right | blank-c.wrong)+, help?, answer?
+blank-c.right = element right { inlines }
+blank-c.wrong = element wrong { inlines }
 # ~~~~~~ s
 s = element s { s.content }
 s.content = text
 | audio
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ point ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 point = element point { point.attributes, point.content }
-pip.point = element point { pip.point.attributes, point.content }
 point.attributes =
 point.ref.attribute?
-pip.point.attributes =
-point.ref.attribute?
-& x.attribute
-& y.attribute
-& w.attribute
-& h.attribute
 point.ref.attribute = attribute ref {
 "right" | "cat1" | "cat2" | "cat3" | "cat4" | "cat5" }
 point.content = inlines

changeset 441	2b94d6c7fe0c
parent 438	f4ab39840020
child 442	e3341312dff7