Compare commits

..

3 commits

2 changed files with 2116 additions and 70 deletions

File diff suppressed because it is too large Load diff

View file

@ -45,6 +45,10 @@
{0pt} {0pt}
{*0.5} {*0.5}
{-9pt} {-9pt}
% im Fließtext Unterthema hervorheben #NEU
\newcommand{\subtopic}[1]{\textbf{#1}}
% weil häufig \leave verwendet wird. #NEU
\newcommand{\leave}[2][]{\away[#1]{#2}}
\makeatletter \makeatletter
\newcommand*{\insertheaderrule}{\rlap{\rule[-.5\normalbaselineskip]{\textwidth}{.4pt}}} \newcommand*{\insertheaderrule}{\rlap{\rule[-.5\normalbaselineskip]{\textwidth}{.4pt}}}
@ -116,7 +120,7 @@
Sitzungsleitung: \the\chairperson \, | % Sitzungsleitung: \the\chairperson \, | %
Protokoll: \the\clerks% Protokoll: \the\clerks%
Sitzungsbeginn: \the\meetingStart \, | Sitzungsende: \the\meetingEnd% Sitzungsbeginn: \the\meetingStart \, Uhr | Sitzungsende: \the\meetingEnd \, Uhr%
Sitzungsort: \the\meetingPlace % required by FSO Sitzungsort: \the\meetingPlace % required by FSO
\end{center}% \end{center}%
@ -211,71 +215,6 @@
\end{minipage}\end{lrbox}\fbox{\usebox{\mybox}} \end{minipage}\end{lrbox}\fbox{\usebox{\mybox}}
} }
\newenvironment{vote-two-thirds} {%
\immediate\write\exportdata{-}
\begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth}
\newcommand*{\voteNumber}[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}{}} {%
\immediate\write\exportdata{ money_limit: NULL}%
\textbf{Antrag}%
} {%
\immediate\write\exportdata{ money_limit: ##1}%
\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}\\}%
\newcommand*{\voting}[3]{\textbf{Abstimmung: }%
\ifthenelse{\equal{##1}{} \AND \equal{##2}{} \AND \equal{##3}{}} {%
\immediate\write\exportdata{ v_yes: 0}%
\immediate\write\exportdata{ v_no: 0}%
\immediate\write\exportdata{ v_neutral: 0}%
\immediate\write\exportdata{ accepted: 1}%
Der Antrag wurde ohne Gegenrede angenommen.%
} {%
\immediate\write\exportdata{ v_yes: ##1}%
\immediate\write\exportdata{ v_no: ##2}%
\immediate\write\exportdata{ v_neutral: ##3}%
Dafür: ##1, Dagegen: ##2, Enthaltungen: ##3%
\\%
\setcounter{x}{##2+##3}%
\ifnum##1>\arabic{x}%
{%
\immediate\write\exportdata{ accepted: 1}%
Der Antrag wurde angenommen.
}%
\else%
{
\immediate\write\exportdata{ accepted: 0}%
Der Antrag wurde abgelehnt.
}%
\fi%
}%
}%
\newcommand*{\voteComment}[1]{%
\immediate\write\exportdata{ comment: "##1"}%
##1
}%
} {
\end{minipage}\end{lrbox}\fbox{\usebox{\mybox}}
}
\newenvironment{vote-two-thirds} {% \newenvironment{vote-two-thirds} {%
\immediate\write\exportdata{-} \immediate\write\exportdata{-}
\begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth} \begin{lrbox}{\mybox}\begin{minipage}{.985\textwidth}
@ -373,11 +312,11 @@
\end{minipage}\end{lrbox}\fbox{\usebox{\mybox}} \end{minipage}\end{lrbox}\fbox{\usebox{\mybox}}
} }
\newcommand*{\away}[1] { \newcommand*{\away}[2][] {
\ifthenelse{\the\numexpr \countInlineItems{#1} > 1} {% \ifthenelse{\the\numexpr \countInlineItems{#2} > 1 \OR \NOT \equal{#1}{}} {%
\textit{[#1 verlassen die Sitzung]}% \textit{[#2 verlassen die Sitzung]}%
} {% } {%
\textit{[#1 verlässt die Sitzung]}% \textit{[#2 verlässt die Sitzung]}%
} }
} }
\newcommand*{\appear}[1] { \newcommand*{\appear}[1] {