11 files changed, 42 insertions, 27 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index b32a2fa4585..0614d2b5e40 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.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)
+              error with \vskip in hmode within \marginnote 
+              changed to \vspace in \pdfcomment and \pdfmargincomment / deleted \vss [uf]
+              changed \baselineskip (=0 in tables) -> \normalbaselineskip [hv]
+              see Msg-ID: <h377a3$avp$1@kleberj.eternal-september.org> ff
+
+            reported by: Thomas König
+            fixed by: Ulrike Fischer, Herbert Voß
+
 -- pdfcomment.sty (v1.4) (<- v1.35dev 2009/04/01) -- (svn rev 36)
 
 2009/03/26  merged "line annotations" [jk] (svn rev 35)
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 92bbcc49c35..9879e458f29 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,12 +15,10 @@ Adobe Reader.
 
 License: LPPL
 
-New in v1.4:
+New in v1.4a:
 
-  - new annotation type: PDF sideline, line, polyline, polygon, square 
-    and circle annotation
-    -> \pdfsidelinecomment, \pdflinecomment (type=line|polyline|polygon),
-       \pdfsquarecomment, \pdfcirclecomment
-  - new options: font, fontsize, fontcolor, borderstyle, dashstyle, bse,
-                 bsei, line, type, lineend, linebegin, icolor, caption,
-                 captionhoffset, captionvoffset
-\ No newline at end of file
+  - 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
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index 56978fd58f3..e79a0f5d96b 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 07b788734af..57a55747181 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 25fa4a036de..1d54cc25845 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_latex_dvips_ps2pdf.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
index 564132f567b..3558511e89d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
@@ -14,24 +14,24 @@
 A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
-\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
-\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
-\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
+\pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}%
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.3cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}%
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}%
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}%
 
-\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
-\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
-\end{textblock*}}
-{\small
-\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}
-\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}
-\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}
-}
-\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} 
+\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)%
+\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}%
+\end{textblock*}}%
+{\small%
+\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}%
+\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}%
+\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}%
+}%
+\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation}%
 
 \colorlet{KernFarbe}{red}
 \colorlet{HuelleFarbe}{blue}
-\vspace{35mm}
+\vspace{30mm}
 \begin{tikzpicture}[
         Huelle/.style = {ball color=HuelleFarbe!25},
         Kern/.style = {ball color=KernFarbe!25},
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index 634ffb8bb71..0074692bde8 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 21827c424c1..8fcd9d4cf7c 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 8c206614e28..d79c03dbc4d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -4,6 +4,7 @@
 \usepackage[latin1]{inputenc}%
 \usepackage[T1]{fontenc}%
 \usepackage{textcomp}%
+\usepackage{lmodern}%
 \usepackage{bera}%
 \usepackage{microtype}
 \usepackage{url}%
@@ -13,7 +14,7 @@
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.4}
+\def\fileversion{v1.4a}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 \CodelineIndex
@@ -102,11 +103,13 @@ I want to thank the following persons for contributions to the development of th
 
 \item \textbf{Gabriel Cardona} for pointing out problems with older versions of \texttt{hyperref} (v6.76a [2007/04/09])
 
-\item \textbf{Ulrike Fischer} for answering my stupid questions on d.c.t.t. for making possible the avatar and style system.
+\item \textbf{Ulrike Fischer} for answering my stupid questions on d.c.t.t. for making possible the avatar and style system and much more.
 
 \item \textbf{Christian Feuersänger} for contributing new ideas in form of his package \package{pdfmarginpar.sty} and for solving the printing problem\footnote{see section \ref{sec:print}} of PDF annotations and popups.
 
 \item \textbf{Heiko Oberdiek} also for answering my stupid questions on d.c.t.t., as well as for the development of dozens of very usefull packages, especially \file{hyperref.sty}, \file{hycolor.sty} and \file{zref.sty}, which made this package possible.
+
+\item \textbf{Herbert Voß} also for answering my stupid questions on d.c.t.t.
 \end{itemize}
 \clearpage
 \section{Options}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index ef3bfb0dcf5..020be7df14e 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 379bc11f6d8..b1f5a3ef1bf 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -2,8 +2,9 @@
 \usepackage[german]{babel}%
 \usepackage[latin1]{inputenc}%
 \usepackage[T1]{fontenc}%
-\usepackage{textcomp}%
+\usepackage{lmodern}%
 \usepackage{bera}%
+\usepackage{textcomp}%
 \usepackage{microtype}
 \usepackage{url}%
 \usepackage{attachfile}%
@@ -12,7 +13,7 @@
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.4}
+\def\fileversion{v1.4a}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 \CodelineIndex
@@ -101,11 +102,13 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
 
 \item \textbf{Gabriel Cardona} für den Hinweis auf Probleme mit älteren Versionen von \texttt{hyperref} (v6.76a [2007/04/09])
 
-\item \textbf{Ulrike Fischer} für das Beantworten meiner dummen Fragen in d.c.t.t. zur Verwirklichung des Avatar- und Style-Systems.
+\item \textbf{Ulrike Fischer} für das Beantworten meiner dummen Fragen in d.c.t.t. zur Verwirklichung des Avatar- und Style-Systems und vieles mehr.
 
 \item \textbf{Christian Feuersänger} für das Einbringen neuer Ideen in Form von \package{pdfmarginpar.sty} und die Lösung des Druckproblems\footnote{siehe Abschnitt \ref{sec:print}} der PDF annotations und popups. 
 
 \item \textbf{Heiko Oberdiek} ebenfalls für das Beantworten meiner dummen Fragen in d.c.t.t., sowie die Entwicklung dutzender nützlicher Pakete, speziell \file{hyperref.sty}, \file{hycolor.sty} und \file{zref.sty}, die dieses Paket erst ermöglichten.
+
+\item \textbf{Herbert Voß} ebenfalls für das Beantworten meiner dummen Fragen in d.c.t.t.
 \end{itemize}
 \clearpage
 \section{Optionen}