summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-11-16 01:16:52 +0000
committerKarl Berry <karl@freefriends.org>2011-11-16 01:16:52 +0000
commit7fe7dded5bf2ae143d4f7ae1c5da9e394022a684 (patch)
tree05727f0d0e064a6a8b47deace84f2186ed4f25b4
parentc9f10f84058bee6805ccb5b949207cf6ced6a6d7 (diff)
moderntimeline (15nov11)
git-svn-id: svn://tug.org/texlive/trunk@24607 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdfbin171151 -> 173379 bytes
-rw-r--r--Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx111
-rw-r--r--Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty87
3 files changed, 121 insertions, 77 deletions
diff --git a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf
index 87a1c1e6181..fc7d261e1e2 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 672b0885d25..29e4f5575b1 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/10/02 0.4 Add timelines to moderncv entries]
+ [2011/11/15 0.5 Add timelines to moderncv entries]
%</package>
%
%<*driver>
@@ -43,7 +43,7 @@
%</driver>
% \fi
%
-% \CheckSum{203}
+% \CheckSum{211}
%
% \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.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}
% \changes{0.2}{2011/09/29}{Add tlsince and options for tltext*}
@@ -151,6 +152,19 @@
% \end{verbatim}
%
%
+% \DescribeMacro{\tltextsingle}
+% If you wish to set the size of single date labels,
+% you can do so by using |\tltextsingle|, passing it
+% a text size macro.
+%
+% For example if you wish to set the text size to
+% |\scriptsize|:
+%
+% \begin{verbatim}
+% \tltextsingle{\scriptsize}
+% \end{verbatim}
+%
+%
% \DescribeMacro{\tltext}
% You can set the sizes of both the start and end dates
% by calling the |\tltext| macro with a text size macro.
@@ -315,9 +329,9 @@
% \begin{macrocode}
\newcommand{\tltextstart}[2][base west]{%
\tikzset{
- tlstartyear/.style={
+ tl@startyear/.style={
font=#2,
- name=tlstartyear,
+ name=tl@startyear,
above=\tl@textstartabove,
inner xsep=0pt,
anchor=#1,
@@ -345,13 +359,30 @@
% \end{macro}
%
%
+% \begin{macro}{\tltextsingle}
+% \begin{macrocode}
+\newcommand{\tltextsingle}[1]{%
+ \tikzset{
+ tl@singleyear/.style={
+ font=#1,
+ name=tl@singleyear,
+ above=1pt,
+ inner xsep=0pt,
+ }
+ }
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}{\tltext}
% \begin{macrocode}
\newcommand{\tltext}[1]{%
% \end{macrocode}
% \begin{macrocode}
\tltextstart{#1}%
- \tltextend{#1}
+ \tltextend{#1}%
+ \tltextsingle{#1}%
}
% \end{macrocode}
% \end{macro}
@@ -392,7 +423,7 @@
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)
++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#3}
+ node [tl@startyear] {#3}
node {$\bullet$};
}
}
@@ -406,21 +437,20 @@
\newcommand{\tldatecventry}[7][sectionrectanglecolor]{%
% \end{macrocode}
% \begin{macrocode}
-\pgfmathsetmacro\tl@endyear{\tl@lastyear}
+\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)}%
-% \end{macrocode}
-% \begin{macrocode}
- \cventry{\tikz{
- \fill [\tl@runningcolor] (0,0)
- rectangle (\hintscolumnwidth,\tl@runningwidth);
- \fill [#1] (0,0)
- ++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#2}
- node {$\bullet$};
- }
-}
-{#3}{#4}{#5}{#6}{#7}
+\cventry{\tikz[baseline=0pt]{
+ \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
+ \fill [\tl@runningcolor] (0,0)
+ rectangle (\hintscolumnwidth,\tl@runningwidth);
+ \fill [#1] (0,0)
+ ++(\tl@startfraction*\hintscolumnwidth,0pt)
+ node [tl@singleyear] {#2}
+ node {$\bullet$};
+ }%
+}%
+{#3}{#4}{#5}{#6}{#7}%
}
% \end{macrocode}
% \end{macro}
@@ -430,29 +460,30 @@
\newcommand{\tlcventry}[8][sectionrectanglecolor]{%
% \end{macrocode}
% \begin{macrocode}
-\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}
+\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)}%
\ifnum #3=0 \def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
- \cventry{\tikz[baseline=(tl@endyear.north)]{
- \fill [\tl@runningcolor] (0,0)
- rectangle (\hintscolumnwidth,\tl@runningwidth);
- \fill [#1] (0,0)
- ++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {\tl@startlabel}
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt)
- node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
- (\hintscolumnwidth,0pt) ;
- \ifnum #3=0
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
- \else
- \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
- \fi
- }
-}
-{#4}{#5}{#6}{#7}{#8}
+ \cventry{\tikz[baseline=0pt]{
+ \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
+ \fill [\tl@runningcolor] (0,0)
+ rectangle (\hintscolumnwidth,\tl@runningwidth);
+ \fill [#1] (0,0)
+ ++(\tl@startfraction*\hintscolumnwidth,0pt)
+ node [tl@startyear] {\tl@startlabel}
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt)
+ node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
+ (\hintscolumnwidth,0pt) ;
+ \ifnum #3=0
+ \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \else
+ \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \fi
+ }%
+}%
+{#4}{#5}{#6}{#7}{#8}%
}
% \end{macrocode}
% \end{macro}
@@ -470,7 +501,7 @@
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)
++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#4}
+ node [tl@startyear] {#4}
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt);
\ifnum #3=0
\shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
diff --git a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty
index 767f1df331d..69a58ba75eb 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/10/02 0.4 Add timelines to moderncv entries]
+ [2011/11/15 0.5 Add timelines to moderncv entries]
\ProvidesPackage{moderntimeline}
\RequirePackage{tikz}
\RequirePackage{kvoptions}
@@ -46,9 +46,9 @@
}
\newcommand{\tltextstart}[2][base west]{%
\tikzset{
- tlstartyear/.style={
+ tl@startyear/.style={
font=#2,
- name=tlstartyear,
+ name=tl@startyear,
above=\tl@textstartabove,
inner xsep=0pt,
anchor=#1,
@@ -66,9 +66,20 @@
}
}
}
+\newcommand{\tltextsingle}[1]{%
+ \tikzset{
+ tl@singleyear/.style={
+ font=#1,
+ name=tl@singleyear,
+ above=1pt,
+ inner xsep=0pt,
+ }
+ }
+}
\newcommand{\tltext}[1]{%
\tltextstart{#1}%
- \tltextend{#1}
+ \tltextend{#1}%
+ \tltextsingle{#1}%
}
\tltext{\scriptsize}
\tlwidth{0.8ex}
@@ -89,51 +100,53 @@
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)
++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#3}
+ node [tl@startyear] {#3}
node {$\bullet$};
}
}
{#4}{#5}{#6}{#7}{#8}
}
\newcommand{\tldatecventry}[7][sectionrectanglecolor]{%
-\pgfmathsetmacro\tl@endyear{\tl@lastyear}
+\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)}%
- \cventry{\tikz{
- \fill [\tl@runningcolor] (0,0)
- rectangle (\hintscolumnwidth,\tl@runningwidth);
- \fill [#1] (0,0)
- ++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#2}
- node {$\bullet$};
- }
-}
-{#3}{#4}{#5}{#6}{#7}
+\cventry{\tikz[baseline=0pt]{
+ \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
+ \fill [\tl@runningcolor] (0,0)
+ rectangle (\hintscolumnwidth,\tl@runningwidth);
+ \fill [#1] (0,0)
+ ++(\tl@startfraction*\hintscolumnwidth,0pt)
+ node [tl@singleyear] {#2}
+ node {$\bullet$};
+ }%
+}%
+{#3}{#4}{#5}{#6}{#7}%
}
\newcommand{\tlcventry}[8][sectionrectanglecolor]{%
-\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}
+\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)}%
\ifnum #3=0 \def\tl@startlabel{\tl@since #2} \else \def\tl@startlabel{#2} \fi
- \cventry{\tikz[baseline=(tl@endyear.north)]{
- \fill [\tl@runningcolor] (0,0)
- rectangle (\hintscolumnwidth,\tl@runningwidth);
- \fill [#1] (0,0)
- ++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {\tl@startlabel}
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt)
- node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
- (\hintscolumnwidth,0pt) ;
- \ifnum #3=0
- \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
- \else
- \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
- rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
- \fi
- }
-}
-{#4}{#5}{#6}{#7}{#8}
+ \cventry{\tikz[baseline=0pt]{
+ \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex);
+ \fill [\tl@runningcolor] (0,0)
+ rectangle (\hintscolumnwidth,\tl@runningwidth);
+ \fill [#1] (0,0)
+ ++(\tl@startfraction*\hintscolumnwidth,0pt)
+ node [tl@startyear] {\tl@startlabel}
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt)
+ node [tl@endyear] {\pgfmathparse{ifthenelse(#3==0,,#3)}\pgfmathresult}
+ (\hintscolumnwidth,0pt) ;
+ \ifnum #3=0
+ \shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \else
+ \fill [#1] (\tl@startfraction*\hintscolumnwidth,0)
+ rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width);
+ \fi
+ }%
+}%
+{#4}{#5}{#6}{#7}{#8}%
}
\newcommand{\tllabelcventry}[9][sectionrectanglecolor]{%
\pgfmathsetmacro\tl@endyear{ifthenelse(#3==0,\tl@lastyear,#3)}
@@ -144,7 +157,7 @@
rectangle (\hintscolumnwidth,\tl@runningwidth);
\fill [#1] (0,0)
++(\tl@startfraction*\hintscolumnwidth,0pt)
- node [tlstartyear] {#4}
+ node [tl@startyear] {#4}
rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt);
\ifnum #3=0
\shade [left color=#1] (\tl@startfraction*\hintscolumnwidth,0)