pdfcomment update (19feb09)

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

16 files changed, 889 insertions, 144 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index d21af4e8322..e8f4ab8afe0 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,29 +1,54 @@
 === pdfcomment.sty ===
 
--- pdfcomment.sty (v1.1) (<- v1.05dev 2008/12/12) --
+-- pdfcomment.sty (v1.2) (<- v1.13dev 2009/02/19) -- (svn rev 12)
+
+2009/02/15  new annotation type FreeText [jk] (svn rev 11)
+              \pdffreetextcomment
+  
+2009/02/15  added style system [jk]
+              for logical split in avatar system
+              personal options -> avatar
+              style options -> style
+              -> combination of avatar=Josef, style=MyComment
+
+2009/02/14  new global style and local command options: [jk] (svn rev 10)
+              voffset, hoffset, width, height, depth, opacity
+
+2009/02/13  added "/F 4" to all annotations to allow printing [jk] (svn rev 8)
+
+            contributed by Christian Feuersänger (pdfmarginpar.sty)
+
+2008/12/17  introduction of avatar system [jk] (svn rev 7)
+              - \defineavatar
+              - \avatar
+              - global and local options (avatar)
+
+
+-- pdfcomment.sty (v1.1) (<- v1.05dev 2008/12/12) -- (svn rev 6)
+
+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.              
 
 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
-			
+              latex->dvips->ps2pdf, latex->dvipdfmx, xelatex
+              new option dvipdfmx
+  
+            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
+  
+            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.              
+              final: pdf annotations are not typeset
 
-			  
+  
 === pdfcomment bundle ===
 
 -- pdfcomment bundle --
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 83014373615..05060a23469 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,9 +15,11 @@ Adobe Reader.
 
 License: LPPL
 
-New in v1.1:
+New in v1.2:
 
-  - support of other drivers:
-    LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx and XeLaTeX
-	
-  - new options: draft, final, dvipdfmx
\ No newline at end of file
+  - new options: voffset, hoffset, width, height, opacity, avatar, style
+  - new annotation type: FreeText annotation
+    -> \pdffreetextcomment
+  - introduction of an avatar and style system
+    -> \defineavatar, \definestyle, options avatar and style
+  - printing the PDF annotations and popups is possible now!
\ 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 9d88c239dbc..46bae70ef90 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 4135ac8915a..27a1b77cdff 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -4,11 +4,23 @@
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage[svgnames]{xcolor}
+\usepackage[absolute]{textpos}
 \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!}
+\definecolor{myblue}{rgb}{0.045,0.278,0.643}
+\colorlet{myorange}{red!30!yellow}
+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,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+
+\marginpar{\begin{textblock*}{1cm}(6cm,13.7cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)}
+\end{textblock*}}
+
+A little Test!
 
 \colorlet{KernFarbe}{red}
 \colorlet{HuelleFarbe}{blue}
@@ -41,7 +53,11 @@ A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This
     \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!}
+\defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}}
+\pdfcommentsetup{avatar=Newton}
+\pdfcomment{Wow, that's nice!}
+\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}}
+\pdfcommentsetup{avatar=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!}
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 728dade17a8..3ddf4b96329 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_dvipdfmx.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
index ab01f5f3f7f..10c0a5958be 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -2,6 +2,7 @@
 \usepackage[german]{babel}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
+\usepackage[absolute]{textpos}
 %dvipdfmx leads to an error with xcolor
 \usepackage[svgnames,dvipdfm]{xcolor}
 % define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf
@@ -9,8 +10,19 @@
 \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!}
+\definecolor{myblue}{rgb}{0.045,0.278,0.643}
+\colorlet{myorange}{red!30!yellow}
+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,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+
+\marginpar{\begin{textblock*}{1cm}(6cm,13.7cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)}
+\end{textblock*}}
+
+A little Test!
 
 \colorlet{KernFarbe}{red}
 \colorlet{HuelleFarbe}{blue}
@@ -43,7 +55,11 @@ A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This
     \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!}
+\defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}}
+\pdfcommentsetup{avatar=Newton}
+\pdfcomment{Wow, that's nice!}
+\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}}
+\pdfcommentsetup{avatar=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!}
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 fb9b130dcb7..edeef49a28f 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 900a26f1645..1e482725efd 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
@@ -3,11 +3,23 @@
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage[svgnames]{xcolor}
+\usepackage[absolute]{textpos}
 \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!}
+\definecolor{myblue}{rgb}{0.045,0.278,0.643}
+\colorlet{myorange}{red!30!yellow}
+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,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+
+\marginpar{\begin{textblock*}{1cm}(6cm,13.7cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)}
+\end{textblock*}}
+
+A little Test!
 
 \colorlet{KernFarbe}{red}
 \colorlet{HuelleFarbe}{blue}
@@ -40,7 +52,11 @@ A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This
     \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!}
+\defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}}
+\pdfcommentsetup{avatar=Newton}
+\pdfcomment{Wow, that's nice!}
+\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}}
+\pdfcommentsetup{avatar=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!}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index 24963e20bed..c9c31d29e7f 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/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
index 16f6e4dbc91..9491e783b2d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -4,13 +4,25 @@
 \usepackage{xltxtra}
 \usepackage[svgnames]{xcolor}
 \usepackage{tikz}
+\usepackage[absolute]{textpos}
 %\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!}
+\definecolor{myblue}{rgb}{0.045,0.278,0.643}
+\colorlet{myorange}{red!30!yellow}
+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,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+
+\marginpar{\begin{textblock*}{1cm}(6cm,13.7cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)}
+\end{textblock*}}
+
+A little Test!
 
 \colorlet{KernFarbe}{red}
 \colorlet{HuelleFarbe}{blue}
@@ -43,7 +55,11 @@ A \pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211}]{This
     \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!}
+\defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}}
+\pdfcommentsetup{avatar=Newton}
+\pdfcomment{Wow, that's nice!}
+\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}}
+\pdfcommentsetup{avatar=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!}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 6a325effcfd..55f0626bec0 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 aaa72f4bb8b..c93383bc41d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -9,12 +9,11 @@
 \usepackage{url}%
 \usepackage{attachfile}%
 \usepackage{marginnote}%
-\usepackage{natbib}
 \usepackage[svgnames]{xcolor}
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.1}
+\def\fileversion{v1.2}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 %\usepackage{acrofont}%
@@ -52,11 +51,12 @@
 \setlength\parindent{0pt}
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{4.0em}}
 \makeatother
-\hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to pdf annotations},pdfsubject={Documentation for LaTeX style \filename}}
+\hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to PDF annotations},pdfsubject={Documentation for LaTeX style \filename}}
 \begin{document}
 \bibliographystyle{alphadin}
-\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}}}}
+\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
@@ -69,7 +69,7 @@ For a long time \texttt{pdflatex} has offered the command \cmd\pdfannot{} for in
 
 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!
