diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf | bin | 19438 -> 19268 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf | bin | 21648 -> 21464 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf | bin | 22255 -> 22072 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf | bin | 35712 -> 35507 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf | bin | 156381 -> 178966 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx | 709 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls | 522 |
7 files changed, 939 insertions, 292 deletions
diff --git a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf Binary files differindex 271905fa883..dcd142b2eed 100644 --- a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf +++ b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf diff --git a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf Binary files differindex fd2ef80c017..2eab8d0ae64 100644 --- a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf +++ b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf diff --git a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf Binary files differindex f65bbd170fa..c34950254b9 100644 --- a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf +++ b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf diff --git a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf Binary files differindex c3d74e2539a..22162c3dc51 100644 --- a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf +++ b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf diff --git a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf Binary files differindex a93182cdff0..81353b62318 100644 --- a/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf +++ b/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf diff --git a/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx b/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx index a5ea3ae3e60..385951fe169 100644 --- a/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx +++ b/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx @@ -228,7 +228,7 @@ Copyright (C) 2016-2017 by Alex Ball <a.j.ball@bath.ac.uk> %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<class>\ProvidesClass{beamerswitch} %<*class> - [2017/12/10 v1.3 Convenient mode selection in Beamer documents] + [2018/08/29 v1.4 Convenient mode selection in Beamer documents] %</class> %<*driver> \documentclass[12pt]{article} @@ -520,7 +520,8 @@ If you have an existing \pkg{beamer} presentation and want convert it to use \item Have you specified class options other than \key{ignorenonframetext}? If so, start by rewriting your \cs{documentclass} line in terms of - \cs{PassOptionsToClass}: + \cs{PassOptionsToClass} -- note that the optional argument (in square + brackets) becomes mandatory (in curly braces): \begin{multicols}{2} \begin{dispListing*}{title=Before,coltitle=black,fonttitle=\sffamily} @@ -548,7 +549,6 @@ If you have an existing \pkg{beamer} presentation and want convert it to use or something more specific, as required. \end{enumerate} -\pagebreak In summary, here is an example: \begin{multicols}{2} @@ -556,33 +556,25 @@ In summary, here is an example: \documentclass[10pt]{beamer} - \usetheme{metropolis} \title{Test presentation} - \begin{document} - \maketitle - \end{document} \end{dispListing*} \columnbreak \begin{dispListing*}{title=After,coltitle=black,fonttitle=\sffamily} \PassOptionsToClass{10pt}{beamer} \documentclass{beamerswitch} - \mode<presentation>{% \usetheme{metropolis} } \title{Test presentation} - \begin{document} \mode<all> - \maketitle - \end{document} \end{dispListing*} \end{multicols} @@ -1081,14 +1073,31 @@ using the following command in the preamble. \label{fig:layouts} \end{figure} +\begin{docKey}{pnos}{}{no value, initially unset} + Adds page numbers to the bottom of each page. The number appears at a distance + of \cs{handoutpnobaseline} (initially 5mm) from the bottom edge of the page. + You change this with \cs{setlength}. +\end{docKey} + \begin{docKey}{border}{=\meta{length}}{default 0.4pt, initially 0pt} Puts a rectangular border of thickness \meta{length} around each slide. Note that the borders are drawn regardless of whether a slide is actually printed, so you may end up with empty boxes on the last page. \end{docKey} -\begin{docKey}{pnos}{}{no value, initially unset} - Adds page numbers to the bottom of each page. +\begin{docKey}{margin}{=\meta{length}}{default 0pt, initially 5mm} + Sets how much extra space to leave around each slide on the page. To achieve + this it uses the \key{border shrink} option from \pkg{pgfpages}. If you add + page numbers, this value will increase if necessary to prevent the number + colliding with the slides. +\end{docKey} + +\begin{docKey}{align}{}{no value, initially unset} + When \key{margin} is non-zero, the effective page margins are approximately + half the size of the gaps between slides (some additional white space comes + from preserving the aspect ratio of the slides). When set, this option tweaks + the positions of the slides so that the page margins are approximately the + same as the interior gaps. \end{docKey} \section{Changing the look of article mode} @@ -1515,14 +1524,203 @@ suggestions for improvements or new features to the % % \subsection{Handout layout} % +% \begin{optionkey}{paper} +% \begin{macro}{beamerswitch@handoutpaper} +% In theory it would be nice to anticipate the paper size that the article mode +% would use, and pass that as an option to \cs{pgfpagesuselayout} but as that's +% unlikely to be clean code, we settle here for setting it with an option. +% +% \begin{macrocode} +\def\beamerswitch@handoutpaper{a4paper} +\define@key[HL]{beamerswitch}{paper}{% + \def\beamerswitch@handoutpaper{#1}% +} +% \end{macrocode} +% \end{macro} +% \end{optionkey} +% +% \begin{optionkey}{nup} +% \begin{optionvalue}{2} +% \begin{optionvalue}{3} +% \begin{optionvalue}{3plus} +% \begin{optionvalue}{4} +% \begin{optionvalue}{4plus} +% \begin{optionvalue}{6} +% \begin{optionvalue}{8} +% The \key{nup} option specifies how many slides to include per page. +% The `plus' keyword indicates a layout with additional gaps for writing. +% +% \begin{macrocode} +\newcounter{beamerswitch@nupcase} +\setcounter{beamerswitch@nupcase}{5} +\define@choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{% + \setcounter{beamerswitch@nupcase}{\nr} +}{% + \ClassWarning{beamerswitch}{Value of `nup' not recognized. + Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}% +} +% \end{macrocode} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionvalue} +% \end{optionkey} +% +% \begin{optionkey}{border} % \begin{macro}{beamerswitch@Border} -% We set up a command for drawing borders around the slides in handout mode. -% This is initially set up to do nothing. +% The \key{borders} option switches on borders around the slides on handout +% pages (and gaps where slides would appear if there were enough). The value +% is used to set the width of the border. +% +% This is implemented as a PGF drawing command, which is initially set up to do +% nothing but gets filled out if the option is selected. % % \begin{macrocode} \newcommand*{\beamerswitch@Border}{\relax} +\define@key[HL]{beamerswitch}{border}[0.4pt]{% + \RequirePackage{pgf}% + \ifdimcomp{#1}{>}{0pt}{% + \renewcommand*{\beamerswitch@Border}{\pgfsetlinewidth{#1}\pgfstroke}% + }{% + \renewcommand*{\beamerswitch@Border}{\relax}% + }% +} +% \end{macrocode} +% \end{macro} +% \end{optionkey} +% +% \changes{v1.4}{2018/08/29}{Make margins around slides a configurable size} +% \begin{optionkey}{margin} +% \begin{macro}{beamerswitch@margin} +% The \key{margin} option controls how much white space is added around each +% slide on handout pages. It corresponds to the \texttt{border shrink} option +% of \cs{pgfpagesuselayout}. +% +% \begin{macrocode} +\newlength{\beamerswitch@margin} +\setlength{\beamerswitch@margin}{5mm} +\define@key[HL]{beamerswitch}{margin}[0pt]{% + \setlength{\beamerswitch@margin}{#1}% +} +% \end{macrocode} +% \end{macro} +% \end{optionkey} +% +% \begin{optionkey}{align} +% The \key{align} option chooses whether to rejig the positions of the slides +% on the page so that the effective page margin is the same as, rather than +% half, the space between adjacent slides. +% +% \begin{macrocode} +\define@boolkey[HL]{beamerswitch}{align}[true]{} +% \end{macrocode} +% \end{optionkey} +% +% \begin{optionkey}{pnos} +% \begin{macro}{handoutpnobaseline} +% The \key{pnos} option switches on page numbers for handout pages. The height +% at which the baseline of the number sits, relative to the bottom edge of the +% paper, is given by the length \cs{handoutpnobaseline}. +% +% \begin{macrocode} +\newlength{\handoutpnobaseline} +\setlength{\handoutpnobaseline}{5mm} +\define@boolkey[HL]{beamerswitch}{pnos}[true]{} % \end{macrocode} % \end{macro} +% \end{optionkey} +% +% \begin{macro}{handoutlayout} +% \begin{macro}{beamerswitch@nup} +% We set up the \cs{handoutlayout} command for applying these options. +% +% \begin{macrocode} +\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 + }% + \ifbool{HL@beamerswitch@align}{% + \ifcase\value{beamerswitch@nupcase}\relax + \addtolength{\beamerswitch@pnoadjust}{-0.333\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.333\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.6\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.6\beamerswitch@margin}% + \fi + }{}% + \ifdimcomp{\beamerswitch@margin}{<}% + {\handoutpnobaseline + \beamerswitch@pnoadjust}{% + \setlength{\beamerswitch@margin}% + {\the\dimexpr\handoutpnobaseline + \beamerswitch@pnoadjust\relax}% + }{}% + }{% + \def\pgfsys@endpicture{}% + }% + \ifcase\value{beamerswitch@nupcase}\relax + \def\beamerswitch@nup{2}% + \pgfpagesuselayout{1 by 2}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{3}% + \pgfpagesuselayout{1 by 3}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{3}% + \pgfpagesuselayout{1 by 3 narrow}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{4}% + \pgfpagesuselayout{2 by 2}[\beamerswitch@handoutpaper,% + landscape,border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{4}% + \pgfpagesuselayout{1 by 4 narrow}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{6}% + \pgfpagesuselayout{2 by 3}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{8}% + \pgfpagesuselayout{2 by 4}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \fi + }% +} +% \end{macrocode} +%\end{macro} +%\end{macro} +% +% We initialize the class with the defaults set above. +% +% \begin{macrocode} +\AtEndPreamble{% + \ifdef{\beamerswitch@nup}{}{% + \handoutlayout{}% + }% +} +% \end{macrocode} % % Though \pkg{pgfpages} defines some perfectly fine layouts, we need to add % configurability to the existing ones and provide some new ones. @@ -1554,7 +1752,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1562,7 +1764,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -1572,7 +1778,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1580,7 +1790,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \fi } @@ -1612,7 +1826,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1628,7 +1846,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -1638,7 +1860,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1654,7 +1880,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -1687,7 +1917,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1695,7 +1930,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1703,7 +1942,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -1713,7 +1957,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1721,7 +1970,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1729,7 +1982,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -1740,7 +1998,7 @@ suggestions for improvements or new features to the % \begin{macrocode} \pgfpagesdeclarelayout{2 by 2} { - \edef\pgfpageoptionheight{\the\paperheight} + \edef\pgfpageoptionheight{\the\paperheight} \edef\pgfpageoptionwidth{\the\paperwidth} \edef\pgfpageoptionborder{0pt} } @@ -1757,7 +2015,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1765,7 +2028,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1773,7 +2041,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -1781,7 +2054,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% } % \end{macrocode} @@ -1813,7 +2091,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1821,7 +2104,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1829,7 +2117,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -1837,7 +2130,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -1847,7 +2145,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1855,7 +2158,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1863,7 +2171,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -1871,7 +2184,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \fi } @@ -1903,7 +2221,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1911,7 +2234,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheigh - 0.333\beamerswitch@margint}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1919,7 +2246,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -1927,7 +2259,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -1935,7 +2272,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -1943,7 +2284,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -1952,7 +2298,12 @@ suggestions for improvements or new features to the border shrink=\pgfpageoptionborder,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -1960,7 +2311,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -1968,7 +2324,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -1976,7 +2336,11 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -1984,7 +2348,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -1992,7 +2361,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -2024,7 +2398,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -2032,7 +2411,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -2040,7 +2424,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -2048,7 +2437,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -2056,7 +2450,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -2064,7 +2463,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{7} {% @@ -2072,7 +2476,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{8} {% @@ -2080,7 +2489,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -2090,7 +2504,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -2098,7 +2517,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -2106,7 +2530,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -2114,7 +2543,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -2122,7 +2556,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -2130,7 +2569,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{7} {% @@ -2138,7 +2582,12 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{8} {% @@ -2146,128 +2595,18 @@ suggestions for improvements or new features to the border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \fi } } % \end{macrocode} % -% \begin{optionkey}{paper} -% \begin{macro}{beamerswitch@handoutpaper} -% In theory it would be nice to anticipate the paper size that the article mode -% would use, and pass that as an option to \cs{pgfpagesuselayout} but as that's -% unlikely to be clean code, we settle here for setting it with an option. -% -% \begin{macrocode} -\define@key[HL]{beamerswitch}{paper}{% - \def\beamerswitch@handoutpaper{#1}% -} -% \end{macrocode} -% \end{macro} -% \end{optionkey} -% -% \begin{optionkey}{nup} -% \begin{optionvalue}{2} -% \begin{optionvalue}{3} -% \begin{optionvalue}{3plus} -% \begin{optionvalue}{4} -% \begin{optionvalue}{4plus} -% \begin{optionvalue}{6} -% \begin{optionvalue}{8} -% The \key{nup} option specifies how many slides to include per page. -% The `plus' keyword indicates a layout with additional gaps for writing. -% -% \begin{macrocode} -\newcounter{beamerswitch@nupcase} -\define@choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{% - \setcounter{beamerswitch@nupcase}{\nr} -}{% - \ClassWarning{beamerswitch}{Value of `nup' not recognized. - Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}% -} -% \end{macrocode} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionvalue} -% \end{optionkey} -% -% \begin{optionkey}{border} -% The \key{borders} option switches on borders around the slides on handout -% pages (and gaps where slides would appear if there were enough). The value -% is used to set the width of the border. -% -% \begin{macrocode} -\define@key[HL]{beamerswitch}{border}[0.4pt]{% - \RequirePackage{pgf}% - \renewcommand*{\beamerswitch@Border}{\pgfsetlinewidth{#1}\pgfstroke}% -} -% \end{macrocode} -% \end{optionkey} -% -% \begin{optionkey}{pnos} -% The \key{pnos} option switches on page numbers for handout pages. -% -% \begin{macrocode} -\define@boolkey[HL]{beamerswitch}{pnos}[true]{} -% \end{macrocode} -% \end{optionkey} -% -% \begin{macro}{handoutlayout} -% \begin{macro}{beamerswitch@nup} -% We set up the \cs{handoutlayout} command for applying these options. -% -% \begin{macrocode} -\newcommand*{\handoutlayout}[1]{% - \only<handout>{% - \setkeys[HL]{beamerswitch}{#1}% - \ifcase\value{beamerswitch@nupcase}\relax - \def\beamerswitch@nup{2} - \pgfpagesuselayout{1 by 2}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{3} - \pgfpagesuselayout{1 by 3}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{3} - \pgfpagesuselayout{1 by 3 narrow}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{4} - \pgfpagesuselayout{2 by 2}[\beamerswitch@handoutpaper,landscape,border shrink=5mm]% - \or - \def\beamerswitch@nup{4} - \pgfpagesuselayout{1 by 4 narrow}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{6} - \pgfpagesuselayout{2 by 3}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{8} - \pgfpagesuselayout{2 by 4}[\beamerswitch@handoutpaper,border shrink=5mm]% - \fi - \ifbool{HL@beamerswitch@pnos}{% - \def\pgfsys@endpicture{% - \raisebox{5mm}[0pt][0pt]{% - \makebox[\pgfphysicalwidth]{% - \the\numexpr\value{page}/\beamerswitch@nup\relax - }% - }% - }% - }{}% - }% -} -% \end{macrocode} -%\end{macro} -%\end{macro} -% -% We initialize the class with a layout of six slides on A4 paper. -% -% \begin{macrocode} -\handoutlayout{paper=a4paper,nup=6} -% \end{macrocode} -% % \subsection{Article layout} % % We provide some options for configuring the appearance of article mode. diff --git a/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls b/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls index dbb4cd3030a..df711623170 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} - [2017/12/10 v1.3 Convenient mode selection in Beamer documents] + [2018/08/29 v1.4 Convenient mode selection in Beamer documents] \RequirePackage{xkeyval,xkvltxp,etoolbox,xstring,shellesc,iftex} \define@boolkey[DC]{beamerswitch}{beamer}[true]{% \ifbool{DC@beamerswitch@beamer}{% @@ -154,7 +154,111 @@ \def\beamer@insttitle#1{\textsuperscript{#1}} \def\beamer@instinst#1{\textsuperscript{#1}\ignorespaces} }{} +\def\beamerswitch@handoutpaper{a4paper} +\define@key[HL]{beamerswitch}{paper}{% + \def\beamerswitch@handoutpaper{#1}% +} +\newcounter{beamerswitch@nupcase} +\setcounter{beamerswitch@nupcase}{5} +\define@choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{% + \setcounter{beamerswitch@nupcase}{\nr} +}{% + \ClassWarning{beamerswitch}{Value of `nup' not recognized. + Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}% +} \newcommand*{\beamerswitch@Border}{\relax} +\define@key[HL]{beamerswitch}{border}[0.4pt]{% + \RequirePackage{pgf}% + \ifdimcomp{#1}{>}{0pt}{% + \renewcommand*{\beamerswitch@Border}{\pgfsetlinewidth{#1}\pgfstroke}% + }{% + \renewcommand*{\beamerswitch@Border}{\relax}% + }% +} +\newlength{\beamerswitch@margin} +\setlength{\beamerswitch@margin}{5mm} +\define@key[HL]{beamerswitch}{margin}[0pt]{% + \setlength{\beamerswitch@margin}{#1}% +} +\define@boolkey[HL]{beamerswitch}{align}[true]{} +\newlength{\handoutpnobaseline} +\setlength{\handoutpnobaseline}{5mm} +\define@boolkey[HL]{beamerswitch}{pnos}[true]{} +\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 + }% + \ifbool{HL@beamerswitch@align}{% + \ifcase\value{beamerswitch@nupcase}\relax + \addtolength{\beamerswitch@pnoadjust}{-0.333\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.333\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.6\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.5\beamerswitch@margin}% + \or + \addtolength{\beamerswitch@pnoadjust}{-0.6\beamerswitch@margin}% + \fi + }{}% + \ifdimcomp{\beamerswitch@margin}{<}% + {\handoutpnobaseline + \beamerswitch@pnoadjust}{% + \setlength{\beamerswitch@margin}% + {\the\dimexpr\handoutpnobaseline + \beamerswitch@pnoadjust\relax}% + }{}% + }{% + \def\pgfsys@endpicture{}% + }% + \ifcase\value{beamerswitch@nupcase}\relax + \def\beamerswitch@nup{2}% + \pgfpagesuselayout{1 by 2}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{3}% + \pgfpagesuselayout{1 by 3}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{3}% + \pgfpagesuselayout{1 by 3 narrow}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{4}% + \pgfpagesuselayout{2 by 2}[\beamerswitch@handoutpaper,% + landscape,border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{4}% + \pgfpagesuselayout{1 by 4 narrow}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{6}% + \pgfpagesuselayout{2 by 3}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \or + \def\beamerswitch@nup{8}% + \pgfpagesuselayout{2 by 4}[\beamerswitch@handoutpaper,% + border shrink=\the\beamerswitch@margin]% + \fi + }% +} +\AtEndPreamble{% + \ifdef{\beamerswitch@nup}{}{% + \handoutlayout{}% + }% +} \mode<handout>{% \pgfpagesdeclarelayout{1 by 2} { @@ -179,7 +283,11 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -187,7 +295,11 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -197,7 +309,11 @@ border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -205,7 +321,11 @@ border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \fi } @@ -232,7 +352,11 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -248,7 +372,11 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -258,7 +386,11 @@ border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -274,7 +406,11 @@ border code=\beamerswitch@Border,% resized width=\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -301,7 +437,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -309,7 +450,11 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -317,7 +462,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -327,7 +477,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -335,7 +490,11 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -343,7 +502,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -366,7 +530,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -374,7 +543,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -382,7 +556,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -390,7 +569,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% } \pgfpagesdeclarelayout{1 by 4 narrow} @@ -416,7 +600,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -424,7 +613,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -432,7 +626,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -440,7 +639,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -450,7 +654,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -458,7 +667,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -466,7 +680,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -474,7 +693,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \fi } @@ -501,7 +725,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -509,7 +738,11 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheigh - 0.333\beamerswitch@margint}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -517,7 +750,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -525,7 +763,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.167\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.167\pgfphysicalwidth + 0.5\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.167\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -533,7 +776,11 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.5\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -541,7 +788,12 @@ border code=\beamerswitch@Border,% resized width=.333\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.833\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.833\pgfphysicalwidth - 0.5\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.833\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -550,7 +802,12 @@ border shrink=\pgfpageoptionborder,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -558,7 +815,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.833\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.833\pgfphysicalheight - 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.833\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -566,7 +828,11 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -574,7 +840,11 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}{.5\pgfphysicalheight}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.5\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -582,7 +852,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -590,7 +865,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.333\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.167\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.167\pgfphysicalheight + 0.5\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.167\pgfphysicalheight}% + }% }% \fi } @@ -617,7 +897,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -625,7 +910,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -633,7 +923,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -641,7 +936,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.75\pgfphysicalheight - 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.75\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -649,7 +949,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.125\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.125\pgfphysicalwidth + 0.6\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.125\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -657,7 +962,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.375\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.375\pgfphysicalwidth + 0.2\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.375\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{7} {% @@ -665,7 +975,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.625\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.625\pgfphysicalwidth - 0.2\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.625\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{8} {% @@ -673,7 +988,12 @@ border code=\beamerswitch@Border,% resized width=.25\pgfphysicalwidth,% resized height=.5\pgfphysicalheight,% - center=\pgfpoint{.875\pgfphysicalwidth}{.25\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.875\pgfphysicalwidth - 0.6\beamerswitch@margin}% + {.25\pgfphysicalheight + 0.333\beamerswitch@margin}% + }{% + \pgfpoint{.875\pgfphysicalwidth}{.25\pgfphysicalheight}% + }% }% \else % stack on top of one another @@ -683,7 +1003,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{2} {% @@ -691,7 +1016,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.875\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.875\pgfphysicalheight - 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.875\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{3} {% @@ -699,7 +1029,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{4} {% @@ -707,7 +1042,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25\pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.625\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.625\pgfphysicalheight - 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.625\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{5} {% @@ -715,7 +1055,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{6} {% @@ -723,7 +1068,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.375\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.375\pgfphysicalheight + 0.2\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.375\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{7} {% @@ -731,7 +1081,12 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \pgfpageslogicalpageoptions{8} {% @@ -739,63 +1094,16 @@ border code=\beamerswitch@Border,% resized width=.5\pgfphysicalwidth,% resized height=.25 \pgfphysicalheight,% - center=\pgfpoint{.75\pgfphysicalwidth}{.125\pgfphysicalheight}% + center=\ifbool{HL@beamerswitch@align}{% + \pgfpoint{.75\pgfphysicalwidth - 0.333\beamerswitch@margin}% + {.125\pgfphysicalheight + 0.6\beamerswitch@margin}% + }{% + \pgfpoint{.75\pgfphysicalwidth}{.125\pgfphysicalheight}% + }% }% \fi } } -\define@key[HL]{beamerswitch}{paper}{% - \def\beamerswitch@handoutpaper{#1}% -} -\newcounter{beamerswitch@nupcase} -\define@choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{% - \setcounter{beamerswitch@nupcase}{\nr} -}{% - \ClassWarning{beamerswitch}{Value of `nup' not recognized. - Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}% -} -\define@key[HL]{beamerswitch}{border}[0.4pt]{% - \RequirePackage{pgf}% - \renewcommand*{\beamerswitch@Border}{\pgfsetlinewidth{#1}\pgfstroke}% -} -\define@boolkey[HL]{beamerswitch}{pnos}[true]{} -\newcommand*{\handoutlayout}[1]{% - \only<handout>{% - \setkeys[HL]{beamerswitch}{#1}% - \ifcase\value{beamerswitch@nupcase}\relax - \def\beamerswitch@nup{2} - \pgfpagesuselayout{1 by 2}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{3} - \pgfpagesuselayout{1 by 3}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{3} - \pgfpagesuselayout{1 by 3 narrow}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{4} - \pgfpagesuselayout{2 by 2}[\beamerswitch@handoutpaper,landscape,border shrink=5mm]% - \or - \def\beamerswitch@nup{4} - \pgfpagesuselayout{1 by 4 narrow}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{6} - \pgfpagesuselayout{2 by 3}[\beamerswitch@handoutpaper,border shrink=5mm]% - \or - \def\beamerswitch@nup{8} - \pgfpagesuselayout{2 by 4}[\beamerswitch@handoutpaper,border shrink=5mm]% - \fi - \ifbool{HL@beamerswitch@pnos}{% - \def\pgfsys@endpicture{% - \raisebox{5mm}[0pt][0pt]{% - \makebox[\pgfphysicalwidth]{% - \the\numexpr\value{page}/\beamerswitch@nup\relax - }% - }% - }% - }{}% - }% -} -\handoutlayout{paper=a4paper,nup=6} \define@boolkey[AL]{beamerswitch}{maketitle}[true]{} \newtoggle{titlepunct} \IfFileExists{xparse.sty}{\@tempswatrue}{\@tempswafalse} |