1 files changed, 22 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls b/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls
index df711623170..a9302bd920a 100644
--- a/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls
+++ b/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls
@@ -15,7 +15,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{beamerswitch}
-    [2018/08/29 v1.4 Convenient mode selection in Beamer documents]
+    [2018/09/05 v1.4.1 Convenient mode selection in Beamer documents]
 \RequirePackage{xkeyval,xkvltxp,etoolbox,xstring,shellesc,iftex}
 \define@boolkey[DC]{beamerswitch}{beamer}[true]{%
   \ifbool{DC@beamerswitch@beamer}{%
@@ -183,20 +183,30 @@
 \define@boolkey[HL]{beamerswitch}{align}[true]{}
 \newlength{\handoutpnobaseline}
 \setlength{\handoutpnobaseline}{5mm}
+\newcounter{handoutpno}
 \define@boolkey[HL]{beamerswitch}{pnos}[true]{}
+\def\beamerswitch@footer{}
+\patchcmd{\pgfpages@buildshipoutbox}{%
+  \pgfsys@endpicture
+}{%
+  \beamerswitch@footer\pgfsys@endpicture
+}{}{}
 \newlength{\beamerswitch@pnoadjust}
 \newcommand*{\handoutlayout}[1]{%
   \only<handout>{%
     \setlength{\beamerswitch@pnoadjust}{1em}%
     \setkeys[HL]{beamerswitch}{#1}%
     \ifbool{HL@beamerswitch@pnos}{%
-      \def\pgfsys@endpicture{%
-        \raisebox{\the\handoutpnobaseline}[0pt][0pt]{%
-          \makebox[\pgfphysicalwidth]{%
-            \the\numexpr(\value{page} - 2 + (\beamerswitch@nup / 2))%
-              / \beamerswitch@nup\relax
-          }%
-        }\par
+      \def\beamerswitch@footer{%
+        \stepcounter{handoutpno}%
+        \setbox0\vbox{\makebox[0pt][c]{\arabic{handoutpno}}}%
+        \pgfsys@beginscope
+        \pgflowlevel{\pgftransformshift{%
+          \pgfpoint{.5\pgfphysicalwidth}{\handoutpnobaseline}}}%
+        \wd0=0pt%
+        \dp0=-\ht0%
+        \pgfsys@hbox0%
+        \pgfsys@endscope
       }%
       \ifbool{HL@beamerswitch@align}{%
         \ifcase\value{beamerswitch@nupcase}\relax
@@ -221,7 +231,7 @@
           {\the\dimexpr\handoutpnobaseline + \beamerswitch@pnoadjust\relax}%
       }{}%
     }{%
-      \def\pgfsys@endpicture{}%
+      \def\beamerswitch@footer{}%
     }%
     \ifcase\value{beamerswitch@nupcase}\relax
       \def\beamerswitch@nup{2}%
@@ -1174,7 +1184,8 @@
       \ifundef{\beamer@originstitute}{%
         \renewcommand{\institute}[2][]{\def\insertinstitute{##2}}%
       }{%
-        \renewcommand{\institute}[2][]{\def\insertinstitute{##2}\beamer@originstitute{##2}}%
+        \renewcommand{\institute}[2][]{%
+          \def\insertinstitute{##2}\beamer@originstitute{##2}}%
       }%
       \def\@maketitle{%
         \newpage
@@ -1217,6 +1228,6 @@
   }%
 }
 %% 
-%% Copyright (C) 2016-2017 by Alex Ball <a.j.ball@bath.ac.uk>
+%% Copyright (C) 2016-2018 by Alex Ball <a.j.ball@bath.ac.uk>
 %%
 %% End of file `beamerswitch.cls'.