From 84a83dea69f2536eb79716d0cbc9ad4860bbdf4f Mon Sep 17 00:00:00 2001 From: Gustav Eek Date: Mon, 24 May 2021 14:04:45 +0200 Subject: Annual 2021. Annual report. Corect acronyms and makefile Update *Makefile*, main wrapper, sed scripts, and acronyms. --- annual-reports/Makefile | 1 + annual-reports/annual-report-2021-of-2020.main.tex | 9 +++++++++ preamble/acronyms.sed | 15 +++++++++++++-- preamble/acronyms.tex | 11 +++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 annual-reports/annual-report-2021-of-2020.main.tex diff --git a/annual-reports/Makefile b/annual-reports/Makefile index d7225f6..4bb0a9b 100644 --- a/annual-reports/Makefile +++ b/annual-reports/Makefile @@ -1,4 +1,5 @@ ALL = \ + annual-report-2021-of-2020.pdf \ annual-report-2020-of-2019.pdf \ economical-report-2020-of-2019.pdf \ auditors-report-2020-of-2019.pdf \ diff --git a/annual-reports/annual-report-2021-of-2020.main.tex b/annual-reports/annual-report-2021-of-2020.main.tex new file mode 100644 index 0000000..369ebe4 --- /dev/null +++ b/annual-reports/annual-report-2021-of-2020.main.tex @@ -0,0 +1,9 @@ +\input{../preamble/preamble} +\usepackage{parskip} +\selectlanguage{swedish} +\rhead{\footnotesize Verksamhetsberättelse 2020} +\begin{document} +\section*{Verksamhetsberättelse 2020} +\hyphenation{ut-rus-t-ning} +\input {annual-report-2021-of-2020._} +\end{document} diff --git a/preamble/acronyms.sed b/preamble/acronyms.sed index f124f26..6ddbe45 100644 --- a/preamble/acronyms.sed +++ b/preamble/acronyms.sed @@ -1,8 +1,10 @@ # Standards and protocols and -s/PHP/\\php{}/g +s/CalDAV/\\caldav{}/g s/IPv4/\\ipvfour{}/g s/IPv6/\\ipvsix{}/g +s/PHP/\\php{}/g + 1,/SMTP/ {s/\SMTP/\\smtpp{}/g}; s/SMTP/\\smtp{}/g 1,/TCP/ {s/\TCP/\\tcpp{}/g}; s/TCP/\\tcp{}/g 1,/TLS/ {s/\TLS/\\tlss{}/g}; s/TLS/\\tls{}/g @@ -12,14 +14,23 @@ s/IPv6/\\ipvsix{}/g 1,/CPU/ {s/\CPU/\\cpuu{}/g}; s/CPU/\\cpu{}/g 1,/FLFD/ {s/FLFD/\\flfdd{}/g}; s/FLFD/\\flfd{}/g 1,/VM/ {s/\VM/\\vmm{}/g}; s/VM/\\vm{}/g +1,/DKIM/ {s/DKIM/\\dkimm{}/g}; s/DKIM/\\dkim{}/g +1,/DMARC/ {s/DMARC/\\dmarcc{}/g}; s/DMARC/\\dmarc{}/g # Organizations 1,/CCC/ {s/CCC/\\cccc{}/g}; s/CCC/\\ccc{}/g 1,/DFRI/ {s/DFRI/\\dfrii{}/g}; s/DFRI/\\dfri{}/g +1,/DN/ {s/DN/\\dnn{}/g}; s/DN/\\dn{}/g +1,/FOSDEM/ {s/FOSDEM/\\fosdemm{}/g}; s/FOSDEM/\\fosdem{}/g 1,/NSU/ {s/NSU/\\nsuu{}/g}; s/NSU/\\nsu{}/g 1,/OSSI/ {s/OSSI/\\ossii{}/g}; s/OSSI/\\ossi{}/g -1,/SCB/ {s/\SCB/\\scbb{}/g}; s/scb/\\scb{}/g +1,/SCB/ {s/\SCB/\\scbb{}/g}; s/SCB/\\scb{}/g + +# Acronymes + +1,/FAQ/ {s/\FAQ/\\faqq{}/g}; s/FAQ/\\faq{}/g + # Hosts s/\*antilop\*/\\antilop{}/g diff --git a/preamble/acronyms.tex b/preamble/acronyms.tex index 068a85d..77347d9 100644 --- a/preamble/acronyms.tex +++ b/preamble/acronyms.tex @@ -12,6 +12,8 @@ \newcommand \ccc {\textsc{ccc}} \newcommand \cccc {\ccc\ (Chaos Communication Congress)} \newcommand \cfengine {\textsc{cf}-engine} +\newcommand \cgi {\textsc{cgi}} +\newcommand \cgii {Common Gateway Interface (\cgi)} \newcommand \civett {\texthost{civett}} \newcommand \cli {\textsc{cli}} \newcommand \clii {kommandotolk (\textsc{cli})} @@ -35,12 +37,17 @@ \newcommand \etc {\textsc{etc}} \newcommand \etcdagens {\textit{Dagens \etc}} \newcommand \eu {\textsc{eu}} +\newcommand \existdb {Exist \textsc{db}} \newcommand \faq {\textsc{faq}} +\newcommand \faqq {frågor och svar (\faq)} \newcommand \flfd {\textsc{flfd}} \newcommand \flfdd {Fripost Lagring för delning (\flfd)} \newcommand \fosdem {\textsc{fosdem}} +\newcommand \fosdemm {Free and Open source Software Developers Meeting (\textsc{fosdem})} \newcommand \fossgbg {\textsc{foss-gbg}} \newcommand \fossnorth {\textsc{foss} North} +\newcommand \fpm {\textsc{fpm}} +\newcommand \fpmm {Fast\cgi\ Process Manager (\fpm)} \newcommand \fps {\textsc{fps}} \newcommand \fpss {Friprogramvarusyndikatet (\fps)} \newcommand \fpsss {Friprogramvarusyndikatets (\fps)} @@ -71,6 +78,7 @@ \newcommand \ipvsix {\textsc{ip}v6} \newcommand \ipred {\textsc{ipred}} \newcommand \ipsec {\textsc{ipsec}} +\newcommand \irc {\textsc{irc}} \newcommand \isp {\textsc{isp}} \newcommand \isplong {\textsc{isp} (\textit{Internet Service Provider})} \newcommand \ituniv {\textsc{it}-universitetet} @@ -79,6 +87,7 @@ \newcommand \lann {\textsc{lan} (\textit{Local Area Network})} \newcommand \ldap {\textsc{ldap}} \newcommand \ldapp {\ldap\ (Lightweight Directory Access Protocol)} +\newcommand \levante {\texthost{levante}} \newcommand \lool {\textsc{lool}} \newcommand \looll {LibreOffice Online (\lool)} \newcommand \luxemburg {\texthost{luxemburg}} @@ -111,6 +120,8 @@ \newcommand \paypal {PayPal} \newcommand \pgp {\textsc{pgp}} \newcommand \php {\textsc{php}} +\newcommand \phpfpm {\php-\fpm} +\newcommand \phpfpmm {\php\ Fast\cgi\ Process Manager (\phpfpm)} \newcommand \prq {\textsc{prq}} \newcommand \prqq {PeriQ Networks (\textsc{})} \newcommand \psu {\textsc{psu}} -- cgit v1.2.3