+If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test annotation},color=lime,hspace=20pt]{This is an annotation} you are definitely using the wrong PDF viewer!
 \end{abstract}
 \vfill
 \begin{center}
@@ -97,60 +97,100 @@ I want to thank the following persons for contributions to the development of th
 \medskip
 
 \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{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.
 \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.
+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.
+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.
+You can use the option \styleoption{subject} for defining the subject of the PDF popup annotations.
 
 \subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
-You can use the option \styleoption{author} for defining the author of the pdf popup annotations.
+You can use the option \styleoption{author} for defining the author of the PDF popup annotations.
+
+\subsubsection[\texttt{opacity}]{\styleoption{opacity}}\label{sec:opacity}
+You can use the option \styleoption{opacity} for defining the opacity of PDF annotations with values between 0 (transparent) and 1 (not transparent, default). If you want to print PDF popup annotations with transparency you will have to use the option \styleoption{open} = \texttt{true}.
 
 \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.
+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.
+
+By definition the PDF specification allows four different color spaces with different numbers of color values:
+
+\begin{center}
+\begin{tabular}{rl}
+\# & color space\\
+\hline
+0 & transparent \\
+1 & grey scale \\
+3 & RGB\\
+4 & CMYK\\
+\end{tabular}
+\end{center}
 
 \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:
+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}}
-\texttt{Comment} \hspace{1em} \pdfcomment[icon=Comment,color=Ivory]{Options: icon=Comment,color=Ivory} \hfill \texttt{Key} \hspace{1em} \pdfcomment[icon=Key,color=Khaki]{Options: icon=Key,color=Khaki} \hfill \texttt{Note} \hspace{1em} \pdfcomment[icon=Note,color=LavenderBlush]{Options: icon=Note,color=LavenderBlush} \hfill \texttt{Help} \hspace{1em} \pdfcomment[icon=Help,color=CornflowerBlue]{Options: icon=Help,color=CornflowerBlue}
+\texttt{Comment} \hspace{1em} \pdfcomment[icon=Comment,color=Ivory]{Options: icon=Comment,color=Ivory} \hfill \texttt{Key} \hspace{1em} \pdfcomment[icon=Key,color=Khaki]{Options: icon=Key,color=Khaki} \hfill \texttt{Note} \hspace{1em} \pdfcomment[icon=Note,color=LavenderBlush]{Options: icon=Note,color=LavenderBlush} \hfill \texttt{Help} \hspace{1em} \pdfcomment[icon=Help,color=CornflowerBlue]{Options: icon=Help,color=CornflowerBlue}\hspace{20pt}
 
 \bigskip
 
-\hspace*{1cm}\texttt{NewParagraph} \hspace{1em} \pdfcomment[icon=NewParagraph,color=SkyBlue]{Options: icon=NewParagraph,color=SkyBlue} \hfill \texttt{Paragraph} \hspace{1em} \pdfcomment[icon=Paragraph,color=SpringGreen]{Options: icon=Paragraph,color=SpringGreen} \hfill \texttt{Insert} \hspace{1em} \pdfcomment[icon=Insert,color=PaleTurquoise]{Options: Insert,color=PaleTurquoise}\hspace{0pt}\hspace*{1cm}
+\hspace*{1cm}\texttt{NewParagraph} \hspace{1em} \pdfcomment[icon=NewParagraph,color=SkyBlue]{Options: icon=NewParagraph,color=SkyBlue} \hfill \texttt{Paragraph} \hspace{1em} \pdfcomment[icon=Paragraph,color=SpringGreen]{Options: icon=Paragraph,color=SpringGreen} \hfill \texttt{Insert} \hspace{1em} \pdfcomment[icon=Insert,color=PaleTurquoise]{Options: Insert,color=PaleTurquoise}\hspace{0pt}\hspace*{1cm}\hspace{20pt}
 
 \bigskip
-Furthermore the following icons are also supported by \texttt{Adobe Reader} and some other pdf viewers:
+Furthermore the following icons are also supported by \texttt{Adobe Reader} and some other PDF viewers:
 
 \bigskip
 
-\texttt{Check} \hspace{1em} \pdfcomment[icon=Check,color=Orchid]{Options: icon=Check,color=Orchid} \hfill \texttt{Circle} \hspace{1em} \pdfcomment[icon=Circle,color=LightCyan]{Options: icon=Circle,color=LightCyan} \hfill \texttt{Cross} \hspace{1em} \pdfcomment[icon=Cross,color=Bisque]{Options: icon=Cross,color=Bisque}
+\texttt{Check} \hspace{1em} \pdfcomment[icon=Check,color=Orchid]{Options: icon=Check,color=Orchid} \hfill \texttt{Circle} \hspace{1em} \pdfcomment[icon=Circle,color=LightCyan]{Options: icon=Circle,color=LightCyan} \hfill \texttt{Cross} \hspace{1em} \pdfcomment[icon=Cross,color=Bisque]{Options: icon=Cross,color=Bisque}\hspace{20pt}
 
 \bigskip
 
-\hspace*{1cm}\texttt{Star} \hspace{1em} \pdfcomment[icon=Star,color=Aquamarine]{Options: icon=Star,color=Aquamarine} \hfill \texttt{RightArrow} \hspace{1em} \pdfcomment[icon=RightArrow,color=Gainsboro]{Options: icon=RightArrow,color=Gainsboro} \hfill \texttt{RightPointer} \hspace{1em} \pdfcomment[icon=RightPointer,color=Salmon]{Options: icon=RightPointer,color=Salmon}\hspace*{1cm}
+\hspace*{1cm}\texttt{Star} \hspace{1em} \pdfcomment[icon=Star,color=Aquamarine]{Options: icon=Star,color=Aquamarine} \hfill \texttt{RightArrow} \hspace{1em} \pdfcomment[icon=RightArrow,color=Gainsboro]{Options: icon=RightArrow,color=Gainsboro} \hfill \texttt{RightPointer} \hspace{1em} \pdfcomment[icon=RightPointer,color=Salmon]{Options: icon=RightPointer,color=Salmon}\hspace*{1cm}\hspace{20pt}
 
 \bigskip
 
-\hspace*{2.5cm}\texttt{UpArrow} \hspace{1em} \pdfcomment[icon=UpArrow,color=Teal]{Options: icon=UpArrow,color=Teal} \hfill \texttt{UpLeftArrow} \hspace{1em} \pdfcomment[icon=UpLeftArrow,color=Magenta]{Options: icon=UpLeftArrow,color=Magenta}\hspace*{2.5cm}
+\hspace*{2.5cm}\texttt{UpArrow} \hspace{1em} \pdfcomment[icon=UpArrow,color=Teal]{Options: icon=UpArrow,color=Teal} \hfill \texttt{UpLeftArrow} \hspace{1em} \pdfcomment[icon=UpLeftArrow,color=Magenta]{Options: icon=UpLeftArrow,color=Magenta}\hspace*{2.5cm}\hspace{20pt}
 
 \bigskip
 
 \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).
