Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

\tllabelcventry Support to specify label for end date #15

Merged
merged 1 commit into from
Jan 31, 2017
Merged

\tllabelcventry Support to specify label for end date #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions moderntimeline.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
%</driver>
% \fi
%
% \CheckSum{335}
% \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
Expand All @@ -62,6 +62,7 @@
% Right brace \} Tilde \~}
%
%
% \changes{0.10}{2017/01/31}{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}
Expand Down Expand Up @@ -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|.
%
%
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -668,15 +684,18 @@
% \begin{macrocode}
\tl@formatendyear{#3}
\tl@formatstartyear{#2}
\tl@splitlabels{#4}
\cventry{\tikz[baseline=0pt]{
\fill [\tl@runningcolor] (0,0)
rectangle (\hintscolumnwidth,\tl@runningwidth);
\useasboundingbox (0,-1.5ex)
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}
Expand Down
4 changes: 2 additions & 2 deletions spec/pdf_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

describe 'Moderntimeline PDF' do
reader = PDF::Reader.new('moderntimeline.pdf')
it 'should have 11 pages' do
reader.page_count.should eq(11)
it 'should have 12 pages' do
reader.page_count.should eq(12)
end
it 'should be made by TeX' do
reader.info[:Creator].should eq('TeX')
Expand Down