pdfcomment update (15dec08)

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

16 files changed, 444 insertions, 93 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index 1529323e863..d21af4e8322 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,3 +1,29 @@
+=== pdfcomment.sty ===
+
+-- pdfcomment.sty (v1.1) (<- v1.05dev 2008/12/12) --
+
+2008/12/10  added code for the support of other drivers than pdflatex [jk] (svn rev 2)
+              various changes for the support of
+			  latex->dvips->ps2pdf, latex->dvipdfmx, xelatex
+			  
+			contributed by Alexander Grahn
+			
+2008/12/10  problems with too old versions of hyperref [jk] (svn rev 4)
+              no \HyColor@XZeroOneThreeFour (hycolor.sty)
+              Change: \RequirePackage{hyperref}[2007/04/09] (v6.76a)              
+			  
+			reported by Gabriel Cardona
+
+2008/12/10  implementation of two new global options [jk] (svn rev 4)
+              draft: pdf annotations are typeset (default)
+			  final: pdf annotations are not typeset
+
+2008/12/12  disabled global options draft, final, dvipdfmx at "\AtBeginDocument" [jk] (svn rev 5)
+              Using the options draft, final and dvipdfmx in \pdfcommentsetup 
+			  makes absolutely no sense! Therefore, they are switched off at 
+			  "\AtBeginDocument" and a warning is issued by xkeyval.sty, if used.              
+
+			  
 === pdfcomment bundle ===
 
 -- pdfcomment bundle --
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 8324e232434..83014373615 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -1,12 +1,23 @@
-For a long time pdflatex offers the command \pdfannot for inserting 
-arbitrary pdf annotations. However, in a form where additional knowledge
-of the pdf reference is indispensable. pdfcomment.sty is an answer to 
-the – from time to time – emerging questions in newsgroups, how one could 
-use the comment function of Adobe Reader. At least out of the LaTeX code 
-pdfcomment.sty offers a convenient and user-friendly possibility to use 
-pdf annotations in pdf files.
-Unfortunately the support of pdf annotations by pdf viewers is only partly 
-available to nonexistent. The reference viewer for the development of this
-package is Adobe Reader.
+For a long time pdflatex has offered the command \pdfannot for inserting
+arbitrary PDF annotations. However, the command is presented in
+a form where additional knowledge of the definition of the PDF format is
+indispensable. This package is an answer to the – occasional – questions
+in newsgroups, about how one could use the comment function of Adobe
+Reader. At least for the writer of LATEX code, the package offers a
+convenient and user-friendly means of using \pdfannot to provide comments
+in PDF files. Since version v1.1, pdfcomment.sty also supports:
+
+      LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx and XeLaTeX.
+
+Unfortunately, support of PDF annotations by PDF viewers is sparse to
+nonexistent. The reference viewer for the development of this package is
+Adobe Reader.
 
 License: LPPL
+
+New in v1.1:
+
+  - support of other drivers:
+    LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx and XeLaTeX
+	
+  - new options: draft, final, dvipdfmx
\ 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 8883c5b8dc5..9d88c239dbc 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.tex b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
index 900a26f1645..4135ac8915a 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -1,3 +1,4 @@
+% example for pdflatex
 \documentclass{scrartcl}
 \usepackage[german]{babel}
 \usepackage[latin1]{inputenc}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
