From 004ff1ec58dec1d80bd33261a06a4d56b15a412e Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:18:34 +0100 Subject: [PATCH 1/7] update title (format and spacing) - not by me --- protokoll/fsrprotokoll.cls | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index f51e259..cb2d945 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -37,6 +37,13 @@ {0pt} {*0.5} {-5pt} +\titleformat{\subsubsection} + {\normalfont\rmfamily\bfseries} + {}{0em}{} +\titlespacing{\subsubsection} + {0pt} + {*0.5} + {-9pt} \makeatletter \newcommand*{\insertheaderrule}{\rlap{\rule[-.5\normalbaselineskip]{\textwidth}{.4pt}}} From 99a2a392f3b7d7261ba58c48a93be62539c3ab73 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:22:03 +0100 Subject: [PATCH 2/7] update \quorum, add \meetingPlace and \meetingBreak --- protokoll/fsrprotokoll.cls | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index cb2d945..aecbd46 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -84,6 +84,7 @@ } \newcommand*{\quorum}[2] { + Die Sitzungsleitung eröffnet die Sitzung. \newcount\quorateThreshold \quorateThreshold=#2 Es sind #1 von #2 Mitgliedern mit aktivem Stimmrecht anwesend. @@ -103,10 +104,12 @@ \vspace*{1cm}% \textbf{\Large Protokoll zur FSR--Sitzung vom \the\date}% - Sitzungsleitung: \the\chairperson \,| % + Sitzungsleitung: \the\chairperson \, | % Protokoll: \the\clerks% - Sitzungsbeginn: \the\meetingStart \,| Sitzungsende: \the\meetingEnd% + Sitzungsbeginn: \the\meetingStart \, | Sitzungsende: \the\meetingEnd% + + Sitzungsort: \the\meetingPlace % required by FSO \end{center}% \textbf{Anwesende:} \the\attendees% \, (\the\attendeesNumber \, von 17)% @@ -275,6 +278,11 @@ \textit{[#1 erscheint zur Sitzung]}% } } + +\newcommand*{\meetingBreak}[1] { + \textit{Die Sitzung wird für #1 Minuten unterbrochen.}% +} + \newcommand*{\signature} { \vfill \noindent\rule{6.5cm}{0.3pt} \hfill \noindent\rule{6.5cm}{0.3pt} @@ -298,6 +306,7 @@ \newtoks\clerks \newtoks\meetingStart \newtoks\meetingEnd +\newtoks\meetingPlace \newtoks\attendees \newtoks\excused \newtoks\unexcused From d0d3aec7614eb68bf62e4284cc2816a1ecb925f5 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:24:30 +0100 Subject: [PATCH 3/7] expand 'Antrag': 'FA' now with money, and \voteSubmitter --- protokoll/fsrprotokoll.cls | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index aecbd46..51e9c01 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -147,7 +147,7 @@ \textbf{Antrag}% } {% \immediate\write\exportdata{ money_limit: ##1}% - \textbf{Finanzantrag}% + \textbf{Finanzantrag über \EUR{##1} -- Antrag}% }% } \newcommand{\voteText}[1]{% @@ -207,12 +207,15 @@ \textbf{Antrag}% } {% \immediate\write\exportdata{ money_limit: ##1}% - \textbf{Finanzantrag}% + \textbf{Finanzantrag über \EUR{##1} - Antrag}% }% } \newcommand*{\voteText}[1]{% \immediate\write\exportdata{ text: "##1"}% ##1\vspace{\baselineskip}\\}% + \newcommand*{\voteSubmitter}[1]{% + \immediate\write\exportdata{ submitter: "##1"}% + \textbf{Antragsteller\_in: }##1\vspace{\baselineskip}\\}% \newcommand*{\voteReason}[1]{% \immediate\write\exportdata{ rationale: "##1"}% \textbf{Begründung: }##1\vspace{\baselineskip}\\}% From 387806ac7aeab94e97b8af767397c048b6fb0819 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:27:27 +0100 Subject: [PATCH 4/7] add automatic vote numbering, therefore v0.2.1 \newcounter{votenumber} \initVoteNumber for the first lines of the protocol automatic increment in every vote and vote-two-thirds environment some documentation at the end and references to that Protokoll-Vorlage entsprechend angepasst und erweitert --- protokoll/fsrprotokoll.cls | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index 51e9c01..9c2fe01 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -1,5 +1,5 @@ % vim: ft=tex -\ProvidesClass{fsrprotokoll}[2018/03/05 Klasse fuer FSR Protokolle v0.2] +\ProvidesClass{fsrprotokoll}[2018/03/05 Klasse fuer FSR Protokolle v0.2.1] \LoadClass{scrartcl} \RequirePackage[utf8]{inputenc} @@ -138,8 +138,13 @@ \immediate\write\exportdata{-} \begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth} \newcommand*{\voteNumber}[1]{% - \immediate\write\exportdata{ decision_id: "\the\year/##1"}% - \textbf{\the\year\,/\,##1:}\\% + %see section VOTENUMBER at the end + \ifthenelse{\equal{##1}{}}{}{% else (argument is not empty) + \setcounter{votenumber}{##1}% + }% + \immediate\write\exportdata{ decision_id: "\the\year/\thevotenumber"}% + \textbf{\the\year\,/\,\thevotenumber:}\\% + \stepcounter{votenumber}% }% \newcommand*{\voteMoney}[1]{% \ifthenelse{\equal{##1}{}} {% @@ -198,8 +203,13 @@ \immediate\write\exportdata{-} \begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth} \newcommand*{\voteNumber}[1]{% - \immediate\write\exportdata{ decision_id: "\the\year/##1"}% - \textbf{\the\year\,/\,##1:}\\% + %see section VOTENUMBER at the end + \ifthenelse{\equal{##1}{}}{}{% else (argument is not empty) + \setcounter{votenumber}{##1}% + }% + \immediate\write\exportdata{ decision_id: "\the\year/\thevotenumber"}% + \textbf{\the\year\,/\,\thevotenumber:}\\% + \stepcounter{votenumber}% }% \newcommand*{\voteMoney}[1]{% \ifthenelse{\equal{##1}{}} {% @@ -292,7 +302,14 @@ \noindent\makebox[6.5cm][l]{Sitzungsleitung} \hfill \noindent\makebox[6.5cm][l]{Protokoll} } +%see section VOTENUMBER at the end +\newcommand*{\initVoteNumber}[1] { + \setcounter{votenumber}{#1} +} + \AtBeginDocument{% + %see section VOTENUMBER at the end + \newcounter{votenumber} \immediate\newwrite\exportdata% \immediate\openout\exportdata=tmp.txt\relax } @@ -317,3 +334,12 @@ \newtoks\guests \endinput +%documentation on VOTENUMBERS (version 0.2 -> 0.2.1, Author: Anton Obersteiner) +%votes are numbered within one year. use \initVoteCount{num} at the beginning +%of your protocol to set this counter to num, otherwise the counter starts at 0. +%each vote is automatically numbered 20YY / and then +%increments the counter *if you call \voteNumber{} in your vote environment*. +%if you call votenumber with an argument: \voteNumber{num}, the counter is reset to that value +%and increments from there in the votes after. +%for backwards compatibility, the argument is not optional (would require \voteNumber[] syntax), +%but the argument to the {} is ignored if empty. From 67decddb6dcb52b07f3ff8464f8825f3244dc672 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:38:31 +0100 Subject: [PATCH 5/7] add command \invisible for white-on-white text --- protokoll/fsrprotokoll.cls | 4 ++++ protokoll/protokoll.tex | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index 9c2fe01..53f854d 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -17,6 +17,7 @@ \RequirePackage[autostyle=true,german=quotes]{csquotes} % https://github.com/AndyClifton/AccessibleMetaClass/blob/master/accessibilityMeta.sty \RequirePackage[tagged]{accessibilityMeta} +\RequirePackage{xcolor} \parindent 0pt \parskip 1ex @@ -302,6 +303,9 @@ \noindent\makebox[6.5cm][l]{Sitzungsleitung} \hfill \noindent\makebox[6.5cm][l]{Protokoll} } +\definecolor{MyWhite}{HTML}{FFFFFF} +\newcommand{\invisible}[1]{\textcolor{MyWhite}{#1}} + %see section VOTENUMBER at the end \newcommand*{\initVoteNumber}[1] { \setcounter{votenumber}{#1} diff --git a/protokoll/protokoll.tex b/protokoll/protokoll.tex index de9428e..460370e 100644 --- a/protokoll/protokoll.tex +++ b/protokoll/protokoll.tex @@ -14,11 +14,19 @@ %%!sitzungsleitung,protokoll: Das Protokoll ist fertig und kann unterschrieben werden! :) \date{} % DD.MM.YYYY -\attendeesNumber{} % Anzahl anwesender Mitglieder -\chairperson{} -\clerks{} + +% irrelevant, da \quorate broken ist und wir eh \quorum verwenden müssen (Anton O) +%\attendeesNumber{} % Anzahl anwesender Mitglieder, +\chairperson{} % Sitzungsleitung +\clerks{} % Protokoll \meetingStart{} % HH:MM \meetingEnd{} % HH:MM +\meetingPlace{APB/1004} % Raum der Sitzung, normalerweise der Ratssaal + +% Nummer des letzten Antrags aus dem letztem Protokoll + 1, +% sonst \initVoteNumber des letzten Protokolls kopieren +\initVoteNumber{26} + % Liste anwesender Mitglieder \attendees{} \excused{} From 3bdc642e472753c1ff365d1ae49c6a9901845f97 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:39:37 +0100 Subject: [PATCH 6/7] add command \election --- protokoll/fsrprotokoll.cls | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index 53f854d..c7ebcf5 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -278,6 +278,25 @@ \end{minipage}\end{lrbox}\fbox{\usebox{\mybox}} } +% election command - not an environment! +\newcommand{\election}[3] {% + \begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth} + \ifthenelse{\isempty{#1}}{}{% + \textbf{#1. Wahlgang:}\\[7pt] + } + \begin{tabularx}{\linewidth}{p{.275\linewidth}|c|c|c|l} + \textbf{Kandidat\_in} & \textbf{Dafür} & \textbf{Dagegen} & + \textbf{Enthaltungen} & \textbf{Ergebnis} \\ + \hline + #2 + \end{tabularx}% + \ifthenelse{\isempty{#3}}{}{% + \\[7pt] + #3 + } + \end{minipage}\end{lrbox}\fbox{\usebox{\mybox}} +} + \newcommand*{\away}[1] { \ifthenelse{\the\numexpr \countInlineItems{#1} > 1} {% \textit{[#1 verlassen die Sitzung]}% From fbb7cdaf49ba1687c1ba40cdec814a463f0506b5 Mon Sep 17 00:00:00 2001 From: AntonObersteiner Date: Fri, 3 Feb 2023 12:42:46 +0100 Subject: [PATCH 7/7] add command \textInString for future use could be used to make \appear and \away sensitive to Person1 und Person2 --- protokoll/fsrprotokoll.cls | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/protokoll/fsrprotokoll.cls b/protokoll/fsrprotokoll.cls index c7ebcf5..6209e2e 100644 --- a/protokoll/fsrprotokoll.cls +++ b/protokoll/fsrprotokoll.cls @@ -59,6 +59,14 @@ \includegraphics[height=4em]{tudlogo}% } } +% from https://tex.stackexchange.com/questions/566641/test-for-substring-with-expl3-in-argument-of-setlength +\newcommand{\textInString}[2]{% + \ifnum\pdfmatch{#1}{#2}=1 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \makeatother \pagestyle{fsrProtokoll}