chg: Bump themes, bump readme, change location

README.md

@@ -82,6 +82,8 @@ bash build.sh
 
 The output directory will contain all the generated PDF files and the PDF file called `misp-training.pdf` which is the complete handout of all the slides.
 
+**Note**: In case the rendering is somewhat broken, it might be related to latex using the styles installed systemwide in `/usr/share/texlive/texmf-dist/tex/latex/beamertheme-focus`. Removing this directory will solve the problem.
+
 ## License, Attribution and Funding
 
 All the materials are dual-licensed under GNU Affero General Public License version 3 or later and
@@ -96,7 +98,7 @@ The MISP project training materials are co-financed and supported by CIRCL Compu
 All the source code is available at [https://www.github.com/MISP/misp-training](https://www.github.com/MISP/misp-training).
 
 If you reuse the training materials, don't forget to include the above for attribution.
- 
+
 ## Contributors in alphabetical order
 
 - Steve Clement [:house:](https://github.com/SteveClement)

build.sh

@@ -9,6 +9,7 @@ for slide in ${slidedecks[@]}; do
         cd ${slide}
         if test -f "slide_nl.tex"; then
                 pdflatex slide_nl.tex
+                pdflatex slide_nl.tex
         fi
         pdflatex slide.tex
         pdflatex slide.tex

includes/location.txt

@@ -1 +1 @@
-MISP Training @ CIRCL \\ \small{20190520}
+MISP Training @ Malta \\ \small{20190529-30}

themes/beamercolorthemefocus.sty

@@ -1,5 +1,7 @@
-% Copyright (C) 2018 Pasquale Claudio Africa.
+% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
-%               2018 Sebastian Friedl.
+% A full list of contributors can be found at
+%
+%     https://github.com/elauksap/focus-beamertheme
 %
 % This file is part of beamerthemefocus.
 %
@@ -7,12 +9,12 @@
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
-% 
+%
 % beamerthemefocus is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 % GNU General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU General Public License
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 

themes/beamerfontthemefocus.sty

@@ -1,5 +1,7 @@
-% Copyright (C) 2018 Pasquale Claudio Africa.
+% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
-%               2018 Sebastian Friedl.
+% A full list of contributors can be found at
+%
+%     https://github.com/elauksap/focus-beamertheme
 %
 % This file is part of beamerthemefocus.
 %
@@ -7,12 +9,12 @@
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
-% 
+%
 % beamerthemefocus is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 % GNU General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU General Public License
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 

themes/beamerinnerthemefocus.sty

@@ -1,5 +1,7 @@
-% Copyright (C) 2018 Pasquale Claudio Africa.
+% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
-%               2018 Sebastian Friedl.
+% A full list of contributors can be found at
+%
+%     https://github.com/elauksap/focus-beamertheme
 %
 % This file is part of beamerthemefocus.
 %
@@ -7,12 +9,12 @@
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
-% 
+%
 % beamerthemefocus is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 % GNU General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU General Public License
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
@@ -34,11 +36,13 @@
 % STRUCTURE FRAME TEMPLATE DEFINITIONS. ----------------------------------------
 % Title page.
 \defbeamertemplate*{title page}{focus}{%
-    {\usebeamercolor{frametitle}\colorlet{focus@@temp}{bg}%
+    {%
+        \usebeamercolor{frametitle}\colorlet{focus@@temp}{bg}%
         \begin{tikzpicture}[overlay, remember picture]
             \fill[color=focus@@temp] (current page.north west) rectangle ([shift = {(0, -0.45\paperheight)}] current page.north east);
-        \end{tikzpicture}}
+        \end{tikzpicture}
-    
+    }
+
     \vspace{-1.65\baselineskip}
     \begin{minipage}[b][0.35\paperheight]{\textwidth}
         \vspace{\baselineskip}
@@ -46,45 +50,38 @@
         \usebeamercolor[fg]{frametitle}
         \inserttitle
     \end{minipage}
-    
+
     \begin{minipage}[t][0.1\paperheight]{\textwidth}
         \usebeamerfont{subtitle}
         \usebeamercolor[fg]{frametitle}
         \insertsubtitle
     \end{minipage}
-    
+
     % Set the title graphic in a zero-height box, so that
     % the position of other elements is not affected.
     {\vfuzz=9999pt\vbox to 0pt {
         \raggedleft
         \inserttitlegraphic
     }}
-    
+
-   
+    \begin{minipage}[t]{\textwidth}
+        \usebeamerfont{author}
+        \insertauthor
+    \end{minipage}
+
     \vspace*{\baselineskip}
     \begin{minipage}[t]{\textwidth}
         \usebeamerfont{institute}
         \insertinstitute
     \end{minipage}
-    
+
     \vspace*{\baselineskip}
     \begin{minipage}[t]{\textwidth}
         \usebeamerfont{date}{\insertdate}
     \end{minipage}
 
-    
+    \vspace*{0pt plus 100fill}
-    \vspace*{\baselineskip}
-    \vspace*{\baselineskip}
-    \vspace*{\baselineskip}
-    \vspace*{\baselineskip}
-    \begin{minipage}[t]{\textwidth}
-        \usebeamerfont{author}
-        \insertauthor
-    \end{minipage}
-    
 
-    \vspace*{5\baselineskip}
-    
     \addtocounter{framenumber}{-1}
 }
 
@@ -96,19 +93,18 @@
             \fill[color=focus@@temp] (current page.north west) rectangle ([shift = {(0, -0.45\paperheight)}] current page.north east);
         \end{tikzpicture}%
     }
-    
+
-    \vspace{-2\baselineskip}
+    \vspace{-2.5\baselineskip}
     \begin{minipage}[b][0.45\paperheight]{\textwidth}
         \usebeamerfont{sectiontitle}
         \usebeamercolor[fg]{frametitle}
         \let\hyperlink\@secondoftwo\insertsection
     \end{minipage}
-    
+
-    \begin{minipage}[t][0.55\paperheight]{\textwidth}
+    \vspace*{0pt plus 100fill}
-    \end{minipage}
 }
 