new file mode 100644
index 00000000000..728dade17a8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
new file mode 100644
index 00000000000..ab01f5f3f7f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -0,0 +1,52 @@
+\documentclass{scrartcl}
+\usepackage[german]{babel}
+\usepackage[latin1]{inputenc}
+\usepackage[T1]{fontenc}
+%dvipdfmx leads to an error with xcolor
+\usepackage[svgnames,dvipdfm]{xcolor}
+% define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf
+\def\pgfsysdriver{pgfsys-dvipdfm.def}
+\usepackage{tikz}
+\usepackage[subject={Top1},author={\AA{}nsgar Lund},dvipdfmx]{pdfcomment}
+\begin{document}
+\definecolor{MyBlue}{rgb}{0.045,0.278,0.643}
+A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This is a comment.} little Test! \pdfcomment[color=MyBlue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace! \pdfcomment[color=Gold,icon=Star,author={Captain Jack}]{It's enough now!}
+
+\colorlet{KernFarbe}{red}
+\colorlet{HuelleFarbe}{blue}
+\vspace{35mm}
+\begin{tikzpicture}[
+        Huelle/.style = {ball color=HuelleFarbe!25},
+        Kern/.style = {ball color=KernFarbe!25},
+        Proton/.style = {ball color=HuelleFarbe!80},
+        Elektron/.style = {ball color=KernFarbe!80},
+    ]
+
+    \shade[Huelle] (8,0) circle (2cm);
+    \shade[Kern]   (8,0) circle (.7cm);
+
+    % Elektronen
+    \foreach \cx/\cy in {8/0,8/.3,8/-.3,8.2/.25,8.2/-.25,%
+        8.3/.09,8.3/-.09,7.8/.25,7.8/.-.25,7.7/.09,%
+        7.7/-.09,7.5/.09,8.5/-.09,7.6/-.3,8/-.5,8/.5,8.4/.4}{
+            \shade[Elektron] (\cx,\cy) circle (.6mm);
+    }
+    % Protonen
+    \foreach \cx/\cy in {6.9/-.1,7.4/1.2,7/.7,7.9/1.5,9.2/0.2,%
+        9/1,7.5/-1.2,7/-0.8,9/-0.8,8.7/-1.2,7.7/-1.5,8.9/.5, %8.6,-1
+        7/1.3,6.6/.4,9.6/-.31,9.6/.6,8.3/1.2}{
+            \shade[Proton] (\cx,\cy) circle (.6mm);
+    }
+    
+    \draw[<-] (8.25,.55) -- +(1.4,1.4) node[above] {Atomkern};
+    \draw[<-] (7,.4) -- +(-1.3,1) node[above] {Atomhülle};
+    \draw[<-] (6.8,-.085) -- +(-1.6,.4) node[above] {Elektron};
+    \draw[<-] (7.5,-.35) -- +(-2,-.7) node[below] {Proton};
+\end{tikzpicture}
+\pdfcomment[color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}]{Wow, that's nice!}\pdfcommentsetup{color=NavyBlue,subject={Top1},icon=Circle,author={Prof. Dolittle}}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
+
+\vspace{2cm}
+For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
+
+Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+\end{document} 
\ No newline at end of file
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
new file mode 100644
index 00000000000..fb9b130dcb7
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..900a26f1645
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
@@ -0,0 +1,49 @@
+\documentclass{scrartcl}
+\usepackage[german]{babel}
+\usepackage[latin1]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[svgnames]{xcolor}
+\usepackage{tikz}
+\usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment}
+\begin{document}
+\definecolor{MyBlue}{rgb}{0.045,0.278,0.643}
+A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This is a comment.} little Test! \pdfcomment[color=MyBlue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace! \pdfcomment[color=Gold,icon=Star,author={Captain Jack}]{It's enough now!}
+
+\colorlet{KernFarbe}{red}
+\colorlet{HuelleFarbe}{blue}
+\vspace{35mm}
+\begin{tikzpicture}[
+        Huelle/.style = {ball color=HuelleFarbe!25},
+        Kern/.style = {ball color=KernFarbe!25},
+        Proton/.style = {ball color=HuelleFarbe!80},
+        Elektron/.style = {ball color=KernFarbe!80},
+    ]
+
+    \shade[Huelle] (8,0) circle (2cm);
+    \shade[Kern]   (8,0) circle (.7cm);
+
+    % Elektronen
+    \foreach \cx/\cy in {8/0,8/.3,8/-.3,8.2/.25,8.2/-.25,%
+        8.3/.09,8.3/-.09,7.8/.25,7.8/.-.25,7.7/.09,%
+        7.7/-.09,7.5/.09,8.5/-.09,7.6/-.3,8/-.5,8/.5,8.4/.4}{
+            \shade[Elektron] (\cx,\cy) circle (.6mm);
+    }
+    % Protonen
+    \foreach \cx/\cy in {6.9/-.1,7.4/1.2,7/.7,7.9/1.5,9.2/0.2,%
+        9/1,7.5/-1.2,7/-0.8,9/-0.8,8.7/-1.2,7.7/-1.5,8.9/.5, %8.6,-1
+        7/1.3,6.6/.4,9.6/-.31,9.6/.6,8.3/1.2}{
+            \shade[Proton] (\cx,\cy) circle (.6mm);
+    }
+    
+    \draw[<-] (8.25,.55) -- +(1.4,1.4) node[above] {Atomkern};
+    \draw[<-] (7,.4) -- +(-1.3,1) node[above] {Atomhülle};
+    \draw[<-] (6.8,-.085) -- +(-1.6,.4) node[above] {Elektron};
+    \draw[<-] (7.5,-.35) -- +(-2,-.7) node[below] {Proton};
+\end{tikzpicture}
+\pdfcomment[color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}]{Wow, that's nice!}\pdfcommentsetup{color=NavyBlue,subject={Top1},icon=Circle,author={Prof. Dolittle}}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
+
+\vspace{2cm}
+For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
+
+Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+\end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
new file mode 100644
index 00000000000..24963e20bed
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
new file mode 100644
index 00000000000..16f6e4dbc91
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -0,0 +1,52 @@
+\documentclass{scrartcl}
+\usepackage[no-math]{fontspec}
+\usepackage{xunicode}
+\usepackage{xltxtra}
+\usepackage[svgnames]{xcolor}
+\usepackage{tikz}
+%\usepackage[unicode]{hyperref}
+\usepackage[subject={Top1},author={Ã…nsgar Lund}]{pdfcomment}
+\setmainfont[Mapping=tex-text]{Bergamo}
+\begin{document}
+\fontspec[SmallCapsFont={BergamoSmc},]{Bergamo}
+\definecolor{MyBlue}{rgb}{0.045,0.278,0.643}
+A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This is a comment.} little Test! \pdfcomment[color=MyBlue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace! \pdfcomment[color=Gold,icon=Star,author={Captain Jack}]{It's enough now!}
+
+\colorlet{KernFarbe}{red}
+\colorlet{HuelleFarbe}{blue}
+\vspace{35mm}
+\begin{tikzpicture}[
+        Huelle/.style = {ball color=HuelleFarbe!25},
+        Kern/.style = {ball color=KernFarbe!25},
+        Proton/.style = {ball color=HuelleFarbe!80},
+        Elektron/.style = {ball color=KernFarbe!80},
+    ]
+
+    \shade[Huelle] (8,0) circle (2cm);
+    \shade[Kern]   (8,0) circle (.7cm);
+
+    % Elektronen
+    \foreach \cx/\cy in {8/0,8/.3,8/-.3,8.2/.25,8.2/-.25,%
+        8.3/.09,8.3/-.09,7.8/.25,7.8/.-.25,7.7/.09,%
+        7.7/-.09,7.5/.09,8.5/-.09,7.6/-.3,8/-.5,8/.5,8.4/.4}{
+            \shade[Elektron] (\cx,\cy) circle (.6mm);
+    }
+    % Protonen
+    \foreach \cx/\cy in {6.9/-.1,7.4/1.2,7/.7,7.9/1.5,9.2/0.2,%
+        9/1,7.5/-1.2,7/-0.8,9/-0.8,8.7/-1.2,7.7/-1.5,8.9/.5, %8.6,-1
+        7/1.3,6.6/.4,9.6/-.31,9.6/.6,8.3/1.2}{
+            \shade[Proton] (\cx,\cy) circle (.6mm);
+    }
+    
+    \draw[<-] (8.25,.55) -- +(1.4,1.4) node[above] {Atomkern};
+    \draw[<-] (7,.4) -- +(-1.3,1) node[above] {Atomhülle};
+    \draw[<-] (6.8,-.085) -- +(-1.6,.4) node[above] {Elektron};
+    \draw[<-] (7.5,-.35) -- +(-2,-.7) node[below] {Proton};
+\end{tikzpicture}
+\pdfcomment[color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}]{Wow, that's nice!}\pdfcommentsetup{color=NavyBlue,subject={Top1},icon=Circle,author={Prof. Dolittle}}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
+
+\vspace{2cm}
+For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the - from time to time - emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
+
+Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
index 2b69404563a..ab45a5dd09f 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
+++ b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
@@ -14,7 +14,12 @@ pdfcomment_de.pdf
 pdfcomment_de.tex
 example.tex
 example.pdf
-
+example_latex_dvips_ps2pdf.tex
+example_latex_dvips_ps2pdf.pdf
+example_latex_dvipdfmx.tex
+example_latex_dvipdfmx.pdf
+example_xelatex.tex
+example_xelatex.pdf
 
 -- Misc. Files --
 
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 0cd4ca3198f..6a325effcfd 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 ecd540bc574..aaa72f4bb8b 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -9,21 +9,17 @@
 \usepackage{url}%
 \usepackage{attachfile}%
 \usepackage{marginnote}%
-\usepackage{tabularx}
-\usepackage{makeidx}
-\usepackage{moredefs,lips}
-\usepackage{footmisc}
 \usepackage{natbib}
-\usepackage{multicol}
-\usepackage{listings}
 \usepackage[svgnames]{xcolor}
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
+\def\fileversion{v1.1}
+\def\filename{pdfcomment.sty}
+\def\XeLaTeX{Xe\LaTeX}
 %\usepackage{acrofont}%
 \CodelineIndex
 %\EnableCrossrefs
-%\setfnsymbol{wiley}
 %\makeatletter
 %\def\tableofcontents{\@starttoc{toc}}
 %\makeatother
@@ -57,24 +53,28 @@
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
 \makeatother
-\hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to pdf annotations},pdfsubject={Documentation for LaTeX style pdfcomment.sty}}
+\hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to pdf annotations},pdfsubject={Documentation for LaTeX style \filename}}
 \begin{document}
 \bibliographystyle{alphadin}
