--- a/RelaxNG/publidoc.rnc lun. janv. 14 19:19:33 2013 +0100
+++ b/RelaxNG/publidoc.rnc dim. janv. 20 10:13:22 2013 +0100
@@ -27,13 +27,13 @@
top.head.content =
(title, shorttitle?, subtitle?)?
- & identifier*
+ & (identifier, identifier?)?
& copyright?
& collection?
& contributors?
& date?
& place?
- & source*
+ & (source, source?)?
& keywordset?
& subjectset?
& abstract?
@@ -417,15 +417,18 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ identifier ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-identifier.uri = element identifier {
- attribute type { "uri" }, xsd:anyURI
+identifier = element identifier {
+ (attribute type { "ean" }, xsd:token {pattern = "\d{13}"})
+ | (attribute type { "uri" }, xsd:anyURI)
}
identifier.ean = element identifier {
attribute type { "ean" }, xsd:token {pattern = "\d{13}"}
}
-identifier = identifier.uri | identifier.ean
+identifier.uri = element identifier {
+ attribute type { "uri" }, xsd:anyURI
+}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ copyright ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- a/Xxe/Css/publidoc.css lun. janv. 14 19:19:33 2013 +0100
+++ b/Xxe/Css/publidoc.css dim. janv. 20 10:13:22 2013 +0100
@@ -27,7 +27,7 @@
head > *:before {
display: marker;
color: #7f7f7f;
- content: element-label() " :";
+ content: insert-before-button() element-label() " :";
}
head > title:before { display: none; }
head > shorttitle:before { display: none; }
@@ -35,6 +35,7 @@
head > identifier[type="uri"]:before { content: insert-before-button() " URI :"; }
head > identifier[type="ean"]:before { content: insert-before-button() " EAN :"; }
head > copyright:before { content: insert-before-button() " Copyright :"; }
+head > collection:before { content: insert-before-button() " Collection :"; }
head > contributors:before { content: insert-before-button() " Contributeurs :"; }
head > date:before { content: insert-before-button() " Date :"; }
head > place:before { content: insert-before-button() " Lieu :"; }
@@ -104,8 +105,8 @@
contributor role {
color: #7f7f7f;
content: " rôle : " combo-box(element, role, font-size, 75%,
- labels, "auteur\A illustrateur\A éditeur"
- values, "author\A illustrator\A publisher", color, black)
+ labels, "auteur\A illustrateur\A éditeur\A packager"
+ values, "author\A illustrator\A publisher\A packager", color, black)
insert-same-after-button(icon, icon(right-half-disc));
}
@@ -130,10 +131,6 @@
content: insert-same-after-button(color, #7f7f7f, icon, icon(right-half-disc));
}
-/* annotation ~~~~~~~~~~~~~~~~~~~~~~ */
-
-head > annotation:after { content: ""; }
-
/* Division level ========================================================== */
@@ -444,6 +441,9 @@
media caption {
display: block;
+ font-family: sans-serif;
+ font-size: 93%;
+ color: #004080;
}
media caption:after {
content: insert-after-button(color, #7f7f7f, icon, icon(right-half-disc));
@@ -474,7 +474,7 @@
}
media image {
- margin-bottom: .8em;
+ margin-bottom: .3em;
}
image > copyright {
@@ -540,8 +540,8 @@
/* sup, sub, var ~~~~~~~~~~~~~~~~~~~ */
-sup { font-family: sans-serif; vertical-align: super; font-size: 75%; }
-sub { font-family: sans-serif; vertical-align: sub; font-size: 75%; }
+sup { font-family: sans-serif; vertical-align: super; font-size: 75%; white-space: nowrap; }
+sub { font-family: sans-serif; vertical-align: sub; font-size: 75%; white-space: nowrap; }
var { font-family: sans-serif; font-style: italic; }
/* date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */