equal
deleted
inserted
replaced
129 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
129 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ author, publisher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
130 |
130 |
131 # ~~~~~~ author |
131 # ~~~~~~ author |
132 author = element author { author.content } |
132 author = element author { author.content } |
133 |
133 |
134 author.attributes = |
|
135 role.attribute? |
|
136 role.attribute = attribute role { "author" | "illustrator" } |
|
137 |
|
138 author.content = |
134 author.content = |
139 firstname?, |
135 firstname?, |
140 lastname, |
136 lastname, |
141 role* |
137 role* |
142 |
138 |
302 # BLOCK LEVEL |
298 # BLOCK LEVEL |
303 # ============================================================================= |
299 # ============================================================================= |
304 |
300 |
305 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
301 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
306 |
302 |
307 block = (p | speech | \list | table | media) |
303 block = (p | speech | \list | blockquote | table | media) |
308 |
304 |
309 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
305 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
310 |
306 |
311 p = element p { p.content } |
307 p = element p { p.content } |
312 |
308 |
354 glossary.item = element item { glossary.item.content } |
350 glossary.item = element item { glossary.item.content } |
355 |
351 |
356 glossary.item.content = |
352 glossary.item.content = |
357 label, |
353 label, |
358 block+ |
354 block+ |
|
355 |
|
356 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blockquote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
357 |
|
358 # ~~~~~~ blockquote |
|
359 blockquote = element blockquote { blockquote.content } |
|
360 |
|
361 blockquote.content = |
|
362 block.head?, |
|
363 (p | speech | \list)+, |
|
364 attribution? |
|
365 |
|
366 # ~~~~~~ attribution |
|
367 attribution = element attribution { attribtuion.content } |
|
368 |
|
369 attribtuion.content = |
|
370 inlines |
359 |
371 |
360 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
372 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
361 |
373 |
362 table = element table { table.content } |
374 table = element table { table.content } |
363 |
375 |