spot (10may11)

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

4 files changed, 13 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/spot/spot.pdf b/Master/texmf-dist/doc/latex/spot/spot.pdf
index da0ff4e27a8..903911d05cd 100644
--- a/Master/texmf-dist/doc/latex/spot/spot.pdf
+++ b/Master/texmf-dist/doc/latex/spot/spot.pdf
diff --git a/Master/texmf-dist/source/latex/spot/spot.dtx b/Master/texmf-dist/source/latex/spot/spot.dtx
index fde06a0c21d..cd8d2af9638 100644
--- a/Master/texmf-dist/source/latex/spot/spot.dtx
+++ b/Master/texmf-dist/source/latex/spot/spot.dtx
@@ -27,7 +27,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{spot}
 %<*package>
-    [2010/09/21 v1.0 Spotlight highlighting]
+    [2011/05/09 v1.1 Spotlight highlighting]
 %</package>
 %
 %<*driver>
@@ -45,7 +45,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{359}
+% \CheckSum{360}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -164,6 +164,8 @@
 %
 % For a complete understanding of possible \meta{node options},
 % please see the PGF/\TikZ\ documentation.
+% Of particular note is that |path fading=none| will eliminate the fading,
+% causing the node to \spot*[path fading=none]{overlap} surrounding text.
 % To change the default behavior for subsequent calls to |\spot|, 
 % the following commands are provided.
 %
@@ -208,10 +210,8 @@
 % \spot*{E}
 % & |\setspotlightstyle{star points=7}| \\
 % & |\spot{C} \quad| \\
-% & |\resetspotlightstyle| \\
-% & |\spot{D} \quad| \\
-% & |\resetspotlightcolor| \\
-% & |\spot{E}| \\
+% & |\resetspotlightstyle \spot{D} \quad| \\
+% & |\resetspotlightcolor \spot{E}| \\
 % \end{tabular}
 % \end{quote}
 % \resetspotlightcolor
@@ -411,10 +411,13 @@
 %
 % In Beamer, we will need hooks for running code at the beginning and end of each frame.
 % The commands |\AtEveryBeginFrame| and |\AtEveryEndFrame| store commands to be run in every frame,
+% \changes{v1.1}{2011/05/09}{Fixed bug with Beamer's title command}
 % while the command |\AtEndFrame| applies only to the current frame.
+% We repeat the last token of |\beamer@frameslide|, namely |\beamer@checkframetitle|,
+% so that |\beamer@frameslide| can still detect the presence of a frame title.
 %    \begin{macrocode}
 \ifspot@beamer
-  \g@addto@macro\beamer@frameslide{\spot@everybeginframe@hook}
+  \g@addto@macro\beamer@frameslide{\spot@everybeginframe@hook\beamer@checkframetitle}
 %    \end{macrocode}
 % Whereas |\g@addto@macro| makes it easy to add
 % |\spot@everybeginframe@hook| to the end of the |\begin{beamer@frameslide}| code,
diff --git a/Master/texmf-dist/tex/latex/spot/spot.sty b/Master/texmf-dist/tex/latex/spot/spot.sty
index f82652c01fd..686545ca491 100644
--- a/Master/texmf-dist/tex/latex/spot/spot.sty
+++ b/Master/texmf-dist/tex/latex/spot/spot.sty
@@ -20,7 +20,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{spot}
-    [2010/09/21 v1.0 Spotlight highlighting]
+    [2011/05/09 v1.1 Spotlight highlighting]
 \RequirePackage{tikz}
 \usetikzlibrary{shapes}
 \usetikzlibrary{fadings}
@@ -28,7 +28,7 @@
 \@ifundefined{beamer@frameslide}{\spot@beamerfalse}{\spot@beamertrue}
 \let\xa=\expandafter
 \ifspot@beamer
-  \g@addto@macro\beamer@frameslide{\spot@everybeginframe@hook}
+  \g@addto@macro\beamer@frameslide{\spot@everybeginframe@hook\beamer@checkframetitle}
   \let\spot@oldmaterial=\endbeamer@frameslide
   \def\spot@newmaterial{%
         \spot@endframe@hook%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 99a64fd7317..7da53b5ffa1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -124,7 +124,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'bclogo',	"&MAKEflatten",
  'beamer',	"&MAKEbeamer",
  'beamer2thesis',	"&MAKEflatten",
- 'beamer-contrib',	"&MAKEflatten",
+ 'beamer-contrib',	"die 'skipping, use subdirs'",
  'beebe',		"die 'skipping, MAKEbeebe needs work, sorry'",
  'bengali',		"&MAKEflatten",
  'bengali-omega',	"die 'skipping, duplicates odev.sty et al.'",