equal
deleted
inserted
replaced
270 # ~~~~~~ attribution |
270 # ~~~~~~ attribution |
271 attribution = element attribution { attribution.content } |
271 attribution = element attribution { attribution.content } |
272 |
272 |
273 attribution.content = mixed { |
273 attribution.content = mixed { |
274 sup* & number* & date* & name* & foreign* & acronym* & term* & literal* |
274 sup* & number* & date* & name* & foreign* & acronym* & term* & literal* |
275 & highlight* & mentioned* & note* & warning* } |
275 & highlight* & emphasis* & mentioned* & note* & warning* } |
276 |
276 |
277 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
277 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
278 |
278 |
279 # ~~~~~~ table |
279 # ~~~~~~ table |
280 table = element table { table.content } |
280 table = element table { table.content } |
649 & acronym* |
649 & acronym* |
650 & term* |
650 & term* |
651 & literal* |
651 & literal* |
652 & stage* |
652 & stage* |
653 & highlight* |
653 & highlight* |
|
654 & emphasis* |
654 & mentioned* |
655 & mentioned* |
655 & initial* |
656 & initial* |
656 & note* |
657 & note* |
657 & quote* |
658 & quote* |
658 & link* |
659 & link* |
760 |
761 |
761 highlight = element highlight { highlight.content } |
762 highlight = element highlight { highlight.content } |
762 |
763 |
763 highlight.content = inlines |
764 highlight.content = inlines |
764 |
765 |
|
766 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ emphasis ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
|
767 |
|
768 emphasis = element emphasis { emphasis.content } |
|
769 |
|
770 emphasis.content = inlines |
|
771 |
765 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mentioned ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
772 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mentioned ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
766 |
773 |
767 mentioned = element mentioned { mentioned.content } |
774 mentioned = element mentioned { mentioned.content } |
768 |
775 |
769 mentioned.content = inlines |
776 mentioned.content = inlines |
810 uri.attribute = attribute uri { xsd:anyURI } |
817 uri.attribute = attribute uri { xsd:anyURI } |
811 idref.attribute = attribute idref { xsd:IDREF } |
818 idref.attribute = attribute idref { xsd:IDREF } |
812 |
819 |
813 link.content = mixed { |
820 link.content = mixed { |
814 sup* & sub* & var* & number* & math* & date* & name* & foreign* & acronym* |
821 sup* & sub* & var* & number* & math* & date* & name* & foreign* & acronym* |
815 & term* & literal* & stage* & highlight* & mentioned* & warning* } |
822 & term* & literal* & stage* & highlight* & emphasis* & mentioned* & warning* } |
816 |
823 |
817 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ anchor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
824 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ anchor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
818 |
825 |
819 anchor = element anchor { anchor.attributes, anchor.content } |
826 anchor = element anchor { anchor.attributes, anchor.content } |
820 |
827 |