Publidoc: comparison RelaxNG/publiquiz.rnc

equal deleted inserted replaced

-:2b94d6c7fe0c
+:e3341312dff7
 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 }
+correct.section = element section {
+section.attributes, correct.section.content }
 pointing.section = element section {
 section.attributes, pointing.section.content }
 blanks.section.content =
 section.head?,
 section.head?,
 (blanks-m.section+ | blanks-m.block+)
 blanks-c.section.content =
 section.head?,
 (blanks-c.section+ | blanks-c.block+)
+correct.section.content =
+section.head?,
+(correct.section+ | correct.block+)
 pointing.section.content =
 section.head?,
 (pointing.section+ | pointing.block+)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ instructions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 | choices-check
 | blanks-fill
 | blanks-select
 | blanks-media
 | blanks-choices
-| blanks-char
+| correct-line
 | pointing
 | pointing-categories
 | matching
 | sort
 | categories
 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?
 & strict.attribute?
 & long.attribute?
 blanks-m.intruders?,
 (blanks-m.block+ | blanks-m.section+)
 blanks-choices.content =
 (blanks-c.block+ | blanks-c.section+)
-blanks-char.attributes =
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ correct-line ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+correct-line = element correct-line {
+correct.attributes, correct.content }
+correct.attributes =
 remove-space.attribute?
 remove-space.attribute = attribute remove-space { xsd:boolean }
+correct.content =
+correct.intruders?,
+(correct.block+ | correct.section+)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ pointing ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pointing = element pointing { pointing.attributes, pointing.content }
 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)
+correct.block = (
+correct.p | correct.list | correct.blockquote | correct.speech
+| correct.table | 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 }
+correct.p = element p { correct.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
+correct.p.content =
+correct.inlines
 pointing.p.content =
 pointing.inlines
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 | (attribute type {"glossary"}, item.glossary+) )
 }
 blanks-c.list = element list {
 block.head?,
 (  (attribute type {"ordered"}?, blanks.item, blanks.item+)
+| (attribute type {"glossary"}, item.glossary+) )
+}
+correct.list = element list {
+block.head?,
+(  (attribute type {"ordered"}?, correct.item, correct.item+)
 | (attribute type {"glossary"}, item.glossary+) )
 }
 pointing.list = element list {
 block.head?,
 (  (attribute type {"ordered"}?, pointing.item, pointing.item+)
 # ~~~~~~ item
 blanks.item = element item { blanks.item.content }
 blanks-m.item = element item { blanks-m.item.content }
 blanks-c.item = element item { blanks-c.item.content }
+correct.item = element item { correct.item.content }
 pointing.item = element item { pointing.item.content }
-blanks.item.content =
-blanks.inlines
+blanks.item.content = blanks.inlines | blanks.block+
-| blanks.block+
+blanks-m.item.content = blanks-m.inlines | blanks-m.block+
-blanks-m.item.content =
+blanks-c.item.content = blanks-c.inlines | blanks-c.block+
-blanks-m.inlines
+correct.item.content = correct.inlines | correct.block+
-| blanks-m.block+
+pointing.item.content = pointing.inlines | pointing.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 }
+correct.blockquote = element blockquote {
+blockquote.attributes, correct.blockquote.content }
 pointing.blockquote = element blockquote {
 blockquote.attributes, pointing.blockquote.content }
 blanks.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?
+correct.blockquote.content =
+block.head?,
+(correct.p | speech | correct.list)+,
 attribution?
 pointing.blockquote.content =
 block.head?,
 (pointing.p | speech | pointing.list)+,
 attribution?
 # ~~~~~~ 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 }
+correct.speech = element speech { correct.speech.content }
 pointing.speech = element speech { pointing.speech.content }
 blanks.speech.content =
 blanks.speaker?,
 stage?,
 (blanks-m.p | blanks-m.blockquote)+
 blanks-c.speech.content =
 blanks-c.speaker?,
 stage?,
 (blanks-c.p | blanks-c.blockquote)+
+correct.speech.content =
+correct.speaker?,
+stage?,
+(correct.p | correct.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 }
+correct.speaker = element speaker { correct.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
+correct.speaker.content = correct.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 }
+correct.table = element table { table.attributes, correct.table.content }
 pointing.table = element table { table.attributes, pointing.table.content }
 blanks.table.content =
 block.head?,
 ((thead?, blanks.tbody+) | blanks.tr+),
 blanks-m.table.caption?
 blanks-c.table.content =
 block.head?,
 ((thead?, blanks-c.tbody+) | blanks-c.tr+),
 blanks-c.table.caption?
+correct.table.content =
+block.head?,
+((thead?, correct.tbody+) | correct.tr+),
+correct.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 }
+correct.tbody = element tbody { correct.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+
+correct.tbody.content =
+correct.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 }
+correct.tr = element tr { tr.attributes, correct.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)+
+correct.tr.content =
+(correct.td | correct.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 }
+correct.td = element td { td.attributes, correct.td.content }
+correct.th = element th { td.attributes, correct.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-m.inlines
 | (blanks-m.p | blanks-m.media)+
 blanks-c.td.content =
 blanks-c.inlines
 | (blanks-c.p | blanks-c.media)+
+correct.td.content =
+correct.inlines
+| (correct.p | 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 }
+correct.table.caption = element caption { correct.caption.content }
 pointing.table.caption = element caption { pointing.caption.content }
 blanks.caption.content =
 blanks.inlines
 | (blanks.p | speech | blanks.list | blockquote)+
 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)+
