--- /dev/null	jeu. janv. 01 00:00:00 1970 +0000
+++ b/Data/Glossary/english.xml	dim. avril 09 13:24:52 2017 +0200
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Id$ -->
+<publidoc version="1.0">
+  <glossary>
+    <entry>
+      <mainterm>to agree</mainterm>
+      <meanings>
+        <meaning>
+          <translation>être d'accord</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to be born</mainterm>
+      <meanings>
+        <meaning>
+          <translation>naître</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to be promoted</mainterm>
+      <meanings>
+        <meaning>
+          <translation>être promu</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to fail</mainterm>
+      <meanings>
+        <meaning>
+          <translation>échouer</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to marry</mainterm>
+      <meanings>
+        <meaning>
+          <translation>épouser, marier</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to offer</mainterm>
+      <meanings>
+        <meaning>
+          <translation>offrir, proposer</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to be surprised</mainterm>
+      <meanings>
+        <meaning>
+          <translation>être surpris</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>to surprise</mainterm>
+      <meanings>
+        <meaning>
+          <translation>surprendre</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>an advert (advertisement)</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une annonce, une publicité</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a birthday</mainterm>
+      <meanings>
+        <meaning>
+          <translation>un anniversaire (birth = naissance)</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a career</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une carrière (professionnelle)</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a degree</mainterm>
+      <meanings>
+        <meaning>
+          <translation>un diplôme universitaire</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a dozen</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une douzaine</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>an exam (examination)</mainterm>
+      <meanings>
+        <meaning>
+          <translation>un examen</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>oil</mainterm>
+      <meanings>
+        <meaning>
+          <translation>l'huile</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>an oil company</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une société pétrolière</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a reason</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une raison</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a start-up (ou a start-up company)</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une « jeune pousse » (entreprise nouvelle)</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>a university</mainterm>
+      <meanings>
+        <meaning>
+          <translation>une université (a uni en anglais familier)</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>bored</mainterm>
+      <meanings>
+        <meaning>
+          <translation>lassé, ennuyé</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>famous</mainterm>
+      <meanings>
+        <meaning>
+          <translation>célèbre</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>fantastic</mainterm>
+      <meanings>
+        <meaning>
+          <translation>fantastique</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>fascinating</mainterm>
+      <meanings>
+        <meaning>
+          <translation>fascinant</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>fast</mainterm>
+      <meanings>
+        <meaning>
+          <translation>rapide / rapidement</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>fortunately</mainterm>
+      <meanings>
+        <meaning>
+          <translation>heureusement</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>hard</mainterm>
+      <meanings>
+        <meaning>
+          <translation>assidûment (adv.)</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>Not really</mainterm>
+      <meanings>
+        <meaning>
+          <translation>Pas vraiment</translation>
+        </meaning>
+      </meanings>
+    </entry>
+
+    <entry>
+      <mainterm>Please go on</mainterm>
+      <meanings>
+        <meaning>
+          <translation>Continuez s'il vous plaît</translation>
+        </meaning>
+      </meanings>
+    </entry>
+  </glossary>
+</publidoc>

--- a/Data/Sets/composition.xml	dim. avril 09 09:36:40 2017 +0200
+++ b/Data/Sets/composition.xml	dim. avril 09 13:24:52 2017 +0200
@@ -54,9 +54,9 @@
             <p>Où l'on évoque pêle-mêle quelques sujets d'actualité.</p>
           </abstract>
         </head>
-        <file label="Un nouveau centre Pompidou">centre_pompidou.xml</file>
-        <file label="Les chasseurs contestent" xpath="*">chasseurs.xml</file>
-        <file label="La Rolls Phantom" path="../Topics/Alternatives">rolls_phantom.xml</file>
+        <file title="Un nouveau centre Pompidou">centre_pompidou.xml</file>
+        <file title="Les chasseurs contestent" xpath="*">chasseurs.xml</file>
+        <file title="La Rolls Phantom" path="../Topics/Alternatives">rolls_phantom.xml</file>
       </division>
 
       <!-- =========================== Brèves ============================= -->
@@ -68,7 +68,7 @@
             <index><entry>brèves</entry><entry>Europe</entry></index>
           </indexset>
         </head>
-        <file label="Le Portugal préside l'UE" xslt="composition.xsl"
+        <file title="Le Portugal préside l'UE" xslt="composition.xsl"
               path="../Topics">portugal_ue.xml</file>
       </division>
 
@@ -81,7 +81,7 @@
           </indexset>
         </head>
         <division as="topic" path="../Topics">
-          <file label="L'A380" xpath="topic/section">a380.xml</file>
+          <file title="L'A380" xpath="topic/section">a380.xml</file>
         </division>
       </division>
 
@@ -90,7 +90,7 @@
         <head>
           <title>Les livres</title>
         </head>
-        <file label="Les Misérables">les_miserables.xml</file>
+        <file title="Les Misérables">les_miserables.xml</file>
       </division>
     </division>
   </composition>

--- a/RelaxNG/publidoc.rnc	dim. avril 09 09:36:40 2017 +0200
+++ b/RelaxNG/publidoc.rnc	dim. avril 09 13:24:52 2017 +0200
@@ -245,7 +245,7 @@
    ((section+, bibliography?) | bibliography),
    footer?
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 glossary = element glossary { glossary.attributes, glossary.content }
 
@@ -386,6 +386,7 @@
    block+
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ glossary.entry ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 # ~~~~~~ glossary.entry
 glossary.entry= element entry {
    glossary.entry.attributes, glossary.entry.content }
@@ -402,19 +403,25 @@
 
 # ~~~~~~ mainterm
 mainterm = element mainterm { mainterm.content }
+
 mainterm.content = simple.inlines
 
 # ~~~~~~ alt-terms
 alt-terms = element alt-terms { alt-terms.content }
-alt-terms.content = alt-term+
+
+alt-terms.content =
+    alt-term+
 
 # ~~~~~~ alt-term
 alt-term = element alt-term { alt-term.attributes, alt-term.content }
-alt-term.attributes = alt-term.type.attribute?
+
 alt-term.content = inlines
 
+alt-term.attributes =
+    alt-term.type.attribute?
 alt-term.type.attribute = attribute type { xsd:NCName }
 
+
 # =============================================================================
 #                                 BLOCK LEVEL
 # =============================================================================
@@ -855,7 +862,7 @@
  & image*
  & audio*
  & smil*
-   
+
  & nowrap*
 }
 
@@ -920,7 +927,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ example ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 example = element example { example.content }
-   
+
 example.content = inlines
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ stage ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

--- a/RelaxNG/publiset.rnc	dim. avril 09 09:36:40 2017 +0200
+++ b/RelaxNG/publiset.rnc	dim. avril 09 13:24:52 2017 +0200
@@ -325,12 +325,12 @@
  & (xpath.attribute | xslt.attribute)?
  & argument.attribute?
  & mode.attribute?
- & label.attribute?
+ & title.attribute?
 selection.file.attributes =
    path.attribute?
 argument.attribute = attribute argument { text }
 mode.attribute = attribute mode { text }
-label.attribute = attribute label { text }
+title.attribute = attribute title { text }
 
 file.content = xsd:anyURI