texlive[49456] Master/texmf-dist: tikz-kalender (19dec18)
commits+karl at tug.org
commits+karl at tug.org
Wed Dec 19 23:11:39 CET 2018
Revision: 49456
http://tug.org/svn/texlive?view=revision&revision=49456
Author: karl
Date: 2018-12-19 23:11:39 +0100 (Wed, 19 Dec 2018)
Log Message:
-----------
tikz-kalender (19dec18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tikz-kalender/README.md
trunk/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf
trunk/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf
trunk/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls
Modified: trunk/Master/texmf-dist/doc/latex/tikz-kalender/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tikz-kalender/README.md 2018-12-19 22:11:24 UTC (rev 49455)
+++ trunk/Master/texmf-dist/doc/latex/tikz-kalender/README.md 2018-12-19 22:11:39 UTC (rev 49456)
@@ -75,6 +75,9 @@
* `\event*{2016-07-10}{Fußball-EM: Endspiel}[color=DarkTurquoise]`;
colored event with a special color
+* `\period{2016-12-23}{2017-01-03}`; period colored with the color defined
+by the key `periodColor`
+
* `\period{2016-02-01}{2016-02-06}[color=LightGreen]`; period colored with a
special color
@@ -81,4 +84,4 @@
* `\period{2016-09-12}{2016-10-04}[color=red!30,name=Urlaub]`; named period
colored with a special color
-Rolf Niepraschk, 2018-01-05
+Rolf Niepraschk, 2018-04-01
Modified: trunk/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls 2018-12-19 22:11:24 UTC (rev 49455)
+++ trunk/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls 2018-12-19 22:11:39 UTC (rev 49456)
@@ -7,7 +7,7 @@
\setcounter{errorcontextlines}{100}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{tikz-kalender}[2017/05/17 v0.4b Calendar class (RN)]
+\ProvidesClass{tikz-kalender}[2018/12/18 v0.4d Calendar class (RN)]
\DeclareOption*{\OptionNotUsed}
\ProcessOptions\relax
@@ -137,7 +137,6 @@
\fi
\RequirePackage{babel,translator,tikz}
\input{tikz-kalender-translation.clo}
- %\usetikzlibrary{calc}
\usetikzlibrary{calendar}
}
@@ -206,7 +205,7 @@
}
\newcommand*\RN at formatEvent[2]{%
\RN at eventFont
- \def\RN at tempa{\strut\hfill#2}%
+ \def\RN at tempa{\strut#2}%
\settowidth\@tempdima{\mbox{\RN at tempa}}%
\ifdim\@tempdima>#1 %
\@tempdimb=\dimexpr\f at size pt %
@@ -214,7 +213,7 @@
\def\RN at tempa{\fontsize{\@tempdimb}{1.1\@tempdimb}\selectfont#2}%
\fi
\makebox[-50\RN at xunit][r]{\raisebox{0.55\totalheight}[\totalheight]{%
- \parbox[c]{#1}{\RaggedLeft\nointerlineskip\RN at tempa}}}%
+ \parbox[c]{#1}{\raggedleft\hskip\z@\RN at tempa}}}% \nointerlineskip
}
\newcommand*\RN at setFont[3][]{%
@@ -239,14 +238,9 @@
\pgfcalendar{}{#1}{#2}{%
\edef\RN at tempa{\pgfcalendarcurrentyear-\pgfcalendarcurrentmonth-%
\pgfcalendarcurrentday}%
- \@ifundefined{event@\RN at tempa}{%
- \let\RN at event@ii=\RN at event@ii at orig% activate again
- % period name as event entry for event-less days
- \event{\RN at tempa}{\RN at period@name}%
- \edef\RN at tempb{\noexpand\expandafter\noexpand\gdef\noexpand%
- \csname event@\RN at tempa\noexpand\endcsname{\RN at period@name}}%
- \RN at tempb
- }{}%
+ \let\RN at event@ii=\RN at event@ii at orig% activate temporarily
+ % period name as event entry for event-less days
+ \event{\RN at tempa}{\RN at period@name}%
}%
\fi
\endgroup
@@ -263,20 +257,25 @@
\def\RN at event@ii#1#2[#3]{%
\begingroup
\pgfkeys{/RN/event/.cd, #3}%
+ \@tempdima=\RN at eventwidthL
+ \ifRN at showweeknumbers
+ \pgfcalendarifdate{#1}{Monday}{\@tempdima=\RN at eventwidthS}{}%
+ \fi
\@ifundefined{event@#1}{%
- \@tempdima=\RN at eventwidthL
- \ifRN at showweeknumbers
- \pgfcalendarifdate{#1}{Monday}{\@tempdima=\RN at eventwidthS}{}%
- \fi
+ \expandafter\protected at xdef\csname event@#1\endcsname{#2}%
\protected at edef\@tempa{\noexpand\@ifundefined{pgf at sh@ns at cal-#1}{}{%
- \noexpand\node[anchor=south west,inner sep=0pt] at (cal-#1.south east){%
- \noexpand\RN at formatEvent{\the\@tempdima}{#2}};}%
+ \noexpand\node[anchor=south west,inner sep=0pt] at (cal-#1.south east){%
+ \noexpand\RN at formatEvent{\the\@tempdima}{%
+ \noexpand\csname event@#1\endcsname}};%
+ }
}%
- \expandafter\gdef\csname event@#1\endcsname{#2}%
\pgfcalendarifdate{#1}{at most=06-last}% first half-year?
- {\expandafter\g at addto@macro\expandafter\RN at events@I\expandafter{\@tempa}}%
- {\expandafter\g at addto@macro\expandafter\RN at events@II\expandafter{\@tempa}}%
- }{}%
+ {\expandafter\g at addto@macro\expandafter\RN at events@I\expandafter{\@tempa}}%
+ {\expandafter\g at addto@macro\expandafter\RN at events@II\expandafter{\@tempa}}%
+ }{%
+ \expandafter\protected at xdef\csname event@#1\endcsname{%
+ #2, \csname event@#1\endcsname}%
+ }
\if at tempswa
\edef\@tempa{%
\noexpand\ifdate{equals=#1}{\noexpand\tikzset{%
@@ -284,8 +283,9 @@
}%
\expandafter\g at addto@macro\expandafter\RN at backgrounds\expandafter{\@tempa}%
\fi
- \endgroup
+ \endgroup
}
+
\let\RN at event@ii at orig=\RN at event@ii
\newcommand\RN at makeKalender[2]{%
@@ -314,12 +314,14 @@
}{}%
\ifdate{workday}{\tikzset{every day/.style=%
{fill=\RN at workdayColor}}}{}%
- \RN at periods
+ %\RN at periods
\ifdate{Saturday}{\tikzset{every day/.style=%
{fill=\RN at saturdayColor}}}{}%
\ifdate{Sunday}{\tikzset{every day/.style=%
{fill=\RN at sundayColor}}}{}%
\RN at backgrounds
+ \RN at periods
+ %\RN at backgrounds
},%
execute at begin day scope={%
\pgftransformyshift{-\pgfcalendarcurrentday\RN at dayheight}%
@@ -339,16 +341,17 @@
}
\newcommand*\makeKalender{%
- \setcounter{weeknumber}{0}%
- \begingroup
+ \pgfcalendarifdate{\RN at year-01-01}{Tuesday,Wednesday,Thursday}{%
+ \setcounter{weeknumber}{1}}{\setcounter{weeknumber}{0}}%
+ \begingroup%
\let\year=\RN at year
- \def\RN at period@i##1##2[##3]{}% 1st loop: only the events
+ \def\RN at event@ii##1##2[##3]{}% 1st loop: only the periods
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
\expandafter\docsvlist\expandafter{\RN at events@files}%
\endgroup
\begingroup
\let\year=\RN at year
- \def\RN at event@ii##1##2[##3]{}% 2nd loop: only the periods
+ \def\RN at period@i##1##2[##3]{}% 2nd loop: only the events
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
\expandafter\docsvlist\expandafter{\RN at events@files}%
\endgroup
More information about the tex-live-commits
mailing list