# HG changeset patch # User Patrick PIERRE # Date 1343920596 -7200 # Node ID efce69890bfd6fd10a0c93a854083c007cfd387d # Parent 59658f3a4f6f6c7036ff618dc4c5ad5b1b7e5a02 Ajout de diff -r 59658f3a4f6f -r efce69890bfd RelaxNG/Examples/Documents/torture_test.xml --- a/RelaxNG/Examples/Documents/torture_test.xml lun. juil. 30 23:23:57 2012 +0200 +++ b/RelaxNG/Examples/Documents/torture_test.xml jeu. août 02 17:16:36 2012 +0200 @@ -4,6 +4,7 @@ Torture test + Test Test des capacités de publidoc 9781449328030 http://www.prismallia.fr/Xml/torture_test 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 diff -r 59658f3a4f6f -r efce69890bfd RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc lun. juil. 30 23:23:57 2012 +0200 +++ b/RelaxNG/publiquiz.rnc jeu. août 02 17:16:36 2012 +0200 @@ -185,6 +185,7 @@ category.head.content = title, + shorttitle?, subtitle? # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ production ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -r 59658f3a4f6f -r efce69890bfd RelaxNG/publiset.rnc --- a/RelaxNG/publiset.rnc lun. juil. 30 23:23:57 2012 +0200 +++ b/RelaxNG/publiset.rnc jeu. août 02 17:16:36 2012 +0200 @@ -53,7 +53,7 @@ remap.attributes composition.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? & identifier* & copyright? & contributors? @@ -118,7 +118,7 @@ division.head = element head { division.head.content } division.head.content = - (title, subtitle?)? + (title, shorttitle?, subtitle?)? # ============================================================================= @@ -161,6 +161,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ title, subtitle ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ title = element title { title.content } +shorttitle = element shorttitle { title.content } subtitle = element subtitle { title.content } title.content = inlines diff -r 59658f3a4f6f -r efce69890bfd Xxe/Css/publidoc.css --- a/Xxe/Css/publidoc.css lun. juil. 30 23:23:57 2012 +0200 +++ b/Xxe/Css/publidoc.css jeu. août 02 17:16:36 2012 +0200 @@ -30,6 +30,7 @@ content: element-label() " :"; } head > title:before { display: none; } +head > shorttitle:before { display: none; } head > subtitle:before { display: none; } head > identifier[type="uri"]:before { content: insert-before-button() " URI :"; } head > identifier[type="ean"]:before { content: insert-before-button() " EAN :"; } @@ -55,14 +56,18 @@ content: " " insert-after-button(); } -/* title & subtitle ~~~~~~~~~~~~~~~~ */ +/* title, shortitle & subtitle ~~~~~ */ + +head > title, head > shorttitle { + font-weight: bold; + font-size: 120%; + margin: 0 0 .2em 0; +} head > title { - font-size: 120%; - font-weight: bold; color: #004080; - margin: 0 0 .2em 0; } + head > subtitle { font-weight: bold; color: #004080;