present 2.2 (12apr12)

git-svn-id: svn://tug.org/texlive/trunk@25953 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 241 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf
index 7d6c878a64c..756d7de1753 100644
--- a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf
+++ b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf
diff --git a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex
index 94446a6a4ac..f7306afea3e 100644
--- a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex
+++ b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex
@@ -3,12 +3,14 @@
 % HOW TO DO A TALK IN TeX
 %
 % Author: Matthias Meister
-% Version 2.1, March 2012
+% Version 2.2, April 2012
 %
 % This file is part of a work distributed under the LaTeX Project Public License
 %
 
-\input present % Load presentation specific macros
+\input present 		   % Load presentation specific macros
+\input present-transitions % Load macros for transitions.
+
 \setcolour\textcolour
 \setbgcolour\backgroundcolour
 \overfullrule=0pt
@@ -18,11 +20,11 @@
 \vskip 5mm plus 2mm minus 1mm
 \line{\hfil\font\subtitlefont=cmssbx10 at 15pt\subtitlefont One Of Many Solutions\hfil}
 \vskip 5mm plus 2mm minus 1mm
-\line{\hfil\linkbarfont Version 2.1\hfil}
+\line{\hfil\linkbarfont Version 2.2\hfil}
 \vskip 20mm plus 2mm minus 1mm
 \line{\hfil\normalfont Matthias Meister\hfil}\target{title}
 \vskip 5mm plus 2mm minus 1mm
-\line{\hfil\normalfont Regensburg, March 2012\hfil}
+\line{\hfil\normalfont Regensburg, April 2012\hfil}
 \NewSlide
 \pageno=1% Don't want to count the titlepage
 \normalfont
@@ -44,8 +46,9 @@
 \NewSlide
 \SlideTitle{\hfil Requirements}
 \font\cdfo=cmtt12
-\def\codecolour{0 0.0 1.0}
+\def\codecolour{1.0 0.0 1.0}
 \def\cf{\setcolour\codecolour\cdfo}