+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).
+
+If you want to print the PDF popup annotations (with transparency) you will have to use the option \styleoption{open} = \texttt{true}.
+
+\subsubsection[\texttt{voffset}]{\styleoption{voffset}}\label{sec:voffset}
+You can use the option \styleoption{voffset} for defining a vertical offset of the PDF annotations, that is a vertical shift for the given length.
+
+\subsubsection[\texttt{hoffset}]{\styleoption{hoffset}}\label{sec:hoffset}
+You can use the option \styleoption{hoffset} for defining a horizontal offset of the PDF annotations.
+
+\subsubsection[\texttt{width}]{\styleoption{width}}\label{sec:width}
+You can use the option \styleoption{width} for defining the width of PDF annotations, e.\,g. the width of FreeText annotations. PDF text annatations have a width of 0pt by definition.
+
+\subsubsection[\texttt{height}]{\styleoption{height}}\label{sec:height}
+You can use the option \styleoption{height} for definig the height of PDF annotations. PDF text annatations have a height of \cmd\baselineskip{} by definition.
 
 \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.
+You can use the option \styleoption{hspace} for defining the horizontal space after the PDF text annotations, otherwise the PDF text annoations will overlay the text.
+
+\subsubsection[\texttt{avatar}]{\styleoption{avatar}}\label{sec:avatar}
+With the option \styleoption{avatar} you can load the option lists, that were predefined with the command \cmd\defineavatar{} to avoid annoying typing. 
+
+\subsubsection[\texttt{style}]{\styleoption{style}}\label{sec:style}
+With the option \styleoption{style} you can also load predefined option lists for spliting personal and stylistic options, e.\,g. \texttt{avatar=Josef, style=MyComment}.
 
 \section{Commands}\label{sec:befehle}
 
@@ -164,13 +204,51 @@ You can use the following commands for commenting your documents.
 
 \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}}
 \label{sec:pdfmargincomment}
-\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}} will typeset an annotation into the margin. Please note the positioning of the annotation in this example. This documentation was written with the \LaTeX{} class \texttt{ltxdoc} \pdfcommentsetup{subject={\textbackslash pdfmargincomment test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{This is a comment in the margin}. Therefore the annotation is typeset into the left margin.
+\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}} will typeset an annotation into the margin. Please note the positioning of the annotation in this example. This documentation was written with the \LaTeX{} class \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{This is a comment in the margin}. Therefore the annotation is typeset into the left margin.
+
+\subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
+\label{sec:pdffreetextcomment}
+\cmd\pdffreetextcomment \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}} will typset a comment in form of a freely positioned box on the wished spot of the page.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=1cm,hoffset=1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation}
 
 \subsection{Misc. commands}
 
 \subsubsection{\texorpdfstring{\cs{pdfcommentsetup}}{\textbackslash pdfcommentsetup}}
 \label{sec:commentsetup}
-With the command \cmd\pdfcommentsetup \margcs{\cmd\pdfcommentsetup\marg{options}} you can reset the global options at any time. With it, e.g. a co-author can simply use a different optical look, without specifying the options in every comment command.
+With the command \cmd\pdfcommentsetup \margcs{\cmd\pdfcommentsetup\marg{options}} you can reset the global options at any time.
+
+\subsubsection{\texorpdfstring{\cs{defineavatar}}{\textbackslash defineavatar}}
+\label{sec:defineavatar}
+With the command \cmd\defineavatar \margcs{\cmd\defineavatar\marg{name}\marg{options}} you can create named predefined option lists, which can be later used in the comment commands with the option \styleoption{avatar}. With this option, it's easy for several authors of the same document to switch between different avatars, that is their graphical representation. 
+
+\subsubsection{\texorpdfstring{\cs{definestyle}}{\textbackslash definestyle}}
+\label{sec:definestyle}
+With the command \cmd\definestyle \margcs{\cmd\definestyle\marg{name}\marg{options}} you can split up lists in personal and stylistic option lists (see \file{example.tex}). This option list can be loaded with the option \styleoption{style}.
+
+\section{Printing comments and popups}
+\label{sec:print}
+Basically, \texttt{Adobe Reader} is able to print PDF annotations. Therefore, you have to choose 'Document and Markups' in the field 'Comments and Forms' of the print dialog. Additionally, you have to configure the menu 'Edit $\rightarrow$ Preferences $\rightarrow$ Commenting'. Unfortunately, this option does not exist in many versions of \texttt{Adobe Reader}. If it does not exist, the only possibility is to edit the configuration files itself. 
+
+\begin{description}
+\item[Windows:] the registry needs to be changed (on your own risk!)
+
+Start the registry editor (\file{regedit.exe}) and open the following key, e.\,g. for \texttt{Adobe Reader 9.0}:
+
+\texttt{HKEY\_CURRENT\_USER/Software/Adobe/Acrobat Reader/9.0/Annots/\newline cPrefs}
+
+The key for other version will be similar, except version number and some letters in lower- or uppercase!
+
+Open or create (with closed \texttt{Adobe Reader}) the key \newline\texttt{bprintCommentPopups} and change the value to 1 (dword).
+
+\item[Linux:] open the configuration file:
+
+\nolinkurl{~/.adobe/Acrobat/8.0/Preferences/reader_prefs}
+
+with a text editor and change the entry 
+
+{\texttt{/printCommentPopups\,[/b false]} to \texttt{/printCommentPopups\,[/b true]}}
+\end{description}
+
+Please note that only opened popups will be printed!
 
 {
 \clearpage
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index d6ebc46dbe9..9189a4f63ce 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 a0c120aa442..026b15adf48 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -1,5 +1,4 @@
 \documentclass[a4paper]{ltxdoc}
-
 \usepackage[german]{babel}%
 \usepackage[latin1]{inputenc}%
 \usepackage[T1]{fontenc}%
@@ -9,12 +8,11 @@
 \usepackage{url}%
 \usepackage{attachfile}%
 \usepackage{marginnote}%
-\usepackage{natbib}
 \usepackage[svgnames]{xcolor}
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.1}
+\def\fileversion{v1.2}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
 %\usepackage{acrofont}%
@@ -52,24 +50,25 @@
 \setlength\parindent{0pt}
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{4.0em}}
 \makeatother
 \hypersetup{pdfauthor={Josef Kleber},pdftitle={Ein benutzerfreundliches Interface zu PDF-Kommentaren},pdfsubject={Dokumentation für den LaTeX style \filename}}
-\begin{document}
+\begin{document} 
 \bibliographystyle{alphadin}
 \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}\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:
+\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}.
+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}.
 
-Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Kommentar},color=lime,hspace=18pt]{Das ist ein Kommentar} nicht sehen, benutzen Sie definitiv den falschen PDF-Viewer!
+Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Kommentar},color=lime,hspace=20pt]{Das ist ein Kommentar} nicht sehen, benutzen Sie definitiv den falschen PDF-Viewer!
 \end{abstract}
 \vfill
 \begin{center}
