# HG changeset patch # User Fabien Ninoles <fabien@tzone.org> # Date 1441592056 14400 # Node ID a1ec4d6963d78b02bec56cedcf76473e8cb8170f # Parent d0e38c0c45c9cfef06f4772bfd825f985d20e4bc More compact old jobs section. diff -r d0e38c0c45c9 -r a1ec4d6963d7 cv_print.xsl --- a/cv_print.xsl Sun Jan 08 15:12:51 2012 -0500 +++ b/cv_print.xsl Sun Sep 06 22:14:16 2015 -0400 @@ -211,7 +211,7 @@ <xsl:with-param name="string">str-experience</xsl:with-param> </xsl:call-template> </block> - <xsl:apply-templates select="work[not(@role='stage' or @role='minor')]"/> + <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"> @@ -219,7 +219,14 @@ <xsl:with-param name="string">str-otherexperience</xsl:with-param> </xsl:call-template> </block> - <xsl:apply-templates select="work[@role='minor']" mode="short"/> + <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"> @@ -315,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> @@ -378,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> diff -r d0e38c0c45c9 -r a1ec4d6963d7 html.xsl --- a/html.xsl Sun Jan 08 15:12:51 2012 -0500 +++ b/html.xsl Sun Sep 06 22:14:16 2015 -0400 @@ -204,6 +204,11 @@ <xsl:template match="para"> <p><xsl:apply-templates/></p> </xsl:template> +<xsl:template match="para[list|shortlist]"> + <div> + <xsl:apply-templates select="list|shortlist"/> + </div> +</xsl:template> <!-- formalpara processing --> <xsl:template match="formalpara/para"> diff -r d0e38c0c45c9 -r a1ec4d6963d7 print.xsl --- a/print.xsl Sun Jan 08 15:12:51 2012 -0500 +++ b/print.xsl Sun Sep 06 22:14:16 2015 -0400 @@ -96,6 +96,11 @@ <xsl:apply-templates/> </list-block> </xsl:template> +<xsl:template match="para/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>