pdfcomment 1.4a (15jul09)

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

1 files changed, 21 insertions, 27 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 85adf6f694d..c01a411a9f3 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/04/01 pdfcomment.sty v1.4 - Josef Kleber (C) 2008-2009]%
+\ProvidesPackage{pdfcomment}[2009/07/13 pdfcomment.sty v1.4a - Josef Kleber (C) 2008-2009]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -2503,36 +2503,35 @@
   \ifpc@gopt@final\else%
     % typeset text annotation (see: PDF Reference)
     \ifpdf%
-      \vbox to 0pt%
+      \vbox%
       {%
         \hsize=0pt%
         \noindent%
-        \vskip-\pc@lopt@voffset%
+        \vspace{\pc@lopt@voffset}%
         \hbox to 0pt%
         {%
           \vsize=0pt%
           \hskip\pc@lopt@hoffset%
-          \pdfannot width 0pt height \baselineskip depth 0pt%
+          \pdfannot width 0pt height \normalbaselineskip depth 0pt%
           {%
             /Subtype /Text%
             \pc@annot@text%
           }%
         \hss%
         }%
-      \vss%
       }%
     \else%
       \ifpc@gopt@dvipdfmx%
-        \vbox to 0pt%
+        \vbox%
         {%
           \hsize=0pt%
           \noindent%
-          \vskip-\pc@lopt@voffset%
+          \vspace{\pc@lopt@voffset}%
           \hbox to 0pt%
           {%
             \vsize=0pt%
             \hskip\pc@lopt@hoffset%
-            \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt%
+            \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
               <<%
                 /Subtype /Text%
                 \pc@annot@text%
@@ -2540,20 +2539,19 @@
             }%
             \hss%
           }%
-          \vss%
         }%
       \else%
-        \vbox to 0pt%
+        \vbox%
         {%
           \hsize=0pt%
           \noindent%
-          \vskip-\pc@lopt@voffset%
-          \vskip-\baselineskip%
+          \vspace{\pc@lopt@voffset}%
+          \vspace{\normalbaselineskip}%
           \hbox to 0pt%
           {%
             \vsize=0pt%
             \hskip\pc@lopt@hoffset%
-            \pdfmark[\rule{0pt}{\pc@lopt@height}]%
+            \pdfmark[\rule{0pt}{0pt}]%
             {%
               pdfmark=/ANN,%
               Subtype=/Text,%
@@ -2561,7 +2559,6 @@
             }%
             \hss%
           }%
-          \vss%
         }%
       \fi%
     \fi%
@@ -2595,36 +2592,35 @@
       \marginnote%
       {%
         \ifpdf%
-          \vbox to 0pt%
+          \vbox%
           {%
             \hsize=0pt%
             \noindent%
-            \vskip-\pc@lopt@voffset%
+            \vspace{\pc@lopt@voffset}%
             \hbox to 0pt%
             {%
               \vsize=0pt%
               \hskip\pc@lopt@hoffset%
-              \pdfannot width 0pt height \baselineskip depth 0pt%
+              \pdfannot width 0pt height \normalbaselineskip depth 0pt%
               {%
                 /Subtype /Text%
                 \pc@annot@text%
               }
               \hss%
             }%
-            \vss%
           }%
         \else%
           \ifpc@gopt@dvipdfmx%
-            \vbox to 0pt%
+            \vbox%
             {%
               \hsize=0pt%
               \noindent%
-              \vskip-\pc@lopt@voffset%
+              \vspace{\pc@lopt@voffset}%
               \hbox to 0pt%
               {%
                 \vsize=0pt%
                 \hskip\pc@lopt@hoffset%
-                \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt%
+                \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
                   <<%
                     /Subtype /Text%
                     \pc@annot@text%
@@ -2632,20 +2628,19 @@
                 }%
                 \hss%
               }%
-              \vss%
             }%
           \else%
-            \vbox to 0pt%
+            \vbox%
             {%
               \hsize=0pt%
               \noindent%
-              \vskip-\pc@lopt@voffset%
-              \vskip-\baselineskip%
+              \vspace{\pc@lopt@voffset}%
+              \vspace{\normalbaselineskip}%
               \hbox to 0pt%
               {%
                 \vsize=0pt%
                 \hskip\pc@lopt@hoffset%
-                \pdfmark[\rule{0pt}{\pc@lopt@height}]%
+                \pdfmark[\rule{0pt}{0pt}]%
                 {%
                   pdfmark=/ANN,%
                   Subtype=/Text,%
@@ -2653,7 +2648,6 @@
                 }%
                 \hss%
               }%
-              \vss%
             }%
           \fi%
         \fi%