Merge branch '2020-05-10-annual' into master

6 files changed, 62 insertions, 4 deletions

diff --git a/preamble/acronyms.sed b/preamble/acronyms.sed
new file mode 100644
index 0000000..f124f26
--- /dev/null
+++ b/preamble/acronyms.sed
@@ -0,0 +1,38 @@
+# Standards and protocols and
+
+s/PHP/\\php{}/g
+s/IPv4/\\ipvfour{}/g
+s/IPv6/\\ipvsix{}/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
+
+# Hardware and software
+
+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
+
+# Organizations
+
+1,/CCC/ {s/CCC/\\cccc{}/g}; s/CCC/\\ccc{}/g
+1,/DFRI/ {s/DFRI/\\dfrii{}/g}; s/DFRI/\\dfri{}/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
+# Hosts
+
+s/\*antilop\*/\\antilop{}/g
+s/\*benjamin\*/\\benjamin{}/g
+s/\*calima\*/\\calima{}/g
+s/\*civett\*/\\civett{}/g
+s/\*elefant\*/\\elefant{}/g
+s/\*giraff\*/\\giraff{}/g
+s/\*gnuhost\*/\\gnuhost{}/g
+s/\*harvey\*/\\harvey{}/g
+s/\*luxemburg\*/\\luxemburg{}/g
+s/\*mistral\*/\\mistral{}/g
+s/\*savann\*/\\savann{}/g
+s/\*sereng\*/\\sereng{}/g
+s/\*zetkin\*/\\zetkin{}/g
+s/\*zivette\*/\\zivette{}/g
diff --git a/preamble/acronyms.tex b/preamble/acronyms.tex
index b192d47..faaae20 100644
--- a/preamble/acronyms.tex
+++ b/preamble/acronyms.tex
@@ -14,6 +14,7 @@
 \newcommand \cfengine {\textsc{cf}-engine}
 \newcommand \civett {\texthost{civett}}
 \newcommand \cpu {\textsc{cpu}}
+\newcommand \cpuu {\cpu{} (\textit{Central Processing Unit})}
 \newcommand \dfd {\textsc{dfd}}
 \newcommand \dfdd {Document Freedom Day (\textsc{dfd})}
 \newcommand \dfri {\textsc{dfri}}
@@ -53,6 +54,7 @@
 \newcommand \gdprr {Allmänna dataskyddsförordningen (\textsc{gdpr}, \textit{General Data Protection Regulation})}
 \newcommand \giraff {\texthost{giraff}}
 \newcommand \gnuhost {\textsc{gnu}}
+\newcommand \gnulinux {\textsc{gnu}/Linux}
 \newcommand \gnupg {Gnu\textsc{pg}}
 \newcommand \gpg {\textsc{gpg}}
 \newcommand \gpgg {\gpg\ (\gnu\ Privacy Guard)} 
@@ -101,8 +103,8 @@
 \newcommand \ossec {\textsc{ossec}}
 \newcommand \otrs {\textsc{otrs}}
 \newcommand \otrss {\otrs\ (Open-source Ticket Request System)}
-\newcommand \issi {\textsc{issi}}
-\newcommand \issii {\issi\ (Open Suorce Seed Initiative)}
+\newcommand \ossi {\textsc{ossi}}
+\newcommand \ossii {\ossi\ (Open Suorce Seed Initiative)}
 \newcommand \paypal {PayPal}
 \newcommand \pgp {\textsc{pgp}}
 \newcommand \php {\textsc{php}}
@@ -122,6 +124,7 @@
 \newcommand \smart {\textsc{smart}}
 \newcommand \sms {\textsc{sms}}
 \newcommand \smtp {\textsc{smtp}}
+\newcommand \smtpp {\smtp{} (\textit{Simple Mail Transport Protocol})}
 \newcommand \spf {\textsc{spf}}
 \newcommand \spff {\spf\ (\textit{Sender Policy Framework}, ramverk för avsändarpolicy)}
 \newcommand \ssh {\textsc{ssh}}
@@ -131,6 +134,7 @@
 \newcommand \sql {\textsc{sql}}
 \newcommand \srpfyra {\textsc{sr p4}}
 \newcommand \tcp {\textsc{tcp}}
+\newcommand \tcpp {\tcp{} (\textit{Transmission Control Protocol})}
 \newcommand \tls {\textsc{tls}}
 \newcommand \tlss {\textsc{tls} (Transport Layer Secuity)}
 \newcommand \udp {\textsc{udp}}
diff --git a/preamble/attendants.sed b/preamble/attendants.sed
new file mode 100644
index 0000000..9cfd07a
--- /dev/null
+++ b/preamble/attendants.sed
@@ -0,0 +1,11 @@
+s/LB/\\LB{}/g
+s/GE/\\GE{}/g
+s/GM/\\GM{}/g
+s/LM/\\LM{}/g
+s/ER/\\ER{}/g
+s/AS/\\AS{}/g
+s/AW/\\AW{}/g
+s/OV/\\OV{}/g
+
+s/LJO/\\LJO{}/g
+s/SRE/\\SRE{}/g
diff --git a/preamble/attendants.tex b/preamble/attendants.tex
index 3c463ce..e64fb0e 100644
--- a/preamble/attendants.tex
+++ b/preamble/attendants.tex
@@ -1,5 +1,6 @@
 \newcommand \LB {\textsc{lb}}   % Ludvig Blomkvist  
-\newcommand \GE {\textsc{ge}}   % Gustav Eek        
+\newcommand \IB {\textsc{ib}}   %
+\newcommand \GE {\textsc{ge}}   % Gustav Eek
 \newcommand \GM {\textsc{gm}}   % Guilhem Moulin    
 \newcommand \LM {\textsc{lm}}   % Lola Möller
 \newcommand \LJO {\textsc{ljo}} % Leif-Jöran Olsson 
@@ -9,7 +10,7 @@
 \newcommand \AW {\textsc{aw}}   % Anders Westerström
 \newcommand \OV {\textsc{ov}}   % Oskar Vigren      
 
-
+\newcommand \M {\textsc{m}}
 
 
 
diff --git a/preamble/preamble.tex b/preamble/preamble.tex
index 7952529..8f63c4e 100644
--- a/preamble/preamble.tex
+++ b/preamble/preamble.tex
@@ -13,6 +13,8 @@
 \usepackage{sectsty, soul, enumerate}
 \usepackage{calc}
 \usepackage{graphicx}
+\usepackage{hyperref}
+\usepackage{hyphenat}
 
 % Colours 
 \definecolor{gray70}{gray}{.3}
diff --git a/preamble/snippets.sed b/preamble/snippets.sed
new file mode 100644
index 0000000..8d7f989
--- /dev/null
+++ b/preamble/snippets.sed
@@ -0,0 +1,2 @@
+s/→/$\\rightarrow{}$/g
+s/->/$\\rightarrow{}$/g