equal
deleted
inserted
replaced
191 |
191 |
192 categories.attributes = |
192 categories.attributes = |
193 multiple.attribute? |
193 multiple.attribute? |
194 |
194 |
195 categories.content = |
195 categories.content = |
|
196 category.item*, |
196 category, |
197 category, |
197 category+ |
198 category+ |
198 |
199 |
199 # ~~~~~~ category |
200 # ~~~~~~ category |
200 category = element category { category.content } |
201 category = element category { category.content } |
259 # ============================================================================= |
260 # ============================================================================= |
260 |
261 |
261 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
262 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
262 |
263 |
263 blanks.block = |
264 blanks.block = |
264 (blanks.p | speech | blanks.list | blockquote | blanks.table | media) |
265 (blanks.p | speech | blanks.list | blockquote | blanks.table | blanks.media) |
265 point.block = |
266 point.block = |
266 (point.p | speech | point.list | blockquote | point.table | media) |
267 (point.p | speech | point.list | blockquote | point.table | media) |
267 |
268 |
268 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
269 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
269 |
270 |
352 | (p | media)+ |
353 | (p | media)+ |
353 |
354 |
354 point.entry.content = |
355 point.entry.content = |
355 point.inlines |
356 point.inlines |
356 | (p | media)+ |
357 | (p | media)+ |
|
358 |
|
359 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
360 |
|
361 # ~~~~~~ blanks.media |
|
362 blanks.media = element media { blanksmedia.content } |
|
363 |
|
364 blanksmedia.content = |
|
365 block.head?, |
|
366 (blanks.image | audio | video)+, |
|
367 media.caption?, |
|
368 link? |
|
369 |
|
370 # ~~~~~~ blanks.image |
|
371 blanks.image = element image { image.attributes, blanks.image.content } |
|
372 |
|
373 blanks.image.content = |
|
374 copyright?, |
|
375 hotspot*, |
|
376 blanks.tooltip* |
|
377 |
|
378 # ~~~~~~ blanks.tooltip |
|
379 blanks.tooltip = element tooltip { tooltip.attributes, blanks.tooltip.content } |
|
380 |
|
381 blanks.tooltip.content = |
|
382 (p+ | image | blank) |
357 |
383 |
358 # ~~~~~~~~~~~~~~~~~~~~~~~~ choices.right, choices.wrong ~~~~~~~~~~~~~~~~~~~~~~~ |
384 # ~~~~~~~~~~~~~~~~~~~~~~~~ choices.right, choices.wrong ~~~~~~~~~~~~~~~~~~~~~~~ |
359 |
385 |
360 choices.right = element right { choices.right.content } |
386 choices.right = element right { choices.right.content } |
361 choices.wrong = element wrong { choices.right.content } |
387 choices.wrong = element wrong { choices.right.content } |
433 & quote* |
459 & quote* |
434 & acronym* |
460 & acronym* |
435 & term* |
461 & term* |
436 & link* |
462 & link* |
437 & anchor* |
463 & anchor* |
|
464 & image* |
438 & blank* |
465 & blank* |
439 } |
466 } |
440 point.inlines = mixed { |
467 point.inlines = mixed { |
441 sup* |
468 sup* |
442 & sub* |
469 & sub* |
452 & quote* |
479 & quote* |
453 & acronym* |
480 & acronym* |
454 & term* |
481 & term* |
455 & link* |
482 & link* |
456 & anchor* |
483 & anchor* |
|
484 & image* |
457 & blank* |
485 & blank* |
458 & point.right* |
486 & point.right* |
459 & point.wrong* |
487 & point.wrong* |
460 } |
488 } |
461 |
489 |