@@ -97,60 +96,100 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
 \medskip
 
 \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{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. 
 \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. 
+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.
+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.
+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.
+Die Option \styleoption{subject} dient der Festlegung der Überschriften der PDF popup annotations.
 
 \subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
-Die Option \styleoption{author} dient der Festlegung des Verfassers der pdf popup annotations.
+Die Option \styleoption{author} dient der Festlegung des Verfassers der PDF popup annotations.
+
+\subsubsection[\texttt{opacity}]{\styleoption{opacity}}\label{sec:opacity}
+Die Option \styleoption{opacity} dient der Festlegung der Transparenz der PDF annotations. Die Werte liegen dabei zwischen 0 (transparent) und 1 (nicht transparent, default). Möchten Sie die PDF popup annotations mit Transparenz drucken, funktioniert das nur zuverlässig, falls sie mit der Option \styleoption{open} = \texttt{true} erstellt werden.
 
 \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.
+Die Option \styleoption{color} dient der Festlegung der Farbe der PDF annotations z.\,B. 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.
+
+Grundsätzlich erlaubt die PDF Spezifikation vier unterschiedliche Farbräume, die sich in der Anzahl der Farbwertangaben unterscheiden:
+
+\begin{center}
+\begin{tabular}{rl}
+\# & Farbraum\\
+\hline
+0 & transparent \\
+1 & Grauwert \\
+3 & RGB\\
+4 & CMYK\\
+\end{tabular}
+\end{center}
 
 \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:
+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}}
-\texttt{Comment} \hspace{1em} \pdfcomment[icon=Comment,color=Ivory]{Optionen: icon=Comment,color=Ivory} \hfill \texttt{Key} \hspace{1em} \pdfcomment[icon=Key,color=Khaki]{Optionen: icon=Key,color=Khaki} \hfill \texttt{Note} \hspace{1em} \pdfcomment[icon=Note,color=LavenderBlush]{Optionen: icon=Note,color=LavenderBlush} \hfill \texttt{Help} \hspace{1em} \pdfcomment[icon=Help,color=CornflowerBlue]{Optionen: icon=Help,color=CornflowerBlue}
+\bigskip\pdfcommentsetup{author={Josef Kleber},subject={Icon Übersicht},width=17mm}
+\texttt{Comment} \hspace{1em} \pdfcomment[icon=Comment,color=Ivory]{Optionen: icon=Comment,color=Ivory} \hfill \texttt{Key} \hspace{1em} \pdfcomment[icon=Key,color=Khaki]{Optionen: icon=Key,color=Khaki} \hfill \texttt{Note} \hspace{1em} \pdfcomment[icon=Note,color=LavenderBlush]{Optionen: icon=Note,color=LavenderBlush} \hfill \texttt{Help} \hspace{1em} \pdfcomment[icon=Help,color=CornflowerBlue]{Optionen: icon=Help,color=CornflowerBlue}\hspace{20pt}
 
 \bigskip
 
-\hspace*{1cm}\texttt{NewParagraph} \hspace{1em} \pdfcomment[icon=NewParagraph,color=SkyBlue]{Optionen: icon=NewParagraph,color=SkyBlue} \hfill \texttt{Paragraph} \hspace{1em} \pdfcomment[icon=Paragraph,color=SpringGreen]{Optionen: icon=Paragraph,color=SpringGreen} \hfill \texttt{Insert} \hspace{1em} \pdfcomment[icon=Insert,color=PaleTurquoise]{Optionen: Insert,color=PaleTurquoise}\hspace{0pt}\hspace*{1cm}
+\hspace*{1cm}\texttt{NewParagraph} \hspace{1em} \pdfcomment[icon=NewParagraph,color=SkyBlue]{Optionen: icon=NewParagraph,color=SkyBlue} \hfill \texttt{Paragraph} \hspace{1em} \pdfcomment[icon=Paragraph,color=SpringGreen]{Optionen: icon=Paragraph,color=SpringGreen} \hfill \texttt{Insert} \hspace{1em} \pdfcomment[icon=Insert,color=PaleTurquoise]{Optionen: Insert,color=PaleTurquoise}\hspace{20pt}\hspace*{1cm}
 
 \bigskip
 Außerdem werden vom \texttt{Adobe Reader} und einigen anderen Viewern auch diese Icons unterstützt:
 
 \bigskip
 
-\texttt{Check} \hspace{1em} \pdfcomment[icon=Check,color=Orchid]{Optionen: icon=Check,color=Orchid} \hfill \texttt{Circle} \hspace{1em} \pdfcomment[icon=Circle,color=LightCyan]{Optionen: icon=Circle,color=LightCyan} \hfill \texttt{Cross} \hspace{1em} \pdfcomment[icon=Cross,color=Bisque]{Optionen: icon=Cross,color=Bisque}
+\texttt{Check} \hspace{1em} \pdfcomment[icon=Check,color=Orchid]{Optionen: icon=Check,color=Orchid} \hfill \texttt{Circle} \hspace{1em} \pdfcomment[icon=Circle,color=LightCyan]{Optionen: icon=Circle,color=LightCyan} \hfill \texttt{Cross} \hspace{1em} \pdfcomment[icon=Cross,color=Bisque]{Optionen: icon=Cross,color=Bisque}\hspace{20pt}
 
 \bigskip
 
-\hspace*{1cm}\texttt{Star} \hspace{1em} \pdfcomment[icon=Star,color=Aquamarine]{Optionen: icon=Star,color=Aquamarine} \hfill \texttt{RightArrow} \hspace{1em} \pdfcomment[icon=RightArrow,color=Gainsboro]{Optionen: icon=RightArrow,color=Gainsboro} \hfill \texttt{RightPointer} \hspace{1em} \pdfcomment[icon=RightPointer,color=Salmon]{Optionen: icon=RightPointer,color=Salmon}\hspace*{1cm}
+\hspace*{1cm}\texttt{Star} \hspace{1em} \pdfcomment[icon=Star,color=Aquamarine]{Optionen: icon=Star,color=Aquamarine} \hfill \texttt{RightArrow} \hspace{1em} \pdfcomment[icon=RightArrow,color=Gainsboro]{Optionen: icon=RightArrow,color=Gainsboro} \hfill \texttt{RightPointer} \hspace{1em} \pdfcomment[icon=RightPointer,color=Salmon]{Optionen: icon=RightPointer,color=Salmon}\hspace*{1cm}\hspace{20pt}
 
 \bigskip
 
