From fe0e333e467cf6e0d1a533da3ff7caa679aeb1dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Jan 2018 21:49:07 +0000 Subject: tikz-kalender (5jan18) git-svn-id: svn://tug.org/texlive/trunk@46224 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/tikz-kalender/Feiertage-2016.events | 2 +- .../texmf-dist/doc/latex/tikz-kalender/README.md | 76 ++++++++++++++++++++- .../latex/tikz-kalender/tikz-kalender-example1.pdf | Bin 59563 -> 59540 bytes .../latex/tikz-kalender/tikz-kalender-example2.pdf | Bin 56867 -> 56867 bytes .../tex/latex/tikz-kalender/tikz-kalender.cls | 22 +----- 5 files changed, 78 insertions(+), 22 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/tikz-kalender/Feiertage-2016.events b/Master/texmf-dist/doc/latex/tikz-kalender/Feiertage-2016.events index e8c70d9d6b2..99be5b7aaa7 100644 --- a/Master/texmf-dist/doc/latex/tikz-kalender/Feiertage-2016.events +++ b/Master/texmf-dist/doc/latex/tikz-kalender/Feiertage-2016.events @@ -10,7 +10,7 @@ \event*{2016-05-05}{Himmelfahrt} \event{2016-05-15}{Pfingstsonntag} \event*{2016-05-16}{Pfingstmontag} -\event*{\year-10-03}{Tag der deutschen der deutschen Einheit} +\event*{\year-10-03}{Tag der deutschen Einheit} \event{\year-12-24}{Heiligabend} \event*{\year-12-25}{1. Weihnachtstag} \event*{\year-12-26}{2. Weihnachtstag} diff --git a/Master/texmf-dist/doc/latex/tikz-kalender/README.md b/Master/texmf-dist/doc/latex/tikz-kalender/README.md index 68521aa6fc3..f67311702e9 100644 --- a/Master/texmf-dist/doc/latex/tikz-kalender/README.md +++ b/Master/texmf-dist/doc/latex/tikz-kalender/README.md @@ -7,6 +7,78 @@ repository](https://github.com/rolfn/kalenderRN). The Code is inspired by this and has the »Creative Commons attribution license (CC-BY-SA)«. The class »tikz-kalender« requires the package »tikz« and the tkiz libraries -»calc« and »calendar«. +»calc« and »calendar«. -Rolf Niepraschk, 2017-05-17 +### Short Description + +#### Keys for the macro \setup + +`\setup[key1=value1,key2=value2,..]` + +##### General + +* `year=`_year of the calendar_ +* `yearText=`_text for the year_ (default: 4-digit current year) +* `title=`_title of the calendar_ +* `events=`_list of files with events or periods_ (without the ending `.events`) +* `showweeknumbers=`_true or empty or false_ (showing the number of the week) +* `lang=`_language for marking_ (option passed to package babel) +* `paper=`_papersize abbreviation_ (understandable by package geometry; +default: a4) +* `print=`_true or empty or false_ (printer-friendly orientation for +double-side printing; default: false) +* `xcoloroptions=`_options_ (passed to package xcolor; default: svgnames) + +##### Color definitions + +* `titleColor=...` (default: dark) +* `eventColor=...` (default: medium) +* `periodColor=...` (default: period) +* `monthBGcolor=...` (background; default: dark) +* `monthColor=...` (default: white) +* `workdayColor=...` +* `saturdayColor=...` (default: bright) +* `sundayColor=...` (default: medium) + +The default colors: + +* dark: `{HTML}{A57C00}` +* medium: `dark!35` +* bright: `dark!20` +* period: `gray!30` + +##### Font definitions + +* `titleFont=...` +* `yearFont=...` +* `monthFont=...` +* `dayFont=...` +* `dayNbFont=...` +* `weekNbFont=...` +* `eventFont=...` + +##### Examples + +* `titleFont={\fontsize{1.2em}{1.2em}}` +* `yearFont={\itshape}` +* `titleColor=IndianRed3` (required `xcoloroptions={x11names}`) + +#### Macros \event and \period inside of events files + +##### Examples + +* `\event{\year-10-09}{John Lennon (1940)}`; uncolored every year event + +* `\event*{2016-03-27}{Ostersonntag}`; event colored with the color defined +by the key `eventColor` (general holiday) + +* `\event*{2016-07-10}{Fußball-EM: Endspiel}[color=DarkTurquoise]`; +colored event with a special color + +* `\period{2016-02-01}{2016-02-06}[color=LightGreen]`; period colored with a +special color + +* `\period{2016-09-12}{2016-10-04}[color=red!30,name=Urlaub]`; named period +colored with a special color + +Rolf Niepraschk, 2018-01-05 diff --git a/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf b/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf index 189a81a131a..3aec77b06bd 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf and b/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example1.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf b/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf index dd893479c84..73f4ca69277 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf and b/Master/texmf-dist/doc/latex/tikz-kalender/tikz-kalender-example2.pdf differ diff --git a/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls b/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls index dfc813f53c4..eb9859de086 100644 --- a/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls +++ b/Master/texmf-dist/tex/latex/tikz-kalender/tikz-kalender.cls @@ -7,7 +7,7 @@ \setcounter{errorcontextlines}{100} \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesClass{tikz-kalender}[2017/05/17 v0.4a Calendar class (RN)] +\ProvidesClass{tikz-kalender}[2017/05/17 v0.4b Calendar class (RN)] \DeclareOption*{\OptionNotUsed} \ProcessOptions\relax @@ -133,13 +133,11 @@ \fi \RequirePackage[margin={0mm,0mm}]{geometry} \ifRN@XeOrLua\else - \@ifpackageloaded{inputenc}{}{% - \RequirePackage[utf8]{inputenc}% - }% + \@ifpackageloaded{inputenc}{}{\RequirePackage[utf8]{inputenc}}% \fi \RequirePackage{babel,translator,tikz} \input{tikz-kalender-translation.clo} - \usetikzlibrary{calc} + %\usetikzlibrary{calc} \usetikzlibrary{calendar} } @@ -206,18 +204,6 @@ \raisebox{.15ex}{[\raisebox{-.15ex}{\arabic{#1}}]}% \hspace{20\RN@xunit}% } -\newcommand*\RN@formatEventX[1]{% - \varwidth{\RN@eventwidthL}#1\strut\endvarwidth% ?????? -} -\newcommand*\RN@formatEventXX[1]{% - \makebox[0pt][r]{\frame{\resizebox{\RN@eventwidthL}{!}{% ?????? - \parbox[t][\RN@dayheight]{% - \RN@eventwidthL}{\RN@eventFont\raggedleft#1\strut}}}}% -} -\newcommand*\RN@formatEventXXX[2]{% - \makebox[0pt][r]{\resizebox{#1}{\RN@dayheight}{% ?????? - \frame{\varwidth[t]{#1}#2\strut\endvarwidth}}}% -} \newcommand*\RN@formatEvent[2]{% \RN@eventFont \def\RN@tempa{\strut\hfill#2}% @@ -381,8 +367,6 @@ \fi } - - \setlength\parindent{0pt} \pagestyle{empty} -- cgit v1.2.3