+correct.caption.content =
+correct.inlines
+| (correct.p | speech | correct.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 }
+correct.media = element media { media.attributes, correct.media.content }
 pointing.media = element media { media.attributes, pointing.media.content }
 blanks.media.content =
 block.head?,
 (blanks.image | audio | video)+,
 link?
 blanks-c.media.content =
 block.head?,
 (image | audio | video)+,
 blanks-c.media.caption?,
+link?
+correct.media.content =
+block.head?,
+(image | audio | video)+,
+correct.media.caption?,
 link?
 pointing.media.content =
 block.head?,
 (image | audio | video)+,
 pointing.media.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 }
+correct.media.caption = element caption {
+caption.attributes, correct.caption.content }
 pointing.media.caption = element caption {
 caption.attributes, pointing.caption.content }
 # ~~~~~~~~~~~~~~~~~~~~~~~~ choices.right, choices.wrong ~~~~~~~~~~~~~~~~~~~~~~~
 blanks.intruders = element intruders { blanks.intruders.content }
 blanks-m.intruders = element intruders { blanks-m.intruders.content }
 blanks.intruders.content = blank+
 blanks-m.intruders.content = blank-m+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ correct.intruders ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+correct.intruders = element intruders { correct.intruders.content }
+correct.intruders.content = char+
 # ~~~~~~~~~~~~~~~~~~~~~~~ matching.intruders, match.item ~~~~~~~~~~~~~~~~~~~~~~
 # ~~~~~~~ matching.intruders
 matching.intruders = element intruders { matching.intruders.content }
 & nowrap*
 & blank-c*
 }
-pointing.inlines = mixed {
+correct.inlines = mixed {
 sup*
 & sub*
 & var*
 & number*
 & acronym*
 & image*
 & audio*
 & smil*
 & nowrap*
+& char*
+}
+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-c ~~~~~~~~~~~~~~~~~~~~~~~~~~
 blank = element blank { blank.attributes, blank.content }
 blank.attributes =
 area.attribute?
 & long.attribute?
-& function.attribute?
 area.attribute = attribute area { xsd:boolean }
-function.attribute = attribute function { 'accent' | 'uppercase' }
 blank.content =
 text
 | (s+, help?, answer?)
 s-m.content =
 p
 | math
 | image
 | audio
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ char ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+char = element char { char.attributes, char.content }
+char.attributes = function.attribute?
+function.attribute = attribute function { "accent" | "uppercase" }
+char.content = text
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ point ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 point = element point { point.attributes, point.content }

changeset 442	e3341312dff7
parent 441	2b94d6c7fe0c
child 448	9bc794bf36b0