11 files changed, 51 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index 0614d2b5e40..06694debeb0 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,16 @@
 === pdfcomment.sty ===
 
+-- pdfcomment.sty (v1.4b) (<- v1.4a 2009/07/13) -- (svn rev 40)
+
+2009/07/23  Bugfix: problem with different default values for page size [jk] (svn rev 40)
+              with pdflatex (dvi mode) and dvips/dvipdfmx
+              => better specify page size with an option like a4paper
+
+            Bugfix: changed procedure of loading hyperref to prevent warnings
+                    with dvipdfmx
+
+            reported by: Jin-Hwan Cho
+
 -- pdfcomment.sty (v1.4a) (<- v1.4 2009/04/01) -- (svn rev 39)
 
 2009/07/13  Bugfix: (pdf}latex crashed with pdf text annoatations in tabulars [jk] (svn rev 39)
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 9879e458f29..000453ff8f8 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,10 +15,13 @@ Adobe Reader.
 
 License: LPPL
 
-New in v1.4a:
+Changes in v1.4b:
 
-  - Bugfix: (pdf}latex crashed with PDF text annoatations 
-            (\pdfcomment and \pdfmargincomment) in tabulars
-            
-            reported by: Thomas König
-            fixed by: Ulrike Fischer, Herbert Voß
-\ No newline at end of file
+  - Bugfix: problem with different default values for page size
+            with pdflatex (dvi mode) and dvips/dvipdfmx
+            => better specify page size with an option like a4paper
+
+  - Bugfix: changed procedure of loading hyperref to prevent warnings
+            with dvipdfmx
+
+  reported by: Jin-Hwan Cho
+\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index e79a0f5d96b..740bb48a5e9 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
index 57a55747181..d0537a8cf82 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
index 1d54cc25845..2c87ef23256 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index 0074692bde8..935b721385d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 8fcd9d4cf7c..0762f68f215 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
index d79c03dbc4d..22e74e414d4 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -11,10 +11,9 @@
 \usepackage{attachfile}%
 \usepackage{marginnote}%
 \usepackage[svgnames,rgb]{xcolor}
-\usepackage{ltxdocext}%
-\usepackage{hyperref}
+\usepackage{ltxdocext}
 \usepackage{pdfcomment}
-\def\fileversion{v1.4a}
+\def\fileversion{v1.4b}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 \CodelineIndex
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 020be7df14e..6921848ee3e 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
index b1f5a3ef1bf..5e14c97ef42 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -11,9 +11,8 @@
 \usepackage{marginnote}%
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage{ltxdocext}%
-\usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.4a}
+\def\fileversion{v1.4b}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 \CodelineIndex
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index c01a411a9f3..39fef04278d 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -20,7 +20,7 @@
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2009/07/13 pdfcomment.sty v1.4a - Josef Kleber (C) 2008-2009]%
+\ProvidesPackage{pdfcomment}[2009/07/23 pdfcomment.sty v1.4b - Josef Kleber (C) 2008-2009]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -2442,9 +2442,6 @@
 %
 \ProcessOptionsX\relax%
 %
-% problems with older versions of hyperref than v6.76a [2007/04/09]
-% reported by Gabriel Cardona
-\RequirePackage{hyperref}[2007/04/09]%
 \RequirePackage{zref-savepos}[2007/04/22]%
 \zref@require@unique%
 \RequirePackage{ifthen}%
@@ -2453,7 +2450,19 @@
 \RequirePackage{ifpdf}%
 %
 %hyperref setup
-\ifpdf\else%
+\ifpdf%
+  \@ifpackageloaded{hyperref}%
+  {%
+    \hypersetup{pdftex}%
+  }%
+  {%
+    \RequirePackage[pdftex]{hyperref}[2007/04/09]%
+  }%
+\else%
+  % to avoid problems with different default page size in 
+  % pdflatex (dvi mode) and dvipdfmx/dvips 
+  \pdfpageheight=\paperheight%
+  \pdfpagewidth=\paperwidth%
   %auto-set dvipdfmx driver in case of xetex
   \expandafter\ifx\csname XeTeXrevision\endcsname\relax%
     \ifpc@gopt@dvipdfmx%
@@ -2462,14 +2471,25 @@
         \hypersetup{dvipdfmx}%
       }%
       {%
-        \PassOptionsToPackage{dvipdfmx}{hyperref}%
+        \RequirePackage[dvipdfmx]{hyperref}[2007/04/09]%
+      }%
+    \else%
+      \@ifpackageloaded{hyperref}%
+      {%
+        \hypersetup{dvips}%
+      }%
+      {%
+        \RequirePackage[dvips]{hyperref}[2007/04/09]%
       }%
     \fi%
   \else%
     \global\pc@gopt@dvipdfmxtrue%
-    \@ifpackageloaded{hyperref}{}%
+    \@ifpackageloaded{hyperref}%
+    {%
+      \hypersetup{xetex}%
+    }%
     {%
-      \PassOptionsToPackage{xetex}{hyperref}%
+      \RequirePackage[xetex]{hyperref}[2007/04/09]%
     }%
   \fi%
 \fi%