From d8298304562a75b78ea26af0093930cdcb6e8471 Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Wed, 26 May 2021 10:30:22 +0200 Subject: Annual 2021. Propositions. Add Makefile and sed scripts --- annual-meetings/motions/Makefile | 21 +++++++++++++-------- annual-meetings/motions/headings.sed | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 annual-meetings/motions/headings.sed (limited to 'annual-meetings/motions') diff --git a/annual-meetings/motions/Makefile b/annual-meetings/motions/Makefile index 683f2f4..019b239 100644 --- a/annual-meetings/motions/Makefile +++ b/annual-meetings/motions/Makefile @@ -8,14 +8,12 @@ PREAMBLE = preamble_.tex acronyms_.tex attendants_.tex all: $(ALL) %_.tex: %.mdwn - cat < $< | sed -e 's/^$$/\\mypar\n/' |\ - sed -f ../../preamble/acronyms.sed \ - -f ../../preamble/attendants.sed \ - -f ../../preamble/snippets.sed |\ - pandoc -f markdown -t latex > $@ - - - + cat < $< | sed -e 's/^$$/\\mypar\n/' \ + | sed -f ../../preamble/acronyms.sed \ + -f ../../preamble/attendants.sed \ + -f ../../preamble/snippets.sed \ + -f headings.sed \ + | pandoc -f markdown -t latex > $@ motions-%.pdf: %.main.tex $(TEX) $(PREAMBLE) pdflatex -jobname=$(basename $@) $< @@ -27,3 +25,10 @@ clean: $(PREAMBLE): %_.tex: ../../preamble/%.tex sed 's/..\/preamble\/\([a-z]*\)/\1_/g' < $< > $@ + +SEND_FILES = \ + $(wildcard *.pdf) + +send: + rsync -ruvp --chmod=Dugo+rx,Fugo+r $(SEND_FILES) www.fripost.org:/var/www/fripost.org/minutes + @echo; echo Now avialable as; for f in $(SEND_FILES); do echo " - https://fripost.org/minutes/$$f"; done diff --git a/annual-meetings/motions/headings.sed b/annual-meetings/motions/headings.sed new file mode 100644 index 0000000..9e40d4d --- /dev/null +++ b/annual-meetings/motions/headings.sed @@ -0,0 +1 @@ +1 s/^% \(.*\)/## \1/ -- cgit v1.2.3 From 507437cb18252a728641d122dcb3e3a1ae945b0d Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Wed, 26 May 2021 10:32:21 +0200 Subject: Annual 2021. Propositions. Add budget and by-laws changes --- annual-meetings/motions/2021-a-budget.mdwn | 32 +++++++++++++++++++++++++++++ annual-meetings/motions/2021-b-stadgar.mdwn | 11 ++++++++++ annual-meetings/motions/2021.main.tex | 24 ++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 annual-meetings/motions/2021-a-budget.mdwn create mode 100644 annual-meetings/motions/2021-b-stadgar.mdwn create mode 100644 annual-meetings/motions/2021.main.tex (limited to 'annual-meetings/motions') diff --git a/annual-meetings/motions/2021-a-budget.mdwn b/annual-meetings/motions/2021-a-budget.mdwn new file mode 100644 index 0000000..e751f81 --- /dev/null +++ b/annual-meetings/motions/2021-a-budget.mdwn @@ -0,0 +1,32 @@ +% Styrelsens förslag till budget + +Budgeten föreslås enligt nedan, oförändrad jämfört med i fjol, +undantaget en uppräkning av medlemsantalet till fjolårets siffra. + +\newlength{\thisskip} +\setlength{\thisskip}{-\textwidth} +\addtolength{\thisskip}{\linewidth} +\mbox{}\hspace{\thisskip}\hspace{0em} +\parbox{\textwidth}{\centering% + \begin{tabular}{c@{\hspace{1cm}}c} + Intäkter & Utgifter \\[.5\baselineskip] + \begin{tabular}{l r l} + \hline + Medlemsavg. & $38\,400$ & ($160 \times 240$) \\ + Övrigt & $10\,000$ \\ + \hline + & $48\,400$ & $\sek$ + \end{tabular} + & + \begin{tabular}{l r l} + \hline + Infrastruktur & $45\,000$ \\ + Yttre aktivitet & $10\,000$ \\ + Medlemsaktivitet & $1\,000$ \\ + Administration & $200$ \\ + Övrigt & $0$ \\ + \hline + & $56\,200$ & $\sek$ + \end{tabular} + \end{tabular} +} diff --git a/annual-meetings/motions/2021-b-stadgar.mdwn b/annual-meetings/motions/2021-b-stadgar.mdwn new file mode 100644 index 0000000..819dd2b --- /dev/null +++ b/annual-meetings/motions/2021-b-stadgar.mdwn @@ -0,0 +1,11 @@ +% Bekräftan av stadgeändring + +\label{sec:motions:by} + +Vid årsmötet 2020 beslutades flera stadgeändringar, varav en gällde +§ 10, vilken kräver uppföljande beslut på efterföljande årsmöte: + +Föreslår att fixa hänvisning i § 10.2: "4.4" → "4.5" + +Hänvisningen hade glömts bort i samband med tidigare ändring i +§ 4. diff --git a/annual-meetings/motions/2021.main.tex b/annual-meetings/motions/2021.main.tex new file mode 100644 index 0000000..8f388a8 --- /dev/null +++ b/annual-meetings/motions/2021.main.tex @@ -0,0 +1,24 @@ +\makeatletter +\def\input@path{{.}{..}} +\makeatother + +\input{preamble_} +\newcommand\mytitle{Propositioner och motioner till Friposts årsmöte 2021} + + +\rhead{\footnotesize \footnotesize \mytitle} + +\begin{document} + +\section*{\mytitle} + +\allsectionsfont{\normalsize\raggedright\sffamily\color{grayFri}} +\renewcommand{\labelitemi}{\enumiform$\bullet$} +\renewcommand{\labelitemii}{\enumiform$\circ$} +\renewcommand{\labelenumi}{\enumiform \thesection.\arabic{enumi}} +\renewcommand{\labelenumii}{\enumiform (\alph{enumii})} + +\input{2021-a-budget_} +\input{2021-b-stadgar_} + +\end{document} -- cgit v1.2.3