+\leftskip0pt
 You need the program {\cf pdftex}, which probably is included in your \TeX-distribution.
 \vskip3mm
 You need the file {\cf present.tex}, which is to be {\cf\char'134input} at the beginning of your source code.
@@ -87,12 +90,15 @@ You can include images easily:\vskip20pt plus 3pt minus 10pt
 \SlideTitle{\hfil Ordinary stuff}
 You type text, equations, and so on as usual in \TeX. Keep in mind, though, that the effective paper size is 
 rather small (12cm wide, 9cm high in standard configuration).
-\vskip20pt plus 5pt minus 10pt
+\vskip10pt plus 5pt minus 10pt
 The paper size is small, because you rely on the fullscreen mode of your pdf-viewer to blow the slide up to full 
 screen size, thus also automatically enlarging the fonts.
-\vskip20pt plus 5pt minus 10pt
+\vskip10pt plus 5pt minus 10pt
 Your macros should work (unless there is a collision of names), because what you are doing is creating an ordinary
 pdf-file with {\cf pdftex}, for viewing it with a pdf-viewer.
+\vskip10pt plus 5pt minus 10pt
+You start a new slide with {\cf\char'134 NewSlide}. If you use {\cf\char'134 NewFrame}, it has almost the same effect, only
+the slide number doesn't get increased.
 \NewSlide
 %%%
 %%%
@@ -155,9 +161,6 @@ You draw attention to \att{Stuff} by saying
 \vskip5pt
 If a predefined colour is redefined, {\cf\char'134setcolour}
 must also be used for the change to take effect for text. 
-\vskip5pt
-Colour handling is different from version 1.0 of {\cf present.tex}.
-The additional files {\cf miniltx.tex}, {\cf color.tex}, {\cf color.sty} are \att{no longer} required.
 \NewSlide
 %%%
 %%%
@@ -213,56 +216,107 @@ or define further ones.
 \vskip5pt
 The version used here shows the number of the current slide and the total number of slides in the centre (the latter is
 provided by the {\cf\char'134 LP} macro), and the {\cf\char'134 PageBar} on the right.
-
+\vskip5pt
 The {\cf\char'134 PageBar}-symbols \PageBar move to the previous or following page, or move back and forth in the 
 page history.
 \NewSlide
 %%%
 %%%
 %%%
-{The page history is relevant if cross-references are used in the presentation. These will be discussed subsequently.}
+The page history is relevant if cross-references are used in the presentation. These will be discussed later.
 \vskip5pt
 \phantom{With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
 used, it is shown on the left side of the footline, but currently is defined to be empty.}
 \vskip5pt
 \phantom{The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.}
 \vskip5pt
-\phantom{Before we turn to cross-references or links: You start a new slide by saying {\cf\char'134 NewSlide}. If instead you
-say {\cf\char'134 NewFrame}, it has almost the same effect, only the slide number doesn't get increased. This is useful, 
-if a slide is to be shown incrementally.}
+\phantom{This slide has been shown incrementally by a copy-paste procedure when writing the source (have a look at it). 
+It is straightforward, very flexible, one might occasionally lose track, and it may be tedious to introduce
+changes later. A further possibility is shown on the next slides.}
 \NewFrame
-{The page history is relevant if cross-references are used in the presentation. These will be discussed subsequently.}
+The page history is relevant if cross-references are used in the presentation. These will be discussed later.
 \vskip5pt
-{With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
-used, it is shown on the left side of the footline, but currently is defined to be empty.}
+With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
+used, it is shown on the left side of the footline, but currently is defined to be empty.
 \vskip5pt
 \phantom{The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.}
 \vskip5pt
-\phantom{Before we turn to cross-references or links: You start a new slide by saying {\cf\char'134 NewSlide}. If instead you
-say {\cf\char'134 NewFrame}, it has almost the same effect, only the slide number doesn't get increased. This is useful, 
-if a slide is to be shown incrementally.}
+\phantom{This slide has been shown incrementally by a copy-paste procedure when writing the source (have a look at it). 
+It is straightforward, very flexible, one might occasionally lose track, and it may be tedious to introduce
+changes later. A further possibility is shown on the next slides.}
 \NewFrame
-{The page history is relevant if cross-references are used in the presentation. These will be discussed subsequently.}
+The page history is relevant if cross-references are used in the presentation. These will be discussed later.
 \vskip5pt
-{With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
-used, it is shown on the left side of the footline, but currently is defined to be empty.}
+With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
+used, it is shown on the left side of the footline, but currently is defined to be empty.
 \vskip5pt
-{The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.}
+The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.
 \vskip5pt
-\phantom{Before we turn to cross-references or links: You start a new slide by saying {\cf\char'134 NewSlide}. If instead you
-say {\cf\char'134 NewFrame}, it has almost the same effect, only the slide number doesn't get increased. This is useful, 
-if a slide is to be shown incrementally.}
+\phantom{This slide has been shown incrementally by a copy-paste procedure when writing the source (have a look at it). 
+It is straightforward, very flexible, one might occasionally lose track, and it may be tedious to introduce
+changes later. A further possibility is shown on the next slides.}
 \NewFrame
-{The page history is relevant if cross-references are used in the presentation. These will be discussed subsequently.}
+The page history is relevant if cross-references are used in the presentation. These will be discussed later.
 \vskip5pt
-{With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
-used, it is shown on the left side of the footline, but currently is defined to be empty.}
+With cross-references or links, also the {\cf\char'134 LinkBar} can be useful. In the {\cf\char'134 SlideFoot}-version
+used, it is shown on the left side of the footline, but currently is defined to be empty.
 \vskip5pt
-{The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.}
+The {\cf\char'134 LinkBar} is intended to hold links to various places in the presentation you might want to jump to.
 \vskip5pt
-{Before we turn to cross-references or links: You start a new slide by saying {\cf\char'134 NewSlide}. If instead you
-say {\cf\char'134 NewFrame}, it has almost the same effect, only the slide number doesn't get increased. This is useful, 
-if a slide is to be shown incrementally.}
+This slide has been shown incrementally by a copy-paste procedure when writing the source (have a look at it). 
+It is straightforward, very flexible, one might occasionally lose track, and it may be tedious to introduce
+changes later. A further possibility is shown on the next slides.
+\NewSlide
+\def\hl{\setcolour\attentioncolour}
+%%%
+%%%
+%%%
+\Frames5{%
+\SlideTitle{\hfill {\onframe1\hl Slides} {\onframe2\hl Step} {\onframe3\hl by} {\onframe4\hl Step}}
+A slide can be shown incrementally using
+\vskip1pt
+\beforeframe2\hide{\afterframe1\cf
+\char'134 NewSlide\par
+\char'134 Frames\char'173}{\it num}{\afterframe1\cf\char'175\char'173}%
+{\it CONTENT}
+{\afterframe1\cf\char'175\char'134 endFrames\par
+\char'134NewSlide}
+\vskip1pt
+\beforeframe3\hide By the above, the {\it CONTENT} of the slide, enclosed between 
+{\afterframe2\cf\char'134begingroup} \dots{\afterframe2\cf\char'134endgroup}, 
+is repeated {\it num} times, with a 
+{\afterframe2\cf\char'134NewFrame} between subsequent repetitions. 
+\vskip1pt
+\beforeframe4\hide Due to this grouping, definitions are local to the body of a frame.
+{\afterframe3\cf\char'134global} is used in the replacement texts of {\afterframe3\cf\char'134SlideTitle} 
+and {\afterframe3\cf\char'134SlideFoot} to allow frame-dependent changes here, too.  
+\vskip1pt
+\beforeframe5\hide  
+{\onframe5\cf\char'134hide}, defined as {\onframe5\cf\char'134setcolour\char'134backgroundcolour}, can be used
+to hide parts of the slide on a monochromatic background.}
+\endFrames
+%%%
+%%%
+%%%
+\NewSlide
+\Frames5{%
+Incremental showing or modification of content is achieved by
+\vskip1pt
+\beforeframe2\hide{\afterframe1\cf\char'134 onframe\char'173}{\it fn}{\afterframe1\cf\char'175\char'173}{\it arg}%
+{\afterframe1\cf\char'175}\par
+which evaluates to {\it arg} on frame number {\it fn} and to {\afterframe1\cf\char'134relax} otherwise (frames are counted from 1).
+\vskip1pt
+\beforeframe3\hide{\afterframe2\cf\char'134 afterframe\char'173}{\it fn}{\afterframe2\cf\char'175\char'173}%
+{\it arg}{\afterframe2\cf\char'175}\par
+which evaluates to {\it arg} after frame {\it fn} and to {\afterframe2\cf\char'134relax} before and on frame {\it fn}.
+\vskip1pt
+\beforeframe4\hide{\afterframe3\cf\char'134 beforeframe\char'173}{\it fn}{\afterframe3\cf\char'175\char'173}{\it arg}%
+{\afterframe3\cf\char'175}\par
+which evaluates to {\it arg} before frame {\it fn} and to {\afterframe3\cf\char'134relax} on and after frame {\it fn}.
+\vskip1pt
+\beforeframe5\hide If {\it arg} is a single token, no braces are necessary. The same applies if {\it fn} or {\it num}
+is a single digit number.}%
+\endFrames
 \NewSlide
 %%%
 %%%
@@ -308,6 +362,92 @@ Notice also that {\cf\char'134 LinkBar} has been redefined (on the previous slid
 %%%
 %%%
 %%%
+\SlideTitle{\hfill Transition Effects}
+\UseTrans
+\SetTrans{Fade}
+\SetDuration{2}
+\def\satt{\setcolour\attentioncolour}
+\def\sumcol{0 0 0}
+\def\sscol{\setcolour\sumcol}
+\Frames{6}{%
+Transition effects for a presentation 
+can be provided by the macros in {\cf present-transitions.tex}
+to be {\cf\char'134input} after {\cf present.tex}. 
+
+\beforeframe2\hide
+Transitions are activated with {\afterframe1\cf\char'134UseTrans} and deactivated with
+{\afterframe1\cf\char'134NoTrans}.
+
+\beforeframe3\hide
+The type of a transition effect is selected with {\afterframe2\cf\char'134SetTrans\char'173}{\it TYPE\/}{\afterframe2\cf\char'175},
+the duration of a transition effect 
+with {\afterframe2\cf\char'134SetDuration\char'173}{\it num}{\afterframe2\cf\char'175}.
+
+\beforeframe4\hide
+Possible values for {\it TYPE} are {\afterframe3\cf Split},
+{\afterframe3\cf Blinds},
+{\afterframe3\cf Box},
+{\afterframe3\cf Wipe},
+{\afterframe3\cf Dissolve},
+{\afterframe3\cf Glitter},
+{\afterframe3\cf R},
+{\afterframe3\cf Fly},
+{\afterframe3\cf Push},
+{\afterframe3\cf Cover},
+{\afterframe3\cf Uncover},
+{\afterframe3\cf Fade}.
+See the PDF Reference for details.
+\beforeframe5\hide
+{\it num} specifies the duration of the transition effect in seconds.
+
+\beforeframe6\hide{\afterframe5\satt Only 
+some transition effects may be supported by your pdf-viewer}.}%
+\endFrames
+\NewSlide
+\SetTrans{Push}
+\Frames{15}{%
+Compare
+$$
+\Gamma^{{\onframe3\satt a}}_{{\onframe4\satt b}{\onframe5\satt c}}=
+{\textstyle{1\over2}}
+g^{{\onframe3\satt a}{\afterframe1\sscol u}}
+\Big(\partial_{\onframe4\satt b}
+g_{{\afterframe1\sscol u}{\onframe5\satt c}}
++\partial_{\onframe5\satt c}g_{{\onframe4\satt b}{\afterframe1\sscol u}}
+-\partial_{\afterframe1\sscol u}g_{{\onframe4\satt b}{\onframe5\satt c}}\Big)
+$$
+\beforeframe6\hide
+\onframe{5}\NoTrans
+with
+$$
+\Gamma^{{\onframe{8}\satt a}}_{{\onframe{9}\satt b}{\onframe{10}\satt c}}=
+{\textstyle{1\over2}}
+g^{{\onframe{8}\satt a}{\afterframe6\sscol u}}
+\Big(\partial_{\onframe{9}\satt b}
+g_{{\afterframe6\sscol u}{\onframe{10}\satt c}}
++\partial_{\onframe{10}\satt c}g_{{\onframe{9}\satt b}{\afterframe6\sscol u}}
+-\partial_{\afterframe6\sscol u}g_{{\onframe{9}\satt b}{\onframe{10}\satt c}}\Big)
+$$
+\onframe{11}\UseTrans
+\beforeframe{11}\hide\onframe{11}{\SetTrans{Dissolve}}%
+Are transition effects an advantage didactically?
+\vskip5pt
+\beforeframe{12}\hide\onframe{12}{\SetTrans{Fade}}
+Sometimes {\afterframe{12}\satt\onframe{12}\hide transition} effects may be {\afterframe{12}\satt\onframe{12}\hide helpful}.
+\vskip3pt
+Sometimes they {\beforeframe{14}\hide\afterframe{13}\satt distract}
+the {\beforeframe{14}\hide\afterframe{13}\satt audience} 
+from the {\beforeframe{14}\hide\afterframe{13}\satt content} of the slide.
+\vskip3pt
+\onframe{14}{\SetTrans{Dissolve}\SetDuration{5}}
+\beforeframe{15}\hide Use links or {\onframe{15}\cf \char'134PageBar}-symbols for navigation in order to
+see transition effects.
+}\endFrames
+\NewSlide
+\NoTrans
+%%%
+%%%
+%%%
 \SlideTitle{\hfil Background Images}
 \SetBackground{background.png}
 You can set images for the background with 
diff --git a/Master/texmf-dist/doc/plain/present/README b/Master/texmf-dist/doc/plain/present/README
index e066b495f1f..3b40b0f5c7e 100644
--- a/Master/texmf-dist/doc/plain/present/README
+++ b/Master/texmf-dist/doc/plain/present/README
@@ -1,5 +1,5 @@
 present.tex
-Version 2.1, March 2012
+Version 2.2, April 2012
 
 Some simple macros for preparing presentations in TeX
 Copyright 2010-2012 Matthias Meister
@@ -24,6 +24,7 @@ The macros in present.tex allow the user to:
 +) include weblinks
 +) include links to local files
 +) include images
++) show slides incrementally
 
 The macros as such are simple enough so that users should
 not find it difficult to adapt them to their needs. 
@@ -35,6 +36,17 @@ which have PDF-code in their replacement text.
 -----------------------
 Changes
 
+From 2.1 to 2.2:
+
+Added macros \Frames, \endFrames, \onframe, \afterframe,
+\beforeframe to support the incremental showing of a slide
+as a sequence of frames.
+
+The additional source file present-transitions.tex
+contains macro definitions which allow to use transition 
+effects between slides / frames. 
+
+
 From 2.0 to 2.1:
 
 Fixed a bug which caused complaints about unknown 
@@ -49,5 +61,3 @@ From 1.0 to 2.0:
 *) Rewritten colour support; miniltx.tex, color.tex, 
    color.sty no longer required. As a result, control
    sequences for handling colour have changed.
-
- 
diff --git a/Master/texmf-dist/doc/plain/present/present-transitions.tex b/Master/texmf-dist/doc/plain/present/present-transitions.tex
new file mode 100644
index 00000000000..eea3d6603c9
--- /dev/null
+++ b/Master/texmf-dist/doc/plain/present/present-transitions.tex
@@ -0,0 +1,53 @@
+%
+%
+% present-transitions.tex
+%
+% Author: Matthias Meister
+% Version 1.0, April 2012
+%
+% This file is part of a work distributed under the LaTeX Project Public License.
+% The macros in this file are a supplement to the macros in present.tex.
+%
+\catcode`\@=11
+\let\simplelink=\link
+\let\simplelinkarea=\linkarea
+\let\simplepagelink=\pagelink
+
+\def\Tr@ns{Push}
+\def\D@r{2}
+
+\def\tl@nk#1#2{%
+\pdfstartlink attr {/Border [0 0 0]} user {/Subtype /Link /A <</S /GoTo /D /#1 /Next <</S /Trans /Trans << /S /\Tr@ns /D \D@r >> >> >>}#2%
+\pdfendlink}
+
+\def\tl@nkarea#1#2#3#4{%
+\pdfannot{%
+/Subtype /Link
+/Rect [#2]
+/Border [0 0 #3]
+/C [#4]
+/A << /S /GoTo /D (#1) /Next << /S /Trans /Trans << /S /\Tr@ns /D \D@r >> >> >>}}
+
+\def\tpagel@nk#1#2{%
+\pdfstartlink    
+attr {/Border [0 0 0]} user {/Subtype /Link /A <</S /Named /N /#1 /Next << /S /Trans /Trans << /S /\Tr@ns /D \D@r>> >> >>}%
+#2%
+\pdfendlink}
+
+\def\NoTrans{%
+\global\let\link=\simplelink
+\global\let\pagelink=\simplepagelink
+\global\let\linkarea=\simplelinkarea
+}
+
+\def\UseTrans{%
+\global\let\link=\tl@nk
+\global\let\pagelink=\tpagel@nk
+\global\let\linkarea=\tl@nkarea
+}
+
+\def\SetDuration#1{\gdef\D@r{#1}}
+\def\SetTrans#1{\gdef\Tr@ns{#1}}
+
+\NoTrans
+\catcode`\@=12