3 files changed, 27 insertions, 23 deletions
diff --git a/Master/texmf-dist/doc/latex/hypdvips/README b/Master/texmf-dist/doc/latex/hypdvips/README
index f1e408bf5e8..09744b1976e 100644
--- a/Master/texmf-dist/doc/latex/hypdvips/README
+++ b/Master/texmf-dist/doc/latex/hypdvips/README
@@ -1,4 +1,4 @@
-LaTeX package hypdvips 2008/12/26 v1.04
+LaTeX package hypdvips 2009/03/04 v1.05
 
 The hypdvips package fixes some problems when using hyperref with dvips. It
 also adds support for breaking links, hyperlinked tablenotes, file attachments,
@@ -8,6 +8,9 @@ referencing system.
 
 History:
 
+v1.05 - improved compatibility with packages tabularx & subcaption (thanks to
+        Marco Daniel for the bug-report)
+
 v1.04 - fixes problem with back-reference when citing in footnotetext and
         option smallfootnotes is enabled
 
diff --git a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf
index 28284ff9944..b93b7642a54 100644
--- a/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf
+++ b/Master/texmf-dist/doc/latex/hypdvips/hypdvips.pdf
diff --git a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty
index aab395dde5a..0b9a00f4c68 100644
--- a/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty
+++ b/Master/texmf-dist/tex/latex/hypdvips/hypdvips.sty
@@ -1,9 +1,9 @@
 %%
 %% This is file `hypdvips.sty',
-%% Copyright 2008 Raimund Niedrist
+%% Copyright 2009 Raimund Niedrist
 %% 
 %% With portions written by David Carlisle, Toby Cubitt, Geoffrey
-%% Keating, Heiko Oberdiek and Sebastian Rahtz, 1995-2008
+%% Keating, Heiko Oberdiek and Sebastian Rahtz, 1995-2009
 %%
 %% This work may be distributed and/or modified under the conditions
 %% of the LaTeX Project Public License, either version 1.3 of this
@@ -21,7 +21,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdvips}
-  [2008/12/26 v1.04
+  [2009/03/04 v1.05
   Hyperref extensions for use with dvips]
 \RequirePackage{hyperref}
 \newif\ifpp@dvips
@@ -1834,10 +1834,10 @@
 
 \newif\ifpp@subfigure
 \pp@subfigurefalse
-\let\pp@backup@subfigure\subfigure
-\def\subfigure{%
+\let\pp@backup@@subfigure\@subfigure
+\def\@subfigure{%
   \pp@subfiguretrue%
-  \pp@backup@subfigure%
+  \pp@backup@@subfigure%
 }
 
 \let\pp@backup@endfigure\endfigure
@@ -2098,15 +2098,14 @@
     \ifhmode\spacefactor\@x@sf\fi
     \relax
     }
-\fi  
-
-\let\pp@backup@H@@footnotetext\H@@footnotetext
-\renewcommand{\H@@footnotetext}[1]{%
-  \pp@backup@H@@footnotetext{%
-    \pp@SDictPS{/pp.voffset \f@size\space 5 add def}%
-    #1%
-    }%
-}
+  \let\pp@backup@H@@footnotetext\H@@footnotetext
+  \renewcommand{\H@@footnotetext}[1]{%
+    \pp@backup@H@@footnotetext{%
+      \pp@SDictPS{/pp.voffset \f@size\space 5 add def}%
+      #1%
+      }%
+    }
+\fi
 
 \let\pp@backup@bibstyle\bibstyle
 \renewcommand{\bibstyle}[1]{%
@@ -2274,13 +2273,15 @@
       }%
     \@esphack%
     }%
-  \renewcommand{\H@@footnotetext}[1]{%
-    \pp@backup@H@@footnotetext{%
-      \edef\@currentlabel{[footnote][\arabic{Hfootnote}][\relax]\@thefnmark}%
-      \pp@SDictPS{/pp.voffset \f@size\space 5 add def}%
-      #1%
-      }%
-    }
+  \ifHy@hyperfootnotes
+    \renewcommand{\H@@footnotetext}[1]{%
+      \pp@backup@H@@footnotetext{%
+        \edef\@currentlabel{[footnote][\arabic{Hfootnote}][\relax]\@thefnmark}%
+        \pp@SDictPS{/pp.voffset \f@size\space 5 add def}%
+        #1%
+        }%
+      }
+  \fi
   }{}
 
 \newlength{\pp@backup@baselineskip}