summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdfbin173379 -> 174318 bytes
-rw-r--r--Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx13
-rw-r--r--Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty12
3 files changed, 13 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf
index fc7d261e1e2..9cff3210969 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 29e4f5575b1..0b3bcf708ae 100644
--- a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx
+++ b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx
@@ -26,7 +26,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{moderntimeline}
%<*package>
- [2011/11/15 0.5 Add timelines to moderncv entries]
+ [2012/01/17 0.6 Add timelines to moderncv entries]
%</package>
%
%<*driver>
@@ -62,6 +62,7 @@
% Right brace \} Tilde \~}
%
%
+% \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}
% \changes{0.4}{2011/10/02}{Add firstyear and lastyear options}
% \changes{0.3}{2011/09/29}{Bugfix: initialize tlsince}
@@ -410,7 +411,7 @@
%
% \begin{macro}{\tldatelabelcventry}
% \begin{macrocode}
-\newcommand{\tldatelabelcventry}[8][sectionrectanglecolor]{%
+\newcommand{\tldatelabelcventry}[8][color1]{%
% \end{macrocode}
% \begin{macrocode}
\pgfmathsetmacro\tl@endyear{\tl@lastyear}
@@ -434,7 +435,7 @@
%
% \begin{macro}{\tldatecventry}
% \begin{macrocode}
-\newcommand{\tldatecventry}[7][sectionrectanglecolor]{%
+\newcommand{\tldatecventry}[7][color1]{%
% \end{macrocode}
% \begin{macrocode}
\pgfmathsetmacro\tl@endyear{\tl@lastyear}%
@@ -457,7 +458,7 @@
%
% \begin{macro}{\tlcventry}
% \begin{macrocode}
-\newcommand{\tlcventry}[8][sectionrectanglecolor]{%
+\newcommand{\tlcventry}[8][color1]{%
% \end{macrocode}
% \begin{macrocode}
\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}%
@@ -490,13 +491,13 @@
%
% \begin{macro}{\tllabelcventry}
% \begin{macrocode}
-\newcommand{\tllabelcventry}[9][sectionrectanglecolor]{%
+\newcommand{\tllabelcventry}[9][color1]{%
% \end{macrocode}
% \begin{macrocode}
\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)}%
- \cventry{\tikz[baseline=(tl@endyear.north)]{
+ \cventry{\tikz[baseline=0pt]{
\fill [\tl@runningcolor] (0,0)
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)
diff --git a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
index 69a58ba75eb..d3e298dabac 100644
--- a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
+++ b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{moderntimeline}
- [2011/11/15 0.5 Add timelines to moderncv entries]
+ [2012/01/17 0.6 Add timelines to moderncv entries]
\ProvidesPackage{moderntimeline}
\RequirePackage{tikz}
\RequirePackage{kvoptions}
@@ -91,7 +91,7 @@
\def\tl@lastyear{#2}
\pgfmathsetmacro\tl@yearrange{\tl@lastyear-\tl@firstyear}
}
-\newcommand{\tldatelabelcventry}[8][sectionrectanglecolor]{%
+\newcommand{\tldatelabelcventry}[8][color1]{%
\pgfmathsetmacro\tl@endyear{\tl@lastyear}
\pgfmathsetmacro\tl@startfraction{(#2-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
\pgfmathsetmacro\tl@endfraction{(\tl@endyear-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
@@ -106,7 +106,7 @@
}
{#4}{#5}{#6}{#7}{#8}
}
-\newcommand{\tldatecventry}[7][sectionrectanglecolor]{%
+\newcommand{\tldatecventry}[7][color1]{%
\pgfmathsetmacro\tl@endyear{\tl@lastyear}%
\pgfmathsetmacro\tl@startfraction{(#2-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
\pgfmathsetmacro\tl@endfraction{(\tl@endyear-\tl@firstyear)/(\tl@lastyear-\tl@firstyear)}%
@@ -122,7 +122,7 @@
}%
{#3}{#4}{#5}{#6}{#7}%
}
-\newcommand{\tlcventry}[8][sectionrectanglecolor]{%
+\newcommand{\tlcventry}[8][color1]{%
\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)}%
@@ -148,11 +148,11 @@
}%
{#4}{#5}{#6}{#7}{#8}%
}
-\newcommand{\tllabelcventry}[9][sectionrectanglecolor]{%
+\newcommand{\tllabelcventry}[9][color1]{%
\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)}%
- \cventry{\tikz[baseline=(tl@endyear.north)]{
+ \cventry{\tikz[baseline=0pt]{
\fill [\tl@runningcolor] (0,0)
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)