-\title{\substyle{pdfcomment.sty} v1.0\footnote{\protect\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}}\\A user-friendly interface to pdf annotations\footnote{\protect\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}}
+\title{\substyle{\filename} \fileversion\footnote{\protect\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}}\\A user-friendly interface to pdf annotations\footnote{\protect\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}}
 \author{Josef Kleber\footnote{\protect\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}}}
 \date{\today}
 \maketitle
 \begin{abstract}
-For a long time \texttt{pdflatex}\footnote{Please note that this package is only applicable using \texttt{pdflatex}}\index{pdflatex} offers the command \cmd\pdfannot{} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \substyle{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \substyle{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files.
+For a long time \texttt{pdflatex} has offered the command \cmd\pdfannot{} for inserting arbitrary PDF annotations. However, the command is presented in a form where additional knowledge of the definition of the PDF format is indispensable. This package is an answer to the -- occasional -- questions in newsgroups, about how one could use the comment function of \texttt{Adobe Reader}. At least for the writer of \LaTeX{} code, the package offers a convenient and user-friendly means of using \cmd\pdfannot{} to provide comments in PDF files. Since version v1.1, \texttt{\filename{}} also supports: 
 
-Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+\medskip
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{only with style option \texttt{dvipdfmx}} and \XeLaTeX}.\hfill
+\medskip
+
+Unfortunately, support of PDF annotations by PDF viewers is sparse to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
 
 If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test annotation},color=lime,hspace=18pt]{This is an annotation} you are definitely using the wrong pdf viewer!
 \end{abstract}
 \vfill
 \begin{center}
