--- a/cv_print.xsl	Thu Aug 10 16:54:47 2006 -0400
+++ b/cv_print.xsl	Sun Jun 17 19:49:07 2007 -0400
@@ -27,38 +27,38 @@
 <xsl:attribute-set name="section-title-font" xsl:use-attribute-sets="verylarge-title-font">
   <xsl:attribute name="font-size">12pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="space-after">8pt</xsl:attribute>
+  <xsl:attribute name="space-after">6pt</xsl:attribute>
   <xsl:attribute name="text-decoration">underline</xsl:attribute>
   <xsl:attribute name="score-spaces">true</xsl:attribute>
   <xsl:attribute name="keep-with-next.within-page">always</xsl:attribute>
 </xsl:attribute-set>
-<xsl:attribute-set name="knowledge-title-font" xsl:use-attribute-sets="large-title-font">
+<xsl:attribute-set name="knowledge-title-font" use-attribute-sets="large-title-font">
   <xsl:attribute name="font-size">12pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="space-after">4pt</xsl:attribute>
   <xsl:attribute name="space-before">4pt</xsl:attribute>
   <xsl:attribute name="font-variant">small-caps</xsl:attribute>
 </xsl:attribute-set>
-<xsl:attribute-set name="work-title-font" xsl:use-attribute-sets="large-title-font">
-  <xsl:attribute name="font-size">14pt</xsl:attribute>
+<xsl:attribute-set name="work-title-font" use-attribute-sets="large-title-font">
+  <xsl:attribute name="font-size">16pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="space-after">4pt</xsl:attribute>
   <xsl:attribute name="space-before">4pt</xsl:attribute>
   <xsl:attribute name="font-variant">small-caps</xsl:attribute>
 </xsl:attribute-set>
-<xsl:attribute-set name="work-short-font" xsl:use-attribute-sets="large-title-font">
+<xsl:attribute-set name="work-short-font" use-attribute-sets="large-title-font">
   <xsl:attribute name="font-size">12pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="space-before">4pt</xsl:attribute>
   <xsl:attribute name="space-after">4pt</xsl:attribute>
   <xsl:attribute name="font-variant">small-caps</xsl:attribute>
 </xsl:attribute-set>
-<xsl:attribute-set name="post-title-font" xsl:use-attribute-sets="medium-title-font">
+<xsl:attribute-set name="post-title-font" use-attribute-sets="medium-title-font">
   <xsl:attribute name="font-size">10pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="space-after">4pt</xsl:attribute>
 </xsl:attribute-set>
-<xsl:attribute-set name="name-title-font" xsl:use-attribute-sets="verylarge-title-font">
+<xsl:attribute-set name="name-title-font" use-attribute-sets="verylarge-title-font">
   <xsl:attribute name="font-size">16pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
   <xsl:attribute name="space-after">8pt</xsl:attribute>
@@ -75,7 +75,7 @@
   <!-- <xsl:attribute name="border-before-style">solid</xsl:attribute> -->
   <!-- <xsl:attribute name="border-after-style">solid</xsl:attribute> -->
   <!-- <xsl:attribute name="padding-before">5mm</xsl:attribute> -->
-  <xsl:attribute name="space-before">22pt</xsl:attribute>
+  <xsl:attribute name="space-before">20pt</xsl:attribute>
   <xsl:attribute name="space-before.conditionality">discard</xsl:attribute>
 </xsl:attribute-set>
 <!-- cv -->
@@ -205,14 +205,21 @@
             <xsl:apply-templates select="interest" mode="short"/>
           </list-block>
         </block>
-        <block xsl:use-attribute-sets="section-block"
-	xsl:space-before="0mm">
+        <block xsl:use-attribute-sets="section-block">
           <block xsl:use-attribute-sets="section-title-font">
             <xsl:call-template name="gentext">
               <xsl:with-param name="string">str-experience</xsl:with-param>
             </xsl:call-template>
           </block>
-          <xsl:apply-templates select="work"/>
+          <xsl:apply-templates select="work[not(@role='stage')]"/>
+        </block>
+	<block xsl:use-attribute-sets="section-block">
+          <block xsl:use-attribute-sets="section-title-font">
+            <xsl:call-template name="gentext">
+              <xsl:with-param name="string">str-stage</xsl:with-param>
+            </xsl:call-template>
+          </block>
+          <xsl:apply-templates select="work[@role='stage']" mode="short"/>
         </block>
         <block visibility="hidden" id="xsl_cv_the_end"/>
       </flow>
@@ -223,7 +230,7 @@
 <xsl:template match="knownlist[@level='learning']"/>
 <xsl:template match="item[@role='old']" mode="short"/>
 <xsl:template match="work[@role='old']">
-  <!-- xsl:apply-templates select="." mode="short"/ -->
+  <xsl:apply-templates select="." mode="short"/>
 </xsl:template>
 <xsl:template match="concours[@role='old']" mode="short"/>
 <xsl:template match="project[@role='old']" mode="short"/>
@@ -290,7 +297,7 @@
 
 <!-- work -->
 <xsl:template match="work">
-  <block space-before="5pt" keep-together="always">
+  <block space-before="12pt" keep-together="always">
     <xsl:apply-templates/>
   </block>
 </xsl:template>
@@ -299,7 +306,7 @@
 </xsl:template>
 
 <xsl:template match="work" mode="short">
-  <block keep-together.within-page="always">
+  <block space-before="10pt" keep-together.within-page="always">
     <block xsl:use-attribute-sets="work-short-font"><xsl:apply-templates select="organism" mode="short"/></block>
     <list-block>
       <xsl:apply-templates select="post" mode="short"/>