[verein.git] holidays

teckidscaltmp.sty

@@ -335,6 +335,10 @@
  \expandafter\xdef\csname tkDayTeckids\number\tkjd\endcsname{#1}%
 }%
 
+\newcommand{\tkAmdToks}[1]{%
+ \tkCalToks=\expandafter{\the\tkCalToks #1}%
+}%
+
 \newcommand{\tkAddToks}[1]{%
  \tkCalToks=\expandafter{\the\expandafter\tkCalToks #1}%
 }%
@@ -344,10 +348,6 @@
  \tkCalToks=\expandafter{\the\expandafter\tkCalToks \expandafter{\1}}%
 }%
 
-\newcommand{\tkAmdToks}[1]{%
- \tkCalToks=\expandafter{\the\tkCalToks #1}%
-}%
-
 \newcommand{\teckidscalrender}[1]{%
  \tkCalNumYr=\z@%
  \tkCalNumMon=\z@%
@@ -421,31 +421,32 @@
    \tkAmdToks{\tkCalColsep}%
   \fi%
   %
-  \tkAddToks{\cellcolor}%
+  \tkAmdToks{\cellcolor}%
   \tkAddTokp{teckidscal\csname tkDayType\number\tkjd\endcsname}%
-  \tkAddToks{\color{black}}%
+  \tkAmdToks{\color{black}}%
   \tkAddToks{\number\tktmD}%
   \tkAmdToks{\tkCalColsep}%
-  \tkAddToks{\cellcolor}%
+  \tkAmdToks{\cellcolor}%
   \tkAddTokp{teckidscal\csname tkDayType\number\tkjd\endcsname}%
-  \tkAddToks{\color{black}}%
+  \tkAmdToks{\color{black}}%
   \tkAddToks{\csname tkDayName\number\tkjd\endcsname}%
-% \tkifdef{tkDayHoliday\number\tkjd}{%
-%  \tkifdef{tkDayTeckids\number\tkjd}{%
-%   \stepcounter{tkFN}%
-%   \xdef\tkDynContent{\textsuperscript{\thetkFN}}%
-%   \csname tkCalLine\number\tktmD\endcsname=\expandafter{\the\expandafter\expandafter\csname tkCalLine\number\tktmD\endcsname{\tkDynContent}}%
-%   \csname tkCalLine\number\tktmD\endcsname=\expandafter{\the\csname tkCalLine\number\tktmD\endcsname \tkCalColsep}%
-%   \let\teckidsTmp\tkFNtext%
-%   \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}%
-%    \tktmD.\tktmM.\tktmY: {}%
-%    \csname tkDayHoliday\number\tkjd\endcsname}%
-%  }{%
-   \tkAmdToks{\tkCalColsep tmpb}%
-%   \xdef\tkDynContent{\csname tkDayHoliday\number\tkjd\endcsname}%
-%   \csname tkCalLine\number\tktmD\endcsname=\expandafter{\the\expandafter\expandafter\csname tkCalLine\number\tktmD\endcsname{\tkDynContent}}%
-%  }%
-% }{}%
+  \tkifdef{tkDayHoliday\number\tkjd}{%
+   \tkifdef{tkDayTeckids\number\tkjd}{%
+    \stepcounter{tkFN}%
+    \tkAmdToks{\textsuperscript}
+    \tkAddTokp{\thetkFN}%
+    \let\teckidsTmp\tkFNtext%
+    \xdef\tkFNtext{\teckidsTmp \dash \thetkFN) {}%
+     \tktmD.\tktmM.\tktmY: {}%
+     \csname tkDayHoliday\number\tkjd\endcsname}%
+    \tkAmdToks{\tkCalColsep}%
+   }{%
+    \tkAmdToks{\tkCalColsep}%
+    \tkAddToks{\csname tkDayHoliday\number\tkjd\endcsname}%
+   }%
+  }{%
+   \tkAmdToks{\tkCalColsep}%
+  }%
 %    \tkifdef{tkDayTeckids\number\tkjd}{%
 %     \color{teckidscal\csname tkDayType\number\tkjd\endcsname Label}%
 %     {} \textbf{\csname tkDayTeckids\number\tkjd\endcsname}%