-\subsubsection*{Required packages for using \substyle{pdfcomment.sty}}
-\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref}, \package{xkeyval}, \package{ifpdf}, \package{marginnote} and the packages loaded by them.}}
+\subsubsection*{Required packages for using \substyle{\filename}}
+\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{xkeyval}, \package{ifpdf}, \package{marginnote} and the packages loaded by them.}}
 \end{center}
 \vfill
 \clearpage
@@ -86,19 +86,40 @@ If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test
 %\end{multicols}
 \tableofcontents
 \clearpage
-\section{Options}
-The following options are useable as style options as well as options for the commands presented in section \ref{sec:befehle}. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten. 
+\section*{Acknowledgment}
+I want to thank the following persons for contributions to the development of this package:
+
+\begin{itemize}
+\item \textbf{Alexander Grahn} for contributing a patch for other drivers
 
-\subsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
+\medskip
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} und \XeLaTeX}.\hfill
+\medskip
+
+\item \textbf{Gabriel Cardona} for pointing out problems with older versions of \texttt{hyperref} (v6.76a [2007/04/09])
+\end{itemize}
+\clearpage
+\section{Options}
+\subsection{Global options}
+\subsubsection[\texttt{final}]{\styleoption{final}}\label{sec:final}
+The option \styleoption{final} will set the package to final mode. The pdf annotations will not be typeset and will not influence line breaking.
+\subsubsection[\texttt{draft}]{\styleoption{draft}}\label{sec:draft}
+The option \styleoption{draft} (default) will set the package to draft mode. Therefore, the pdf annotations will be typeset.
+\subsubsection[\texttt{dvipdfmx}]{\styleoption{dvipdfmx}}\label{sec:dvipdfmx}
+If you want to use the driver \texttt{dvipdfmx} for creating your documents, you have to use the option \styleoption{dvipdfmx}. The other drivers are recognized automatically.
+\subsection{Local options}
+The following options are useable as options for the commands presented in section \ref{sec:befehle}, as well as style options. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten. 
+
+\subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
 You can use the option \styleoption{subject} for defining the subject of the pdf popup annotations.
 
-\subsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
+\subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
 You can use the option \styleoption{author} for defining the author of the pdf popup annotations.
 
-\subsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
+\subsubsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
 You can use the option \styleoption{color} for defining the color of pdf annotations in the form \{0.34 0.56 0.12\} (RGB). If you are using the additional package \package{xcolor} you can use predefined color names, as well as the available optional color names. Furthermore you can use the command \cmd\definecolor{} to define your own named colors. Please take a look at the attached example \file{example.tex}.\marginnote{\attachfile[author={Josef Kleber},subject={example.tex},description={source code: example.tex} ,mimetype={text/plain}, icon={Tag}]{example.tex}} It shows the different possibilities of defining colors.
 
-\subsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
+\subsubsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
 You can use the option \styleoption{icon} for defining the graphic used for the pdf text annotations. The following icons are defined as mandatory by the pdf reference:
 
 \bigskip\pdfcommentsetup{author={Josef Kleber},subject={Icon overview}}
@@ -125,10 +146,10 @@ Furthermore the following icons are also supported by \texttt{Adobe Reader} and
 
 \bigskip
 
