diff -r 59658f3a4f6f -r efce69890bfd RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc lun. juil. 30 23:23:57 2012 +0200 +++ b/RelaxNG/publidoc.rnc jeu. août 02 17:16:36 2012 +0200 @@ -26,7 +26,7 @@ top.head = element head { top.head.content } top.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? & identifier* & copyright? & contributors? @@ -87,7 +87,7 @@ division.head = element head { division.head.content } division.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? & abstract? & annotation* @@ -101,7 +101,7 @@ component.head = element head { component.head.content } component.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? & contributors? & abstract? & annotation* @@ -143,7 +143,7 @@ section.head = element head { section.head.content } section.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? & abstract? & audio* & annotation* @@ -162,7 +162,7 @@ block.head = element head { block.head.content } block.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ p ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -383,9 +383,10 @@ # HEAD LEVEL # ============================================================================= -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ title, subtitle ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# ~~~~~~~~~~~~~~~~~~~~~~~ title, shorttitle, subtitle ~~~~~~~~~~~~~~~~~~~~~~~~~ title = element title { title.content } +shorttitle = element shorttitle { title.content } subtitle = element subtitle { title.content } title.content = inlines