# HG changeset patch
# User Fabien Ninoles <fabien@tzone.org>
# Date 1451442760 18000
# Node ID acf70691eb316feafa7bff9a99355c9095903e3b
# Parent  8445a48b1679dad9d5a1a0bd37c19af01e073539# Parent  dc2252620c0204cbe67944ddadf374c1898ef120
Merge

diff -r dc2252620c02 -r acf70691eb31 cv_print.xsl
--- a/cv_print.xsl	Sun Sep 20 14:41:06 2015 -0400
+++ b/cv_print.xsl	Tue Dec 29 21:32:40 2015 -0500
@@ -315,7 +315,12 @@
 <!-- work -->
 <xsl:template match="work">
   <block space-before="12pt" keep-together="always">
-    <xsl:apply-templates/>
+    <xsl:apply-templates select="organism"/>
+    <xsl:apply-templates select="post[not(@role='minor')]"/>
+    <xsl:if test="post[@role='minor']">
+      <xsl:apply-templates select="post[@role='minor']"/>
+    </xsl:if>
+    <xsl:apply-templates select="description"/>
   </block>
 </xsl:template>
 <xsl:template match="work/organism">
@@ -377,9 +382,11 @@
         </table-row>
       </table-body>
     </table>
-    <block margin-left="24pt" space-before="5pt">
-      <xsl:apply-templates/>
-    </block>
+    <xsl:if test="not(@role='minor')">
+      <block margin-left="24pt" space-before="5pt">
+        <xsl:apply-templates/>
+      </block>
+    </xsl:if>
   </block>
 </xsl:template>
 <xsl:template match="post/supervisor|post/duration|post/title"/>
diff -r dc2252620c02 -r acf70691eb31 print.xsl
--- a/print.xsl	Sun Sep 20 14:41:06 2015 -0400
+++ b/print.xsl	Tue Dec 29 21:32:40 2015 -0500
@@ -105,7 +105,7 @@
   <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>
+  <block margin-left="24pt"><xsl:apply-templates mode="short"/></block>
 </xsl:template>
 
 <xsl:template match="listitem">