-\hspace*{2.5cm}\texttt{UpArrow} \hspace{1em} \pdfcomment[icon=UpArrow,color=Teal]{Optionen: icon=UpArrow,color=Teal} \hfill \texttt{UpLeftArrow} \hspace{1em} \pdfcomment[icon=UpLeftArrow,color=Magenta]{Optionen: icon=UpLeftArrow,color=Magenta}\hspace*{2.5cm}
+\hspace*{2.5cm}\texttt{UpArrow} \hspace{1em} \pdfcomment[icon=UpArrow,color=Teal]{Optionen: icon=UpArrow,color=Teal} \hfill \texttt{UpLeftArrow} \hspace{1em} \pdfcomment[icon=UpLeftArrow,color=Magenta]{Optionen: icon=UpLeftArrow,color=Magenta}\hspace*{2.5cm}\hspace{20pt}
 
 \bigskip
 
 \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).
+Die Option \styleoption{open} dient der Festlegung des Öffnungsstatus der PDF popup annotations. Mögliche Werte sind dabei \texttt{true} oder \texttt{false} (Default).
+
+Möchten Sie die PDF popup annotations (mit Transparenz) drucken, funktioniert das nur mit PDF annotations, die mit der Option \styleoption{open} = \texttt{true} erstellt wurden.
+
+\subsubsection[\texttt{voffset}]{\styleoption{voffset}}\label{sec:voffset}
+Die Option \styleoption{voffset} dient der Festlegung eines vertikalen Offsets, d.\,h. einer vertikalen Verschiebung um den angegebenen Wert.
+
+\subsubsection[\texttt{hoffset}]{\styleoption{hoffset}}\label{sec:hoffset}
+Die Option \styleoption{hoffset} dient der Festlegung eines horizontalen Offsets der PDF annotations.
+
+\subsubsection[\texttt{width}]{\styleoption{width}}\label{sec:width}
+Die Option \styleoption{width} dient der Festlegung der Breite der PDF annotations, speziell der Breite der FreeText annotations. PDF text annatations haben grundsätzlich eine Breite von 0pt.
+
+\subsubsection[\texttt{height}]{\styleoption{height}}\label{sec:height}
+Die Option \styleoption{height} dient der Festlegung der Höhe der PDF annotations. Wegen der PDF text annotations wurde der Defaultwert auf \cmd\baselineskip{} festgelegt.
 
 \subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
-Die Option \styleoption{hspace} dient der Anpassung des horizontalen Abstands hinter den pdf text annotations.
+Die Option \styleoption{hspace} dient der Anpassung des horizontalen Abstands hinter den PDF text annotations, falls der Text nicht durch die PDF text annotations überschrieben werden sollen.
+
+\subsubsection[\texttt{avatar}]{\styleoption{avatar}}\label{sec:avatar}
+Mit der Option \styleoption{avatar} kann man die mit dem Befehl \cmd\defineavatar{} vordefinierten Optionslisten laden, um lästige Tipparbeit zu vermeiden. 
+
+\subsubsection[\texttt{style}]{\styleoption{style}}\label{sec:style}
+Die Option \styleoption{style} dient ebenfalls dem Laden vordefinierter Optionslisten zur Trennung personenbezogener und stylister Optionen, z.\,B. \texttt{avatar=Josef, style=MyComment}.
 
 \section{Befehle}\label{sec:befehle}
 
@@ -160,18 +199,56 @@ Die folgenden Befehlen können Sie zur Kommentierung Ihres Dokuments einsetzen.
 
 \subsubsection{\texorpdfstring{\cs{pdfcomment}}{\textbackslash pdfcomment}}
 \label{sec:pdfcomment}
-\cmd\pdfcomment \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=18pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext.
+\cmd\pdfcomment \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=20pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext.
 
 \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}}
 \label{sec:pdfmargincomment}
-\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar in Höhe der aktuellen Zeile in die Randspalte. Bitte beachten Sie in diesem Beispiel die Positionierung des Kommentars. Diese Dokumentation wurde mit der \LaTeX{}-Klasse \texttt{ltxdoc} \pdfcommentsetup{subject={\textbackslash pdfmargincomment Test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{Das ist ein Kommentar in der Randspalte} erstellt. Daher erscheint der Kommentar in der linken Randspalte.
+\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar in Höhe der aktuellen Zeile in die Randspalte. Bitte beachten Sie in diesem Beispiel die Positionierung des Kommentars. Diese Dokumentation wurde mit der \LaTeX{}-Klasse \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment Test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{Das ist ein Kommentar in der Randspalte} erstellt. Daher erscheint der Kommentar in der linken Randspalte.
+
+\subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
+\label{sec:pdffreetextcomment}
+\cmd\pdffreetextcomment \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} setzt einen Kommentar in Form einer frei positionierbaren Box an die gewünschte Stelle der Seite.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-1.8cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}
+
 
 \subsection{Allgemeine Befehle}
 
 \subsubsection{\texorpdfstring{\cs{pdfcommentsetup}}{\textbackslash pdfcommentsetup}}
 \label{sec:commentsetup}
-Mit dem Befehl \cmd\pdfcommentsetup \margcs{\cmd\pdfcommentsetup\marg{Optionen}} kann man jederzeit die globalen Styleoptionen neu setzen. Damit kann z.\,B. ein Co-Autor Kommentare anders kennzeichnen, ohne in jedem Kommentarbefehl die Optionen einzeln anpassen zu müssen.
+Mit dem Befehl \cmd\pdfcommentsetup \margcs{\cmd\pdfcommentsetup\marg{Optionen}} kann man jederzeit die globalen Styleoptionen neu setzen.
+
+\subsubsection{\texorpdfstring{\cs{defineavatar}}{\textbackslash defineavatar}}
+\label{sec:defineavatar}
+Der Befehl \cmd\defineavatar \margcs{\cmd\defineavatar\marg{Name}\marg{Optionen}} dient der Erstellung benannter vordefinierter Optionslisten, die später in den Kommentarbefehlen über die Option \styleoption{avatar} wieder geladen werden. Damit können z.\,B. mehrere Autoren eines Dokuments sehr einfach zwischen ihren Avataren -- also ihren grafischen Repräsentationen -- wechseln. 
+
+\subsubsection{\texorpdfstring{\cs{definestyle}}{\textbackslash definestyle}}
+\label{sec:definestyle}
+Analog dient \cmd\definestyle \margcs{\cmd\definestyle\marg{Name}\marg{Optionen}} dazu die Optionslisten bei Bedarf in personenbezogene und stylistische Optionslisten aufzuteilen (siehe \file{example.tex}). Geladen wird die Optionsliste in den Befehlen über die Option \styleoption{style}.
+
+\section{Drucken der Kommentare und Popups}
+\label{sec:print}
+\texttt{Adobe Reader} kann prinzipiell PDF annotations drucken. Dazu muß man im Druckdialog im Feld 'Kommentare und Formulare' die Einstellung 'Dokument und Markierungen' wählen. Zusätzlich muß das Drucken im Menü 'Bearbeiten $\rightarrow$ Voreinstellungen $\rightarrow$ Kommentare' konfiguriert werden. Leider ist diese Einstellungsmöglichkeit nur in sehr wenigen Versionen von \texttt{Adobe Reader} vorhanden. Falls sie nicht vorhanden ist bleibt nur die Möglichkeit die Konfigurationsdateien selbst zu ändern. 
+
+\begin{description}
+\item[Windows:] Ändern der Registry Einträge notwendig (auf eigene Gefahr!)
+
+Starten Sie den Registry Editor (\file{regedit.exe}) und öffnen Sie z.\,B. für \texttt{Adobe Reader 9.0} den folgenden Schlüssel:
+
+\texttt{HKEY\_CURRENT\_USER/Software/Adobe/Acrobat Reader/9.0/Annots/\newline cPrefs}
+
+Der Schlüssel ist für andere Versionen bis auf die Versionsnummer und Groß- und Kleinschreibung ähnlich!
+
+Öffnen oder erstellen Sie (bei geschlossenem \texttt{Adobe Reader}) den Schlüssel \texttt{bprintCommentPopups} und ändern Sie den Wert auf 1 (dword).
+
+\item[Linux:] Öffnen Sie die Konfigurationsdatei:
+
+\nolinkurl{~/.adobe/Acrobat/8.0/Preferences/reader_prefs}
+
+mit einem Text-Editor und ändern Sie den Eintrag 
+
+{\texttt{/printCommentPopups\,[/b false]} zu \texttt{/printCommentPopups\,[/b true]}}
+\end{description}
 
