7 files changed, 20 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index a6165d15958..8b3b86cad46 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,13 @@
 === pdfcomment.sty ===
 
+-- pdfcomment.sty (v1.5d) (<- v1.5c 2010/03/09) -- (svn rev 46)
+
+2010/03/16  Bugfix: faulty expansion broke hyperref's auto corrected conversions [jk]
+                    of LaTeX commands like \$ or \textCR to PDFDocEncoding or
+                    PDFUnicode in comments
+
+            reported by: Guillaume Millet 
+
 -- pdfcomment.sty (v1.5c) (<- v1.5b 2009/11/10) -- (svn rev 45)
 
 2010/03/09  Bugfix: \pdfsidelinecomment only worked on pages with arabic page numbers [jk]
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 5261a3d55de..a89b014c000 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,8 +15,10 @@ Adobe Reader.
 
 License: LPPL
 
-Changes in v1.5c:
+Changes in v1.5d:
   
-- Bugfix: \pdfsidelinecomment only worked on pages with arabic page numbers
+- Bugfix: faulty expansion broke hyperref's auto corrected conversions
+          of LaTeX commands like \$ or \textCR to PDFDocEncoding or
+          PDFUnicode in comments
 
-          reported by: Fritz Moore
\ No newline at end of file
+          reported by: Guillaume Millet
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 86902b89660..de2f393256f 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 e30db3abd3d..a6db1019b5e 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -48,7 +48,7 @@
 \title{\filename}%
 \Subtitle{A user-friendly interface to PDF annotations}%
 \author{Josef Kleber}
-\Fileversion{v1.5c}
+\Fileversion{v1.5d}
 \Refline{\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}\\\href{http://pdfcomment.josef-kleber.de/en_index.htm}{\texttt{http://pdfcomment.josef-kleber.de/en\_index.htm}}}%
 \maketitle
 \Headline{Abstract}
@@ -99,7 +99,7 @@ I want to thank the following persons for contributions to the development of th
 
 I also want to thank the following persons for bug reports, feature requests, ...:
 
-Gabriel Cardona, Jin-Hwan Cho, Thomas König, Fritz Moore, Michael Niedermair
+Gabriel Cardona, Jin-Hwan Cho, Thomas König, Guillaume Millet, Fritz Moore, Michael Niedermair
 \clearpage
 \section{Options}
 \subsection{Global options}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 5ca9ec65182..3e5b1b44e55 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 8ae8e512c26..b85cc3d2433 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -68,7 +68,7 @@
 \title{\filename}%
 \Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
 \author{Josef Kleber}
-\Fileversion{v1.5c}
+\Fileversion{v1.5d}
 \Refline{\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}\\\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}%
 \maketitle
 \Headline{Zusammenfassung}%
@@ -121,7 +121,7 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
 
 Außerdem möchte ich folgenden Personen danken für bug reports, feature requests, ...:
 
-Gabriel Cardona, Jin-Hwan Cho, Thomas König, Fritz Moore, Michael Niedermair
+Gabriel Cardona, Jin-Hwan Cho, Thomas König, Guillaume Millet, Fritz Moore, Michael Niedermair
 \clearpage
 \section{Optionen}
 \subsection{Globale Styleoptionen}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 4e3d09ffb89..00ac643a548 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}[2010/03/09 pdfcomment.sty v1.5c - Josef Kleber (C) 2008-2010]%
+\ProvidesPackage{pdfcomment}[2010/03/16 pdfcomment.sty v1.5d - Josef Kleber (C) 2008-2010]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -3622,11 +3622,11 @@
   \gdef\pc@lopt@comment{#1}%
   \ifthenelse{\equal{\pc@lopt@deadline}{}}%
   {%
-    \xdef\pc@comment@deadline{\pc@lopt@comment}%
+    \gdef\pc@comment@deadline{\pc@lopt@comment}%
     \pdfstringdef\pc@pdfenc@contents{\pc@comment@deadline}%
   }%
   {%
-    \xdef\pc@comment@deadline{\pc@lopt@comment\noexpand\textCR(\pc@lopt@deadline)}%
+    \gdef\pc@comment@deadline{\pc@lopt@comment\textCR(\pc@lopt@deadline)}%
     \pdfstringdef\pc@pdfenc@contents{\pc@comment@deadline}%
   }%
   \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}%