--- a/cv_print.xsl Mon Sep 14 11:30:58 2015 -0400
+++ b/cv_print.xsl Mon Sep 14 11:32:00 2015 -0400
@@ -27,7 +27,7 @@
<xsl:attribute-set name="section-title-font" 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">6pt</xsl:attribute>
+ <xsl:attribute name="space-after">4pt</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>
@@ -43,14 +43,14 @@
<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="space-before">2pt</xsl:attribute>
<xsl:attribute name="font-variant">small-caps</xsl:attribute>
</xsl:attribute-set>
<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-size">10pt</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="space-before">2pt</xsl:attribute>
+ <xsl:attribute name="space-after">2pt</xsl:attribute>
<xsl:attribute name="font-variant">small-caps</xsl:attribute>
</xsl:attribute-set>
<xsl:attribute-set name="post-title-font" use-attribute-sets="medium-title-font">
@@ -211,7 +211,22 @@
<xsl:with-param name="string">str-experience</xsl:with-param>
</xsl:call-template>
</block>
- <xsl:apply-templates select="work[not(@role='stage')]"/>
+ <xsl:apply-templates select="work[not(@role='stage' or @role='minor' or @role='old')]"/>
+ </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-otherexperience</xsl:with-param>
+ </xsl:call-template>
+ </block>
+ <table table-layout="fixed"
+ border-collapse="separate" border-separation="5pt">
+ <table-column column-width="50%"/>
+ <table-column column-width="50%"/>
+ <table-body>
+ <xsl:apply-templates select="work[@role='minor' or @role='old']" mode="short"/>
+ </table-body>
+ </table>
</block>
<!--
<block xsl:use-attribute-sets="section-block">
@@ -307,25 +322,39 @@
<block xsl:use-attribute-sets="work-title-font"><xsl:apply-templates select="." mode="short"/></block>
</xsl:template>
-<xsl:template match="work" mode="short">
+<!--xsl:template match="work" mode="short">
<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"/>
</list-block>
</block>
+</xsl:template-->
+<xsl:template match="work" mode="short">
+ <table-row keep-together.within-page="always">
+ <table-cell>
+ <block xsl:use-attribute-sets="work-short-font"><xsl:apply-templates select="organism" mode="short"/></block>
+ </table-cell>
+ <table-cell keep-together.within-page="always">
+ <list-block>
+ <xsl:apply-templates select="post" mode="short"/>
+ </list-block>
+ </table-cell>
+ </table-row>
</xsl:template>
<xsl:template match="post" mode="short">
<list-item>
<xsl:call-template name="list-label"/>
<list-item-body start-indent="body-start()">
- <block>
<xsl:if test="title">
+ <block>
<xsl:apply-templates select="title" mode="short"/>
<xsl:text>; </xsl:text>
+ </block>
</xsl:if>
- <xsl:apply-templates select="duration" mode="short"/>
- <xsl:text>.</xsl:text>
+ <block>
+ <xsl:apply-templates select="duration" mode="short"/>
+ <xsl:text>.</xsl:text>
</block>
</list-item-body>
</list-item>
@@ -370,6 +399,14 @@
<block><xsl:apply-templates/></block>
</xsl:template>
+<!-- work/description -->
+<!-- post -->
+<xsl:template match="work/description">
+ <block keep-together.within-page="always" space-before="6pt">
+ <xsl:apply-templates/>
+ </block>
+</xsl:template>
+
<!-- study -->
<xsl:template match="study" mode="short">
<list-item>