-\subsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
+\subsubsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
 You can use the option \styleoption{open} for defining the opening status of the pdf popup annotations. Possible values are \texttt{true} or \texttt{false} (default).
 
-\subsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
+\subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
 You can use the option \styleoption{hspace} for defining the horizontal space after the pdf text annotations.
 
 \section{Commands}\label{sec:befehle}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 024e66ee609..d6ebc46dbe9 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 6f880f6ab2a..a0c120aa442 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -9,21 +9,17 @@
 \usepackage{url}%
 \usepackage{attachfile}%
 \usepackage{marginnote}%
-\usepackage{tabularx}
-\usepackage{makeidx}
-\usepackage{moredefs,lips}
-\usepackage{footmisc}
 \usepackage{natbib}
-\usepackage{multicol}
-\usepackage{listings}
 \usepackage[svgnames]{xcolor}
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
+\def\fileversion{v1.1}
+\def\filename{pdfcomment.sty}
+\def\XeLaTeX{Xe\LaTeX}
 %\usepackage{acrofont}%
 \CodelineIndex
 %\EnableCrossrefs
-%\setfnsymbol{wiley}
 %\makeatletter
 %\def\tableofcontents{\@starttoc{toc}}
 %\makeatother
@@ -57,15 +53,19 @@
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
 \makeatother
-\hypersetup{pdfauthor={Josef Kleber},pdftitle={Ein benutzerfreundliches Interface zu PDF-Kommentaren},pdfsubject={Dokumentation für den LaTeX style pdfcomment.sty}}
+\hypersetup{pdfauthor={Josef Kleber},pdftitle={Ein benutzerfreundliches Interface zu PDF-Kommentaren},pdfsubject={Dokumentation für den LaTeX style \filename}}
 \begin{document}
 \bibliographystyle{alphadin}
-\title{\substyle{pdfcomment.sty} v1.0\footnote{\protect\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}}\\Ein benutzerfreundliches Interface zu PDF-Kommentaren\footnote{\protect\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}}
+\title{\substyle{\filename} \fileversion\footnote{\protect\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}}\\Ein benutzerfreundliches Interface zu PDF-Kommentaren\footnote{\protect\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}}
 \author{Josef Kleber\footnote{\protect\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}}}
 \date{\today}
 \maketitle
 \begin{abstract}
-\texttt{pdflatex}\footnote{Bitte beachten Sie, daß dieses Paket nur unter Verwendung von \texttt{pdflatex} einsetzbar ist}\index{pdflatex} bietet seit jeher den Befehl \cmd\pdfannot{} für das Einfügen beliebiger pdf annotations. Allerdings in einer Form, in der zusätzliche Kenntnisse der PDF-Referenz unabdingbar sind. \substyle{pdfcomment.sty} ist eine Antwort auf die in Newsgroups von Zeit zu Zeit auftauchende Frage, wie man die Kommentarfunktion des \texttt{Adobe Reader} nutzen könnte. Zumindest aus dem \LaTeX{}-Code heraus bietet \substyle{pdfcomment.sty} eine bequeme und nutzerfreundliche Möglichkeit pdf annotations in pdf-Dateien zu nutzen.
+\texttt{pdflatex}\index{pdflatex} bietet seit jeher den Befehl \cmd\pdfannot{} für das Einfügen beliebiger pdf annotations. Allerdings in einer Form, in der zusätzliche Kenntnisse der PDF-Referenz unabdingbar sind. \substyle{\filename} ist eine Antwort auf die in Newsgroups -- von Zeit zu Zeit -- auftauchende Frage, wie man die Kommentarfunktion des \texttt{Adobe Reader} nutzen könnte. Zumindest aus dem \LaTeX{}-Code heraus, bietet \substyle{\filename} eine bequeme und nutzerfreundliche Möglichkeit pdf annotations in pdf-Dateien zu nutzen. Seit Version v1.1 unterstützt \texttt{\filename{}} auch:
+
+\medskip
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{nur mit der Styleoption \texttt{dvipdfmx}} und \XeLaTeX}.\hfill
+\medskip
 
 Leider ist die Unterstützung der pdf annotations durch die PDF-Viewer teilweise nur sehr eingeschränkt bzw. gar nicht vorhanden. Der Referenz-Viewer für die Entwicklung dieses Pakets ist \texttt{Adobe Reader}.
 
@@ -73,8 +73,8 @@ Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Komme
 \end{abstract}
 \vfill
 \begin{center}
-\subsubsection*{Benötigte Pakete für die Nutzung von \substyle{pdfcomment.sty}}
-\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref}, \package{xkeyval}, \package{ifpdf}, \package{marginnote} und die von diesen Paketen aufgerufenen Dateien.}}
+\subsubsection*{Benötigte Pakete für die Nutzung von \substyle{\filename}}
+\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{xkeyval}, \package{ifpdf}, \package{marginnote} und die von diesen Paketen aufgerufenen Dateien.}}
 \end{center}
 \vfill
 \clearpage