+Bitte beachten Sie, daß nur geöffnete popup annotations gedruckt werden!
 {
 \clearpage
 \raggedright
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index b06f7885301..ec605e03752 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2008 by:
+%% Copyright (C) 2008-2009 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
 %% 
@@ -20,7 +20,7 @@
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2008/12/12 pdfcomment.sty v1.1 - Josef Kleber (C) 2008]%
+\ProvidesPackage{pdfcomment}[2009/02/19 pdfcomment.sty v1.2 - Josef Kleber (C) 2008-2009]%
 % dvips, dvipdfmx, XeLaTeX drivers by Alexander Grahn
 %
 \RequirePackage{xkeyval}%
@@ -31,7 +31,13 @@
 \gdef\pc@goptd@author{}%
 \gdef\pc@goptd@icon{Comment}%
 \gdef\pc@goptd@open{false}%
-\gdef\pc@goptd@hspace{15pt}%
+\gdef\pc@goptd@hspace{0pt}%
+\gdef\pc@goptd@voffset{0pt}%
+\gdef\pc@goptd@hoffset{0pt}%
+\gdef\pc@goptd@width{0pt}%
+\gdef\pc@goptd@height{0pt}%
+\gdef\pc@goptd@depth{0pt}%
+\gdef\pc@goptd@opacity{1.0}%
 \gdef\pc@goptd@dvipdfmx{true}%
 %
 % values for global package options
@@ -41,6 +47,12 @@
 \gdef\pc@gopt@icon{}%
 \gdef\pc@gopt@open{}%
 \gdef\pc@gopt@hspace{}%
+\gdef\pc@gopt@voffset{}%
+\gdef\pc@gopt@hoffset{}%
+\gdef\pc@gopt@width{}%
+\gdef\pc@gopt@height{}%
+\gdef\pc@gopt@depth{}%
+\gdef\pc@gopt@opacity{}%
 \newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
 \newif\ifpc@gopt@final\pc@gopt@finalfalse%
 %
@@ -51,6 +63,26 @@
 \gdef\pc@lopt@icon{}%
 \gdef\pc@lopt@open{}%
 \gdef\pc@lopt@hspace{}%
