summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-05 21:38:33 +0000
committerKarl Berry <karl@freefriends.org>2017-03-05 21:38:33 +0000
commitc83a6978f6e5eb7456783ecb1401896859d19b4d (patch)
tree4216b727c766c940a3a47810b378ccd8ab6feb95
parenta642a9d24ca74eb111c8595dd1f9fa7181f065c2 (diff)
overlays (5mar17)
git-svn-id: svn://tug.org/texlive/trunk@43404 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/overlays/ChangeLog8
-rw-r--r--Master/texmf-dist/doc/latex/overlays/README2
-rw-r--r--Master/texmf-dist/doc/latex/overlays/overlays.pdfbin35201 -> 36123 bytes
-rw-r--r--Master/texmf-dist/doc/latex/overlays/overlays.tex32
-rw-r--r--Master/texmf-dist/doc/latex/overlays/sample.pdfbin55654 -> 64816 bytes
-rw-r--r--Master/texmf-dist/doc/latex/overlays/sample.tex44
-rw-r--r--Master/texmf-dist/tex/latex/overlays/overlays.sty30
7 files changed, 83 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/overlays/ChangeLog b/Master/texmf-dist/doc/latex/overlays/ChangeLog
index 5bb0c60202b..728f13f726f 100644
--- a/Master/texmf-dist/doc/latex/overlays/ChangeLog
+++ b/Master/texmf-dist/doc/latex/overlays/ChangeLog
@@ -1,3 +1,11 @@
+2017-03-04:
+ * "\saveseriesbetweenoverlays" command for enumitem series not to be
+ incremented between overlays (currently restricted to the first level of
+ lists cloned by \newlist and series names matching the list name)
+ * rename "\savebetweenoverlays" to "\savecountersbetweenoverlays" (preserving
+ "\savebetweenoverlays" as a shortcut for backward compatibility)
+ * bump version to 2.5
+
2016-10-24:
* if PSTricks is loaded, set linecolor to background or alert color
* bump version to 2.4
diff --git a/Master/texmf-dist/doc/latex/overlays/README b/Master/texmf-dist/doc/latex/overlays/README
index 256f5ae56ad..1d6a7cbdae9 100644
--- a/Master/texmf-dist/doc/latex/overlays/README
+++ b/Master/texmf-dist/doc/latex/overlays/README
@@ -1,4 +1,4 @@
-The "overlays" LaTeX package (version 2.3)
+The "overlays" LaTeX package (version 2.5)
------------------------------------------
The "overlay" package allows to write presentations with dynamic slides. It does
diff --git a/Master/texmf-dist/doc/latex/overlays/overlays.pdf b/Master/texmf-dist/doc/latex/overlays/overlays.pdf
index 1db316fa8ee..63d56254595 100644
--- a/Master/texmf-dist/doc/latex/overlays/overlays.pdf
+++ b/Master/texmf-dist/doc/latex/overlays/overlays.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/overlays/overlays.tex b/Master/texmf-dist/doc/latex/overlays/overlays.tex
index 67b2cf9d86c..034cde00e5f 100644
--- a/Master/texmf-dist/doc/latex/overlays/overlays.tex
+++ b/Master/texmf-dist/doc/latex/overlays/overlays.tex
@@ -9,7 +9,7 @@
\begin{document}
\title{\textsf{overlays} -- incremental slides}
\author{Andreas Nolda}
-\date{2016/10/24 (v.\,2.4)}
+\date{2017/03/04 (v.\,2.5)}
\maketitle
\noindent The \textsf{overlay} package allows to write presentations with
@@ -68,13 +68,28 @@ in the overlay specification, but is absent from unspecified overlays and does
not take up space there.
\pagebreak
-\DescribeMacro{\savebetweenoverlays}
+\DescribeMacro{\savecountersbetweenoverlays}
The |page| and |equation| counters are not incremented between overlays. Other
counters can be saved between overlays, too, by means of the following command:
\begin{quote}
-|\savebetweenoverlays{|\meta{counter name}|}|
+|\savecountersbetweenoverlays{|\meta{counter name}|}|
+\end{quote}
+\DescribeMacro{\savebetweenoverlays}
+The |\savebetweenoverlays| command is provided as a shortcut for backward
+compatibility.
+
+\hyphenation{enum-item}
+\DescribeMacro{\saveseriesbetweenoverlays}
+Series of first-level lists cloned by means of the |\newlist| command of the
+\textsf{enumitem} package can be saved between overlays by means of the
+following command:
+\begin{quote}
+|\saveseriesbetweenoverlays{|\meta{series name}|}|
\end{quote}
-Typically, this command would be used in the preamble.
+See below for known limitations.
+
+The |\savecountersbetweenoverlays| and |\saveseriesbetweenoverlays| commands
+are typically used in the preamble.
\section{Known limitations}
@@ -82,6 +97,9 @@ The |\alert|, |\visible|, and |\only| commands must not contain verbatim
commands or environments. They may be used in the content of the |alltt|
environment, though.
+The |\saveseriesbetweenoverlays| command requires that the series name matches
+the list name.
+
\section{Dependencies}
The \textsf{overlays} package requires the following packages: \textsf{color},
@@ -95,7 +113,7 @@ The code of the \textsf{overlays} package is inspired by Matthias Meister's
In addition, it uses an algorithm by Martin Scharrer for testing numbers in
numerical ranges (cf. \url{http://tex.stackexchange.com/q/19000}).
-The code for saving counters between overlays as well as for overlays with
-verbatim content is taken from the \textsf{texpower} package, which in turn is
-based on Till Tantau's \textsf{beamer} package.
+The code for saving counters between overlays as well as the code for overlays
+with verbatim content is taken from the \textsf{texpower} package, which in turn
+is based on Till Tantau's \textsf{beamer} package.
\end{document}
diff --git a/Master/texmf-dist/doc/latex/overlays/sample.pdf b/Master/texmf-dist/doc/latex/overlays/sample.pdf
index b071b89e87c..089223b9e9b 100644
--- a/Master/texmf-dist/doc/latex/overlays/sample.pdf
+++ b/Master/texmf-dist/doc/latex/overlays/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/overlays/sample.tex b/Master/texmf-dist/doc/latex/overlays/sample.tex
index 61c8f46ff1d..ebadb405d28 100644
--- a/Master/texmf-dist/doc/latex/overlays/sample.tex
+++ b/Master/texmf-dist/doc/latex/overlays/sample.tex
@@ -33,8 +33,8 @@
\textit{A sample presentation}} \\[\baselineskip]
Andreas Nolda \\
\url{http://andreas.nolda.org}}\vfill
-{\small Version 2.4 \\
-24 October 2016}
+{\small Version 2.5 \\
+4 March 2017}
\clearpage
\begin{fragileoverlays}{6}
@@ -150,7 +150,7 @@ of the \texttt{alltt} environment of the
\end{fragileoverlays}
\clearpage
-\begin{overlays}{6}
+\begin{overlays}{3}
\subsubsection*{Caveats}
The package expects that the slide content in the \alert{1}{\texttt{overlays}}
environment fits on a single page. This can be ensured by means of
@@ -159,24 +159,34 @@ environment fits on a single page. This can be ensured by means of
\visible{2-}{The \texttt{page} and \texttt{equation} counters are not
incremented between overlays. Other counters can be saved between overlays, too,
by means of the command
-\alert{2}{\texttt{\textbackslash{savebetweenoverlays\{\meta{counter name}\}}}}.}
+\alert{2}{\texttt{\textbackslash{savecounterbetweenoverlays\{\meta{counter name}\}}}}.}
+
+\visible{3-}{Series of first-level lists cloned by means of the
+\texttt{\textbackslash{}newlist} command of the \textrm{enumitem} package can be saved between
+overlays by means of the command
+\alert{3}{\texttt{\textbackslash{saveseriesbetweenoverlays\{\meta{series
+name}\}}}}, provided that the series name matches the list name.}
+\end{overlays}
+\clearpage
-\visible{3-}{In the \texttt{tabular} environment, the
-\alert{3}{\texttt{\textbackslash{}alert}},
-\alert{4}{\texttt{\textbackslash{}visible}} and
-\alert{5}{\texttt{\textbackslash{}only}} commands have to be put into braces:
+\begin{overlays}{4}
+\subsubsection*{Further caveats}
+\visible{1-}{In the \texttt{tabular} environment, the
+\alert{1}{\texttt{\textbackslash{}alert}},
+\alert{2}{\texttt{\textbackslash{}visible}} and
+\alert{3}{\texttt{\textbackslash{}only}} commands have to be put into braces:
\begin{quote}
\begin{tabular}[t]{ll}
outside \texttt{tabular} & inside \texttt{tabular} \\\hline
-{\alert{3}{\texttt{\textbackslash{}alert\{\ldots\}\{\ldots\}}}} &
-{\alert{3}{\texttt{\{\textbackslash{}alert\{\ldots\}\{\ldots\}\}}}} \\
-{\visible{4-}{{\alert{4}{\texttt{\textbackslash{}visible\{\ldots\}\{\ldots\}}}}}} &
-{\visible{4-}{{\alert{4}{\texttt{\{\textbackslash{}visible\{\ldots\}\{\ldots\}\}}}}}} \\
-{\visible{5-}{{\alert{5}{\texttt{\textbackslash{}only\{\ldots\}\{\ldots\}}}}}} &
-{\visible{5-}{{\alert{5}{\texttt{\{\textbackslash{}only\{\ldots\}\{\ldots\}\}}}}}}
+{\alert{1}{\texttt{\textbackslash{}alert\{\ldots\}\{\ldots\}}}} &
+{\alert{1}{\texttt{\{\textbackslash{}alert\{\ldots\}\{\ldots\}\}}}} \\
+{\visible{2-}{{\alert{2}{\texttt{\textbackslash{}visible\{\ldots\}\{\ldots\}}}}}} &
+{\visible{2-}{{\alert{2}{\texttt{\{\textbackslash{}visible\{\ldots\}\{\ldots\}\}}}}}} \\
+{\visible{3-}{{\alert{3}{\texttt{\textbackslash{}only\{\ldots\}\{\ldots\}}}}}} &
+{\visible{3-}{{\alert{3}{\texttt{\{\textbackslash{}only\{\ldots\}\{\ldots\}\}}}}}}
\end{tabular}
\end{quote}}
-\visible{6-}{In addition, make sure not to include the cell delimiter
+\visible{4}{In addition, make sure not to include the cell delimiter
\texttt{\&} or the row delimiter \texttt{\textbackslash{}\textbackslash{}} into
the content of these commands.}
\end{overlays}
@@ -190,8 +200,8 @@ The code of the \textrm{overlays} package is inspired by Matthias Meister's
\visible{2-}{In addition, it uses an algorithm by Martin Scharrer for testing
numbers in numerical ranges (cf. \url{http://tex.stackexchange.com/q/19000}).}
-\visible{3}{The code for saving counters between overlays as well as for
-overlays with verbatim content is taken from the
+\visible{3}{The code for saving counters between overlays as well as the code
+for overlays with verbatim content is taken from the
\href{http://www.ctan.org/pkg/texpower}{\textrm{texpower} package}, which in
turn is based on Till Tantau's
\href{http://www.ctan.org/pkg/beamer}{\textrm{beamer} package}.}
diff --git a/Master/texmf-dist/tex/latex/overlays/overlays.sty b/Master/texmf-dist/tex/latex/overlays/overlays.sty
index 2db16f624ba..151a34ea69a 100644
--- a/Master/texmf-dist/tex/latex/overlays/overlays.sty
+++ b/Master/texmf-dist/tex/latex/overlays/overlays.sty
@@ -1,9 +1,9 @@
-\ProvidesPackage{overlays}[2016/10/24 v2.4 Incremental slides]
+\ProvidesPackage{overlays}[2017/03/04 v2.5 Incremental slides]
-% Copyright (C) 2016 Andreas Nolda
+% Copyright (C) 2017 Andreas Nolda
% Author: Andreas Nolda <andreas@nolda.org>
-% Version: 2.4
+% Version: 2.5
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License, either version 1.3 of this license or (at your option)
@@ -22,17 +22,29 @@
\RequirePackage{pgffor}
\def\s@vedcounters{}
+\def\s@vedseries{}
-\def\s@vecounters%
+\def\s@vecounters
{\begingroup
\def\@elt##1{\global\csname c@##1\endcsname\the\csname c@##1\endcsname}%
\xdef\restores@vedcounters{\s@vedcounters}%
\endgroup}
-\newcommand{\savebetweenoverlays}[1]%
- {\expandafter\def
- \expandafter\s@vedcounters
- \expandafter{\s@vedcounters\@elt{#1}}}
+\def\s@veseries
+ {\begingroup
+ \def\@elt##1{\def\expandafter\noexpand\csname enit@resume@series@##1\endcsname%
+ {\csname c@##1i\endcsname\csname the##1i\endcsname}}%
+ \xdef\restores@vedseries{\s@vedseries}%
+ \endgroup}
+
+\newcommand{\savecounterbetweenoverlays}[1]%
+ {\expandafter\def\expandafter\s@vedcounters\expandafter{\s@vedcounters\@elt{#1}}}
+
+\let\savebetweenoverlays\savecounterbetweenoverlays % for backward compatibility
+
+\newcommand{\saveseriesbetweenoverlays}[1]%
+ {\expandafter\newcount\csname s@ve#1i\endcsname
+ \expandafter\def\expandafter\s@vedseries\expandafter{\s@vedseries\@elt{#1}}}
\savebetweenoverlays{page}
\savebetweenoverlays{equation}
@@ -42,6 +54,7 @@
\NewEnviron{overlays}[1]%
{\s@vecounters
+ \s@veseries
\maxoverl@y=#1%
\curoverl@y=0%
\loop
@@ -52,6 +65,7 @@
\ifnum\curoverl@y<\maxoverl@y%
\clearpage
\restores@vedcounters
+ \restores@vedseries
\repeat}
\newwrite\verb@timfileout