equal
deleted
inserted
replaced
222 image+, |
222 image+, |
223 media.caption? |
223 media.caption? |
224 |
224 |
225 media.id.attribute = attribute id { xsd:NMTOKEN } |
225 media.id.attribute = attribute id { xsd:NMTOKEN } |
226 |
226 |
|
227 # ~~~~~~ image |
|
228 image = element image { image.attributes, image.content } |
|
229 |
|
230 image.attributes = |
|
231 media.id.attribute |
|
232 |
|
233 image.content = |
|
234 copyright? |
|
235 |
227 # ~~~~~~ caption |
236 # ~~~~~~ caption |
228 media.caption = element caption { media.caption.content } |
237 media.caption = element caption { media.caption.content } |
229 |
238 |
230 media.caption.content = |
239 media.caption.content = |
231 parag+ |
240 parag+ |
232 |
241 |
233 # ~~~~~~ image |
|
234 image = element image { image.attributes, image.content } |
|
235 |
|
236 image.attributes = |
|
237 media.id.attribute |
|
238 |
|
239 image.content = |
|
240 copyright? |
|
241 |
|
242 # ~~~~~~ copyright |
242 # ~~~~~~ copyright |
243 copyright = element copyright { copyright.content } |
243 copyright = element copyright { copyright.content } |
|
244 |
244 copyright.content = inlines |
245 copyright.content = inlines |
245 |
246 |
246 |
247 |
247 # ============================================================================= |
248 # ============================================================================= |
248 # Inline level |
249 # Inline level |
273 |
274 |
274 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
275 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
275 |
276 |
276 date = element date { date.attributes, date.content } |
277 date = element date { date.attributes, date.content } |
277 |
278 |
278 date.attributes = date.of.attribute |
279 date.attributes = |
|
280 date.of.attribute |
279 date.of.attribute = attribute of { date.of.enumeration } |
281 date.of.attribute = attribute of { date.of.enumeration } |
280 date.of.enumeration = "event" | "birth" | "death" |
282 date.of.enumeration = "event" | "birth" | "death" |
281 |
283 |
282 date.content = xsd:date | xsd:gYearMonth | xsd:gYear |
284 date.content = xsd:date | xsd:gYearMonth | xsd:gYear |
283 |
285 |