diff --git a/teckidscal.sty b/teckidscal.sty index fca1d38ce48e3b05c723401bdfec7d9b2222abb0..150892c1248c3e584477d8927ab6e336c406491c 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}%