summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-03-06 22:27:41 +0000
committerKarl Berry <karl@freefriends.org>2015-03-06 22:27:41 +0000
commit3d79f409be380b65bef407bae10629114ea5755a (patch)
tree6d1494490e7ee59aaeaf2b2bd8c5644d557c0342
parent59459b17c1b5c64a74bb926836393d379e64493e (diff)
moderntimeline (6mar15)
git-svn-id: svn://tug.org/texlive/trunk@36450 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/moderntimeline/README2
-rw-r--r--Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdfbin174898 -> 176538 bytes
-rw-r--r--Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx48
-rw-r--r--Master/texmf-dist/source/latex/moderntimeline/moderntimeline.ins4
-rw-r--r--Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty27
5 files changed, 62 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/moderntimeline/README b/Master/texmf-dist/doc/latex/moderntimeline/README
deleted file mode 100644
index d0b89c6844c..00000000000
--- a/Master/texmf-dist/doc/latex/moderntimeline/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This package produces timelines to include in moderncv CVs.
-
diff --git a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf
index 6bc93a689a6..b237664f554 100644
--- a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf
+++ b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx
index bf57e236ddb..de469a5114f 100644
--- a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx
+++ b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2011 by Raphaël Pinson <raphink@gmail.com>
+% Copyright (C) 2011-2012 by Raphaël Pinson <raphink@gmail.com>
% ---------------------------------------------------------------------------
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{moderntimeline}
%<*package>
- [2012/04/27 0.7 Add timelines to moderncv entries]
+ [2015/02/25 0.8 Add timelines to moderncv entries]
%</package>
%
%<*driver>
@@ -43,7 +43,7 @@
%</driver>
% \fi
%
-% \CheckSum{222}
+% \CheckSum{251}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -62,6 +62,7 @@
% Right brace \} Tilde \~}
%
%
+% \changes{0.8}{2015/02/25}{Add the tlsetnotshadedfraction command, thanks to Stefano Gronchi}
% \changes{0.7}{2012/04/26}{Various fixes by Jake to allow fractional years in tllabelcventry}
% \changes{0.6}{2012/01/17}{Fix compatibility with moderncv 0.15.1}
% \changes{0.5}{2011/11/15}{Fix positions in tlcventry and tldatecventry, add tltextsingle, thanks to Stéphane Dupille}
@@ -250,6 +251,15 @@
% {The Internet}{}{Tried Scribus for a short while}
% \end{verbatim}
%
+% \DescribeMacro{\tlsetnotshadedfraction}
+% If last year in |\tlcventry| and |\tllabelcventry| is 0, the bar
+% is shaded. With this command you control the fraction of the bar
+% that is not shaded (default = 0):
+%
+% \begin{verbatim}
+% \tlsetnotshadedfraction{0.4} % The first 40% of the bar is not shaded
+% \end{verbatim}
+%
% \DescribeMacro{\tldatecventry}
% Positions usually last long enough to draw time lines,
% but there are also punctual entries, such as diplomas.
@@ -327,6 +337,15 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tlsetnotshadedfraction}
+% \begin{macrocode}
+\newcommand{\tlsetnotshadedfraction}[1]{%
+ \def\tl@nsfrac{#1}
+}
+\tlsetnotshadedfraction{0}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\tltextstart}
% \begin{macrocode}
\newcommand{\tltextstart}[2][base west]{%
@@ -465,7 +484,8 @@
\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}%
\pgfmathsetmacro\tl@startfraction{(#2-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
\pgfmathsetmacro\tl@endfraction{(\tl@endyear-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
-\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt \def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
+\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
+\def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
\cventry{\tikz[baseline=0pt]{
\useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
\fill [\tl@runningcolor] (0,0)
@@ -477,7 +497,12 @@
node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
(\hintscolumnwidth,0pt) ;
\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
+ \newdimen\fullcolorwidth
+ \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth}
+ \shade [left color=#1,right color=#1]
+(\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\fullcolorwidth,\tl@width);
+ \shade [left color=#1] (\fullcolorwidth,0)
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
\else
\fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
@@ -503,15 +528,20 @@
rectangle (\hintscolumnwidth,\tl@runningwidth);
\useasboundingbox (0,-1.5ex)
rectangle (\hintscolumnwidth,1ex);
- \fill [#1] (0,0)
+ \fill [#1] (0,0)
++(\tl@startfraction*\hintscolumnwidth,0pt)
node [tl@startyear] {#4}
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt);
\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \newdimen\fullcolorwidth
+ \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth}
+ \shade [left color=#1,right color=#1]
+(\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\fullcolorwidth,\tl@width);
+ \shade [left color=#1] (\fullcolorwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
\else
- \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
+ \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
\fi
}
diff --git a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.ins b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.ins
index 834b2efcfdd..c2ff8e38124 100644
--- a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.ins
+++ b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2011 by Raphaël Pinson <raphink@gmail.com>
+%% Copyright (C) 2011-2012 by Raphaël Pinson <raphink@gmail.com>
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,7 +25,7 @@
This is a generated file.
-Copyright (C) 2011 by Raphaël Pinson <raphink@gmail.com>
+Copyright (C) 2011-2012 by Raphaël Pinson <raphink@gmail.com>
--------------------------------------------------------------------------
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
index 5a80f34bcc1..f4fe260d0fc 100644
--- a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
+++ b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2011 by Raphaël Pinson <raphink@gmail.com>
+%% Copyright (C) 2011-2012 by Raphaël Pinson <raphink@gmail.com>
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{moderntimeline}
- [2012/04/27 0.7 Add timelines to moderncv entries]
+ [2015/02/25 0.8 Add timelines to moderncv entries]
\ProvidesPackage{moderntimeline}
\RequirePackage{tikz}
\RequirePackage{kvoptions}
@@ -44,6 +44,10 @@
\newcommand{\tlsince}[1]{%
\def\tl@since{#1}
}
+\newcommand{\tlsetnotshadedfraction}[1]{%
+ \def\tl@nsfrac{#1}
+}
+\tlsetnotshadedfraction{0}
\newcommand{\tltextstart}[2][base west]{%
\tikzset{
tl@startyear/.style={
@@ -126,7 +130,8 @@
\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}%
\pgfmathsetmacro\tl@startfraction{(#2-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
\pgfmathsetmacro\tl@endfraction{(\tl@endyear-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
-\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt \def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
+\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
+\def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
\cventry{\tikz[baseline=0pt]{
\useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
\fill [\tl@runningcolor] (0,0)
@@ -138,7 +143,12 @@
node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
(\hintscolumnwidth,0pt) ;
\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
+ \newdimen\fullcolorwidth
+ \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth}
+ \shade [left color=#1,right color=#1]
+(\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\fullcolorwidth,\tl@width);
+ \shade [left color=#1] (\fullcolorwidth,0)
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
\else
\fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
@@ -162,8 +172,13 @@
node [tl@startyear] {#4}
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt);
\pgfmathsetlength{\pgf@xa}{#3} \ifdim\pgf@xa=0pt
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \newdimen\fullcolorwidth
+ \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth}
+ \shade [left color=#1,right color=#1]
+(\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\fullcolorwidth,\tl@width);
+ \shade [left color=#1] (\fullcolorwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
\else
\fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);