From da886e3b99dae500c4aac642fd4e3aa647708138 Mon Sep 17 00:00:00 2001 From: mirabilos <thorsten.glaser@teckids.org> Date: Sun, 8 Jan 2017 16:46:53 +0100 Subject: [PATCH] [verein.git] display long holiday names as footnotes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit both â“ when deplaced by a teckids day and â“‘ on normal holidays --- teckidscal.sty | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/teckidscal.sty b/teckidscal.sty index fca1d38..150892c 100644 --- a/teckidscal.sty +++ b/teckidscal.sty @@ -169,6 +169,9 @@ \newcommand{\tk@mkholiday}[3][teckidsargdefaulted]{% \tkToJD{#2}% + \ifstrequal{#1}{teckidsargdefaulted}{}{% + \expandafter\xdef\csname tkDayHolilong\number\tkjd\endcsname{#1}% + }% \expandafter\xdef\csname tkDayHoliday\number\tkjd\endcsname{#3}% \expandafter\xdef\csname tkDayType\number\tkjd\endcsname{1}% \expandafter\xdef\csname tkDayNr\number\tkjd\endcsname{\csname tkDayNr\number\tkjd\endcsname *}% @@ -462,14 +465,29 @@ \tkAmdToks{\textsuperscript}% \tkAddTokp{\thetkFN}% \let\teckidsTmp\tkFNtext% - \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}% - \tktmD.\tktmM.\tktmY: {}% - \csname tkDayHoliday\number\tkjd\endcsname}% + \tkifdef{tkDayHolilong\number\tkjd}{% + \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}% + \tktmD.\tktmM.\tktmY: {}% + \csname tkDayHolilong\number\tkjd\endcsname}% + }{% + \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}% + \tktmD.\tktmM.\tktmY: {}% + \csname tkDayHoliday\number\tkjd\endcsname}% + }% \tkAmdToks{\tkCalColsep}% \tkAmdToks{\cellcolor}% \tkAddTokp{teckidscal\csname tkDayType\number\tkjd\endcsname}% \tkAmdToks{\color{black}}% }{% + \tkifdef{tkDayHolilong\number\tkjd}{% + \stepcounter{tkFN}% + \tkAmdToks{\textsuperscript}% + \tkAddTokp{\thetkFN}% + \let\teckidsTmp\tkFNtext% + \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}% + \tktmD.\tktmM.\tktmY: {}% + \csname tkDayHolilong\number\tkjd\endcsname}% + }{}% \tkAmdToks{\tkCalColsep}% \tkAmdToks{\cellcolor}% \tkAddTokp{teckidscal\csname tkDayType\number\tkjd\endcsname}% -- GitLab