diff --git a/teckidscal.sty b/teckidscal.sty index 0801a801ac385a04ae3e562b4abc11a68aee0752..0b494302ca28877afe05d2bb16e3c49af546e166 100644 --- a/teckidscal.sty +++ b/teckidscal.sty @@ -21,7 +21,7 @@ % Teckids e.V. Wandkalender-Utilities \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{teckidscal}[2017/01/08 1.1 Teckids e.V. Wandkalender-Utilities]% +\ProvidesPackage{teckidscal}[2017/03/29 1.2 Teckids e.V. Wandkalender-Utilities]% \RequirePackage{pgfkeys,pgfcalendar}% \input{pgflibrarycalendar.easter.code}% \RequirePackage{etoolbox}% @@ -64,12 +64,14 @@ \definecolor{teckidscal3Label}{HTML}{FFFFFF}% \definecolor{teckidscal4Label}{HTML}{FFFFFF}% \definecolor{teckidscal5Label}{HTML}{FFFFFF}% +\definecolor{teckidscal6Label}{HTML}{FFFFFF}% \definecolor{teckidscal0}{HTML}{FFFFFF}% \definecolor{teckidscal1}{HTML}{E6E6E6}% \definecolor{teckidscal2}{HTML}{8730D0}% \definecolor{teckidscal3}{HTML}{00CBFA}% \definecolor{teckidscal4}{HTML}{00CC00}% \definecolor{teckidscal5}{HTML}{D12A00}% +\definecolor{teckidscal6}{HTML}{CDB38B}% \definecolor{teckidscalKW}{HTML}{FFBF00}% \definecolor{teckidscalNO}{HTML}{999999}% \expandafter\def\csname teckidscalcolour0\endcsname{regulärer Wochentag\hfill\color{teckidscalKW}KW\color{black}\Hair\textsuperscript1}% @@ -78,6 +80,7 @@ \expandafter\def\csname teckidscalcolour3\endcsname{Workday „groß“}% \expandafter\def\csname teckidscalcolour4\endcsname{Workday „klein“}% \expandafter\def\csname teckidscalcolour5\endcsname{Online-Treffen}% +\expandafter\def\csname teckidscalcolour6\endcsname{nicht-Teckids- oder\newline ungeplante Veranstaltung}% \def\teckidscalcolourLabel{Arbeitsgruppentreffen}% % From Bernd Raichle via http://www.gust.org.pl/projects/pearls/2006p/index_html @@ -336,6 +339,21 @@ \expandafter\xdef\csname tkDayType\number\tkjd\endcsname{4}% }% +\newcommand{\teckidscalextveranst}[2][teckidsargdefaulted]{% + \tkToJD{#2}% + \ifstrequal{#1}{teckidsargdefaulted}{}{% + \tkifdef{tkDayTeckids\number\tkjd}{\PackageError{teckidscal}% + {Ein Tag kann nur ein Label haben! Fehler in Tag #2}{}}{}% + \expandafter\xdef\csname tkDayTeckids\number\tkjd\endcsname{#1}% + }% + \tk@BoldenDay% + \ifcase\csname tkDayType\number\tkjd\endcsname\or\else% + \PackageError{teckidscal}% + {Ein Tag kann nur einen Typ haben! Fehler in Tag #2}{}% + \fi% + \expandafter\xdef\csname tkDayType\number\tkjd\endcsname{6}% +}% + \newcommand{\teckidscallabel}[2][teckidsargdefaulted]{% \ifstrequal{#1}{teckidsargdefaulted}{\PackageError{teckidscal}% {Das erste Argument zu \protect\teckidscallabel\space% @@ -361,10 +379,10 @@ \newcommand{\teckidsc@llegend}[1]{% \cellcolor{teckidscal#1}\color{black}% - \csname teckidscalcolour#1\endcsname{}% + \strut\csname teckidscalcolour#1\endcsname{}\strut% \tkCalColsep% \cellcolor{teckidscal#1}\color{teckidscal#1Label} - \textbf{\teckidscalcolourLabel}% + \textbf{\strut\teckidscalcolourLabel\strut}% }% \linespread{1.0}% @@ -588,17 +606,20 @@ \edef\TEMP{\tktmM/\tktmY}% \tkFromJD{\tkcalend}% - \begin{tabu} to \linewidth {X[4]|X[0.25]X[2m]|X[3m]|X[3m]|X[m]|X[3m]|X[3m]|X[m]|X[3m]|X[3m]|} - \cline{4-5}\cline{7-8}\cline{10-11} - \multirow{3}{\linewidth}{\Huge Jahresplan \LARGE\TEMP{}–\tktmM/\tktmY} - & & \multirow{3}{*}{\large Legende:} & + \begin{tabu} to \linewidth {X[4]|X[0.25]|X[3m]|X[0.25]|X[3m]|X[3m]|X[m]|X[3m]|X[3m]|X[m]|X[3m]|X[3m]|} + \cline{5-6}\cline{8-9}\cline{11-12} + \multirow{3}{=}{\Huge Jahresplan \LARGE\TEMP{}–\tktmM/\tktmY} + & \multicolumn{1}{l}{} & \multicolumn{1}{l}{\large Legende:} & & \teckidsc@llegend{0} & & \teckidsc@llegend{3} & & \teckidsc@llegend{2}\\ - \cline{4-5}\cline{7-8}\cline{10-11} - & \multicolumn{10}{c}{}\\[-1.8ex] - \cline{4-5}\cline{7-8}\cline{10-11} - & & & + \cline{3-3}\cline{5-6}\cline{8-9}\cline{11-12} + & & \cellcolor{teckidscal6} & \multicolumn{9}{c}{}\\[-1.8ex] + \cline{5-6}\cline{8-9}\cline{11-12} + & & \multirow[b]{-2}{=}[-.86ex]{% + \cellcolor{teckidscal6}\color{black}% + \strut\csname teckidscalcolour6\endcsname\strut% + } & & \teckidsc@llegend{1} & & \teckidsc@llegend{4} & & \teckidsc@llegend{5}\\ - \cline{4-5}\cline{7-8}\cline{10-11} + \cline{3-3}\cline{5-6}\cline{8-9}\cline{11-12} \end{tabu} \vspace{2ex}%