present 2.1 (21mar12)

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

4 files changed, 20 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.pdf
index ee95501836a..7d6c878a64c 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 9714988d578..94446a6a4ac 100644
--- a/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex
+++ b/Master/texmf-dist/doc/plain/present/HowToTalkTeX.tex
@@ -3,7 +3,7 @@
 % HOW TO DO A TALK IN TeX
 %
 % Author: Matthias Meister
-% Version 2.0, October 2010
+% Version 2.1, March 2012
 %
 % This file is part of a work distributed under the LaTeX Project Public License
 %
@@ -18,11 +18,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.0\hfil}
+\line{\hfil\linkbarfont Version 2.1\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, October 2010\hfil}
+\line{\hfil\normalfont Regensburg, March 2012\hfil}
 \NewSlide
 \pageno=1% Don't want to count the titlepage
 \normalfont
@@ -49,13 +49,11 @@
 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.
+The file can for example be obtained from \weblink{http://www.ctan.org}{ctan.org}.
 \vskip3mm
 You furthermore need a pdf-viewer with fullscreen display capabilities, e.g. {\cf xpdf}.
 \vskip5pt
 \att{Warning: Some pdf-viewers do not handle links in a document properly.}
-\vskip5pt
-Version 2.0 does no longer require the 
-files {\cf miniltx.tex}, {\cf color.tex}, {\cf color.sty}.
 %%
 %%
 %%
diff --git a/Master/texmf-dist/doc/plain/present/README b/Master/texmf-dist/doc/plain/present/README
index b57fce78260..e066b495f1f 100644
--- a/Master/texmf-dist/doc/plain/present/README
+++ b/Master/texmf-dist/doc/plain/present/README
@@ -1,8 +1,8 @@
 present.tex
-Version 2.0, October 2010
+Version 2.1, March 2012
 
 Some simple macros for preparing presentations in TeX
-Copyright 2010 Matthias Meister
+Copyright 2010-2012 Matthias Meister
 Distributed under the LaTeX Project Public License
 
 present.tex
@@ -33,8 +33,15 @@ occasionally be useful in the context of those macros
 which have PDF-code in their replacement text.
 
 -----------------------
+Changes
 
-Changes with respect to version 1.0:
+From 2.0 to 2.1:
+
+Fixed a bug which caused complaints about unknown 
+operators 0.0RG and 0.0rg with some pdf-viewers.
+
+
+From 1.0 to 2.0:
 
 *) An image can be set on the slide background.
 *) Added control word \rm for using roman type 
diff --git a/Master/texmf-dist/tex/plain/present/present.tex b/Master/texmf-dist/tex/plain/present/present.tex
index 4f2e9e0626b..0c0ac1843f0 100644
--- a/Master/texmf-dist/tex/plain/present/present.tex
+++ b/Master/texmf-dist/tex/plain/present/present.tex
@@ -2,8 +2,8 @@
 %
 % present.tex
 % Some macros for preparing presentations in TeX, using pdftex
-% Version 2.0
-% Copyright 2010 Matthias Meister
+% Version 2.1
+% Copyright 2010-2012 Matthias Meister
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -125,7 +125,7 @@
 % Added October 3rd, 2010
 
 % Define colours
-\def\backgroundcolour{0.8 0.8 0.8}    % Colour of page background
+\def\backgroundcolour{0.8 1.0 0.8}    % Colour of page background
 \def\textcolour{0.0 0.0 0.0}   	      % Colour of text
 \def\attentioncolour{1 0 0}	      % Colour for "Attention"
 
@@ -134,8 +134,9 @@
 \vsh@ft=-13mm
 \hsh@ft=-5mm
 
+\def\bl@nk{ }  % Introduced this
 \newcount\colst@ck
-\colst@ck=\pdfcolorstackinit page {\textcolour rg \textcolour RG}
+\colst@ck=\pdfcolorstackinit page {\textcolour\bl@nk rg \textcolour\bl@nk RG} % and modified this on March 20, 2012
 \def\popst@ck{\pdfcolorstack\colst@ck pop}
 \def\setcolour#1{\pdfcolorstack\colst@ck push {#1 rg #1 RG}\aftergroup\popst@ck}
 \long\def\coloured#1#2{{\setcolour#1#2}}
@@ -240,7 +241,7 @@ attr {/Border [0 0 0]} user {/Subtype /Link /A <</S /Named /N /#1>>}%
 #3\pdfendlink}
 
 %
-% Includes an image. The image file name is #1, and #1 is a specification of the dimension of the
+% Includes an image. The image file name is #2, and #1 is a specification of the dimension of the
 % image (will be scaled accordingly) in the usual TeX syntax (width, height, depth).
 %
 \def\image[#1]#2{%