texlive[55441] Master/texmf-dist: beamerswitch (6jun20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 6 23:12:52 CEST 2020
Revision: 55441
http://tug.org/svn/texlive?view=revision&revision=55441
Author: karl
Date: 2020-06-06 23:12:52 +0200 (Sat, 06 Jun 2020)
Log Message:
-----------
beamerswitch (6jun20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf
trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf
trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf
trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf
trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf
trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx
trunk/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls
Removed Paths:
-------------
trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.ins
Modified: trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-article.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-handout.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example-trans.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch-example.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/beamerswitch/beamerswitch.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx 2020-06-06 21:12:36 UTC (rev 55440)
+++ trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.dtx 2020-06-06 21:12:52 UTC (rev 55441)
@@ -228,7 +228,7 @@
%<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<class>\ProvidesClass{beamerswitch}
%<*class>
- [2020/01/20 v1.6.1 Convenient mode selection in Beamer documents]
+ [2020/06/06 v1.7 Convenient mode selection in Beamer documents]
%</class>
%<*driver>
\documentclass[12pt]{article}
@@ -381,6 +381,7 @@
\index{\MyName@\tcbIndexPrintValCA {\MyName}|)}%
}
\makeatletter
+\def\MY at EQUALS{=}%
\newcommand{\resetmintedformat}{%
% Comments
\expandafter\def\csname PYGdefault at tok@c\endcsname{\let\PYGdefault at it=\textit\def\PYGdefault at tc####1{\textcolor{gray}{####1}}}
@@ -893,6 +894,7 @@
load \pkg{hyperref} yourself at a different point, use this option.
\end{docKey}
+\pagebreak % TWEAK: may not be needed in future versions
\begin{docKey}{textinst}{}{no value, initially unset}
In all modes, patches the \cs{inst} command so that it prints its argument
using \cs{textsuperscript} instead of a mathematical superscript. This helps
@@ -917,13 +919,13 @@
\key{resize to} layout.
\end{docKey}
-\begin{docKey}{nup}{=\val{2}\textbar \val{3}\textbar \val{3plus}\textbar \val{4}\textbar \val{4plus}\textbar \val{6}\textbar \val{8}}{no default, initially \val{6}}
+\begin{docKey}{nup}{=\val{1}\textbar \val{1plus}\textbar \val{2}\textbar \val{3}\textbar \val{3plus}\textbar \val{4}\textbar \val{4plus}\textbar \val{6}\textbar \val{8}}{no default, initially \val{6}}
Selects how many slides are shown on a single page in \key{handout} mode.
The `plus' layouts leave blank space for recipients to make handwritten notes
- next to each slide. The effects of the various values are shown in Figure~\ref{fig:layouts} on page~\pageref{fig:layouts}. Note that the \docValue{2},
- \docValue{3plus}, \docValue{4} and \docValue{6} layouts are intended for
- slides in the usual 4:3 aspect ratio, while the \docValue{3}, \docValue{4plus}
- and \docValue{8} layouts are intended for widescreen slides.
+ next to each slide. The effects of the various values are shown in Figure~\ref{fig:layouts} on page~\pageref{fig:layouts}. Note that the \val{2}, \val{3plus}, \val{4}
+ and \val{6} layouts are intended for slides in the usual 4:3 aspect ratio,
+ while the \val{3}, \val{4plus} and \val{8} layouts are intended for widescreen
+ slides.
\end{docKey}
\newtcolorbox{pseudopage}[1][]%
@@ -962,19 +964,42 @@
,#1
}
\begin{figure}[t!]
+ \newcounter{subfig}%
+ \def\sfno{\rule[-\bigskipamount]{0pt}{1em}\stepcounter{subfig}(\alph{subfig})\space}%
\centering
\begin{minipage}[b]{11em}
\centering
+ \begin{pseudopage}[width=10em,height=7.1em]
+ \begin{pseudoslide}[width=8em,height=6em]
+ \texttt{1}
+ \end{pseudoslide}
+ \end{pseudopage}
+ \par
+ \sfno\key{nup}=\docValue{1}
+ \end{minipage}
+ \begin{minipage}[b]{11em}
+ \centering
\begin{pseudopage}
\begin{pseudoslide}[width=6em,height=4.5em]
\texttt{1}
\end{pseudoslide}\par\smallskip
+ \vbox to 4.5em{}
+ \end{pseudopage}
+ \par
+ \sfno\key{nup}=\docValue{1plus}
+ \end{minipage}
+ \begin{minipage}[b]{11em}
+ \centering
+ \begin{pseudopage}
\begin{pseudoslide}[width=6em,height=4.5em]
+ \texttt{1}
+ \end{pseudoslide}\par\smallskip
+ \begin{pseudoslide}[width=6em,height=4.5em]
\texttt{2}
\end{pseudoslide}
\end{pseudopage}
\par
- (a) \key{nup}=\val{2}
+ \sfno\key{nup}=\docValue{2}
\end{minipage}
\begin{minipage}[b]{11em}
\centering
@@ -992,7 +1017,7 @@
\end{pseudowideslide}
\end{pseudopage}
\par
- (b) \key{nup}=\val{3}
+ \sfno\key{nup}=\docValue{3}
\end{minipage}
\begin{minipage}[b]{11em}
\centering
@@ -1004,9 +1029,8 @@
\begin{pseudoslide}\texttt{3}\end{pseudoslide}
\end{pseudopage}
\par
- (c) \key{nup}=\val{3plus}
+ \sfno\key{nup}=\docValue{3plus}
\end{minipage}
- \par\bigskip
\begin{minipage}[b]{11em}
\centering
\begin{pseudopage}[width=10em,height=7.1em]
@@ -1024,7 +1048,7 @@
\end{pseudoslide}
\end{pseudopage}
\par
- (d) \key{nup}=\val{4}
+ \sfno\key{nup}=\docValue{4}
\end{minipage}
\begin{minipage}[b]{11em}
\centering
@@ -1038,7 +1062,7 @@
\begin{pseudowideslide}\texttt{4}\end{pseudowideslide}
\end{pseudopage}
\par
- (e) \key{nup}=\val{4plus}
+ \sfno\key{nup}=\docValue{4plus}
\end{minipage}
\begin{minipage}[b]{11em}
\centering
@@ -1053,9 +1077,8 @@
\begin{pseudoslide}\texttt{6}\end{pseudoslide}
\end{pseudopage}
\par
- (f) \key{nup}=\val{6}
+ \sfno\key{nup}=\docValue{6}
\end{minipage}
- \par\bigskip
\begin{minipage}[b]{11em}
\centering
\begin{pseudopage}
@@ -1072,9 +1095,9 @@
\begin{pseudowideslide}\texttt{8}\end{pseudowideslide}
\end{pseudopage}
\par
- (g) \key{nup}=\val{8}
+ \sfno\key{nup}=\docValue{8}
\end{minipage}
- \par
+ \\
\caption{Handout layouts provided by \pkg{beamerswitch}}
\label{fig:layouts}
\end{figure}
@@ -1181,6 +1204,7 @@
\href{https://github.com/alex-ball/beamerswitch/issues}{Issue Tracker} on GitHub.
\StopEventually{^^A
+ \newpage
\PrintChanges
\printindex
}
@@ -1561,6 +1585,8 @@
% \end{optionkey}
%
% \begin{optionkey}{nup}
+% \begin{optionvalue}{1}
+% \begin{optionvalue}{1plus}
% \begin{optionvalue}{2}
% \begin{optionvalue}{3}
% \begin{optionvalue}{3plus}
@@ -1568,17 +1594,19 @@
% \begin{optionvalue}{4plus}
% \begin{optionvalue}{6}
% \begin{optionvalue}{8}
+% \changes{v1.7}{2020/06/06}{Add \key{nup}\string\MY at EQUALS\val{1} option.}
+% \changes{v1.7}{2020/06/06}{Add \key{nup}\string\MY at EQUALS\val{1plus} option.}
% 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 at nupcase}
-\setcounter{beamerswitch at nupcase}{5}
-\define at choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{%
+\setcounter{beamerswitch at nupcase}{7}
+\define at choicekey+[HL]{beamerswitch}{nup}[\val\nr]{1, 1plus, 2, 3, 3plus, 4, 4plus, 6, 8}{%
\setcounter{beamerswitch at nupcase}{\nr}
}{%
\ClassWarning{beamerswitch}{Value of `nup' not recognized.
- Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}%
+ Allowed values are 1, 1plus, 2, 3, 3plus, 4, 4plus, 6, and 8.}%
}
% \end{macrocode}
% \end{optionvalue}
@@ -1588,6 +1616,8 @@
% \end{optionvalue}
% \end{optionvalue}
% \end{optionvalue}
+% \end{optionvalue}
+% \end{optionvalue}
% \end{optionkey}
%
% \begin{optionkey}{border}
@@ -1720,8 +1750,12 @@
}%
\ifbool{HL at beamerswitch@align}{%
\ifcase\value{beamerswitch at nupcase}\relax
+ \relax
+ \or
\addtolength{\beamerswitch at pnoadjust}{-0.333\beamerswitch at margin}%
\or
+ \addtolength{\beamerswitch at pnoadjust}{-0.333\beamerswitch at margin}%
+ \or
\addtolength{\beamerswitch at pnoadjust}{-0.5\beamerswitch at margin}%
\or
\addtolength{\beamerswitch at pnoadjust}{-0.5\beamerswitch at margin}%
@@ -1754,6 +1788,14 @@
%
% \begin{macrocode}
\ifcase\value{beamerswitch at nupcase}\relax
+ \def\beamerswitch at nup{1}%
+ \pgfpagesuselayout{1 by 1}[\beamerswitch at handoutpaper,%
+ landscape,border shrink=\the\beamerswitch at margin]%
+ \or
+ \def\beamerswitch at nup{1}%
+ \pgfpagesuselayout{1 by 1 narrow}[\beamerswitch at handoutpaper,%
+ border shrink=\the\beamerswitch at margin]%
+ \or
\def\beamerswitch at nup{2}%
\pgfpagesuselayout{1 by 2}[\beamerswitch at handoutpaper,%
border shrink=\the\beamerswitch at margin]%
@@ -1801,10 +1843,92 @@
% Though \pkg{pgfpages} defines some perfectly fine layouts, we need to add
% configurability to the existing ones and provide some new ones.
%
+% \changes{v1.7}{2020/06/06}{Add `1 by 1' layout.}
+% The `1 by 1' layout has a single slide per page.
+%
+% \begin{macrocode}
+\mode<handout>{%
+ \pgfpagesdeclarelayout{1 by 1}
+ {
+ \edef\pgfpageoptionheight{\the\paperheight}
+ \edef\pgfpageoptionwidth{\the\paperwidth}
+ \edef\pgfpageoptionborder{0pt}
+ \def\pgfpageoptionfirstshipout{1}
+ }
+ {
+ \pgfpagesphysicalpageoptions
+ {%
+ logical pages=1,%
+ physical height=\pgfpageoptionheight,%
+ physical width=\pgfpageoptionwidth,%
+ current logical shipout=\pgfpageoptionfirstshipout%
+ }
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=\pgfphysicalwidth,%
+ resized height=\pgfphysicalheight,%
+ center=\pgfpoint{.5\pgfphysicalwidth}{.5\pgfphysicalheight}%
+ }%
+ }%
+% \end{macrocode}
+%
+% \changes{v1.7}{2020/06/06}{Add `1 by 1 narrow' layout.}
+% The `1 by 1 narrow' layout is similar to the normal \key{2 on 1} layout, but
+% there is a notes area instead of the second slide.
+%
+% \begin{macrocode}
+ \pgfpagesdeclarelayout{1 by 1 narrow}
+ {
+ \edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default
+ \edef\pgfpageoptionwidth{\the\paperheight}
+ \def\pgfpageoptionborder{0pt}
+ \def\pgfpageoptionfirstshipout{1}
+ }
+ {
+ \pgfpagesphysicalpageoptions
+ {%
+ logical pages=1,%
+ physical height=\pgfpageoptionheight,%
+ physical width=\pgfpageoptionwidth,%
+ current logical shipout=\pgfpageoptionfirstshipout%
+ }
+ \ifdim\paperheight>\paperwidth\relax
+ % put side-by-side
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=.5\pgfphysicalwidth,%
+ resized height=\pgfphysicalheight,%
+ center=\ifbool{HL at beamerswitch@align}{%
+ \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch at margin}{.5\pgfphysicalheight}%
+ }{%
+ \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}%
+ }%
+ }%
+ \else
+ % stack on top of one another
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=\pgfphysicalwidth,%
+ resized height=.5\pgfphysicalheight,%
+ center=\ifbool{HL at beamerswitch@align}{%
+ \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.333\beamerswitch at margin}%
+ }{%
+ \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}%
+ }%
+ }%
+ \fi
+ }
+% \end{macrocode}
+%
% The `1 by 2' layout is similar to the normal \key{2 on 1} layout.
%
% \begin{macrocode}
-\mode<handout>{%
\pgfpagesdeclarelayout{1 by 2}
{
\edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default
Deleted: trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.ins 2020-06-06 21:12:36 UTC (rev 55440)
+++ trunk/Master/texmf-dist/source/latex/beamerswitch/beamerswitch.ins 2020-06-06 21:12:52 UTC (rev 55441)
@@ -1,46 +0,0 @@
-%%
-%% This is file `beamerswitch.ins',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% beamerswitch.dtx (with options: `install')
-%% ----------------------------------------------------------------
-%% beamerswitch --- Convenient mode selection in Beamer documents
-%% Author: Alex Ball
-%% E-mail: ab318 at bath.ac.uk
-%% License: Released under the LaTeX Project Public License v1.3c or later
-%% See: http://www.latex-project.org/lppl.txt
-%% ----------------------------------------------------------------
-%%
-\input docstrip.tex
-\keepsilent
-\askforoverwritefalse
-\preamble
-----------------------------------------------------------------
-beamerswitch --- Convenient mode selection in Beamer documents
-Author: Alex Ball
-E-mail: ab318 at bath.ac.uk
-License: Released under the LaTeX Project Public License v1.3c or later
-See: http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-\endpreamble
-\postamble
-
-Copyright (C) 2016-2020 by Alex Ball <ab318 at bath.ac.uk>
-\endpostamble
-
-\usedir{tex/latex/\jobname}
-\generate{
- \file{\jobname.cls}{\from{\jobname.dtx}{class}}
-}
-\usedir{doc/latex/\jobname}
-\generate{
- \file{\jobname-example.tex}{\from{\jobname.dtx}{example}}
-}
-\endbatchfile
-%%
-%% Copyright (C) 2016-2020 by Alex Ball <ab318 at bath.ac.uk>
-%%
-%% End of file `beamerswitch.ins'.
Modified: trunk/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls 2020-06-06 21:12:36 UTC (rev 55440)
+++ trunk/Master/texmf-dist/tex/latex/beamerswitch/beamerswitch.cls 2020-06-06 21:12:52 UTC (rev 55441)
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{beamerswitch}
- [2020/01/20 v1.6.1 Convenient mode selection in Beamer documents]
+ [2020/06/06 v1.7 Convenient mode selection in Beamer documents]
\RequirePackage{xkeyval,xkvltxp,etoolbox,xstring,shellesc,iftex}
\define at boolkey[DC]{beamerswitch}{beamer}[true]{%
\ifbool{DC at beamerswitch@beamer}{%
@@ -165,12 +165,12 @@
\def\beamerswitch at handoutpaper{#1}%
}
\newcounter{beamerswitch at nupcase}
-\setcounter{beamerswitch at nupcase}{5}
-\define at choicekey+[HL]{beamerswitch}{nup}[\val\nr]{2, 3, 3plus, 4, 4plus, 6, 8}{%
+\setcounter{beamerswitch at nupcase}{7}
+\define at choicekey+[HL]{beamerswitch}{nup}[\val\nr]{1, 1plus, 2, 3, 3plus, 4, 4plus, 6, 8}{%
\setcounter{beamerswitch at nupcase}{\nr}
}{%
\ClassWarning{beamerswitch}{Value of `nup' not recognized.
- Allowed values are 2, 3, 3plus, 4, 4plus, 6, and 8.}%
+ Allowed values are 1, 1plus, 2, 3, 3plus, 4, 4plus, 6, and 8.}%
}
\newcommand*{\beamerswitch at Border}{\relax}
\define at key[HL]{beamerswitch}{border}[0.4pt]{%
@@ -223,8 +223,12 @@
}%
\ifbool{HL at beamerswitch@align}{%
\ifcase\value{beamerswitch at nupcase}\relax
+ \relax
+ \or
\addtolength{\beamerswitch at pnoadjust}{-0.333\beamerswitch at margin}%
\or
+ \addtolength{\beamerswitch at pnoadjust}{-0.333\beamerswitch at margin}%
+ \or
\addtolength{\beamerswitch at pnoadjust}{-0.5\beamerswitch at margin}%
\or
\addtolength{\beamerswitch at pnoadjust}{-0.5\beamerswitch at margin}%
@@ -247,6 +251,14 @@
\def\beamerswitch at footer{\stepcounter{handoutpno}}%
}%
\ifcase\value{beamerswitch at nupcase}\relax
+ \def\beamerswitch at nup{1}%
+ \pgfpagesuselayout{1 by 1}[\beamerswitch at handoutpaper,%
+ landscape,border shrink=\the\beamerswitch at margin]%
+ \or
+ \def\beamerswitch at nup{1}%
+ \pgfpagesuselayout{1 by 1 narrow}[\beamerswitch at handoutpaper,%
+ border shrink=\the\beamerswitch at margin]%
+ \or
\def\beamerswitch at nup{2}%
\pgfpagesuselayout{1 by 2}[\beamerswitch at handoutpaper,%
border shrink=\the\beamerswitch at margin]%
@@ -283,6 +295,75 @@
}%
}
\mode<handout>{%
+ \pgfpagesdeclarelayout{1 by 1}
+ {
+ \edef\pgfpageoptionheight{\the\paperheight}
+ \edef\pgfpageoptionwidth{\the\paperwidth}
+ \edef\pgfpageoptionborder{0pt}
+ \def\pgfpageoptionfirstshipout{1}
+ }
+ {
+ \pgfpagesphysicalpageoptions
+ {%
+ logical pages=1,%
+ physical height=\pgfpageoptionheight,%
+ physical width=\pgfpageoptionwidth,%
+ current logical shipout=\pgfpageoptionfirstshipout%
+ }
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=\pgfphysicalwidth,%
+ resized height=\pgfphysicalheight,%
+ center=\pgfpoint{.5\pgfphysicalwidth}{.5\pgfphysicalheight}%
+ }%
+ }%
+ \pgfpagesdeclarelayout{1 by 1 narrow}
+ {
+ \edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default
+ \edef\pgfpageoptionwidth{\the\paperheight}
+ \def\pgfpageoptionborder{0pt}
+ \def\pgfpageoptionfirstshipout{1}
+ }
+ {
+ \pgfpagesphysicalpageoptions
+ {%
+ logical pages=1,%
+ physical height=\pgfpageoptionheight,%
+ physical width=\pgfpageoptionwidth,%
+ current logical shipout=\pgfpageoptionfirstshipout%
+ }
+ \ifdim\paperheight>\paperwidth\relax
+ % put side-by-side
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=.5\pgfphysicalwidth,%
+ resized height=\pgfphysicalheight,%
+ center=\ifbool{HL at beamerswitch@align}{%
+ \pgfpoint{.25\pgfphysicalwidth + 0.333\beamerswitch at margin}{.5\pgfphysicalheight}%
+ }{%
+ \pgfpoint{.25\pgfphysicalwidth}{.5\pgfphysicalheight}%
+ }%
+ }%
+ \else
+ % stack on top of one another
+ \pgfpageslogicalpageoptions{1}
+ {%
+ border shrink=\pgfpageoptionborder,%
+ border code=\beamerswitch at Border,%
+ resized width=\pgfphysicalwidth,%
+ resized height=.5\pgfphysicalheight,%
+ center=\ifbool{HL at beamerswitch@align}{%
+ \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight - 0.333\beamerswitch at margin}%
+ }{%
+ \pgfpoint{.5\pgfphysicalwidth}{.75\pgfphysicalheight}%
+ }%
+ }%
+ \fi
+ }
\pgfpagesdeclarelayout{1 by 2}
{
\edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default
More information about the tex-live-commits
mailing list.