+\gdef\pc@lopt@voffset{}%
+\gdef\pc@lopt@hoffset{}%
+\gdef\pc@lopt@width{}%
+\gdef\pc@lopt@height{}%
+\gdef\pc@lopt@depth{}%
+\gdef\pc@lopt@opacity{}%
+%
+% define global style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfcomment.sty}{avatar}[]%
+{% thanks to Ulrike Fischer Msg-Id: <rba0oaiflbjf.dlg@nililand.de>
+  \edef\pc@gopt@loadavatar{\noexpand\setkeys{pdfcomment.sty}{\csname pc@avatar@#1\endcsname}}%
+  \pc@gopt@loadavatar%
+}%
+%
+% define global style option style for setting a predefined set of options (Style)
+\define@key{pdfcomment.sty}{style}[]%
+{%
+  \edef\pc@gopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
+  \pc@gopt@loadstyle%
+}%
 %
 % define global style option subject for setting the subject of pdf annotations
 \define@key{pdfcomment.sty}{subject}[\pc@goptd@subject]%
@@ -88,6 +120,42 @@
   \gdef\pc@gopt@hspace{#1}%
 }%
 %
+% define global style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfcomment.sty}{voffset}[\pc@goptd@voffset]%
+{%
+  \gdef\pc@gopt@voffset{#1}%
+}%
+%
+% define global style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdfcomment.sty}{hoffset}[\pc@goptd@hoffset]%
+{%
+  \gdef\pc@gopt@hoffset{#1}%
+}%
+%
+% define global style option width for setting the width of the pdf annotations
+\define@key{pdfcomment.sty}{width}[\pc@goptd@width]%
+{%
+  \gdef\pc@gopt@width{#1}%
+}%
+%
+% define global style option height for setting the height of the pdf annotations
+\define@key{pdfcomment.sty}{height}[\pc@goptd@height]%
+{%
+  \gdef\pc@gopt@height{#1}%
+}%
+%
+% define global style option depth for setting the depth of the pdf annotations
+\define@key{pdfcomment.sty}{depth}[\pc@goptd@depth]%
+{%
+  \gdef\pc@gopt@depth{#1}%
+}%
+%
+% define global style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfcomment.sty}{opacity}[\pc@goptd@opacity]%
+{%
+  \gdef\pc@gopt@opacity{#1}%
+}%
+%
 % define global style option dvipdfmx for setting the output driver in DVI mode
 \define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
 {%
@@ -106,6 +174,20 @@
   \pc@gopt@finalfalse%
 }%
 %
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfcomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdfcomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
 % define local command option subject for setting the subject of pdf annotations
 \define@key{pdfcomment}{subject}[\pc@gopt@subject]%
 {%
@@ -142,6 +224,56 @@
   \gdef\pc@lopt@hspace{#1}%
 }%
 %
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfcomment}{voffset}[\pc@gopt@voffset]%
+{%
+  \gdef\pc@lopt@voffset{#1}%
+}%
+%
+% define local style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdfcomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdfcomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdfcomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdfcomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfcomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfmargincomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdfmargincomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
 % define local command option subject for setting the subject of pdf annotations
 \define@key{pdfmargincomment}{subject}[\pc@gopt@subject]%
 {%
@@ -178,7 +310,129 @@
   \gdef\pc@lopt@hspace{#1}%
 }%
 %
-\ExecuteOptionsX{subject,color,author,icon,open,hspace}%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfmargincomment}{voffset}[\pc@gopt@voffset]%
+{%
+  \gdef\pc@lopt@voffset{#1}%
+}%
+%
+% define local style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdfmargincomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdfmargincomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdfmargincomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdfmargincomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfmargincomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdffreetextcomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdffreetextcomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
+% define local command option subject for setting the subject of pdf annotations
+\define@key{pdffreetextcomment}{subject}[\pc@gopt@subject]%
+{%
+  \gdef\pc@lopt@subject{#1}%
+}%
+%
+% define local command option color for setting the color of pdf annotations
+\define@key{pdffreetextcomment}{color}[\pc@gopt@color]%
+{%
+  \gdef\pc@lopt@color{#1}%
+}%
+%
+% define local command option author for setting the author of pdf annotations
+\define@key{pdffreetextcomment}{author}[\pc@gopt@author]%
+{%
+  \gdef\pc@lopt@author{#1}%
+}%
+%
+% define local command option icon for setting the icon of pdf annotations
+\define@key{pdffreetextcomment}{icon}[\pc@gopt@icon]%
+{%
+  \gdef\pc@lopt@icon{#1}%
+}%
+%
+% define local command option open for setting the open status (true,false) of pdf annotations
+\define@key{pdffreetextcomment}{open}[\pc@gopt@open]%
+{%
+  \gdef\pc@lopt@open{#1}%
+}%
+%
+% define local command option hspace for setting the space after the pdf annotations
+\define@key{pdffreetextcomment}{hspace}[\pc@gopt@hspace]%
+{%
+  \gdef\pc@lopt@hspace{#1}%
+}%
+%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdffreetextcomment}{voffset}[\pc@gopt@voffset]%
+{%
+  \gdef\pc@lopt@voffset{#1}%
+}%
+%
+% define local style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdffreetextcomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdffreetextcomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdffreetextcomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdffreetextcomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdffreetextcomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+\ExecuteOptionsX{subject,color,author,icon,open,hspace,voffset,hoffset,width,height,depth,opacity}%
 %
 \ProcessOptionsX\relax%
 %
@@ -191,17 +445,17 @@
   \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%
@@ -220,7 +474,7 @@
   \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}]%
+\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},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]%
 {%
   % Copy all global options to local options
   \gdef\pc@lopt@subject{\pc@gopt@subject}%
@@ -229,6 +483,12 @@
   \gdef\pc@lopt@icon{\pc@gopt@icon}%
   \gdef\pc@lopt@open{\pc@gopt@open}%
   \gdef\pc@lopt@hspace{\pc@gopt@hspace}%
+  \gdef\pc@lopt@voffset{\pc@gopt@voffset}%
+  \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}%
+  \gdef\pc@lopt@width{\pc@gopt@width}%
+  \gdef\pc@lopt@height{\pc@gopt@height}%
+  \gdef\pc@lopt@depth{\pc@gopt@depth}%
+  \gdef\pc@lopt@opacity{\pc@gopt@opacity}%
   % Change local options if specified
   \setkeys{pdfcomment}{#1}%
   % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
@@ -243,42 +503,88 @@
   \ifpc@gopt@final\else%
     % typeset text annotation (see: PDF Reference)
     \ifpdf%
-      \pdfannot width 0pt height \baselineskip depth 0pt%
+      \vbox to 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%
-      }
+        \hsize=0pt%
+        \noindent%
+        \vskip-\pc@lopt@voffset%
+        \hbox to 0pt%
+        {%
+          \vsize=0pt%
+          \hskip\pc@lopt@hoffset%
+          \pdfannot width 0pt height \baselineskip depth 0pt%
+          {%
+          /Subtype /Text%
+          /C [\pc@hyenc@color]%
+          /CA \pc@lopt@opacity%
+          /T (\pc@pdfenc@author)%
+          /Subj (\pc@pdfenc@subject)%
+          /Name /\pc@lopt@icon%
+          /Contents (\pc@pdfenc@contents)%
+          /Open \pc@lopt@open%
+          /F 4%
+          }%
+        \hss%
+        }%
+      \vss%
+      }%
     \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%
-          >>%
-	    }%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \vskip-\pc@lopt@voffset%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \hskip\pc@lopt@hoffset%
+            \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt%
+              <<%
+                /Subtype /Text%
+                /C [\pc@hyenc@color]%
+                /CA \pc@lopt@opacity%
+                /T (\pc@pdfenc@author)%
+                /Subj (\pc@pdfenc@subject)%
+                /Name /\pc@lopt@icon%
+                /Contents (\pc@pdfenc@contents)%
+                /Open \pc@lopt@open%
+                /F 4%
+              >>%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
       \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%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \vskip-\pc@lopt@voffset%
+          \vskip-\baselineskip%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \hskip\pc@lopt@hoffset%
+            \pdfmark[\rule{0pt}{\pc@lopt@height}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/Text,%
+              Raw={% 
+                /C [\pc@hyenc@color]%
+                /CA \pc@lopt@opacity%
+                /T (\pc@pdfenc@author)%
+                /Subj (\pc@pdfenc@subject)%
+                /Name /\pc@lopt@icon%
+                /Contents (\pc@pdfenc@contents)%
+                /Open \pc@lopt@open%
+                /F 4%
+              }%
+            }%
+            \hss%
           }%
+          \vss%
         }%
       \fi%
     \fi%
@@ -286,7 +592,7 @@
   \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}]%
+\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},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]%
 {%
   % Copy all global options to local options
   \gdef\pc@lopt@subject{\pc@gopt@subject}%
@@ -295,6 +601,12 @@
   \gdef\pc@lopt@icon{\pc@gopt@icon}%
   \gdef\pc@lopt@open{\pc@gopt@open}%
   \gdef\pc@lopt@hspace{\pc@gopt@hspace}%
+  \gdef\pc@lopt@voffset{\pc@gopt@voffset}%
+  \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}%
+  \gdef\pc@lopt@width{\pc@gopt@width}%
+  \gdef\pc@lopt@height{\pc@gopt@height}%
+  \gdef\pc@lopt@depth{\pc@gopt@depth}%
+  \gdef\pc@lopt@opacity{\pc@gopt@opacity}%
   % Change local options if specified
   \setkeys{pdfmargincomment}{#1}%
   % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
@@ -315,42 +627,88 @@
       \marginnote%
       {%
         \ifpdf%
-          \pdfannot width 0pt height \baselineskip depth 0pt%
+          \vbox to 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%
-		      <<%
+            \hsize=0pt%
+            \noindent%
+            \vskip-\pc@lopt@voffset%
+            \hbox to 0pt%
+            {%
+              \vsize=0pt%
+              \hskip\pc@lopt@hoffset%
+              \pdfannot width 0pt height \baselineskip depth 0pt%
+              {%
                 /Subtype /Text%
                 /C [\pc@hyenc@color]%
+                /CA \pc@lopt@opacity%
                 /T (\pc@pdfenc@author)%
                 /Subj (\pc@pdfenc@subject)%
                 /Name /\pc@lopt@icon%
                 /Contents (\pc@pdfenc@contents)%
                 /Open \pc@lopt@open%
-              >>%
-		    }%
+                /F 4%
+              }
+              \hss%
+            }%
+            \vss%
+          }%
+        \else%
+          \ifpc@gopt@dvipdfmx%
+            \vbox to 0pt%
+            {%
+              \hsize=0pt%
+              \noindent%
+              \vskip-\pc@lopt@voffset%
+              \hbox to 0pt%
+              {%
+                \vsize=0pt%
+                \hskip\pc@lopt@hoffset%
+                \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt%
+                  <<%
+                    /Subtype /Text%
+                    /C [\pc@hyenc@color]%
+                    /CA \pc@lopt@opacity%
+                    /T (\pc@pdfenc@author)%
+                    /Subj (\pc@pdfenc@subject)%
+                    /Name /\pc@lopt@icon%
+                    /Contents (\pc@pdfenc@contents)%
+                    /Open \pc@lopt@open%
+                    /F 4%
+                  >>%
+                }%
+                \hss%
+              }%
+              \vss%
+            }%
           \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%
