4 files changed, 140 insertions(+), 20 deletions(-)

M Makefile
M cvhplan-7days.sty
M cvhplan-7days.sty => ferienplan.sty
A => ferienplan.tex
M Makefile +2 -2
@@ 1,4 1,4 @@ 
-all: stundenplan.pdf stundenplan-7days.pdf
+all: stundenplan.pdf stundenplan-7days.pdf ferienplan.pdf
 
-%.pdf : %.tex cvhplan-7days.sty cvhplan.sty
+%.pdf : %.tex cvhplan-7days.sty cvhplan.sty ferienplan.sty
 	pdflatex "$<"

          
M cvhplan-7days.sty +1 -1
@@ 190,7 190,7 @@ 
 \newcommand{\Lfamily}{\colorbox{\Cfamily}{Familienspaß\strut}}
 \newcommand{\Lfood}{\colorbox{\Cfood}{Essen (kochen/essen)\strut}}
 \newcommand{\Lhobby}{\colorbox{\Chobby}{Hobby\strut}}
-\newcommand{\Lrelaxing}{\colorbox{\Crelaxing}{Ausruhen\strut}}
+\newcommand{\Lrelaxing}{\colorbox{\Crelaxing}{Ausruhen/Sport\strut}}
 
 
 \newcommand{\legend}[1]{\put(38.7,19){\makebox(0,0)[r]{\footnotesize#1}}}

          
M cvhplan-7days.sty => ferienplan.sty +36 -17
@@ 79,19 79,13 @@ 
   \multiput(1,-6.4)(0,1.6){16}{\line(1,0){37.8}}
   \color[rgb]{0,0,0}
   \multiput(1,-6.4)(5.4,0){8}{\line(0,1){24.0}}
-  \put(0.9,17.6){\makebox(0,0)[r]{0:00}}
-  \put(0.9,16.0){\makebox(0,0)[r]{2:00}}
-  \put(0.9,14.4){\makebox(0,0)[r]{4:00}}
-  \put(0.9,12.8){\makebox(0,0)[r]{6:00}}
-  \put(0.9,11.2){\makebox(0,0)[r]{8:00}}
-  \put(0.9,9.6){\makebox(0,0)[r]{10:00}}
-  \put(0.9,8.0){\makebox(0,0)[r]{12:00}}
-  \put(0.9,6.4){\makebox(0,0)[r]{14:00}}
-  \put(0.9,4.8){\makebox(0,0)[r]{16:00}}
-  \put(0.9,3.2){\makebox(0,0)[r]{18:00}}
-  \put(0.9,1.6){\makebox(0,0)[r]{20:00}}
-  \put(0.9,0.0){\makebox(0,0)[r]{22:00}}
-  \put(0.9,-1.6){\makebox(0,0)[r]{24:00}}
+  \put(0.9,17.6){\makebox(0,0)[r]{0}}
+  \put(0.9,14.4){\makebox(0,0)[r]{1}}
+  \put(0.9,11.2){\makebox(0,0)[r]{2}}
+  \put(0.9,8.0){\makebox(0,0)[r]{3}}
+  \put(0.9,4.8){\makebox(0,0)[r]{4}}
+  \put(0.9,1.6){\makebox(0,0)[r]{5}}
+  \put(0.9,-1.6){\makebox(0,0)[r]{6}}
   %\put(0.9,-3.2){\makebox(0,0)[r]{02:00}}
   %\put(0.9,-4.8){\makebox(0,0)[r]{04:00}}
   %\put(0.9,-6.4){\makebox(0,0)[r]{06:00}}

          
@@ 107,11 101,11 @@ 
 \newlength{\colwidth}
 \setlength{\colwidth}{5.4\unitlength}
 \newlength{\hours}
-\setlength{\hours}{0.8\unitlength}
+\setlength{\hours}{3.2\unitlength}
 \newlength{\quarters}
 \setlength{\quarters}{0.2\unitlength}
 \newlength{\minutes}
-\setlength{\minutes}{0.013333\unitlength}
+\setlength{\minutes}{0.13333\unitlength}
 % distance from zero, temporary variable to do calculations, mutated
 % along the way
 \newlength{\beginminutes}

          
@@ 134,7 128,7 @@ 
         \rule{\colwidth}{#5\minutes}}%
       \fi
       \begin{center}
-        \scriptsize\setlength{\baselineskip}{15\minutes}\vspace*{-26\minutes}\par
+        \scriptsize\setlength{\baselineskip}{3\minutes}\vspace*{-2.5\minutes}\par
         #1
       \end{center}
     \end{minipage}

          
@@ 183,14 177,31 @@ 
 \newcommand{\Cfood}{LightBlue}
 \newcommand{\Chobby}{LightPeriwinkle}
 \newcommand{\Crelaxing}{SpringGreen}
+% Ferienplan:
+\newcommand{\Cwzero}{YellowOrange}
+\newcommand{\Cwone}{Yellow}
+\newcommand{\Cwtwo}{SpringGreen}
+\newcommand{\Cwthree}{SkyBlue}
+\newcommand{\Cwfour}{LightBlue}
+\newcommand{\Cwfive}{LightPeriwinkle}
+\newcommand{\Cwsix}{White}
 
+% bab:
 \newcommand{\Lwork}{\colorbox{\Cwork}{Arbeit\strut}}
 \newcommand{\Lschool}{\colorbox{\Cschool}{Schule\strut}}
 \newcommand{\Lchore}{\colorbox{\Cchore}{Hausarbeit\strut}}
 \newcommand{\Lfamily}{\colorbox{\Cfamily}{Familienspaß\strut}}
 \newcommand{\Lfood}{\colorbox{\Cfood}{Essen (kochen/essen)\strut}}
 \newcommand{\Lhobby}{\colorbox{\Chobby}{Hobby\strut}}
-\newcommand{\Lrelaxing}{\colorbox{\Crelaxing}{Ausruhen\strut}}
+\newcommand{\Lrelaxing}{\colorbox{\Crelaxing}{Ausruhen/Sport\strut}}
+% Ferienplan:
+\newcommand{\Lwzero}{\colorbox{\Cwzero}{W0\strut}}
+\newcommand{\Lwone}{\colorbox{\Cwone}{W1\strut}}
+\newcommand{\Lwtwo}{\colorbox{\Cwtwo}{W2\strut}}
+\newcommand{\Lwthree}{\colorbox{\Cwthree}{W3\strut}}
+\newcommand{\Lwfour}{\colorbox{\Cwfour}{W4\strut}}
+\newcommand{\Lwfive}{\colorbox{\Cwfive}{W5\strut}}
+\newcommand{\Lwsix}{\colorbox{\Cwsix}{W6\strut}}
 
 
 \newcommand{\legend}[1]{\put(38.7,19){\makebox(0,0)[r]{\footnotesize#1}}}

          
@@ 218,6 229,14 @@ 
 \def\hobby#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Chobby}}
 \def\relaxing#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Crelaxing}}
 \def\note#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Crecreation}} % recreation is white -> empty
+% ferienplan:
+\def\wzero#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwzero}}
+\def\wone#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwone}}
+\def\wtwo#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwtwo}}
+\def\wthree#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwthree}}
+\def\wfour#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwfour}}
+\def\wfive#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwfive}}
+\def\wsix#1#2 #3   #4 #5{\activity{#5}{#1}{#2}{#3}{#4}{\Cwsix}}
 
 \newenvironment{plan}[2]{%beginblock
   \section*{#1\strut}\begin{picture}(38.8,15.2)(0,3)\drawquarters #2%

          
A => ferienplan.tex +101 -0
@@ 0,0 1,101 @@ 
+% cvhplan.tex - LaTeX Time Schedule
+% Copyright (C) 2012, 2013, 2017, 2018  Peter Gerwinski, see https://www.cvh-server.de/~pgerwinski/stundenplan/2018ws/tex/
+% Copyright (C) 2021, 2022  Arne Babenhauserheide
+%
+% This document is free software: you can redistribute it and/or
+% modify it under the terms of the GNU General Public License
+% as published by the Free Software Foundation, either version 3
+% of the License, or (at your option) any later version.
+%
+% This document is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this document.  If not, see <http://www.gnu.org/licenses/>.
+
+\documentclass{article}
+
+\usepackage{ferienplan}
+
+\begin{document}
+
+% TODO: I do not know why this needs an empty pair of braces between the two arguments
+\begin{plan}{Wochenplan}{}{Sommerferien --- Stand: \today}
+% days: \mon \tue \wed \thu \fri \sat \sun
+% entry-types:
+% \wzero to \wsix for the initial partial week zero to the sixth week.
+% \other is non-holiday time.
+
+% format: \entrytype \day \startweek \starthours \durationhours {content}
+% contentformat: \\ = linebreak \strut = empty line
+  \other \mon 0 0 24 {KW 30: 25.7.}
+  \wone \mon 1 0 24 {KW 31: 1.8.}
+  \wtwo \mon 2 0 24 {KW 32: 8.8.}
+  \wthree \mon 3 0 24 {KW 33: 15.8.}
+  \wfour \mon 4 0 24 {KW 34: 22.8.}
+  \wfive \mon 5 0 24 {KW 35: 29.8.}
+  \wsix \mon 6 0 24 {KW 36: 5.9.}
+  \other \mon 7 0 12 {KW 37: 12.9. Schulanfang}
+
+  \other \tue 0 0 24 {}
+  \wone \tue 1 0 24 {}
+  \wtwo \tue 2 0 24 {}
+  \wthree \tue 3 0 24 {}
+  \wfour \tue 4 0 24 {}
+  \wfive \tue 5 0 24 {}
+  \wsix \tue 6 0 24 {}
+  \other \tue 7 0 12 {}
+
+  \other \wed 0 0 12 {}
+  \wzero \wed 0 12 12 {Ferienanfang}
+  \wone \wed 1 0 24 {}
+  \wtwo \wed 2 0 24 {}
+  \wthree \wed 3 0 24 {}
+  \wfour \wed 4 0 24 {}
+  \wfive \wed 5 0 24 {}
+  \wsix \wed 6 0 24 {}
+  \other \wed 7 0 12 {}
+
+  \wzero \thu 0 0 24 {}
+  \wone \thu 1 0 24 {}
+  \wtwo \thu 2 0 24 {}
+  \wthree \thu 3 0 24 {}
+  \wfour \thu 4 0 24 {}
+  \wfive \thu 5 0 24 {}
+  \wsix \thu 6 0 24 {}
+  \other \thu 7 0 12 {}
+
+  \wzero \fri 0 0 24 {}
+  \wone \fri 1 0 24 {}
+  \wtwo \fri 2 0 24 {}
+  \wthree \fri 3 0 24 {}
+  \wfour \fri 4 0 24 {}
+  \wfive \fri 5 0 24 {}
+  \wsix \fri 6 0 24 {}
+  \other \fri 7 0 12 {}
+
+  \wzero \sat 0 0 24 {}
+  \wone \sat 1 0 24 {}
+  \wtwo \sat 2 0 24 {}
+  \wthree \sat 3 0 24 {}
+  \wfour \sat 4 0 24 {}
+  \wfive \sat 5 0 24 {}
+  \wsix \sat 6 0 24 {}
+  \other \sat 7 0 12 {}
+
+  \wzero \sun 0 0 24 {}
+  \wone \sun 1 0 24 {}
+  \wtwo \sun 2 0 24 {}
+  \wthree \sun 3 0 24 {}
+  \wfour \sun 4 0 24 {}
+  \wfive \sun 5 0 24 {}
+  \wsix \sun 6 0 24 {}
+  \other \sun 7 0 12 {}
+
+  \legend{\colorbox{\Cwzero}{KW 30\strut}, \Lwone, \Lwtwo, \Lwthree, \Lwfour, \Lwfive, \Lwsix}
+\end{plan}
+
+\end{document}
+