# HG changeset patch
# User fabien
# Date 1155243222 14400
# Node ID 20b41b986ac608a1884a774640488132b271defe
# Parent  301b54644bfa11387961f5c67f2d65344e8bb649
[svn r2126] r2204@freebird:  fabien | 2006-08-04 10:48:32 -0400
 Mise à jour du CV.

diff -r 301b54644bfa -r 20b41b986ac6 cv_print.xsl
--- a/cv_print.xsl	Mon Jul 17 13:43:22 2006 -0400
+++ b/cv_print.xsl	Thu Aug 10 16:53:42 2006 -0400
@@ -27,7 +27,7 @@
 <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">4pt</xsl:attribute>
+  <xsl:attribute name="space-after">8pt</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>
@@ -42,8 +42,8 @@
 <xsl:attribute-set name="work-title-font" xsl:use-attribute-sets="large-title-font">
   <xsl:attribute name="font-size">14pt</xsl:attribute>
   <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="space-after">8pt</xsl:attribute>
-  <xsl:attribute name="space-before">12pt</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">
@@ -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">10mm</xsl:attribute>
+  <xsl:attribute name="space-before">22pt</xsl:attribute>
   <xsl:attribute name="space-before.conditionality">discard</xsl:attribute>
 </xsl:attribute-set>
 <!-- cv -->
@@ -290,7 +290,7 @@
 
 <!-- work -->
 <xsl:template match="work">
-  <block keep-together="always">
+  <block space-before="5pt" keep-together="always">
     <xsl:apply-templates/>
   </block>
 </xsl:template>
@@ -324,8 +324,8 @@
 
 <!-- post -->
 <xsl:template match="post">
-  <block keep-together.within-page="always">
-    <table width="100%" table-layout="fixed" space-after="6pt">
+  <block keep-together.within-page="always" space-before="6pt">
+    <table width="100%" table-layout="fixed">
       <table-column column-width="proportional-column-width(1)"/>
       <table-column column-width="proportional-column-width(1)"/>
       <table-body>
@@ -339,7 +339,7 @@
         </table-row>
       </table-body>
     </table>
-    <block margin-left="24pt">
+    <block margin-left="24pt" space-before="5pt">
       <xsl:apply-templates/>
     </block>
   </block>
diff -r 301b54644bfa -r 20b41b986ac6 html.xsl
--- a/html.xsl	Mon Jul 17 13:43:22 2006 -0400
+++ b/html.xsl	Thu Aug 10 16:53:42 2006 -0400
@@ -215,6 +215,12 @@
 <xsl:template match="formalpara">
   <p><xsl:apply-templates/></p>
 </xsl:template>
+<xsl:template match="formalpara[list|shortlist]">
+  <div>
+    <p><xsl:apply-templates select="title"/></p>
+    <xsl:apply-templates select="list|shortlist"/>
+  </div>
+</xsl:template>
 
 <!-- citation -->
 <xsl:template match="citation/author">
diff -r 301b54644bfa -r 20b41b986ac6 print.xsl
--- a/print.xsl	Mon Jul 17 13:43:22 2006 -0400
+++ b/print.xsl	Thu Aug 10 16:53:42 2006 -0400
@@ -29,12 +29,14 @@
 </xsl:attribute-set>
 
 <xsl:template name="list-label">
-  <xsl:param name="labeltext"/>
+  <xsl:param name="labeltext">
+    <xsl:text>-</xsl:text>
+  </xsl:param>
   <!-- <xsl:param name="labeltext">
     <xsl:text>&#8226;</xsl:text>
   </xsl:param> -->
   <list-item-label end-indent="label-end()">
-    <block start-indent="5mm"><xsl:value-of select="$labeltext"/></block>
+    <block><xsl:value-of select="$labeltext"/></block>
   </list-item-label>
 </xsl:template>
 
@@ -80,7 +82,7 @@
   <inline font-weight="bold"><xsl:apply-templates/></inline>
 </xsl:template>
 <xsl:template match="formalpara">
-  <block><xsl:apply-templates/></block>
+  <block space-before="4pt"><xsl:apply-templates/></block>
 </xsl:template>
 
 <!-- list processing -->
@@ -89,9 +91,17 @@
     <xsl:apply-templates/>
   </list-block>
 </xsl:template>
+<xsl:template match="formalpara/list">
+  <list-block provisional-distance-between-starts="5mm">
+    <xsl:apply-templates/>
+  </list-block>
+</xsl:template>
 <xsl:template match="shortlist">
   <block margin-left="24pt"><xsl:apply-templates mode="short"/></block>
 </xsl:template>
+<xsl:template match="formalpara/shortlist">
+  <block margin-left="24pt">- <xsl:apply-templates mode="short"/></block>
+</xsl:template>
 
 <xsl:template match="listitem">
   <list-item>