--- a/RelaxNG/publidoc.rnc mer. déc. 21 19:40:37 2011 +0100
+++ b/RelaxNG/publidoc.rnc jeu. déc. 22 02:02:02 2011 +0100
@@ -77,7 +77,7 @@
& annotation*
division.head.content =
(title, subtitle?)?
- & language?
+ & abstract?
& annotation*
component.head.content =
(title, subtitle?)?
@@ -87,7 +87,6 @@
& annotation*
section.head.content =
(title, subtitle?)?
- & language?
& abstract?
& annotation*
block.head.content =
--- a/RelaxNG/publidoc.rng mer. déc. 21 19:40:37 2011 +0100
+++ b/RelaxNG/publidoc.rng jeu. déc. 22 02:02:02 2011 +0100
@@ -177,7 +177,7 @@
</optional>
</optional>
<optional>
- <ref name="language"/>
+ <ref name="abstract"/>
</optional>
<zeroOrMore>
<ref name="annotation"/>
@@ -215,9 +215,6 @@
</optional>
</optional>
<optional>
- <ref name="language"/>
- </optional>
- <optional>
<ref name="abstract"/>
</optional>
<zeroOrMore>
--- a/Xxe/publidoc.css mer. déc. 21 19:40:37 2011 +0100
+++ b/Xxe/publidoc.css jeu. déc. 22 02:02:02 2011 +0100
@@ -3,7 +3,7 @@
*::comment { display: none; }
publidoc {
- display: block;
+ display: block;
font-family: sans-serif;
padding: 0;
}
@@ -12,7 +12,7 @@
/* Head level ============================================================== */
head {
- display: block;
+ display: block;
margin-bottom: .5em;
background-color: #fafafa;
padding: 0 .2em 0 .2em;
@@ -26,7 +26,7 @@
color: #7f7f7f;
}
head > title:before { display: none; }
-head > subtitle:before { content: "Sous-titre :"; }
+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 :"; }
head > language:before { content: insert-before-button() " Langue :"; }
@@ -47,13 +47,15 @@
margin: 0 0 .5em 7em;
}
head > title {
- font-size: 110%;
+ font-size: 120%;
font-weight: bold;
color: #004080;
- margin: .3em 0 .3em 0;
+ margin: .2em 0 .2em 0;
}
-publidoc > * > head > title {
- font-size: 140%;
+head > subtitle {
+ font-weight: bold;
+ color: #004080;
+ margin: 0 0 .2em 0;
}
head > *:after {
@@ -71,6 +73,7 @@
/* Division level ========================================================== */
division:before {
+ display: block;
color: #7f7f7f;
content: collapser() " " insert-before-button() insert-after-button()
" Division"
@@ -101,6 +104,7 @@
display: block;
color: #7f7f7f;
background-color: #ddddcc;
+ border: 1px solid #aeaea0;
font-weight: bold;
padding: .5em 5px .5em 5px;
content: collapser() " " insert-before-button() insert-after-button()
@@ -124,8 +128,8 @@
}
topic {
- display: block;
- border: 1px solid #ddddcc;
+ display: block;
+ border: 1px solid #aeaea0;
margin-bottom: .5em;
padding: 5px;
collapsible: yes;
@@ -166,7 +170,7 @@
publidoc > * {
- display: block;
+ display: block;
margin: 5px;
padding: 0;
border: 0;
@@ -178,33 +182,43 @@
border-radius: 0.5em;
}
+publidoc > * > head > title {
+ font-size: 140%;
+}
+
/* Section level =========================================================== */
section:before {
+ display: block;
color: #7f7f7f;
- content: insert-before-button() insert-button()
- add-attribute-button(icon, icon(plus-box));
+ padding-bottom: 3px;
+ text-align: left;
+ content: insert-before-button() add-attribute-button(icon, icon(plus-box));
}
section[type]:before {
- content: insert-before-button() insert-button()
+ content: insert-before-button()
text(" Type = ", font-size, 75%)
text-field(attribute, type, columns, 10, color, black, font-size, 75%);
}
+section section:before {
+ margin-left: 1em;
+}
section {
display: block;
}
section[type="box"] {
- margin: .5em 0 .5em 0;
+ margin-bottom: .5em;
padding: 5px;
background-color: #e8f0f7;
border-radius: 0.2em;
}
+section[type="ex"] { font-style: italic; }
section[type="sign"] { text-align: right; }
section section {
- margin-left: 1em;
+ margin-left: 1em;
}
section:after {
@@ -217,7 +231,7 @@
p:before, speech:before, list:before,
blockquote:before, table:before, media:before {
- display: marker;
+ display: marker;
content: insert-before-button(color, #7f7f7f, icon, icon(left-half-disc))
insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
}
@@ -225,16 +239,20 @@
p, speech, list, blockquote, table, media {
display: block;
margin-left: 24px;
- font-size: 110%;
+ font-size: 115%;
font-family: serif;
}
-/* List ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* list ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
list {
margin: .3em 0 .3em 24px;
}
+list > head {
+ font-size: 75%;
+}
+
item {
display: list-item;
}
@@ -242,23 +260,59 @@
list-style-type: decimal;
}
+item:after {
+ content: insert-same-after-button(color, #7f7f7f, icon, icon(right-half-disc));
+}
+
list[type="glossary"] > item > label {
font-weight: bold;
}
-/* Blockquote ~~~~~~~~~~~~~~~~~~~~~~ */
+/* blockquote ~~~~~~~~~~~~~~~~~~~~~~ */
attribution { font-style: italic; }
/* Inline level ============================================================ */
-sup { vertical-align: super; font-size: 75%; }
-sub { vertical-align: sub; font-size: 75%; }
+/* sup, sub, var ~~~~~~~~~~~~~~~~~~~ */
-note:before { content: "("; }
-note { color: #7f7f7f; font-size: 85%; font-family: sans-serif; }
-note:after { content: ")"; }
+sup { font-family: sans-serif; vertical-align: super; font-size: 75%; }
+sub { font-family: sans-serif; vertical-align: sub; font-size: 75%; }
+var { font-family: sans-serif; font-style: italic; }
+
+/* note ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+note:before { font-size: 75%; content: "(Note : "; }
+note { font-family: sans-serif; color: #004080; font-size: 75%; }
+note:after { font-size: 75%; content: ")"; }
note p { display:inline; }
+/* highlight ~~~~~~~~~~~~~~~~~~~~~~~ */
+
highlight { font-weight: bold; }
+
+/* link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+link:before {
+ color: #7f7f7f;
+ font-family: sans-serif;
+ content: "["
+}
+
+media link {
+ display: block;
+}
+
+link:after {
+ color: #7f7f7f;
+ font-family: sans-serif;
+}
+link[uri]:after {
+ content: " ‣ " text-field(attribute, uri, color, black, font-size, 80%) "]";
+}
+link[idref]:after {
+ content: " ‣ " label(attribute, idref, color, black)
+ set-attribute-button(attribute, idref) "]";
+}
+