equal
deleted
inserted
replaced
301 <!-- ~~~~~~ author --> |
301 <!-- ~~~~~~ author --> |
302 <define name="author"> |
302 <define name="author"> |
303 <element name="author"> |
303 <element name="author"> |
304 <ref name="author.content"/> |
304 <ref name="author.content"/> |
305 </element> |
305 </element> |
306 </define> |
|
307 <define name="author.attributes"> |
|
308 <optional> |
|
309 <ref name="role.attribute"/> |
|
310 </optional> |
|
311 </define> |
|
312 <define name="role.attribute"> |
|
313 <attribute name="role"> |
|
314 <choice> |
|
315 <value>author</value> |
|
316 <value>illustrator</value> |
|
317 </choice> |
|
318 </attribute> |
|
319 </define> |
306 </define> |
320 <define name="author.content"> |
307 <define name="author.content"> |
321 <optional> |
308 <optional> |
322 <ref name="firstname"/> |
309 <ref name="firstname"/> |
323 </optional> |
310 </optional> |
629 <define name="block"> |
616 <define name="block"> |
630 <choice> |
617 <choice> |
631 <ref name="p"/> |
618 <ref name="p"/> |
632 <ref name="speech"/> |
619 <ref name="speech"/> |
633 <ref name="list"/> |
620 <ref name="list"/> |
|
621 <ref name="blockquote"/> |
634 <ref name="table"/> |
622 <ref name="table"/> |
635 <ref name="media"/> |
623 <ref name="media"/> |
636 </choice> |
624 </choice> |
637 </define> |
625 </define> |
638 <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> |
626 <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> |
737 <ref name="label"/> |
725 <ref name="label"/> |
738 <oneOrMore> |
726 <oneOrMore> |
739 <ref name="block"/> |
727 <ref name="block"/> |
740 </oneOrMore> |
728 </oneOrMore> |
741 </define> |
729 </define> |
|
730 <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blockquote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> |
|
731 <!-- ~~~~~~ blockquote --> |
|
732 <define name="blockquote"> |
|
733 <element name="blockquote"> |
|
734 <ref name="blockquote.content"/> |
|
735 </element> |
|
736 </define> |
|
737 <define name="blockquote.content"> |
|
738 <optional> |
|
739 <ref name="block.head"/> |
|
740 </optional> |
|
741 <oneOrMore> |
|
742 <choice> |
|
743 <ref name="p"/> |
|
744 <ref name="speech"/> |
|
745 <ref name="list"/> |
|
746 </choice> |
|
747 </oneOrMore> |
|
748 <optional> |
|
749 <ref name="attribution"/> |
|
750 </optional> |
|
751 </define> |
|
752 <!-- ~~~~~~ attribution --> |
|
753 <define name="attribution"> |
|
754 <element name="attribution"> |
|
755 <ref name="attribtuion.content"/> |
|
756 </element> |
|
757 </define> |
|
758 <define name="attribtuion.content"> |
|
759 <ref name="inlines"/> |
|
760 </define> |
742 <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> |
761 <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> |
743 <define name="table"> |
762 <define name="table"> |
744 <element name="table"> |
763 <element name="table"> |
745 <ref name="table.content"/> |
764 <ref name="table.content"/> |
746 </element> |
765 </element> |