@@ -86,19 +86,40 @@ Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Komme
 %\end{multicols}
 \tableofcontents
 \clearpage
-\section{Optionen}
-Die anschließend vorgestellten Optionen sind sowohl als Styleoptionen, als auch als Optionen für die im Abschnitt \ref{sec:befehle} vorgestellten Befehle anwendbar. Als Styleoptionen besitzen sie globale Wirkung, während sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht überschreiben. 
+\section*{Danksagung}
+Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
+
+\begin{itemize}
+\item \textbf{Alexander Grahn} für das Bereitstellen eines Patchs für andere Treiber
 
-\subsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
+\medskip
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} und \XeLaTeX}.\hfill
+\medskip
+
+\item \textbf{Gabriel Cardona} für den Hinweis auf Probleme mit älteren Versionen von \texttt{hyperref} (v6.76a [2007/04/09])
+\end{itemize}
+\clearpage
+\section{Optionen}
+\subsection{Globale Styleoptionen}
+\subsubsection[\texttt{final}]{\styleoption{final}}\label{sec:final}
+Mit der Option \texttt{final} versetzt man das Paket in den Final-Modus. Die pdf annotations werden nicht gesetzt und beeinflussen daher auch nicht den Zeilen\-umbruch. 
+\subsubsection[\texttt{draft}]{\styleoption{draft}}\label{sec:draft}
+Mit der Option \texttt{draft} (default) versetzt man das Paket in den Draft-Modus. Die pdf annotations werden daher gesetzt.
+\subsubsection[\texttt{dvipdfmx}]{\styleoption{dvipdfmx}}\label{sec:dvipdfmx}
+Falls Sie für die Erstellung Ihrer Dokumente den Treiber \texttt{dvipdfmx} einsetzen möchten, müssen sie die Option \texttt{dvipdfmx} benutzen. Die anderen bereits erwähnten Treiber werden automatisch erkannt.
+\subsection{Lokale Optionen}
+Die anschließend vorgestellten Optionen sind für die im Abschnitt \ref{sec:befehle} vorgestellten Befehle anwendbar, allerdings können sie auch als Styleoptionen benutzt werden. Als Styleoptionen besitzen sie globale Wirkung, während sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht überschreiben. 
+
+\subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
 Die Option \styleoption{subject} dient der Festlegung der Überschriften der pdf popup annotations.
 
-\subsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
+\subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
 Die Option \styleoption{author} dient der Festlegung des Verfassers der pdf popup annotations.
 
-\subsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
+\subsubsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
 Die Option \styleoption{color} dient der Festlegung der Farbe der pdf popup annotations in der Form \{0.34 0.56 0.12\} (RGB). Bei Verwendung des Zusatzpakets \package{xcolor} kann man auch vordefinierte Basisfarbnamen, sowie die zusätzlich verfügbaren optionalen Farbnamen verwenden. Außerdem kann man mit dem Befehl \cmd\definecolor{} eigene benannte Farben definieren. Bitte beachten Sie das beigefügte Beispiel \file{example.tex}.\marginnote{\attachfile[author={Josef Kleber},subject={example.tex},description={Sourcecode: example.tex} ,mimetype={text/plain}, icon={Tag}]{example.tex}} Es bietet einen Überblick über die unterschiedlichen Möglichkeiten zur Festlegung der Farbe.
 
-\subsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
+\subsubsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
 Die Option \styleoption{icon} dient der Festlegung der Grafik, die für die pdf text annotations benutzt werden sollen. Die folgenden Icons werden in der PDF-Referenz als verbindlich festgelegt:
 
 \bigskip\pdfcommentsetup{author={Josef Kleber},subject={Icon Übersicht}}
@@ -125,10 +146,10 @@ Außerdem werden vom \texttt{Adobe Reader} und einigen anderen Viewern auch diese
 
 \bigskip
 
-\subsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
+\subsubsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
 Die Option \styleoption{open} dient der Festlegung des Öffnungsstatus der pdf popup annotations. Mögliche Werte sind dabei \texttt{true} oder \texttt{false} (Default).
 
-\subsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
+\subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
 Die Option \styleoption{hspace} dient der Anpassung des horizontalen Abstands hinter den pdf text annotations.
 
 \section{Befehle}\label{sec:befehle}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index d65343e719d..b06f7885301 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -20,7 +20,8 @@
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2008/12/07 pdfcomment.sty v1.0 - Josef Kleber (C) 2008]%
+\ProvidesPackage{pdfcomment}[2008/12/12 pdfcomment.sty v1.1 - Josef Kleber (C) 2008]%
+% dvips, dvipdfmx, XeLaTeX drivers by Alexander Grahn
 %
 \RequirePackage{xkeyval}%
 %
