# HG changeset patch # User Patrick PIERRE # Date 1326541471 -3600 # Node ID c85252fac80c44c25d6f7be7c33d3637c906f08f # Parent 91ae8b8e07c6f42dcdf1d1acf433b14a25356f6c Amélioration de la gestion des listes diff -r 91ae8b8e07c6 -r c85252fac80c RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc jeu. janv. 12 18:17:05 2012 +0100 +++ b/RelaxNG/publidoc.rnc sam. janv. 14 12:44:31 2012 +0100 @@ -356,9 +356,9 @@ attribution? # ~~~~~~ attribution -attribution = element attribution { attribtuion.content } +attribution = element attribution { attribution.content } -attribtuion.content = +attribution.content = inlines # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff -r 91ae8b8e07c6 -r c85252fac80c RelaxNG/publidoc.rng --- a/RelaxNG/publidoc.rng jeu. janv. 12 18:17:05 2012 +0100 +++ b/RelaxNG/publidoc.rng sam. janv. 14 12:44:31 2012 +0100 @@ -539,7 +539,7 @@ DIVISION LEVEL ============================================================================= --> - + @@ -774,10 +774,10 @@ - + - + diff -r 91ae8b8e07c6 -r c85252fac80c Xml/Documents/Images/prismallia_logo.png Binary file Xml/Documents/Images/prismallia_logo.png has changed diff -r 91ae8b8e07c6 -r c85252fac80c Xml/Documents/Images/torture_test_cover.jpg Binary file Xml/Documents/Images/torture_test_cover.jpg has changed diff -r 91ae8b8e07c6 -r c85252fac80c Xml/Documents/Images/torture_test_cover.png Binary file Xml/Documents/Images/torture_test_cover.png has changed diff -r 91ae8b8e07c6 -r c85252fac80c Xml/Documents/torture_test.xml --- a/Xml/Documents/torture_test.xml jeu. janv. 12 18:17:05 2012 +0100 +++ b/Xml/Documents/torture_test.xml sam. janv. 14 12:44:31 2012 +0100 @@ -235,33 +235,23 @@ Les listes
+ + la pâte à crêpes + + - Listes imbriquées : la météo aéronautique + Liste non ordonnée : les ingrédients - - - - METAR - - METAR LFPB 230900Z 13003KT CAVOK 18/10 Q1015 NOSIG= - METAR LFOR 230900Z 18003KT CAVOK 17/09 Q1015= - - - - - - TAF - - TAF LFOP 230800Z 230918 18005KT CAVOK BECMG 1416 24010KT BKN014 TEMPO 1618 RA BKN005= - TAF LFOT 230800Z 230918 23007KT CAVOK= - - + 250 g de farine + 3 œufs + 75 cl de lait + 2 cuillères à soupe de sucre - Liste ordonnée : la pâte à crêpes + Liste ordonnée : la recette

Versez dans une terrine 250 g de farine en fontaine, et @@ -289,7 +279,8 @@ crêpes.

 - +
+
Glossaire : la comptabilité @@ -307,6 +298,31 @@
+
+ + + Listes imbriquées : la météo aéronautique + + + + + METAR + + METAR LFPB 230900Z 13003KT CAVOK 18/10 Q1015 NOSIG= + METAR LFOR 230900Z 18003KT CAVOK 17/09 Q1015= + + + + + + TAF + + TAF LFOP 230800Z 230918 18005KT CAVOK BECMG 1416 24010KT BKN014 TEMPO 1618 RA BKN005= + TAF LFOT 230800Z 230918 23007KT CAVOK= + + + +
diff -r 91ae8b8e07c6 -r c85252fac80c Xxe/Css/publidoc.css --- a/Xxe/Css/publidoc.css jeu. janv. 12 18:17:05 2012 +0100 +++ b/Xxe/Css/publidoc.css sam. janv. 14 12:44:31 2012 +0100 @@ -322,8 +322,9 @@ p:before, speech:before, list:before, blockquote:before, table:before, media:before { display: marker; - content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc)) - insert-after-button(color, #7f7f7f, icon, icon(right-half-disc)); + color: #7f7f7f; + content: insert-before-button(icon, icon(left-half-disc)) + insert-after-button(icon, icon(right-half-disc)); } p, speech, list, blockquote, table, media { @@ -355,7 +356,25 @@ /* list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +list:before { + content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc)) + insert-after-button(color, #7f7f7f, icon, icon(right-half-disc)) + command-button(command, "putAttribute", parameter, "type ordered", icon, icon(convert)); +} +list[type="ordered"]:before { + content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc)) + insert-after-button(color, #7f7f7f, icon, icon(right-half-disc)) + command-button(command, "removeAttribute", parameter, "type", icon, icon(convert)); +} +list[type="glossary"]:before { + content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc)) + insert-after-button(color, #7f7f7f, icon, icon(right-half-disc)); +} + list { + margin: .3em 0 .3em 36px; +} +list[type="glossary"] { margin: .3em 0 .3em 24px; } @@ -368,21 +387,36 @@ } list[type="ordered"] > item { list-style-type: decimal; + list-style-position: inside; } item:after { content: insert-same-after-button(color, #7f7f7f, icon, icon(right-half-disc)); } +list:not([type="glossary"]) > item > p:before { + color: #7f7f7f; + content: insert-same-before-button(icon, icon(left-half-disc)) + insert-same-after-button(icon, icon(right-half-disc)); +} +list:not([type="glossary"]) > item > p { + display: inline; +} +list:not([type="glossary"]) > item > p:after { + color: #7f7f7f; + content: "\A"; +} + list[type="glossary"] > item > label { font-weight: bold; } /* blockquote ~~~~~~~~~~~~~~~~~~~~~~ */ +blockquote { color: #004080; } + attribution { font-style: italic; } - /* media ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ media {