Merge branch '2021-05-30-annual'ge/latex-sty

5 files changed, 81 insertions, 8 deletions

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}
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/