@@ -31,6 +32,7 @@
 \gdef\pc@goptd@icon{Comment}%
 \gdef\pc@goptd@open{false}%
 \gdef\pc@goptd@hspace{15pt}%
+\gdef\pc@goptd@dvipdfmx{true}%
 %
 % values for global package options
 \gdef\pc@gopt@subject{}%
@@ -39,6 +41,8 @@
 \gdef\pc@gopt@icon{}%
 \gdef\pc@gopt@open{}%
 \gdef\pc@gopt@hspace{}%
+\newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
+\newif\ifpc@gopt@final\pc@gopt@finalfalse%
 %
 % values for local command options
 \gdef\pc@lopt@subject{}%
@@ -84,6 +88,24 @@
   \gdef\pc@gopt@hspace{#1}%
 }%
 %
+% define global style option dvipdfmx for setting the output driver in DVI mode
+\define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
+{%
+  \expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
+}%
+%
+% define global style option final for setting the output mode to final
+\define@key{pdfcomment.sty}{final}[]%
+{%
+  \pc@gopt@finaltrue%
+}%
+%
+% define global style option draft for setting the output mode to final
+\define@key{pdfcomment.sty}{draft}[]%
+{%
+  \pc@gopt@finalfalse%
+}%
+%
 % define local command option subject for setting the subject of pdf annotations
 \define@key{pdfcomment}{subject}[\pc@gopt@subject]%
 {%
@@ -161,19 +183,46 @@
 \ProcessOptionsX\relax%
 %
 \RequirePackage{marginnote}%
-\RequirePackage{hyperref}%
 \RequirePackage{ifpdf}%
 %
-\ifpdf%
-\else%
-  \PackageError{pdfcomment}%
-  {pdfcomment works only with pdflatex in PDF mode!}%
-  {Not running pdfLaTeX in PDF mode; pdfcomment makes use of pdflatex primitive \pdfannot! Please run pdflatex!}%
+%hyperref setup
+\ifpdf\else%
+  %auto-set dvipdfmx driver in case of xetex
+  \expandafter\ifx\csname XeTeXrevision\endcsname\relax%
+    \ifpc@gopt@dvipdfmx%
+      \@ifpackageloaded{hyperref}%
+	  {%
+        \hypersetup{dvipdfmx}%
+      }%
+	  {%
+        \PassOptionsToPackage{dvipdfmx}{hyperref}%
+      }%
+    \fi%
+  \else%
+    \global\pc@gopt@dvipdfmxtrue%
+    \@ifpackageloaded{hyperref}{}%
+	{%
+      \PassOptionsToPackage{xetex}{hyperref}%
+    }%
+  \fi%
 \fi%
 %
+% problems with older versions of hyperref than v6.76a [2007/04/09]
+% reported by Gabriel Cardona
+\RequirePackage{hyperref}[2007/04/09]%
+%
+% Using the options draft, final and dvipdfmx in \pdfcommentsetup makes absolutely no sense!
+% Therefore, they are switched off at "\AtBeginDocument" 
+% and a warning is issued by xkeyval.sty, if used.
+\AtBeginDocument%
+{%
+  \disable@keys{pdfcomment.sty}{draft}%
+  \disable@keys{pdfcomment.sty}{final}%
+  \disable@keys{pdfcomment.sty}{dvipdfmx}%
+}%
 \newcommand{\pdfcomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace}]%
 {%
-  % Copy all global option to local options
+  % Copy all global options to local options
   \gdef\pc@lopt@subject{\pc@gopt@subject}%
   \gdef\pc@lopt@color{\pc@gopt@color}%
   \gdef\pc@lopt@author{\pc@gopt@author}%
@@ -191,23 +240,55 @@
   \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}%
   % transform color input to pdf color
   \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
