thumbs (25feb12)

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

1 files changed, 28 insertions, 56 deletions

diff --git a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
index 658ff8bbb9e..7b7f5678145 100644
--- a/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
+++ b/Master/texmf-dist/tex/latex/thumbs/thumbs.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: thumbs
-%% Version: 2012/02/23 v1.0m
+%% Version: 2012/02/25 v1.0n
 %% 
 %% Copyright (C) 2010 - 2012 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
@@ -39,7 +39,7 @@
 %%    thumbs-example.tex, thumbs-example.pdf.
 %% 
 \NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{thumbs}[2012/02/23 v1.0m
+\ProvidesPackage{thumbs}[2012/02/25 v1.0n
             Thumb marks and overview page(s) (HMM)]
 
 %% This package allows to create a customizable thumb index,
@@ -90,7 +90,7 @@
 \RequirePackage{ltxcmds}[2011/04/18]%        v1.20
 \RequirePackage{atveryend}[2011/04/23]%      v1.7
 %% \RequirePackage{atveryend}[2011/06/30]%   v1.8
-%% would be needed but is currently (2012/02/23) not available at CTAN yet
+%% would be needed but is currently (2012/02/25) not available at CTAN yet.
 %% thumbs may work with earlier versions of LaTeX2e and those packages,
 %% but this was not tested. Please consider updating your LaTeX contribution
 %% and packages to the most recent version (if they are not already the most
@@ -105,7 +105,7 @@
      \string\AtVeryVeryEnd\space command/hooking of atveryend package as of\MessageBreak%
      2011/04/23, v1.7. New package version 2011/06/30, v1.8, works with\MessageBreak%
      the new LaTeX format, but some older package version was loaded.\MessageBreak%
-     (As of 2012/02/23, the new version is NOT available at CTAN yet.)\MessageBreak%
+     (As of 2012/02/25, the new version is NOT available at CTAN yet.)\MessageBreak%
      For fixing this problem until the update is available,\MessageBreak%
      \string\let\string\AtVeryVeryEnd\string\AtEndAfterFileList\MessageBreak%
      is used now, fingers crossed.%
@@ -853,59 +853,30 @@
   }
 
 \ltx@ifpackageloaded{tikz}{% tikz loaded before thumbs
-  \ltx@ifpackageloaded{hyperref}{% hyperref loaded before thumbs
-%% but tikz and hyperref in which order? To be determined now:
-%% Code similar to the one from Joseph Wright:
-%% http://tex.stackexchange.com/questions/45533/how-to-determine-which-register-a-count-uses/
-\def\th@mbhalt{\th@mbhalt}
-
-\def\registernumber#1{%
-  \expandafter\registernumberauxi\meaning#1\th@mbhalt\stop%
-  }
-
-\def\registernumberauxi#1#2\stop{%
-  \ifx\th@mbhalt#1%
-    \expandafter\ltx@gobbletwo%
-  \else%
-    \expandafter\registernumberauxii%
-  \fi%
-    {#1}{#2}%
-  }
-
-\def\registernumberauxii#1#2{%
-  \ifnum`#1<48%
-  \else%
-    \ifnum`#1>57%
-    \else%
-      #1%
-    \fi%
-  \fi%
-  \registernumberauxi#2\stop%
+  \ltx@ifpackageloaded{hyperref}{% hyperref loaded before thumbs,
+    %% but tikz and hyperref in which order? To be determined now:
+    %% Code similar to the one from David Carlisle:
+    %% http://tex.stackexchange.com/a/45654/6865
+    \xdef\th@mbtikz{-1}% assume tikz loaded after hyperref,
+    %% check for opposite case:
+    \def\th@mbstest{tikz.sty}
+    \let\th@mbstestb\@empty
+    \@for\@th@mbsfl:=\@filelist\do{%
+      \ifx\@th@mbsfl\th@mbstest
+        \def\th@mbstestb{hyperref.sty}
+      \fi
+      \ifx\@th@mbsfl\th@mbstestb
+        \xdef\th@mbtikz{0}% tikz loaded before hyperref
+      \fi
+      }
+    %% End of code similar to the one from David Carlisle
+  }{% tikz loaded before thumbs and hyperref loaded afterwards or not at all
+    \xdef\th@mbtikz{0}%
+   }
+ }{% tikz not loaded before thumbs
+   \xdef\th@mbtikz{-1}
   }
 
-%% End of code similar to the one from Joseph Wright
-
-\def\thumbs@gobblesix#1#2#3#4#5#6#7{#7}
-
-\edef\wrighta{\registernumber\Hy@linkcounter}
-\edef\wrightb{\expandafter\thumbs@gobblesix\wrighta}
-\@tempcnta=\wrightb\relax%
-\edef\wrighta{\registernumber\tikztreelevel}
-\edef\wrightb{\expandafter\thumbs@gobblesix\wrighta}
-\@tempcntb=\wrightb\relax%
-\ifnum\@tempcntb>\@tempcnta% tikz, hyperref
-  \xdef\th@mbtikz{-1}% tikz loaded after hyperref
-\else
-  \xdef\th@mbtikz{0}% tikz loaded before hyperref
-\fi%
-
-}{% tikz loaded before thumbs and hyperref loaded afterwards or not at all
-  \xdef\th@mbtikz{0}%
- }
-}{% tikz not loaded before thumbs
-  \xdef\th@mbtikz{-1}
- }
-
 \newcommand{\th@mbprint}[3]{%
   \put(\th@mbxpos,-\th@mbposyA){%
     \begin{picture}(0,0)%
@@ -1261,7 +1232,8 @@
         \else% l
           \clearotherdoublepage%
         \fi%
-      \else \clearpage%
+      \else%
+        \clearpage%
       \fi%
     \fi%
     \ifnum\value{FileLine}=1%