diff options
author | Karl Berry <karl@freefriends.org> | 2019-03-04 22:12:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-03-04 22:12:11 +0000 |
commit | cdcd34b4700774946edede081d49d6a110feba9c (patch) | |
tree | bf0489c54cfc24c73fb834d0596ef8bd2ee95224 | |
parent | 01c4eb229994ba11e086f958fb74bb7fc7406cfb (diff) |
moderntimeline (4mar19)
git-svn-id: svn://tug.org/texlive/trunk@50228 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/moderntimeline/README.md (renamed from Master/texmf-dist/doc/latex/moderntimeline/README) | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf | bin | 183585 -> 184501 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx | 28 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty | 16 |
4 files changed, 38 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/moderntimeline/README b/Master/texmf-dist/doc/latex/moderntimeline/README.md index a800af6a5f4..15fe2617235 100644 --- a/Master/texmf-dist/doc/latex/moderntimeline/README +++ b/Master/texmf-dist/doc/latex/moderntimeline/README.md @@ -1,6 +1,7 @@ Moderntimeline ============== +[![Join the chat at https://gitter.im/raphink/moderntimeline](https://badges.gitter.im/raphink/moderntimeline.svg)](https://gitter.im/raphink/moderntimeline?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://img.shields.io/travis/raphink/moderntimeline/master.svg)](https://travis-ci.org/raphink/moderntimeline) [![CTAN](https://img.shields.io/ctan/v/moderntimeline.svg)](https://www.ctan.org/pkg/moderntimeline) [![CTAN license](https://img.shields.io/ctan/l/moderntimeline.svg)](https://www.ctan.org/pkg/moderntimeline) diff --git a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf Binary files differindex 457c74be96b..e6f1786cd70 100644 --- a/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf +++ b/Master/texmf-dist/doc/latex/moderntimeline/moderntimeline.pdf diff --git a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx index 856eb01c4ea..ff31f0fcdc4 100644 --- a/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx +++ b/Master/texmf-dist/source/latex/moderntimeline/moderntimeline.dtx @@ -43,7 +43,7 @@ %</driver> % \fi % -% \CheckSum{333} +% \CheckSum{352} % % \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.10}{2019/03/04}{Add support to specify label for end date, thanks to ypid and Astrinus} % \changes{0.9}{2015/08/31}{Add month support, thanks to Astrinus} % \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} @@ -287,6 +288,15 @@ % {The Internet}{}{Tried Scribus for a short while} % \end{verbatim} % +% It is also possible to place a label where the end date would by making use +% of the separator |///|: +% +% \begin{verbatim} +% \tllabelcventry[magenta]{2002}{2003}{July///November 2002} +% {Scribus Student}{GNU School} +% {The Internet}{}{Tried Scribus for a short while} +% \end{verbatim} +% % You can enter months for adjusting bar length as in |\tlcventry|. % % @@ -529,6 +539,12 @@ \begingroup% \edef\@tempa{#1///}% \expandafter\endgroup\expandafter\tl@splitlabels@auxi\@tempa\@nnil% + \ifx\tl@startlabel\empty\relax% + \gdef\tl@startlabel{#1} + \fi + \ifissince% + \xdef\tl@startlabel{\tl@since \tl@startlabel} + \fi } % \end{macrocode} % \end{macro} @@ -588,7 +604,8 @@ % \begin{macrocode} \issincefalse \tl@formatstartyear{#2} -\cventry{\tikz{ +\cventry{\tikz[baseline=0pt]{ + \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex); \fill [\tl@runningcolor] (0,0) rectangle (\hintscolumnwidth,\tl@runningwidth); \fill [#1] (0,0) @@ -667,6 +684,7 @@ % \begin{macrocode} \tl@formatendyear{#3} \tl@formatstartyear{#2} +\tl@splitlabels{#4} \cventry{\tikz[baseline=0pt]{ \fill [\tl@runningcolor] (0,0) rectangle (\hintscolumnwidth,\tl@runningwidth); @@ -674,8 +692,10 @@ rectangle (\hintscolumnwidth,1ex); \fill [#1] (0,0) ++(\tl@startfraction*\hintscolumnwidth,0pt) - node [tl@startyear] {#4} - rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt) ; + node [tl@startyear] {\tl@startlabel} + rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt) + node [tl@endyear] {\tl@endlabel} + (\hintscolumnwidth,0pt) ; \ifissince \newdimen\fullcolorwidth \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth} diff --git a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty index a366c1cda8c..4e93ed18950 100644 --- a/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty +++ b/Master/texmf-dist/tex/latex/moderntimeline/moderntimeline.sty @@ -140,6 +140,12 @@ \begingroup% \edef\@tempa{#1///}% \expandafter\endgroup\expandafter\tl@splitlabels@auxi\@tempa\@nnil% + \ifx\tl@startlabel\empty\relax% + \gdef\tl@startlabel{#1} + \fi + \ifissince% + \xdef\tl@startlabel{\tl@since \tl@startlabel} + \fi } \newcommand{\tl@splitlabels@auxi}[2]{} \def\tl@splitlabels@auxi#1///#2\@nnil{% @@ -177,7 +183,8 @@ \newcommand{\tldatelabelcventry}[8][color1]{% \issincefalse \tl@formatstartyear{#2} -\cventry{\tikz{ +\cventry{\tikz[baseline=0pt]{ + \useasboundingbox (0,-1.5ex) rectangle (\hintscolumnwidth,1ex); \fill [\tl@runningcolor] (0,0) rectangle (\hintscolumnwidth,\tl@runningwidth); \fill [#1] (0,0) @@ -235,6 +242,7 @@ \newcommand{\tllabelcventry}[9][color1]{% \tl@formatendyear{#3} \tl@formatstartyear{#2} +\tl@splitlabels{#4} \cventry{\tikz[baseline=0pt]{ \fill [\tl@runningcolor] (0,0) rectangle (\hintscolumnwidth,\tl@runningwidth); @@ -242,8 +250,10 @@ rectangle (\hintscolumnwidth,1ex); \fill [#1] (0,0) ++(\tl@startfraction*\hintscolumnwidth,0pt) - node [tl@startyear] {#4} - rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt) ; + node [tl@startyear] {\tl@startlabel} + rectangle (\tl@endfraction*\hintscolumnwidth,\tl@width-1pt) + node [tl@endyear] {\tl@endlabel} + (\hintscolumnwidth,0pt) ; \ifissince \newdimen\fullcolorwidth \pgfmathsetlength\fullcolorwidth{\tl@startfraction*(1+(1-\tl@startfraction)*\tl@nsfrac)*\hintscolumnwidth} |