-  % typeset text annotation (see: PDF Reference)
-  \pdfannot width 0pt height \baselineskip depth 0pt%
-  {%
-    /Subtype /Text%
-	/C [\pc@hyenc@color]%
-	/T (\pc@pdfenc@author)%
-	/Subj (\pc@pdfenc@subject)%
-	/Name /\pc@lopt@icon%
-	/Contents (\pc@pdfenc@contents)%
-	/Open \pc@lopt@open%
-  }
-  \hspace{\pc@lopt@hspace}%
+  \ifpc@gopt@final\else%
+    % typeset text annotation (see: PDF Reference)
+    \ifpdf%
+      \pdfannot width 0pt height \baselineskip depth 0pt%
+      {%
+        /Subtype /Text%
+        /C [\pc@hyenc@color]%
+        /T (\pc@pdfenc@author)%
+        /Subj (\pc@pdfenc@subject)%
+        /Name /\pc@lopt@icon%
+        /Contents (\pc@pdfenc@contents)%
+        /Open \pc@lopt@open%
+      }
+    \else%
+      \ifpc@gopt@dvipdfmx%
+        \special{pdf: ann width 0pt height \the\baselineskip%
+	      <<%
+            /Subtype /Text%
+            /C [\pc@hyenc@color]%
+            /T (\pc@pdfenc@author)%
+            /Subj (\pc@pdfenc@subject)%
+            /Name /\pc@lopt@icon%
+            /Contents (\pc@pdfenc@contents)%
+            /Open \pc@lopt@open%
+          >>%
+	    }%
+      \else%
+        \pdfmark[\rule{0pt}{\baselineskip}]%
+	    {%
+          pdfmark=/ANN,%
+          Subtype=/Text,%
+          Raw={% 
+            /C [\pc@hyenc@color]%
+            /T (\pc@pdfenc@author)%
+            /Subj (\pc@pdfenc@subject)%
+            /Name /\pc@lopt@icon%
+            /Contents (\pc@pdfenc@contents)%
+            /Open \pc@lopt@open%
+          }%
+        }%
+      \fi%
+    \fi%
+    \hspace{\pc@lopt@hspace}%
+  \fi%
 }%
 %
 \newcommand{\pdfmargincomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace}]%
 {%
-  % Copy all global option to local options
+  % Copy all global options to local options
   \gdef\pc@lopt@subject{\pc@gopt@subject}%
   \gdef\pc@lopt@color{\pc@gopt@color}%
   \gdef\pc@lopt@author{\pc@gopt@author}%
@@ -225,26 +306,58 @@
   \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}%
   % transform color input to pdf color
   \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
-  \begingroup
-  % center marginnotes!
-    \renewcommand*{\raggedleftmarginnote}{\centering}%
-    \renewcommand*{\raggedrightmarginnote}{\centering}%
-    % typeset text annotation (see: PDF Reference)
-    \marginnote%
-    {%
-      \pdfannot width 0pt height \baselineskip depth 0pt%
+  \ifpc@gopt@final\else%
+    \begingroup
+    % center marginnotes!
+      \renewcommand*{\raggedleftmarginnote}{\centering}%
+      \renewcommand*{\raggedrightmarginnote}{\centering}%
+      % typeset text annotation (see: PDF Reference)
+      \marginnote%
       {%
-        /Subtype /Text%
-	    /C [\pc@hyenc@color]%
-	    /T (\pc@pdfenc@author)%
-	    /Subj (\pc@pdfenc@subject)%
-	    /Name /\pc@lopt@icon%
-	    /Contents (\pc@pdfenc@contents)%
-	    /Open \pc@lopt@open%
-      }
-      \hspace{\pc@lopt@hspace}%
-    }%
-  \endgroup
+        \ifpdf%
+          \pdfannot width 0pt height \baselineskip depth 0pt%
+          {%
+            /Subtype /Text%
+            /C [\pc@hyenc@color]%
+            /T (\pc@pdfenc@author)%
+            /Subj (\pc@pdfenc@subject)%
+            /Name /\pc@lopt@icon%
+            /Contents (\pc@pdfenc@contents)%
+            /Open \pc@lopt@open%
+          }
+        \else%
+          \ifpc@gopt@dvipdfmx%
+            \special{pdf: ann width 0pt height \the\baselineskip%
+		      <<%
+                /Subtype /Text%
+                /C [\pc@hyenc@color]%
+                /T (\pc@pdfenc@author)%
+                /Subj (\pc@pdfenc@subject)%
+                /Name /\pc@lopt@icon%
+                /Contents (\pc@pdfenc@contents)%
+                /Open \pc@lopt@open%
+              >>%
+		    }%
+          \else%
+            \pdfmark[\rule{0pt}{\baselineskip}]
+		    {%
+              pdfmark=/ANN,%
+              Subtype=/Text,%
+              Raw={% 
+                  /C [\pc@hyenc@color]%
+                  /T (\pc@pdfenc@author)%
+                  /Subj (\pc@pdfenc@subject)%
+                  /Name /\pc@lopt@icon%
+                  /Contents (\pc@pdfenc@contents)%
+                  /Open \pc@lopt@open%
+              }%
+            }%
+          \fi%
+        \fi%
+        \hspace{\pc@lopt@hspace}%
+      }%
+    \endgroup
+  \fi
 }%
 %
 \newcommand{\pdfcommentsetup}[1]%
@@ -255,4 +368,4 @@
 %
 %
 %
-\endinput%
\ No newline at end of file
+\endinput%