--- a/TODO Sun Apr 01 22:02:23 2012 -0400
+++ b/TODO Mon Sep 14 11:26:41 2015 -0400
@@ -1,4 +1,4 @@
* Finir la version imprimable (book)
* Faire une version 1/pdf/contes.
* Faire une version HTML-1-PAGE (pour la version texte).
-* Rajouter les xlink, xref, olink, oref...
+* Rajouter les link, xref, olink, oref...
--- a/cv_print.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/cv_print.xsl Mon Sep 14 11:26:41 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>
--- a/cv_str.en.xml Sun Apr 01 22:02:23 2012 -0400
+++ b/cv_str.en.xml Mon Sep 14 11:26:41 2015 -0400
@@ -2,7 +2,8 @@
<gentext>
<string name="str-page">page </string>
<string name="str-page-of"> of </string>
-<string name="str-experience">Work Experience</string>
+<string name="str-experience">Main Work Experience</string>
+<string name="str-otherexperience">Other Work Experience</string>
<string name="str-formation">Studies</string>
<string name="str-competences">Knowledges</string>
<string name="str-languages">Languages</string>
--- a/cv_str.fr.xml Sun Apr 01 22:02:23 2012 -0400
+++ b/cv_str.fr.xml Mon Sep 14 11:26:41 2015 -0400
@@ -2,7 +2,8 @@
<gentext>
<string name="str-page">page </string>
<string name="str-page-of"> de </string>
-<string name="str-experience">Expériences professionnelles</string>
+<string name="str-experience">Principales expériences professionnelles</string>
+<string name="str-otherexperience">Autres expériences professionnelles</string>
<string name="str-formation">Formation</string>
<string name="str-competences">Compétences</string>
<string name="str-languages">Langues parlées et écrites</string>
--- a/html.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/html.xsl Mon Sep 14 11:26:41 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">
@@ -300,7 +305,7 @@
<xsl:value-of select="title/text()"/>
</xsl:template>
-<xsl:template match="section|story|poetry" mode="navbar-link">
+<xsl:template match="section|story|poetry" mode="href">
<xsl:call-template name="get-id"/>
</xsl:template>
@@ -308,7 +313,7 @@
<xsl:param name="prefix"></xsl:param>
<a>
<xsl:attribute name="href">
- <xsl:apply-templates select="." mode="navbar-link"/>
+ <xsl:apply-templates select="." mode="href"/>
<xsl:text>.html</xsl:text>
</xsl:attribute>
<xsl:value-of select="$prefix"/>
@@ -460,6 +465,17 @@
<xsl:template match="*" mode="xref"/>
+<xsl:template match="link">
+ <xsl:variable name="linkend" select="@linkend"/>
+ <a>
+ <xsl:attribute name="href">
+ <xsl:apply-templates select="//*[@id=$linkend]" mode="href"/>
+ <xsl:text>.html</xsl:text>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a>
+</xsl:template>
+
<xsl:template match="section/title"/>
<xsl:template match="section/subtitle"/>
--- a/poetry_html.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/poetry_html.xsl Mon Sep 14 11:26:41 2015 -0400
@@ -54,25 +54,25 @@
<ul class="navbar">
<xsl:for-each select="//xref[@linkend=$my-id]">
<li>
- <xsl:variable name="mysection" select="ancestor::section[last()]/@id"/>
- <xsl:for-each select="ancestor::section">
- <xsl:apply-templates select="." mode="xref"/>
- <xsl:if test="descendant::section">
- <xsl:text> : </xsl:text>
- </xsl:if>
- </xsl:for-each>
- <ul>
- <xsl:if test="preceding::xref[1]/ancestor::section[last()]/@id=$mysection">
- <li><xsl:text>Précédent: </xsl:text>
- <xsl:apply-templates select="preceding::xref[1]"/>
- </li>
- </xsl:if>
- <xsl:if test="following::xref[1]/ancestor::section[last()]/@id=$mysection">
- <li><xsl:text>Suivant: </xsl:text>
- <xsl:apply-templates select="following::xref[1]"/>
- </li>
- </xsl:if>
- </ul>
+ <xsl:variable name="mysection" select="ancestor::section[last()]/@id"/>
+ <xsl:for-each select="ancestor::section">
+ <xsl:apply-templates select="." mode="xref"/>
+ <xsl:if test="descendant::section">
+ <xsl:text> : </xsl:text>
+ </xsl:if>
+ </xsl:for-each>
+ <ul>
+ <xsl:if test="preceding::xref[1]/ancestor::section[last()]/@id=$mysection">
+ <li><xsl:text>Précédent: </xsl:text>
+ <xsl:apply-templates select="preceding::xref[1]"/>
+ </li>
+ </xsl:if>
+ <xsl:if test="following::xref[1]/ancestor::section[last()]/@id=$mysection">
+ <li><xsl:text>Suivant: </xsl:text>
+ <xsl:apply-templates select="following::xref[1]"/>
+ </li>
+ </xsl:if>
+ </ul>
</li>
</xsl:for-each>
</ul>
--- a/poetry_print.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/poetry_print.xsl Mon Sep 14 11:26:41 2015 -0400
@@ -14,7 +14,7 @@
<xsl:attribute-set name="standard-block">
<xsl:attribute name="text-indent">10mm</xsl:attribute>
<xsl:attribute name="space-before">10pt</xsl:attribute>
- <xsl:attribute name="space-before.conditionnaly">discard</xsl:attribute>
+ <xsl:attribute name="space-before.conditionality">discard</xsl:attribute>
<xsl:attribute name="text-align">justify</xsl:attribute>
</xsl:attribute-set>
@@ -99,13 +99,17 @@
<xsl:call-template name="get-id"/>
</xsl:variable>
<flow flow-name="xsl-region-body">
- <block id="{$id}"/>
- <xsl:apply-templates select="*[not(poetry)][name(.)!='poetry']"/>
- <xsl:if test="section[poetry]">
- <list-block text-indent="15mm" space-before="15pt">
- <xsl:apply-templates select="section[poetry]" mode="toc"/>
- </list-block>
- </xsl:if>
+ <block>
+ <xsl:if test="name(.) != 'poetry'">
+ <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
+ </xsl:if>
+ <xsl:apply-templates select="*[not(poetry)][name(.)!='poetry']"/>
+ <xsl:if test="section[poetry]">
+ <list-block text-indent="15mm" space-before="15pt">
+ <xsl:apply-templates select="section[poetry]" mode="toc"/>
+ </list-block>
+ </xsl:if>
+ </block>
</flow>
</page-sequence>
<xsl:apply-templates select="poetry|section[poetry]"/>
@@ -115,25 +119,15 @@
<list-item>
<xsl:call-template name="list-label"/>
<list-item-body start-indent="body-start()">
- <xsl:apply-templates select="." mode="xref"/>
- <!-- xsl:if test="poetry|section">
- <list-block
- text-indent="body-start()"
- space-before="15pt">
- <xsl:apply-templates select="poetry|section" mode="toc"/>
- </list-block>
- </xsl:if -->
+ <block>
+ <xsl:apply-templates select="." mode="toc-xref"/>
+ </block>
</list-item-body>
</list-item>
</xsl:template>
<xsl:template match="section">
- <xsl:variable name="id">
- <xsl:call-template name="get-id"/>
- </xsl:variable>
- <block id="{$id}">
- <xsl:apply-templates/>
- </block>
+ <xsl:apply-templates/>
</xsl:template>
<xsl:template match="preambule">
@@ -171,8 +165,8 @@
<xsl:template match="nda">
<block border="solid" padding="5mm"
font-size="90%" font-style="italic"
- space-before="15mm" space-before.conditionnaly="discard"
- space-after="15mm" space-after.conditionnaly="discard"
+ space-before="15mm" space-before.conditionality="discard"
+ space-after="15mm" space-after.conditionality="discard"
margin="5mm">
<xsl:apply-templates/>
</block>
@@ -239,20 +233,37 @@
<xsl:apply-templates/>
</xsl:template>
-<xsl:template match="poetry|section" mode="xref">
+<xsl:template match="poetry|section" mode="toc-xref">
<xsl:variable name="id">
<xsl:call-template name="get-id"/>
</xsl:variable>
- <basic-link internal-destination="{$id}">
- <xsl:value-of select="descendant::title[1]"/>
- <leader leader-pattern="dots" leader-length.maximum="254mm"/>
- (<page-number-citation ref-id="{$id}"/>)
- </basic-link>
+ <basic-link internal-destination="{$id}">
+ <xsl:value-of select="descendant::title[1]"/>
+ <leader leader-pattern="dots" leader-length.maximum="254mm"/>
+ (<page-number-citation ref-id="{$id}"/>)
+ </basic-link>
+</xsl:template>
+
+<xsl:template match="list[@role='toc']/item/xref">
+ <xsl:variable name="linkend" select="@linkend"/>
+ <xsl:apply-templates mode="toc-xref" select="//*[@id=$linkend]"/>
</xsl:template>
<xsl:template match="xref">
<xsl:variable name="linkend" select="@linkend"/>
- <xsl:apply-templates mode="xref" select="//*[@id=$linkend]"/>
+ <xsl:variable name="linkterm">
+ <xsl:choose>
+ <xsl:when test="@linkterm"><xsl:value-of select="@linkterm"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="@linkend"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <basic-link internal-destination="{$linkend}">
+ <xsl:apply-templates mode="xref" select="//*[@id=$linkterm]"/>
+ </basic-link>
+</xsl:template>
+
+<xsl:template match="poetry|section" mode="xref">
+ <xsl:value-of select="descendant::title[1]"/>
</xsl:template>
</xsl:stylesheet>
--- a/print.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/print.xsl Mon Sep 14 11:26:41 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>
@@ -150,6 +155,13 @@
<inline vertical-align="super" font-size="60%"><xsl:apply-templates/></inline>
</xsl:template>
+<xsl:template match="link">
+ <xsl:variable name="linkend" select="@linkend"/>
+ <basic-link internal-destination="{$linkend}">
+ <xsl:apply-templates/>
+ </basic-link>
+</xsl:template>
+
</xsl:stylesheet>
<!-- Keep this comment at the end of the file
--- a/story_print.xsl Sun Apr 01 22:02:23 2012 -0400
+++ b/story_print.xsl Mon Sep 14 11:26:41 2015 -0400
@@ -14,7 +14,7 @@
<xsl:attribute-set name="standard-block">
<xsl:attribute name="text-indent">10mm</xsl:attribute>
<xsl:attribute name="space-before">10pt</xsl:attribute>
- <xsl:attribute name="space-before.conditionnaly">discard</xsl:attribute>
+ <xsl:attribute name="space-before.conditionality">discard</xsl:attribute>
<xsl:attribute name="text-align">justify</xsl:attribute>
</xsl:attribute-set>