Adds beamer-didactic

OpenSecEd · Feb 23, 2020 · b8f2762 · b8f2762
1 parent c4cdc51
commit b8f2762
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 52 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,3 +6,6 @@
 	path = drmlab
 	url = https://github.com/OpenSecEd/drmlab.git
 	branch = master
+[submodule "beamer-didactic"]
+	path = beamer-didactic
+	url = https://github.com/dbosk/beamer-didactic.git
diff --git a/beamer-didactic b/beamer-didactic
diff --git a/drm/Makefile b/drm/Makefile
@@ -4,6 +4,8 @@ all: slides.pdf README.md
 SRC=		slides.tex abstract.tex preamble.tex bibliography.bib
 SRC+= 		contents.tex
 
+DEPENDS= 	beamer-didactic.sty
+
 slides.pdf: ${SRC}
 
 
@@ -28,3 +30,5 @@ clean:
 INCLUDE_MAKEFILES=../makefiles
 include ${INCLUDE_MAKEFILES}/tex.mk
 include ${INCLUDE_MAKEFILES}/doc.mk
+INCLUDE_BEAMERDIDACTIC=../beamer-didactic
+include ${INCLUDE_BEAMERDIDACTIC}/beamer-didactic.mk
diff --git a/drm/preamble.tex b/drm/preamble.tex
@@ -13,24 +13,9 @@
 \usepackage{listings}
 \usepackage{csquotes}
 
-\usepackage{xparse}
-\ProvideDocumentEnvironment{exercise}{o}{%
-  \setbeamercolor{block body}{bg=yellow!30,fg=black}
-  \setbeamercolor{block title}{bg=yellow,fg=black}
-  \IfValueTF{#1}{%
-    \begin{block}{Exercise: #1}
-  }{%
-    \begin{block}{Exercise}
-  }
-}{%
-  \end{block}
-}
-
 \usepackage[natbib,style=alphabetic,maxbibnames=99]{biblatex}
 \addbibresource{bibliography.bib}
 
-\newenvironment{axiom}[1]{\begin{block}{Axiom (#1)}}{\end{block}}
-
 \DeclareMathOperator{\U}{\mathcal{U}}
 \DeclareMathOperator{\T}{\mathcal{T}}
 \DeclareMathOperator{\V}{\mathcal{V}}
@@ -46,15 +31,4 @@
 
 \renewcommand{\qedsymbol}{Q.E.D.}
 
-\DeclareMathOperator{\hmac}{HMAC}
-\DeclareMathOperator{\concat}{||}
-
-\DeclareMathOperator{\believes}{|\!\!\!\equiv}
-\DeclareMathOperator{\said}{|\!\!\!\sim}
-\DeclareMathOperator{\controls}{\Mapsto}
-\DeclareMathOperator{\sees}{\lhd}
-\newcommand{\fresh}[1]{\#(#1)}
-\newcommand{\encrypt}[2]{\{#1\}_{#2}}
-\newcommand{\share}[1]{\stackrel{#1}{\leftrightarrow}}
-\newcommand{\pubkey}[1]{\stackrel{#1}{\mapsto}}
-
+\usepackage{beamer-didactic}
diff --git a/overview/.gitignore b/overview/.gitignore
@@ -1,2 +1,3 @@
 slides.pdf
 abstract.md
+beamer-didactic.sty
diff --git a/overview/Makefile b/overview/Makefile
@@ -4,7 +4,9 @@ all: slides.pdf
 SRC=		slides.tex abstract.tex preamble.tex bibliography.bib
 SRC+= 		contents.tex
 
-slides.pdf: ${SRC}
+DEPENDS= 	beamer-didactic.sty
+
+slides.pdf: ${SRC} ${DEPENDS}
 
 
 TEX2MDFLAGS= 	-s --bibliography bibliography.bib -t markdown_strict
@@ -28,3 +30,5 @@ clean:
 INCLUDE_MAKEFILES=../makefiles
 include ${INCLUDE_MAKEFILES}/tex.mk
 include ${INCLUDE_MAKEFILES}/doc.mk
+INCLUDE_BEAMERDIDACTIC=../beamer-didactic
+include ${INCLUDE_BEAMERDIDACTIC}/beamer-didactic.mk
diff --git a/overview/preamble.tex b/overview/preamble.tex
@@ -13,24 +13,9 @@
 \usepackage{listings}
 \usepackage{csquotes}
 
-\usepackage{xparse}
-\ProvideDocumentEnvironment{exercise}{o}{%
-  \setbeamercolor{block body}{bg=yellow!30,fg=black}
-  \setbeamercolor{block title}{bg=yellow,fg=black}
-  \IfValueTF{#1}{%
-    \begin{block}{Exercise: #1}
-  }{%
-    \begin{block}{Exercise}
-  }
-}{%
-  \end{block}
-}
-
 \usepackage[natbib,style=alphabetic,maxbibnames=99]{biblatex}
 \addbibresource{bibliography.bib}
 
-\newenvironment{axiom}[1]{\begin{block}{Axiom (#1)}}{\end{block}}
-
 \DeclareMathOperator{\U}{\mathcal{U}}
 \DeclareMathOperator{\T}{\mathcal{T}}
 \DeclareMathOperator{\V}{\mathcal{V}}
@@ -49,12 +34,4 @@
 \DeclareMathOperator{\hmac}{HMAC}
 \DeclareMathOperator{\concat}{||}
 
-\DeclareMathOperator{\believes}{|\!\!\!\equiv}
-\DeclareMathOperator{\said}{|\!\!\!\sim}
-\DeclareMathOperator{\controls}{\Mapsto}
-\DeclareMathOperator{\sees}{\lhd}
-\newcommand{\fresh}[1]{\#(#1)}
-\newcommand{\encrypt}[2]{\{#1\}_{#2}}
-\newcommand{\share}[1]{\stackrel{#1}{\leftrightarrow}}
-\newcommand{\pubkey}[1]{\stackrel{#1}{\mapsto}}
-
+\usepackage{beamer-didactic}