diff --git a/teckidscal.sty b/teckidscal.sty index 0b494302ca28877afe05d2bb16e3c49af546e166..a703c34a8f4bd6d15b3048ec041042f5b5b133af 100644 --- a/teckidscal.sty +++ b/teckidscal.sty @@ -21,7 +21,7 @@ % Teckids e.V. Wandkalender-Utilities \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{teckidscal}[2017/03/29 1.2 Teckids e.V. Wandkalender-Utilities]% +\ProvidesPackage{teckidscal}[2017/03/29 1.3 Teckids e.V. Wandkalender-Utilities]% \RequirePackage{pgfkeys,pgfcalendar}% \input{pgflibrarycalendar.easter.code}% \RequirePackage{etoolbox}% @@ -446,13 +446,22 @@ \fi% \ifnum\@tempcntb=\tktmM\else% \ifnum\count@<29% - \csname tkCalLine29\endcsname=\expandafter{\the\csname tkCalLine29\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \ifnum\tkCalNumMon=\@ne\else% + \csname tkCalLine29\endcsname=\expandafter{\the\csname tkCalLine29\endcsname \tkCalColsep}% + \fi% + \csname tkCalLine29\endcsname=\expandafter{\the\csname tkCalLine29\endcsname \multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% \fi% \ifnum\count@<30% - \csname tkCalLine30\endcsname=\expandafter{\the\csname tkCalLine30\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \ifnum\tkCalNumMon=\@ne\else% + \csname tkCalLine30\endcsname=\expandafter{\the\csname tkCalLine30\endcsname \tkCalColsep}% + \fi% + \csname tkCalLine30\endcsname=\expandafter{\the\csname tkCalLine30\endcsname \multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% \fi% \ifnum\count@<31% - \csname tkCalLine31\endcsname=\expandafter{\the\csname tkCalLine31\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \ifnum\tkCalNumMon=\@ne\else% + \csname tkCalLine31\endcsname=\expandafter{\the\csname tkCalLine31\endcsname \tkCalColsep}% + \fi% + \csname tkCalLine31\endcsname=\expandafter{\the\csname tkCalLine31\endcsname \multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% \fi% \tkCalToks={}% \ifnum\@tempcntb=\z@\else% @@ -556,6 +565,15 @@ \ifnum\tkjd < \tkcalend% \advance\tkjd by 1% \repeat% + \ifnum\count@<29% + \csname tkCalLine29\endcsname=\expandafter{\the\csname tkCalLine29\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \fi% + \ifnum\count@<30% + \csname tkCalLine30\endcsname=\expandafter{\the\csname tkCalLine30\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \fi% + \ifnum\count@<31% + \csname tkCalLine31\endcsname=\expandafter{\the\csname tkCalLine31\endcsname \tkCalColsep\multicolumn{3}{|c|}{\cellcolor{teckidscalNO}}}% + \fi% % \tkCalToks={}% \tkAmdToks{\multicolumn}%