summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-22 20:32:13 +0000
committerKarl Berry <karl@freefriends.org>2024-05-22 20:32:13 +0000
commit1feee6aef8a8bc5e4ca1ad4d4e9cec1ba7e5f9d4 (patch)
treefb08ebaa1cb05328e6cfdc86657a076fd84d9c13
parentc89d993f6dec2422eb4da7f783720d9c54019b17 (diff)
semesterplannerlua (22may24)
git-svn-id: svn://tug.org/texlive/trunk@71322 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/lualatex/semesterplannerlua/README.md2
-rw-r--r--Master/texmf-dist/doc/lualatex/semesterplannerlua/semesterplannerlua.pdfbin144336 -> 146192 bytes
-rw-r--r--Master/texmf-dist/source/lualatex/semesterplannerlua/semesterplannerlua.dtx80
-rw-r--r--Master/texmf-dist/tex/lualatex/semesterplannerlua/semesterplannerlua.sty16
4 files changed, 66 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/lualatex/semesterplannerlua/README.md b/Master/texmf-dist/doc/lualatex/semesterplannerlua/README.md
index d7049942cb8..f445e693240 100644
--- a/Master/texmf-dist/doc/lualatex/semesterplannerlua/README.md
+++ b/Master/texmf-dist/doc/lualatex/semesterplannerlua/README.md
@@ -2,7 +2,7 @@
Author: Lukas Heindl (`oss.heindl+latex@protonmail.com`).
-CTAN page: not yet
+CTAN page: [semesterplannerlua](https://ctan.org/pkg/semesterplannerlua)
## License
The LaTeX package `semesterplannerLua` is distributed under the LPPL 1.3 license.
diff --git a/Master/texmf-dist/doc/lualatex/semesterplannerlua/semesterplannerlua.pdf b/Master/texmf-dist/doc/lualatex/semesterplannerlua/semesterplannerlua.pdf
index 40ee78f8a3d..e2262502125 100644
--- a/Master/texmf-dist/doc/lualatex/semesterplannerlua/semesterplannerlua.pdf
+++ b/Master/texmf-dist/doc/lualatex/semesterplannerlua/semesterplannerlua.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/lualatex/semesterplannerlua/semesterplannerlua.dtx b/Master/texmf-dist/source/lualatex/semesterplannerlua/semesterplannerlua.dtx
index 8341981afd2..b19204d64f0 100644
--- a/Master/texmf-dist/source/lualatex/semesterplannerlua/semesterplannerlua.dtx
+++ b/Master/texmf-dist/source/lualatex/semesterplannerlua/semesterplannerlua.dtx
@@ -26,7 +26,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{semesterplannerlua}
%<*package>
- [2024/05/19 v1.1.1 Semesterplanner package in lua with tikz only]
+ [2024/05/19 v1.1.2 Semesterplanner package in lua with tikz only]
%</package>
%
%<*driver>
@@ -34,6 +34,7 @@
\usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
\usepackage[numbered]{hypdoc}
\usepackage{array}
+\usepackage{babel}
\usepackage{semesterplannerlua}[2024/02/27]
\EnableCrossrefs
\CodelineIndex
@@ -76,6 +77,7 @@
% \changes{v1.0.0}{2024/02/27}{First full release}
% \changes{v1.1.0}{2024/05/19}{Make ready for CTAN}
% \changes{v1.1.1}{2024/05/19}{Make ready for CTAN (2)}
+% \changes{v1.1.2}{2024/05/19}{Typos corrected, \textbackslash laboratory and \textbackslash fieldstudy types added to timetamble}
%
%
% \DoNotIndex{\newcommand,\newenvironment,\\,\begin,\end,\def,\definecolor,\directlua,\endinput,\faBullhorn,\faCamera,\faFlag,\faQuestion,\faTimesCircle,\faWarning,\faWindows,\faYoutubePlay,\node,\pgfkeys,\pgfkeysvalueof,\protected,\raggedright,\textbf,\textcolor,\textwidth,\unexpanded,\",\x,\y,\year,\week,\tiny,\tikz@lib@cal@xshift,\tikz@lib@cal@yshift,\tikz,\textit,\t,\section,\phantom,\pgftransformyshift,\pgftransformxshif,\pgfmathsetlength,\pgf@ya,\pgf@xa,\openout,\n,\newwrite,\month,\minuteToFrac,\matrix,\l,\jobname,\init,\immediate,\ignorespaces,\ifdate,\hfil,\href,\foreach,\faStickyNoteO,\faPencil,\faComment,\faClockO,\faCalendar,\faBold,\draw,\d,\day,\checkKeys,\%,\RequirePackage,\usepackage,\usetikzlibrary,\pgftransformxshift}
@@ -111,12 +113,12 @@
%
% \DescribeEnv{timetable} |\begin{timetable}[opts]...\end{timetable}|\\
% This is the core environment of this package. Within it you can use
-% |\lecture|, |\seminar|, |\tutorial|, |\officehour| and |\meeting|. All
-% these commands are only defined inside the |timetable| environment, and
-% have the same structure. It typesets a timetable with the specified
-% entries. If you have a look at the |.sty| file you'll see that these
-% macros just take a general macro and set some default values before. Thus
-% it is easy to define new ones (keep in mind that you'll need
+% |\lecture|, |\seminar|, |\tutorial|, |\officehour|, |\laboratory|,
+% |\fieldstudy| and |\meeting|. All these commands are only defined inside the
+% |timetable| environment, and have the same structure. It typesets a timetable
+% with the specified entries. If you have a look at the |.sty| file you'll see
+% that these macros just take a general macro and set some default values
+% before. Thus it is easy to define new ones (keep in mind that you'll need
% |\makeatletter|) to access the general macro.
%
% Writes out a file containing the data from the timetable (your events) to
@@ -134,7 +136,7 @@
% column names. Note that if you specify only 4 names only these 4
% columns will be printed (with the first day being identified as
% Monday)
-% \textit{Default: |Mon,Thue,Wend,Thur,Fri|}
+% \textit{Default: |Mon,Tue,Wend,Thur,Fri|}
% \item[|dayse|] List of strings used in the code to idenfity the day.
% This list is kind of a mapping string $\to$ integer.
% \item[|start time|] Explicit start-time of the timetable given in minutes
@@ -161,6 +163,10 @@
%
% \DescribeMacro{\meeting} |\meeting [opts]|
%
+% \DescribeMacro{\fieldstudy} |\fieldstudy[opts]|
+%
+% \DescribeMacro{\laboratory} |\laboratory[opts]|
+%
% |opts| are optional arguments (enclosed with |{}|) separated with |,|:
% \begin{description}
% \item[|title|] Give the name of the lecture
@@ -211,35 +217,35 @@
% |\settowidth{\length}{12:30}| to set a length to the length of a clock
% label and then subtract this from the length you want to specify.
%
-% \hangindent=4.5em \hangafter=1 \textbf{Hint:} The content of the
-% environment isn't processed by this package. Only the event commands (so
-% to speak |\lecture|,|\tutorial|,|\seminar|,|\officehour|,|\meeting| are
-% relevant. All other contents are set immediately before the timetable.
-% Therefore, if you wan to add e.g. a |\hspace*{10cm}| to shift the
-% timetable to the left, the last line of the env would be the place to do
-% so (there musn't be an empty line below since otherwise a new paragraph
-% is started).
+% \hangindent=4.5em \hangafter=1 \textbf{Hint:} The content of the environment
+% isn't processed by this package. Only the event commands (so to speak
+% |\lecture|,|\tutorial|,|\seminar|,|\officehour|,|\fieldstudy|,|\laboratory|,|\meeting|
+% are relevant. All other contents are set immediately before the timetable.
+% Therefore, if you wan to add e.g. a |\hspace*{10cm}| to shift the timetable
+% to the left, the last line of the env would be the place to do so (there
+% musn't be an empty line below since otherwise a new paragraph is started).
%
% \newpage
% \subsubsection{Example}
% |\begin{timetable}[|\\
-% | days={Mon,Thue,Wend,Thur,Fri},|\\
+% | days={Mon,Tue,Wend,Thur,Fri},|\\
% | start time/.evaluated={11*60}, end time/.evaluated={15*60}|\\
% | ]|\\
-% | \lecture[title={TestingLectureLongOne},speaker={Doe},|\\
+% | \lecture[title={Testing Lecture LongOne},speaker={Doe},|\\
% | location={RN1},day={W},time={12:30-13:30}]|\\
-% | \lecture[title={TestingLectureLongOne},speaker={John},|\\
+% | \tutorial[title={Testing Lecture LongOne},speaker={John},|\\
% | location={RN1},day={Th},time={12:30-13:30},offset=0.5,scale width=0.5]|\\
-% | \lecture[title={TestingLectureLongOne},speaker={Dr. Doe},|\\
+% | \lecture[title={Testing Lecture LongOne},speaker={Dr. Doe},|\\
% | location={\zoom},day={T},time={12:30-13:30},prio={\phigh}]|\\
% |\end{timetable}|\\
%
-% \begin{timetable}[days={Mon,Thue,Wend,Thur,Fri}, start
-% time/.evaluated={11*60}, end time/.evaluated={15*60}]
-% \lecture[title={TestingLectureLongOne}, speaker={Heindl}, location={RN1}, day={W}, time={12:30-13:30}]
-% \lecture[title={TestingLectureLongOne}, speaker={Heindl}, location={RN1}, day={Th}, time={12:30-13:30}, offset=0.5, scale width=0.5]
-% \lecture[title={TestingLectureLongOne}, speaker={Heindl}, location={\zoom}, day={T}, time={12:30-13:30}, prio={\phigh}]
-% \hspace*{-.2\textwidth}
+% \begin{timetable}[days={Mon,Tue,Wend,Thur,Fri},start time/.evaluated={11*60}, end time/.evaluated={15*60}]
+% \lecture[title={Testing Lecture LongOne},speaker={Doe},
+% location={RN1},day={W},time={12:30-13:30}]
+% \tutorial[title={Testing Lecture LongOne},speaker={John},
+% location={RN1},day={Th},time={12:30-13:30},offset=0.5,scale width=0.5]
+% \lecture[title={Testing Lecture LongOne},speaker={Dr. Doe},
+% location={\zoom},day={T},time={12:30-13:30},prio={\phigh}]
% \end{timetable}
%
% \subsection{Calendar related things}
@@ -442,6 +448,8 @@
\definecolor{lecture}{rgb}{0.2, 0.7, 1.0}
\definecolor{tutorial}{rgb}{0.0, 0.8, 0.0}
\definecolor{meeting}{rgb}{0.8, 0.0, 0.0}
+\definecolor{laboratory}{rgb}{0.8, 0.0, 0.0}
+\definecolor{fieldstudy}{rgb}{0.8, 0.0, 0.0}
\definecolor{officehour}{rgb}{0.0, 0.4, 0.6}
\definecolor{DodgerBlue}{HTML}{1E90FF}
% \end{macrocode}
@@ -567,7 +575,7 @@
% \end{description}
% \begin{macrocode}
/semesterplannerLua/timetable/env/.cd,
- days/.initial={Mon,Thue,Wend,Thur,Fri}, days/.default={Mon,Thue,Wend,Thur,Fri},
+ days/.initial={Mon,Tue,Wend,Thur,Fri}, days/.default={Mon,Tue,Wend,Thur,Fri},
dayse/.initial={M,T,W,Th,F}, dayse/.default={M,T,W,Th,F},
%
start time/.initial=, start time/.default=,
@@ -695,7 +703,7 @@
% Afterwards the lua module is beeing initialized (erase data from
% possible previous runs.
% \begin{macrocode}
- \pgfkeys{/semesterplannerLua/timetable/env/.cd, days,dayse, start time,end time, width,length, #1}
+ \pgfkeys{/semesterplannerLua/timetable/env/.cd,days,dayse,start time,end time,width,length,#1}
\directlua{sp.init{
days=[[\pgfkeysvalueof{/semesterplannerLua/timetable/env/days}]],
min=[[\pgfkeysvalueof{/semesterplannerLua/timetable/env/start time}]],
@@ -776,6 +784,22 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\laboratory}
+% \begin{macrocode}
+ \newcommand{\laboratory}[1][]{
+ \semesterplannerLua@event[tikz={fill=laboratory,}, textcolor=white, type=lab, ##1]
+ \ignorespaces
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\fieldstudy}
+% \begin{macrocode}
+ \newcommand{\fieldstudy}[1][]{
+ \semesterplannerLua@event[tikz={fill=fieldstudy,}, textcolor=white, type=fieldstudy, ##1]
+ \ignorespaces
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macrocode}
}{
% \end{macrocode}
diff --git a/Master/texmf-dist/tex/lualatex/semesterplannerlua/semesterplannerlua.sty b/Master/texmf-dist/tex/lualatex/semesterplannerlua/semesterplannerlua.sty
index deb287c5b07..ed4adb24f09 100644
--- a/Master/texmf-dist/tex/lualatex/semesterplannerlua/semesterplannerlua.sty
+++ b/Master/texmf-dist/tex/lualatex/semesterplannerlua/semesterplannerlua.sty
@@ -20,7 +20,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{semesterplannerlua}
- [2024/05/19 v1.1.1 Semesterplanner package in lua with tikz only]
+ [2024/05/19 v1.1.2 Semesterplanner package in lua with tikz only]
\RequirePackage{tikz}
\usetikzlibrary{calendar, positioning, shapes.misc, backgrounds}
@@ -32,6 +32,8 @@
\definecolor{lecture}{rgb}{0.2, 0.7, 1.0}
\definecolor{tutorial}{rgb}{0.0, 0.8, 0.0}
\definecolor{meeting}{rgb}{0.8, 0.0, 0.0}
+\definecolor{laboratory}{rgb}{0.8, 0.0, 0.0}
+\definecolor{fieldstudy}{rgb}{0.8, 0.0, 0.0}
\definecolor{officehour}{rgb}{0.0, 0.4, 0.6}
\definecolor{DodgerBlue}{HTML}{1E90FF}
\newcommand*{\semesterplannerLua@encircle}[1]{
@@ -61,7 +63,7 @@
\directlua{cal = require("semesterplannerLua_calendar.lua")}
\pgfkeys{
/semesterplannerLua/timetable/env/.cd,
- days/.initial={Mon,Thue,Wend,Thur,Fri}, days/.default={Mon,Thue,Wend,Thur,Fri},
+ days/.initial={Mon,Tue,Wend,Thur,Fri}, days/.default={Mon,Tue,Wend,Thur,Fri},
dayse/.initial={M,T,W,Th,F}, dayse/.default={M,T,W,Th,F},
%
start time/.initial=, start time/.default=,
@@ -123,7 +125,7 @@
]
\newenvironment{timetable}[1][]{
\section*{\faClockO~Timetable}
- \pgfkeys{/semesterplannerLua/timetable/env/.cd, days,dayse, start time,end time, width,length, #1}
+ \pgfkeys{/semesterplannerLua/timetable/env/.cd,days,dayse,start time,end time,width,length,#1}
\directlua{sp.init{
days=[[\pgfkeysvalueof{/semesterplannerLua/timetable/env/days}]],
min=[[\pgfkeysvalueof{/semesterplannerLua/timetable/env/start time}]],
@@ -170,6 +172,14 @@
\semesterplannerLua@event[tikz={fill=officehour,}, textcolor=white, type=office, ##1]
\ignorespaces
}
+ \newcommand{\laboratory}[1][]{
+ \semesterplannerLua@event[tikz={fill=laboratory,}, textcolor=white, type=lab, ##1]
+ \ignorespaces
+ }
+ \newcommand{\fieldstudy}[1][]{
+ \semesterplannerLua@event[tikz={fill=fieldstudy,}, textcolor=white, type=fieldstudy, ##1]
+ \ignorespaces
+ }
}{
\directlua{sp.draw(
[[\pgfkeysvalueof{/semesterplannerLua/timetable/env/length}]],