-\AtBeginSection{%
+\AtBeginSection[]{%
     \begin{frame}[plain, noframenumbering]{}
         \sectionpage
     \end{frame}%

themes/beamerouterthemefocus.sty

@@ -1,5 +1,7 @@
-% Copyright (C) 2018 Pasquale Claudio Africa.
+% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
-%               2018 Sebastian Friedl.
+% A full list of contributors can be found at
+%
+%     https://github.com/elauksap/focus-beamertheme
 %
 % This file is part of beamerthemefocus.
 %
@@ -7,19 +9,32 @@
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
-% 
+%
 % beamerthemefocus is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 % GNU General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU General Public License
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
 \mode<presentation>
 
-\RequirePackage{appendixnumberbeamer}% Don't number appendix frames.
+\RequirePackage{appendixnumberbeamer} % Don't number appendix frames.
-\RequirePackage{etoolbox}% \BeforeBeginEnvironment
+% Fix hyperref warning caused by \appendix
+% (https://tex.stackexchange.com/questions/192686/hyperref-warning-caused-by-beamer-appendix).
+\newcommand*{\bkmtranslateto}{\languagename}
+\newcommand*{\bkmtranslate}[1]{%
+    \ifcsname tr@@@\bkmtranslateto @#1\endcsname
+    \csname tr@@@\bkmtranslateto @#1\endcsname
+    \else
+    #1%
+    \fi
+}
+\pdfstringdefDisableCommands{\let\translate\bkmtranslate}
+\RequirePackage{bookmark}
+
+\RequirePackage{etoolbox} % \BeforeBeginEnvironment.
 \RequirePackage{tikz}
 
 
@@ -68,13 +83,13 @@
                 \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]\usebeamerfont{footline}
                     \pgfmathsetmacro{\focus@pbar@progress}%
                         {(\paperwidth-\focus@pbar@leftoffset-\focus@pbar@rightoffset)*(\insertframenumber/\inserttotalframenumber)}
-                
+
                     \clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                     \fill[footline.bg] (0,0) rectangle ++(\the\focus@pbar@leftoffset,\the\focus@pbar@height);
-                    
+
                     \fill[footline.bg] (\the\focus@pbar@leftoffset,0) rectangle ++(\focus@pbar@progress pt,\the\focus@pbar@height)
                                        ++(0,{-0.5*\the\focus@pbar@height}) node[anchor=east, text=footline.fg] {\strut\insertframenumber};
-                    
+
                     \fill[footline.bg] (\paperwidth,0) rectangle ++(-\the\focus@pbar@rightoffset,\the\focus@pbar@height)
                                        ++(0,{-0.5*\the\focus@pbar@height}) node[anchor=west, text=footline.fg] {\strut\inserttotalframenumber};
                 \end{tikzpicture}%
@@ -82,7 +97,7 @@
                 \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
                     \clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                     \fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
-                    
+
                     \node[anchor=east, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\insertframenumber};
                     \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
                     \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
@@ -108,7 +123,7 @@
             \begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
                 \clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
                 \fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
-                
+
                 \node[anchor=east, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\insertframenumber};
                 \node[footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut/};
                 \node[anchor=west, footline.fg] at ({\paperwidth-\the\focus@pbar@rightoffset},{0.5*\focus@pbar@height}) {\strut\inserttotalframenumber};
@@ -147,7 +162,7 @@
 \defbeamertemplate{background canvas}{focusframe}{%
     \begin{tikzpicture}
         \clip (0,0) rectangle ++(\paperwidth,\paperheight);
-        \fill[frametitle.bg] (0,0) rectangle ++(\paperwidth,\paperheight);        
+        \fill[frametitle.bg] (0,0) rectangle ++(\paperwidth,\paperheight);
     \end{tikzpicture}%
 }
 

themes/beamerthemefocus.sty

@@ -1,5 +1,7 @@
-% Copyright (C) 2018 Pasquale Claudio Africa.
+% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
-%               2018 Sebastian Friedl.
+% A full list of contributors can be found at
+%
+%     https://github.com/elauksap/focus-beamertheme
 %
 % This file is part of beamerthemefocus.
 %
@@ -7,17 +9,17 @@
 % it under the terms of the GNU General Public License as published by
 % the Free Software Foundation, either version 3 of the License, or
 % (at your option) any later version.
-% 
+%
 % beamerthemefocus is distributed in the hope that it will be useful,
 % but WITHOUT ANY WARRANTY; without even the implied warranty of
 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 % GNU General Public License for more details.
-% 
+%
 % You should have received a copy of the GNU General Public License
 % along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2018/08/09 v2.2 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2019/01/18 v2.3 Focus Beamer theme]
 
 \mode<presentation>
 
@@ -37,10 +39,10 @@
 % LOAD EXTERNAL PACKAGES. ------------------------------------------------------
 \if@focus@loadfirafonts
     \RequirePackage[T1]{fontenc}
-    
+
     \PassOptionsToPackage{type1}{FiraSans}
     \PassOptionsToPackage{type1}{FiraMono}
-    
+
     \RequirePackage{FiraSans}
     \RequirePackage{FiraMono}
 \fi