+            \vbox to 0pt%
+            {%
+              \hsize=0pt%
+              \noindent%
+              \vskip-\pc@lopt@voffset%
+              \vskip-\baselineskip%
+              \hbox to 0pt%
+              {%
+                \vsize=0pt%
+                \hskip\pc@lopt@hoffset%
+                \pdfmark[\rule{0pt}{\pc@lopt@height}]%
+                {%
+                  pdfmark=/ANN,%
+                  Subtype=/Text,%
+                  Raw={% 
+                    /C [\pc@hyenc@color]%
+                    /CA \pc@lopt@opacity%
+                    /T (\pc@pdfenc@author)%
+                    /Subj (\pc@pdfenc@subject)%
+                    /Name /\pc@lopt@icon%
+                    /Contents (\pc@pdfenc@contents)%
+                    /Open \pc@lopt@open%
+                    /F 4%
+                  }%
+                }%
+                \hss%
               }%
+              \vss%
             }%
           \fi%
         \fi%
@@ -360,12 +718,152 @@
   \fi
 }%
 %
+\newcommand{\pdffreetextcomment}[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},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]%
+{%
+  % 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}%
+  \gdef\pc@lopt@icon{\pc@gopt@icon}%
+  \gdef\pc@lopt@open{\pc@gopt@open}%
+  \gdef\pc@lopt@hspace{\pc@gopt@hspace}%
+  \gdef\pc@lopt@voffset{\pc@gopt@voffset}%
+  \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}%
+  \gdef\pc@lopt@width{\pc@gopt@width}%
+  \gdef\pc@lopt@height{\pc@gopt@height}%
+  \gdef\pc@lopt@depth{\pc@gopt@depth}%
+  \gdef\pc@lopt@opacity{\pc@gopt@opacity}%
+  % Change local options if specified
+  \setkeys{pdffreetextcomment}{#1}%
+  % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
+  \def\pc@pdfenc@contents{}%
+  \pdfstringdef\pc@pdfenc@contents{#2}%
+  \def\pc@pdfenc@author{}%
+  \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}%
+  \def\pc@pdfenc@subject{}%
+  \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}%
+  % transform color input to pdf color
+  \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
+  %define options for \pdfannot
+  \def\pc@pdfannotopt{}%
+  \ifx\pc@lopt@width\@empty%
+  \else%
+    \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt width \pc@lopt@width\space}%
+  \fi%
+  \ifx\pc@lopt@height\@empty%
+  \else%
+    \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt height \pc@lopt@height\space}%
+  \fi%
+  \ifx\pc@lopt@depth\@empty%
+  \else%
+    \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt depth \pc@lopt@depth\space}%
+  \fi%
+  \ifpc@gopt@final\else%
+    % typeset text annotation (see: PDF Reference)
+    \ifpdf%
+      \vbox to 0pt%
+      {%
+        \hsize=0pt%
+        \noindent%
+        \vskip-\pc@lopt@voffset%
+        \hbox to 0pt%
+        {%
+          \vsize=0pt%
+          \hskip\pc@lopt@hoffset%
+          \expandafter\pdfannot \pc@pdfannotopt%
+          {%
+          /Subtype /FreeText%
+          /C [\pc@hyenc@color]%
+          /CA \pc@lopt@opacity%
+          /T (\pc@pdfenc@author)%
+          /Subj (\pc@pdfenc@subject)%
+          /Contents (\pc@pdfenc@contents)%
+          /F 4%
+          }%
+        \hss%
+        }%
+      \vss%
+      }%
+    \else%
+      \ifpc@gopt@dvipdfmx%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \vskip-\pc@lopt@voffset%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \hskip\pc@lopt@hoffset%
+            \special{pdf: ann \pc@pdfannotopt%
+              <<%
+                /Subtype /FreeText%
+                /C [\pc@hyenc@color]%
+                /CA \pc@lopt@opacity%
+                /T (\pc@pdfenc@author)%
+                /Subj (\pc@pdfenc@subject)%
+                /Contents (\pc@pdfenc@contents)%
+                /F 4%
+              >>%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \else%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \vskip-\pc@lopt@voffset%
+          % add extra \vskip box height because of different reference point
+          \vskip-\pc@lopt@height%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \hskip\pc@lopt@hoffset%
+            %create dimensions of annoation
+            \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/FreeText,%
+              Raw={% 
+                /C [\pc@hyenc@color]%
+                /CA \pc@lopt@opacity%
+                /T (\pc@pdfenc@author)%
+                /Subj (\pc@pdfenc@subject)%
+                /Contents (\pc@pdfenc@contents)%
+                /F 4%
+              }%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \fi%
+    \fi%
+    \hspace{\pc@lopt@hspace}%
+  \fi%
+}%
+%
+% reset global options
 \newcommand{\pdfcommentsetup}[1]%
 {%
   % Change global options if specified
   \setkeys{pdfcomment.sty}{#1}%
 }%
 %
+% define predefined set of options (Avatar)
+\newcommand{\defineavatar}[2]%
+{%
+  \expandafter\gdef\csname pc@avatar@#1\endcsname{#2}%
+}%
+%
+% define predefined set of options (Style)
+\newcommand{\definestyle}[2]%
+{%
+  \expandafter\gdef\csname pc@style@#1\endcsname{#2}%
+}%
 %
 %
-\endinput%
+\endinput%
\ No newline at end of file
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index cf915422e35..50b4223c146 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -146,6 +146,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'context-vim',       "&MAKEcopy",
  'coptic',	"die 'skipping, it has been replaced by cbcoptic'",
  'corridx',	"die 'skipping, Pascal source'",
+ 'crosstex',	"die 'skipping for now, investigate self-locating?, sorry'",
  'csplain',	"die 'skipping, too hard to automate'",
  'csvtools',	"&MAKEflatten",
  'ctable',	"&MAKEflatten",