pdfcomment 1.4 (2apr09)

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

15 files changed, 2966 insertions, 131 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index 7e336df909a..b32a2fa4585 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,36 @@
 === pdfcomment.sty ===
 
+-- pdfcomment.sty (v1.4) (<- v1.35dev 2009/04/01) -- (svn rev 36)
+
+2009/03/26  merged "line annotations" [jk] (svn rev 35)
+              \pdflinecomment, \pdfpolylinecomment
+              -> \pdflinecomment (type=line|polyline|polygon)
+
+2009/03/26  merged some options [jk] (svn rev 34)
+              line,calloutline,vertices -> line
+              type,polytype -> type
+
+2009/03/20  new annotation type: sideline [jk] (svn rev 33)
+              -> pdfsidelinecomment
+                 new option: linesep
+
+            change from linend, lineends -> linebegin, lineend
+
+2009/03/18  new annotation types: line and polyline (polytype=polyline|polygon) [jk] (svn rev 31)
+              -> \pdflinecomment, pdfpolylinecomment
+                 new options: line, lineends, caption, captionhoffset, captionvoffset,
+                              vertices, polytpye
+
+2009/03/17  new annotation types: square and circle annotations [jk] (svn rev 30)
+              -> \pdfsquarecomment, \pdfcirclecomment
+                 new option: icolor ("inner" color)
+
+2009/03/16  revision of \pdffreetextcomment [jk] (svn rev 28)
+              implementation of more features of pdf freetext annotations   
+              -> new options: font, fontsize, fontcolor, justification,
+                 borderstyle, dashstyle, linewidth, bse, bsei,
+                 type, calloutline, lineend
+
 -- pdfcomment.sty (v1.3) (<- v1.25dev 2009/03/09) -- (svn rev 27)
 
 2009/03/05  new annotation type: text markup annotation [jk] (svn rev 24)
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 0194201832c..92bbcc49c35 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,11 +15,12 @@ Adobe Reader.
 
 License: LPPL
 
-New in v1.3:
+New in v1.4:
 
-  - new annotation type: PDF text markup annotation
-    (known from the comment function of Adobe Reader)
-    -> \pdfmarkupcomment
-  - new option: markup (Highlight,Underline,Squiggly,StrikeOut)
-  - Bugfix: avatar and style system
-            wrong key families (copy and paste)
\ No newline at end of file
+  - new annotation type: PDF sideline, line, polyline, polygon, square 
+    and circle annotation
+    -> \pdfsidelinecomment, \pdflinecomment (type=line|polyline|polygon),
+       \pdfsquarecomment, \pdfcirclecomment
+  - new options: font, fontsize, fontcolor, borderstyle, dashstyle, bse,
+                 bsei, line, type, lineend, linebegin, icolor, caption,
+                 captionhoffset, captionvoffset
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index 1e04f66564d..56978fd58f3 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 a4561d3a468..ba34c9e912c 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -3,6 +3,8 @@
 \usepackage[english]{babel}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
+\usepackage{microtype}
+\usepackage{lipsum}
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage[absolute]{textpos}
 \usepackage{tikz}
@@ -14,12 +16,18 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \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}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
 
-\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)}
+\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
 \end{textblock*}}
-
+{\small
+\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}
+}
 \pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} 
 
 \colorlet{KernFarbe}{red}
@@ -59,11 +67,33 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}}
 \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
 
-\vspace{2cm}
+\vspace{3cm}
 \pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{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}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
 
 \pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{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}.}{This is a Squiggly markup annotation}
 
+\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
+\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
+
+\vspace{3.5cm}
+\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, 
+placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, 
+nonummy eget, consectetuer id, vulputate a, magna. Donec vehicula augue eu neque. 
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis 
+egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna 
+fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat. Integer sapien est, 
+iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. 
+Aeneanfaucibus.Morbidolornulla,malesuadaeu,pulvinarat,mollisac,nulla.Curabitur 
+auctor semper nulla. Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan 
+eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{This is a Highlight markup annotations with page break}
+
 \vspace{5cm}
-\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{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. 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}.}{This is a Highlight markup annotations with page break}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={110 620 220 530},color=green,icolor=blue,caption=none,linebegin={/RClosedArrow},lineend={/Circle},linewidth=2bp]{This is another Line comment! Just to show all possible arrows!}
+\pdflinecomment[type=polygon,avatar=CaptainJack,subject={Top2},opacity=1,line={275 590 355 600 400 570 350 530 270 540 276 590},color=green,icolor=CornflowerBlue,linewidth=5bp,bse=cloudy,bsei=2.2]{This is a Polygon comment!}
+
+\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
+\lipsum[2-6]
+\end{pdfsidelinecomment}
 \end{document} 
\ No newline at end of file
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 779a998e8e4..07b788734af 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 d65686ddb89..7b454c59e74 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,8 @@
 \usepackage[english]{babel}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
+\usepackage{microtype}
+\usepackage{lipsum}
 \usepackage[absolute]{textpos}
 %dvipdfmx leads to an error with xcolor
 \usepackage[svgnames,dvipdfm,rgb]{xcolor}
@@ -16,12 +18,18 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \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}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
 
-\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)}
+\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
 \end{textblock*}}
-
+{\small
+\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}
+}
 \pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} 
 
 \colorlet{KernFarbe}{red}
@@ -61,11 +69,33 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}}
 \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
 
-\vspace{2cm}
+\vspace{3cm}
 \pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{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}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
 
 \pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{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}.}{This is a Squiggly markup annotation}
 
+\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
+\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
+
+\vspace{3.5cm}
+\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, 
+placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, 
+nonummy eget, consectetuer id, vulputate a, magna. Donec vehicula augue eu neque. 
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis 
+egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna 
+fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat. Integer sapien est, 
+iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. 
+Aeneanfaucibus.Morbidolornulla,malesuadaeu,pulvinarat,mollisac,nulla.Curabitur 
+auctor semper nulla. Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan 
+eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{This is a Highlight markup annotations with page break}
+
 \vspace{5cm}
-\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{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. 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}.}{This is a Highlight markup annotations with page break}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={110 620 220 530},color=green,icolor=blue,caption=none,linebegin={/RClosedArrow},lineend={/Circle},linewidth=2bp]{This is another Line comment! Just to show all possible arrows!}
+\pdflinecomment[type=polygon,avatar=CaptainJack,subject={Top2},opacity=1,line={275 590 355 600 400 570 350 530 270 540 276 590},color=green,icolor=CornflowerBlue,linewidth=5bp,bse=cloudy,bsei=2.2]{This is a Polygon comment!}
+
+\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
+\lipsum[2-6]
+\end{pdfsidelinecomment}
 \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
index 6bfda539b48..25fa4a036de 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 63d9061ebcb..564132f567b 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
@@ -2,6 +2,8 @@
 \usepackage[english]{babel}
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
+\usepackage{microtype}
+\usepackage{lipsum}
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage[absolute]{textpos}
 \usepackage{tikz}
@@ -13,12 +15,18 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \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}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-3.2cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
 
-\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)}
+\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
 \end{textblock*}}
-
+{\small
+\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}
+}
 \pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} 
 
 \colorlet{KernFarbe}{red}
@@ -58,11 +66,33 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}}
 \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
 
-\vspace{2cm}
+\vspace{3cm}
 \pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{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}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
 
 \pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{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}.}{This is a Squiggly markup annotation}
 
+\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
+\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
+
+\vspace{3.5cm}
+\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, 
+placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, 
+nonummy eget, consectetuer id, vulputate a, magna. Donec vehicula augue eu neque. 
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis 
+egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna 
+fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat. Integer sapien est, 
+iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. 
+Aeneanfaucibus.Morbidolornulla,malesuadaeu,pulvinarat,mollisac,nulla.Curabitur 
+auctor semper nulla. Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan 
+eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{This is a Highlight markup annotations with page break}
+
 \vspace{5cm}
-\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{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. 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}.}{This is a Highlight markup annotations with page break}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={110 620 220 530},color=green,icolor=blue,caption=none,linebegin={/RClosedArrow},lineend={/Circle},linewidth=2bp]{This is another Line comment! Just to show all possible arrows!}
+\pdflinecomment[type=polygon,avatar=CaptainJack,subject={Top2},opacity=1,line={275 590 355 600 400 570 350 530 270 540 276 590},color=green,icolor=CornflowerBlue,linewidth=5bp,bse=cloudy,bsei=2.2]{This is a Polygon comment!}
+
+\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
+\lipsum[2-6]
+\end{pdfsidelinecomment}
 \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
index acde2f6c227..634ffb8bb71 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 afae2313e77..02b3bc3703f 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -10,6 +10,7 @@
 \usepackage[no-math]{fontspec}
 \usepackage{xunicode}
 \usepackage{xltxtra}
+\usepackage{lipsum}
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage{tikz}
 \usepackage[absolute]{textpos}
@@ -23,12 +24,18 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \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}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=3cm,type=freetext,width=4.5cm,voffset=-4.8cm,hoffset=-2.7cm,opacity=0.5,justification=right]{This is also a comment, but it's a FreeText annotation! Your, Captain Jack}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={100 680 250 680},color=green,icolor=blue,caption=top,linebegin={/ROpenArrow},lineend={/OpenArrow},linewidth=2bp,captionhoffset=-5pt,captionvoffset=15pt]{This is a Line comment!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=1.8cm,width=5.8cm,voffset=-7.2cm,hoffset=-1.2cm,opacity=1.0,justification=right,type=typewriter,font=Harrington,fontsize=18pt,fontcolor=CornflowerBlue]{This is a typewriter FreeText annotation!}
 
-\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)}
+\marginnote{\begin{textblock*}{1cm}(7cm,14.5cm)
+\pdffreetextcomment[avatar=CaptainJack,height=1.9cm,width=9cm,opacity=0.5,voffset=0pt,hoffset=0pt,opacity=1.0,font=Georgia,fontsize=9pt,fontcolor=red,justification=left,linewidth=2bp,bse=cloudy,bsei=1.3,type=callout,line={170 515 120 460 200 460},lineend=/ClosedArrow]{This one was placed with absolute coordinates (textpos.sty) (font=Georgia, fontsize=9pt, fontcolor=red, linewidth=2bp, bse=cloudy, bsei=1.3, type=callout, line=\{170 515 120 460 200 460\}, lineend=/ClosedArrow)}
 \end{textblock*}}
-
+{\small
+\marginnote{\begin{textblock*}{2cm}(6cm,11.9cm){($x_1, y_1$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(3cm,13.3cm){($x_2, y_2$)}\end{textblock*}}
+\marginnote{\begin{textblock*}{2cm}(5.6cm,13.6cm){($x_3, y_3$)}\end{textblock*}}
+}
 \pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} 
 
 \colorlet{KernFarbe}{red}
@@ -68,11 +75,33 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse
 \defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}}
 \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!}
 
-\vspace{2cm}
-\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{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}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
+\vspace{3cm}
+\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{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}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!}
 
 \pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{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}.}{This is a Squiggly markup annotation}
 
+\noindent\pdfsquarecomment[avatar=CaptainJack,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=1cm,opacity=1.0,justification=right,icolor=CornflowerBlue,bse=cloudy,bsei=2.5,linewidth=8pt]{This is a Square annotation!}
+\pdffreetextcomment[avatar=CaptainJack,subject={Top2},height=2.2cm,width=4.8cm,voffset=-2.8cm,hoffset=1.5cm,opacity=1.0,justification=right,type=typewriter,font=Jokerman,fontsize=13pt,fontcolor=black]{This typewriter annotation overlays the square!}
+\pdfcirclecomment[avatar=CaptainJack,color=blue,subject={Top2},height=2.5cm,width=5.8cm,voffset=-2.8cm,hoffset=8cm,opacity=1.0,justification=right,icolor={yellow},linewidth=12pt,borderstyle=dashed,dashstyle={10 5}]{This is a Circle annotation!}
+\pdflinecomment[type=polyline,avatar=CaptainJack,subject={Top2},opacity=1,line={150 120 260 120 300 150 400 80},color=green,icolor=blue,linebegin={/Slash},lineend={/Diamond},linewidth=3bp,bse=cloudy]{This is a Polyline comment!}
+
+\vspace{3.5cm}
+\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit, vestibulum ut, 
+placerat ac, adipiscing vitae, felis. Curabitur dictum gravida mauris. Nam arcu libero, 
+nonummy eget, consectetuer id, vulputate a, magna. Donec vehicula augue eu neque. 
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis 
+egestas. Mauris ut leo. Cras viverra metus rhoncus sem. Nulla et lectus vestibulum urna 
+fringilla ultrices. Phasellus eu tellus sit amet tortor gravida placerat. Integer sapien est, 
+iaculis in, pretium quis, viverra ac, nunc. Praesent eget sem vel leo ultrices bibendum. 
+Aeneanfaucibus.Morbidolornulla,malesuadaeu,pulvinarat,mollisac,nulla.Curabitur 
+auctor semper nulla. Donec varius orci eget risus. Duis nibh mi, congue eu, accumsan 
+eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{This is a Highlight markup annotations with page break}
+
 \vspace{5cm}
-\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{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. 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}.}{This is a Highlight markup annotations with page break}
+\pdflinecomment[avatar=CaptainJack,subject={Top2},type=line,opacity=1,line={110 620 220 530},color=green,icolor=blue,caption=none,linebegin={/RClosedArrow},lineend={/Circle},linewidth=2bp]{This is another Line comment! Just to show all possible arrows!}
+\pdflinecomment[type=polygon,avatar=CaptainJack,subject={Top2},opacity=1,line={275 590 355 600 400 570 350 530 270 540 276 590},color=green,icolor=CornflowerBlue,linewidth=5bp,bse=cloudy,bsei=2.2]{This is a Polygon comment!}
+
+\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
+\lipsum[2-6]
+\end{pdfsidelinecomment}
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 7232ffa6da5..21827c424c1 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 1f4011f8db7..8c206614e28 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -13,15 +13,19 @@
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.3}
+\def\fileversion{v1.4}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
-%\usepackage{acrofont}%
 \CodelineIndex
-%\EnableCrossrefs
-%\makeatletter
-%\def\tableofcontents{\@starttoc{toc}}
-%\makeatother
+\makeatletter
+\renewcommand\tableofcontents%
+{%
+  %\section*{\contentsname
+  \@mkboth{%
+  \MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+  \@starttoc{toc}%
+}%
+\makeatother
 \renewcommand{\arg}[1]{%
  {\ttfamily\string{}\meta{#1}{\ttfamily\string}}%
  \index{#1=\string\ttt{#1}, Argument}\index{Argument>#1=\string\ttt{#1}}%
@@ -51,7 +55,8 @@
 \setlength\parindent{0pt}
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
-\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{4.0em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.2em}{2.3em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{2.4em}{3.7em}}
 \makeatother
 \hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to PDF annotations},pdfsubject={Documentation for LaTeX style \filename}}
 \begin{document}
@@ -78,13 +83,12 @@ If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test
 \end{center}
 \vfill
 \clearpage
-%\begin{multicols}{2}
-%[\section*{Inhaltsverzeichnis}
-%\setlength{\columnseprule}{.4pt}
-%\setlength{\columnsep}{18pt}]
-%\tableofcontents
-%\end{multicols}
+\begin{multicols}{2}
+[\section*{\contentsname}
+\setlength{\columnseprule}{.5pt}
+\setlength{\columnsep}{30pt}\small]
 \tableofcontents
+\end{multicols}
 \clearpage
 \section*{Acknowledgment}
 I want to thank the following persons for contributions to the development of this package:
@@ -93,7 +97,7 @@ I want to thank the following persons for contributions to the development of th
 \item \textbf{Alexander Grahn} for contributing a patch for other drivers
 
 \medskip
-\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} und \XeLaTeX}.\hfill
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} and \XeLaTeX}.\hfill
 \medskip
 
 \item \textbf{Gabriel Cardona} for pointing out problems with older versions of \texttt{hyperref} (v6.76a [2007/04/09])
@@ -114,7 +118,7 @@ The option \styleoption{draft} (default) will set the package to draft mode. The
 \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. 
+The following options are useable as options for the commands presented in sections \ref{sec:kommentarumgebungen} and \ref{sec:kommentarbefehle}, 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.
@@ -141,6 +145,9 @@ By definition the PDF specification allows four different color spaces with diff
 \end{tabular}
 \end{center}
 
+\subsubsection[\texttt{icolor}]{\styleoption{icolor}}\label{sec:icolor}
+You can use the option \styleoption{icolor} for defining the so called 'inner color', which is used by some PDF annotations, like arrowheads or the inner area of PDF circle annotation. For the rest, the provisions of the option \styleoption{color} shall apply.
+
 \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:
 
@@ -173,6 +180,86 @@ You can use the option \styleoption{open} for defining the opening status of the
 
 If you want to print the PDF popup annotations (with transparency) you will have to use the option \styleoption{open} = \texttt{true}.
 
+\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, otherwise the PDF text annoations will overlay the text.
+
+\subsubsection[\texttt{type}]{\styleoption{type}}\label{sec:type}
+You can use the option \styleoption{type} for defining the type of PDF annotation, if a comment command supports more than one PDF annotations:
+
+{\renewcommand{\arraystretch}{1.2}
+\begin{center}
+\begin{tabular}{ll}
+\multicolumn{1}{c}{comment command} & \multicolumn{1}{c}{possible types}\\
+\hline
+\cs{pdffreetextcomment} & freetext, callout, typewriter \\
+\cs{pdflinecomment} & line, polyline, polygon \\
+\end{tabular}
+\end{center}}
+
+
+\subsubsection[\texttt{font}]{\styleoption{font}}\label{sec:font}
+You can use the option \styleoption{font} for defining the font of PDF freetext annotations, like all fonts installed in the system, which don't contain a space in their name. Although \texttt{Adobe Reader} shows these fonts as embedded, they are not embedded in reality, but the PDF file just contains a reference to the font (default: Helvetica)! Therefore you should use this option quite carefully. In the case of document exchange between several authors you should just use fonts, which are available on all computer systems, like the so called  'standard 14 fonts'. \pdfcomment[icon=Help,color=blue,open=true,subject={standard 14 fonts}]{Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic, Helvetica, Helvetica-Bold, Helvetica-Oblique, Helvetica-BoldOblique, Courier, Courier-Bold, Courier-Oblique, Courier-BoldOblique, Symbol, ZapfDingbats}
+
+\subsubsection[\texttt{fontsize}]{\styleoption{fontsize}}\label{sec:fontsize}
+You can use the option \styleoption{fontsize} for defining the fontsize of PDF freetext annotations.
+
+\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor}}\label{sec:fontcolor}
+You can use the option \styleoption{fontcolor} for defining the font color in PDF freetext annotations,which must be a  RGB color. 
+
+\subsubsection[\texttt{line}]{\styleoption{line}}\label{sec:line}
+You can use the option \styleoption{line} for defining the coordinates of lines in certain PDF annotations, e.\,g. in the form \{$x_1$\space$y_1$\space$x_2$\space$y_2$\}. The origin is in the bottom left page corner. The given numbers will be interpreted as Postscript points (\LaTeX{} unit: bp (big points)), as usual in PDF documents.
+
+{\renewcommand{\arraystretch}{1.2}
+\begin{center}
+\begin{tabular}{ll}
+\multicolumn{1}{c}{type of line} & \multicolumn{1}{c}{\# points}\\
+\hline
+line & $n = 2$ \\
+polyline, polygon & $n > 2$ \\
+callout line & $n = 3$ \\
+\end{tabular}
+\end{center}}
+
+In general, the points must be given from line begin to line end. For callout lines the points must be given from line end to line begin. Please note the example file \texttt{example.tex}!
+
+To avoid the method 'trail and error' you can load the PDF file with the Ghostscript viewer, which is capable of showing the cursor position in it's status line.
+
+\subsubsection[\texttt{linewidth}]{\styleoption{linewidth}}\label{sec:linewidth}
+You can use the option \styleoption{linewidth} for defining the line width of PDF annoations.
+
+\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
+You can use the option \styleoption{linebegin} for defining the arrow type at the line begin. The example file \texttt{example.pdf} shows all possible types of arrows. \pdfcomment[icon=Help,color=blue,open=true,subject={arrow types}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)} 
+
+
+\subsubsection[\texttt{lineend}]{\styleoption{lineend}}\label{sec:lineend}
+You can use the option \styleoption{lineend} for defining the arrow type at the line end.
+
+\subsubsection[\texttt{linesep}]{\styleoption{linesep}}\label{sec:linesep}
+You can use the option \styleoption{linesep} for defining the horizontal space between text and line in the command \cs{pdfsidelinecomment}.
+
+\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle}}\label{sec:borderstyle}
+You can use the option \styleoption{borderstyle} for defining the line style.Possible values are: \styleoption{solid} (default) and \styleoption{dashed}
+
+\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle}}\label{sec:dashstyle}
+You can use the option \styleoption{dashstyle} for defining the dash style, e.\,g. \{5 3\} (5 points line, 3 points space).
+
+\subsubsection[\texttt{bse}]{\styleoption{bse}}\label{sec:bse}
+You can use the option \styleoption{bse} for defining the 'border style effect'. Possible values are: \styleoption{none} (default) and \styleoption{cloudy}
+
+\subsubsection[\texttt{bsei}]{\styleoption{bsei}}\label{sec:bsei}
+You can use the option \styleoption{bsei} for defining the 'border style effect intensity' (size of cloud elements). The PDF reference suggests values between 1 and 2. 
+
+\subsubsection[\texttt{caption}]{\styleoption{caption}}\label{sec:caption}
+You can use the option \styleoption{caption} for defining the caption type of lines. Possible values are: none, inline (default), top
+
+The options \styleoption{inline} and \styleoption{top} shows the comment 'inline' and on top of the line. While using \styleoption{none} the comment will be shown in a PDF popup annotation. 
+
+\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset}}\label{sec:captionhoffset}
+You can use the option \styleoption{captionhoffset} for defining a horizontal offset, that is a horizontal shift of the line caption.
+
+\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset}}\label{sec:captionvoffset}
+You can use the option \styleoption{captionvoffset} for definig a vertical offset of the line caption.
+
 \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.
 
@@ -185,9 +272,6 @@ You can use the option \styleoption{width} for defining the width of PDF annotat
 \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, otherwise the PDF text annoations will overlay the text.
-
 \subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
 You can use the option \styleoption{markup} for defining the type of the PDF text markup annotation. Possible values are: Highlight, Underline, Squiggly und StrikeOut.
 
@@ -197,9 +281,32 @@ With the option \styleoption{avatar} you can load the option lists, that were pr
 \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{Environments}\label{sec:umgebungen}
+
+\subsection{Comment environments}\label{sec:kommentarumgebungen}
+
+\subsubsection{\texorpdfstring{\cs{pdfsidelinecomment}}{\textbackslash pdfsidelinecomment}}
+\label{sec:sidelinecomment}
+Possible \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{options}\marg{comment}\\\dots\\\enve{pdfsidelinecomment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}
+
+\bigskip
+With the environment \env{pdfsidelinecomment} you can comment complete parts of a page in the form of two lines in the margins.
+
+\hspace*{0pt}\newline
+\begin{pdfsidelinecomment}[color=red,icolor=yellow,linebegin=/Circle,lineend=/Circle,linewidth=3bp,linesep=1cm]{ Please note }
+Limitations:
+
+\begin{itemize}
+\item The PDF sideline annotation must not be longer than one page, otherwise the recognition of the page break will fail.
+\item While using dvi files in the meantime you have to use a \LaTeX{} distribution, which is using \texttt{pdf(e)latex} as engine in a version $\geq$ v1.40.0\footnote{older versions are not capable of providing x/y coordinates of the current position in dvi mode.}!
+\item While using \XeLaTeX{} you have to make sure that page dimensions are written to the xdvi file, e.\,g. with the option \styleoption{pagesize} of the KoMa-Script classes, or as option of the package \package{typearea.sty} respectively.
+\end{itemize}
+\end{pdfsidelinecomment}
+
+
 \section{Commands}\label{sec:befehle}
 
-\subsection{Comment commands}
+\subsection{Comment commands}\label{sec:kommentarbefehle}
 
 You can use the following commands for commenting your documents.
 
@@ -222,7 +329,7 @@ Possible \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}}options: \s
 Possible \margcs{\cmd\pdfmarkupcomment\oarg{options}\\\marg{markup text}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}
 
 \bigskip
-\cmd\pdfmarkupcomment{} will typeset so called PDF text markup annotations over the text specified in the argument \marg{markup text}. Possible types for the option \styleoption{markup} are: \pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{This is a Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{This is a Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{This is a Squiggly markup annotation!} and \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{This is a StrikeOut markup annotation!}
+\cmd\pdfmarkupcomment{} will typeset so called PDF text markup annotations over the text specified in the argument \marg{markup text}. Possible types for the option \styleoption{markup} are: \pdfcommentsetup{subject={\textbackslash pdfmarkupcomment test}}\pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{This is a Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{This is a Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{This is a Squiggly markup annotation!} and \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{This is a StrikeOut markup annotation!}
 
 \hspace*{0pt}\newline
 Limitations:
@@ -231,15 +338,38 @@ Limitations:
 \item As the name PDF text markup annotation might lead to suggest, this form of comment is suitable for text only.
 \item The specified text with the argument \marg{markup text} must not be longer than one paragraph.
 \item The PDF text markup annotation must not be longer than one page, otherwise the recognition of the page break will fail.
+\item While using dvi files in the meantime you have to use a \LaTeX{} distribution, which is using \texttt{pdf(e)latex} as engine in a version $\geq$ v1.40.0\footnote{older versions are not capable of providing x/y coordinates of the current position in dvi mode.}!
 \item While using \XeLaTeX{} you have to make sure that page dimensions are written to the xdvi file, e.\,g. with the option \styleoption{pagesize} of the KoMa-Script classes, or as option of the package \package{typearea.sty} respectively.
 \end{itemize}
 
 \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
 \label{sec:pdffreetextcomment}
-Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+
+\bigskip
+\cmd\pdffreetextcomment{} (type=freetext) will typeset 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=-3.7cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} By using the option \styleoption{type} = \texttt{callout} the box will have an additional so called callout line, to bind the box to a certain element of the page. With the option \styleoption{type} = \texttt{typewriter} you can write a comment everywhere on the page with a virtual 'typewriter'. These PDF freetext annotation do have no frame and a transparent background for 'overwriting' arbitrary parts of the page. Please note the example file \texttt{example.pdf}!
+
+\subsubsection{\texorpdfstring{\cs{pdfsquarecomment}}{\textbackslash pdfsquarecomment}}
+\label{sec:pdfsquarecomment}
+Possible \margcs{\cmd\pdfsquarecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+
+\bigskip
+\cmd\pdfsquarecomment{} will typeset a rectangular box at the wished spot of a page (see: \texttt{example.pdf}).
+
+
+\subsubsection{\texorpdfstring{\cs{pdfcirclecomment}}{\textbackslash pdfcirclecomment}}
+\label{sec:pdfcirclecomment}
+Possible \margcs{\cmd\pdfcirclecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+
+\bigskip
+\cmd\pdfsquarecomment{} will typeset a comment in form of a circle or ellipse at the wished spot of the page (see: \texttt{example.pdf}).
+
+\subsubsection{\texorpdfstring{\cs{pdflinecomment}}{\textbackslash pdflinecomment}}
+\label{sec:pdflinecomment}
+Possible \margcs{\cmd\pdfsidelinecomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}
 
 \bigskip
-\cmd\pdffreetextcomment{} 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=-1.3cm,hoffset=1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation}
+\cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \texttt{example.pdf}).
 
 \subsection{Misc. commands}
 
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 2d905d52c7a..ef3bfb0dcf5 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 d0fc66a8a8b..379bc11f6d8 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -12,15 +12,19 @@
 \usepackage{ltxdocext}%
 \usepackage{hyperref}
 \usepackage{pdfcomment}
-\def\fileversion{v1.3}
+\def\fileversion{v1.4}
 \def\filename{pdfcomment.sty}
 \def\XeLaTeX{Xe\LaTeX}
-%\usepackage{acrofont}%
 \CodelineIndex
-%\EnableCrossrefs
-%\makeatletter
-%\def\tableofcontents{\@starttoc{toc}}
-%\makeatother
+\makeatletter
+\renewcommand\tableofcontents%
+{%
+  %\section*{\contentsname
+  \@mkboth{%
+  \MakeUppercase\contentsname}{\MakeUppercase\contentsname}%
+  \@starttoc{toc}%
+}%
+\makeatother
 \renewcommand{\arg}[1]{%
  {\ttfamily\string{}\meta{#1}{\ttfamily\string}}%
  \index{#1=\string\ttt{#1}, Argument}\index{Argument>#1=\string\ttt{#1}}%
@@ -50,7 +54,8 @@
 \setlength\parindent{0pt}
 \makeatletter
 \renewcommand\@biblabel[1]{\makebox[1.5cm][l]{[#1]}}
-\renewcommand*\l@subsubsection{\@dottedtocline{3}{3.8em}{4.0em}}
+\renewcommand*\l@subsection{\@dottedtocline{2}{1.2em}{2.3em}}
+\renewcommand*\l@subsubsection{\@dottedtocline{3}{2.4em}{3.7em}}
 \makeatother
 \hypersetup{pdfauthor={Josef Kleber},pdftitle={Ein benutzerfreundliches Interface zu PDF-Kommentaren},pdfsubject={Dokumentation für den LaTeX style \filename}}
 \begin{document} 
@@ -77,13 +82,12 @@ Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Komme
 \end{center}
 \vfill
 \clearpage
-%\begin{multicols}{2}
-%[\section*{Inhaltsverzeichnis}
-%\setlength{\columnseprule}{.4pt}
-%\setlength{\columnsep}{18pt}]
-%\tableofcontents
-%\end{multicols}
+\begin{multicols}{2}
+[\section*{\contentsname}
+\setlength{\columnseprule}{.5pt}
+\setlength{\columnsep}{30pt}\small]
 \tableofcontents
+\end{multicols}
 \clearpage
 \section*{Danksagung}
 Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
@@ -113,7 +117,7 @@ Mit der Option \texttt{draft} (default) versetzt man das Paket in den Draft-Modu
 \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. 
+Die anschließend vorgestellten Optionen sind für die in den Abschnitten \ref{sec:kommentarumgebungen} und \ref{sec:kommentarbefehle} 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.
@@ -140,6 +144,9 @@ Grundsätzlich erlaubt die PDF Spezifikation vier unterschiedliche Farbräume, die
 \end{tabular}
 \end{center}
 
+\subsubsection[\texttt{icolor}]{\styleoption{icolor}}\label{sec:icolor}
+Die Option \styleoption{icolor} dient der Festlegung der bei einigen PDF annotations genutzten sogenannten 'inner color', etwa in Pfeilspitzen oder die Innenfläche der PDF circle annotation. Im Übrigen gelten dieselben Bestimmungen wie bei der Option \styleoption{color}.
+
 \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:
 
@@ -172,21 +179,96 @@ Die Option \styleoption{open} dient der Festlegung des Öffnungsstatus der PDF po
 
 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{hspace}]{\styleoption{hspace}}\label{sec:hspace}
+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{type}]{\styleoption{type}}\label{sec:type}
+Die Option \styleoption{type} dient der Festlegung des jeweiligen Typs der PDF annotation, falls ein Kommentarbefehl mehrere PDF annotations unterstützt:
+
+{\renewcommand{\arraystretch}{1.2}
+\begin{center}
+\begin{tabular}{ll}
+\multicolumn{1}{c}{Kommentarbefehl} & \multicolumn{1}{c}{mögliche Typen}\\
+\hline
+\cs{pdffreetextcomment} & freetext, callout, typewriter \\
+\cs{pdflinecomment} & line, polyline, polygon \\
+\end{tabular}
+\end{center}}
+
+\subsubsection[\texttt{font}]{\styleoption{font}}\label{sec:font}
+Die Option \styleoption{font} dient der Festlegung der Schriftart in PDF freetext annotations. Möglich sind dabei alle im System installierten Schriften, die keine Leerzeichen im Namen enthalten. Obwohl \texttt{Adobe Reader} diese Schrift als eingebettet kennzeichnet, ist sie das in der Realität nicht und die PDF-Datei enthält nur eine Referenz auf die Schrift (default: Helvetica)! Daher sollte man diese Option nur sehr vorsichtig nutzen und z.\,B. beim Austausch des Dokuments unter mehreren Autoren nur Schriften nutzen, die auf allen beteiligten Computersystemen vorhanden sind. Das sind etwa die sogenannten 'standard 14 fonts'. \pdfcomment[icon=Help,color=blue,open=true,subject={Standard 14 fonts}]{Times-Roman, Times-Bold, Times-Italic, Times-BoldItalic, Helvetica, Helvetica-Bold, Helvetica-Oblique, Helvetica-BoldOblique, Courier, Courier-Bold, Courier-Oblique, Courier-BoldOblique, Symbol, ZapfDingbats}
+
+\subsubsection[\texttt{fontsize}]{\styleoption{fontsize}}\label{sec:fontsize}
+Die Option \styleoption{fontsize} dient der Festlegung der Schriftgröße in PDF freetext annotations.
+
+\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor}}\label{sec:fontcolor}
+Die Option \styleoption{fontcolor} dient der Festlegung der Schriftfarbe in PDF freetext annotations und erwartet dabei zwingend eine RGB-Farbe. 
+
+\subsubsection[\texttt{line}]{\styleoption{line}}\label{sec:line}
+Die Option \styleoption{line} dient der Festlegung der Koordinaten der Linien bei bestimmten PDF annotations, z.\,B. in der Form \{$x_1$\space$y_1$\space$x_2$\space$y_2$\}. Der Koordinatenursprung liegt dabei in der linken unteren Seitenecke, wobei die angegebenen Zahlen, als die in PDF-Dokumenten üblichen PostScript-Punkte (\LaTeX{}-Einheit: bp (big points)) interpretiert werden.
+
+{\renewcommand{\arraystretch}{1.2}
+\begin{center}
+\begin{tabular}{ll}
+\multicolumn{1}{c}{Linientyp} & \multicolumn{1}{c}{\# Punkte}\\
+\hline
+Linie & $n = 2$ \\
+Polyline, Polygon & $n > 2$ \\
+Callout Linie & $n = 3$ \\
+\end{tabular}
+\end{center}}
+
+Üblicherweise erfolgt die Angabe der Koordinaten vom Linienanfang zum Linienende. Bei der Callout Linie müssen die Koordinaten vom Linienende bis zum Linienanfang angegeben werden. Beachten Sie dazu bitte das Beispiel \texttt{example.tex}!
+
+Zur Vermeidung der Methode 'Versuch und Irrtum' kann man die PDF-Datei mit dem Ghostscript Viewer laden, der in der Lage ist die aktuelle Position des Cursors in der Statuszeile anzuzeigen.
+ 
+\subsubsection[\texttt{linewidth}]{\styleoption{linewidth}}\label{sec:linewidth}
+Die Option \styleoption{linewidth} dient der Festlegung der Liniendicke in PDF annoations.
+
+\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
+Die Option \styleoption{linebegin} dient der Festlegung des Pfeiltyps am Linienanfang. Die Beispieldatei \texttt{example.pdf} zeigt alle möglichen Pfeiltypen. \pdfcomment[icon=Help,color=blue,open=true,subject={Pfeiltypen}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)} 
+
+\subsubsection[\texttt{lineend}]{\styleoption{lineend}}\label{sec:lineend}
+Die Option \styleoption{lineend} dient der Festlegung des Pfeiltyps am Linienende.
+
+\subsubsection[\texttt{linesep}]{\styleoption{linesep}}\label{sec:linesep}
+Die Option \styleoption{linesep} dient der Festlegung des horizontalen Abstands der Linie beim Befehl \cs{pdfsidelinecomment}.
+
+\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle}}\label{sec:borderstyle}
+Die Option \styleoption{borderstyle} dient der Festlegung des Linienstils. Mögliche Werte sind dabei: \styleoption{solid} (default) und \styleoption{dashed}
+
+\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle}}\label{sec:dashstyle}
+Die Option \styleoption{dashstyle} dient der Festlegung des Strichlinienstils, z.\,B. \{5 3\} (5 Punkte Linie, 3 Punkte Abstand).
+
+\subsubsection[\texttt{bse}]{\styleoption{bse}}\label{sec:bse}
+Die Option \styleoption{bse} dient der Festlegung des 'border style effect'. Mögliche Werte sind dabei: \styleoption{none} (default) und \styleoption{cloudy}
+
+\subsubsection[\texttt{bsei}]{\styleoption{bsei}}\label{sec:bsei}
+Die Option \styleoption{bsei} dient der Festlegung der 'border style effect intensity' (Größe der Wolkenelemente). Die PDF-Referenz empfiehlt dabei Werte zwischen 1 und 2. 
+
+\subsubsection[\texttt{caption}]{\styleoption{caption}}\label{sec:caption}
+Die Option \styleoption{caption} dient der Festlegung des Typs der Linienüberschriften. Mögliche Werte sind dabei: none, inline (default), top
+
+Die beiden Optionen \styleoption{inline} und \styleoption{top} zeigen den Kommentar in der Linie bzw. über der Linie. Bei Verwendung der Option \styleoption{none} erscheint der Kommentar in einer PDF popup annotation. 
+
+\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset}}\label{sec:captionhoffset}
+Die Option \styleoption{captionhoffset} dient der Festlegung eines horizontalen Offsets, d.\,h. einer seitlichen Verschiebung, der Linienüberschrift.
+
+\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset}}\label{sec:captionvoffset}
+Die Option \styleoption{captionvoffset} dient der Festlegung eines vertikalen Offsets der Linienüberschrift.
 
 \subsubsection[\texttt{hoffset}]{\styleoption{hoffset}}\label{sec:hoffset}
 Die Option \styleoption{hoffset} dient der Festlegung eines horizontalen Offsets der PDF annotations.
 
+\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{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. Bei PDF text annotations wurde die Höhe 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, falls der Text nicht durch die PDF text annotations überschrieben werden sollen.
-
 \subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
 Die Option \styleoption{markup} dient der Festlegung des Typs der text markup annotations. Mögliche Werte sind dabei: Highlight, Underline, Squiggly und StrikeOut.
 
@@ -196,9 +278,31 @@ Mit der Option \styleoption{avatar} kann man die mit dem Befehl \cmd\defineavata
 \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{Umgebungen}\label{sec:umgebungen}
+
+\subsection{Kommentarumgebungen}\label{sec:kommentarumgebungen}
+
+\subsubsection{\texttt{pdfsidelinecomment}}
+\label{sec:sidelinecomment}
+Mögliche \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{Optionen}\marg{Kommentar}\\\dots\\\enve{pdfsidelinecomment}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}
+
+\bigskip
+Mit der Umgebung \env{pdfsidelinecomment} kann man ganze Seitenbereiche in Form zweier Linien in den Randspalten mit einem Kommentar kennzeichnen.
+
+\hspace*{0pt}\newline
+\begin{pdfsidelinecomment}[color=red,icolor=yellow,linebegin=/Circle,lineend=/Circle,linewidth=3bp,linesep=1cm]{ ! Beachten ! }
+Einschränkungen:
+
+\begin{itemize}
+\item Die PDF sideline annotation darf nicht länger sein als eine Seite, da sonst die Erkennung des Seitenumbruchs fehlschlägt.
+\item Bei der zwischenzeitlichen Nutzung von dvi-Dateien benötigt man eine \LaTeX{}-Distribution, die \texttt{pdf(e)latex} in einer Version $\geq$ v1.40.0\footnote{ältere Versionen sind nicht in der Lage im dvi mode x/y-Koordinaten der aktuellen Position zur Verfügung zu stellen.} als Engine benutzt!
+\item Bei der Verwendung von \XeLaTeX{} muß Sorge getragen werden, daß die korrekte Seitengröße in die xdvi-Datei geschrieben wird, z.\,B. über die Option \styleoption{pagesize} bei Verwendung der KoMa-Script-Klassen, bzw. als Option beim Paket \package{typearea.sty}.
+\end{itemize}
+\end{pdfsidelinecomment}
+
 \section{Befehle}\label{sec:befehle}
 
-\subsection{Kommentarbefehle}
+\subsection{Kommentarbefehle}\label{sec:kommentarbefehle}
 
 Die folgenden Befehlen können Sie zur Kommentierung Ihres Dokuments einsetzen.
 
@@ -221,7 +325,7 @@ Mögliche \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}}Optionen
 Mögliche \margcs{\cmd\pdfmarkupcomment\oarg{Optionen}\\\marg{Markup Text}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}
 
 \bigskip
-\cmd\pdfmarkupcomment{} setzt eine sogenannte PDF text markup annotation über den mit dem Argument \marg{Markup Text} festgelegten Text. Mögliche Typen für die Option \styleoption{markup} sind dabei: \pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{Das ist eine Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{Das ist eine Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{Das ist eine Squiggly markup annotation!} und \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{Das ist eine StrikeOut markup annotation!}
+\cmd\pdfmarkupcomment{} setzt eine sogenannte PDF text markup annotation über den mit dem Argument \marg{Markup Text} festgelegten Text. Mögliche Typen für die Option \styleoption{markup} sind dabei: \pdfcommentsetup{subject={\textbackslash pdfmarkupcomment Test}}\pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{Das ist eine Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{Das ist eine Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{Das ist eine Squiggly markup annotation!} und \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{Das ist eine StrikeOut markup annotation!}
 
 \hspace*{0pt}\newline
 Einschränkungen:
@@ -230,16 +334,37 @@ Einschränkungen:
 \item Wie die Bezeichnung PDF text markup annotation vermuten läßt, eignet sich diese Form der Kommentierung ausschließlich für reinen Text.
 \item Der mit dem Argument \marg{Markup Text} festgelegte Text darf nicht länger sein als ein Absatz.
 \item Die PDF text markup annotation darf nicht länger sein als eine Seite, da sonst die Erkennung des Seitenumbruchs fehlschlägt.
+\item Bei der zwischenzeitlichen Nutzung von dvi-Dateien benötigt man eine \LaTeX{}-Distribution, die \texttt{pdf(e)latex} in einer Version $\geq$ v1.40.0\footnote{ältere Versionen sind nicht in der Lage im dvi mode x/y-Koordinaten der aktuellen Position zur Verfügung zu stellen.} als Engine benutzt!
 \item Bei der Verwendung von \XeLaTeX{} muß Sorge getragen werden, daß die korrekte Seitengröße in die xdvi-Datei geschrieben wird, z.\,B. über die Option \styleoption{pagesize} bei Verwendung der KoMa-Script-Klassen, bzw. als Option beim Paket \package{typearea.sty}.
 \end{itemize}
 
 \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
 \label{sec:pdffreetextcomment}
-Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
 
 \bigskip
-\cmd\pdffreetextcomment{} 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=0.2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}
+\cmd\pdffreetextcomment{} (type=freetext) 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=-3.2cm,hoffset=-2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}. Bei Verwendung der Option \styleoption{type} = \texttt{callout} verfügt die Box zusätzlich über eine sogenannte Callout Linie, um die Box an ein bestimmtes Element der Seite zu binden. Mit der Option \styleoption{type} = \texttt{typewriter} kann man einen Kommentar an einer beliebigen Stelle mit einer virtuellen 'Schreibmaschine' schreiben. Diese PDF freetext annotation haben keinen Rand und einen transparenten Hintergrund. Dadurch kann man beliebige Stellen 'überschreiben'. Bitte beachten Sie dazu die Beispieldatei \texttt{example.pdf}!
+
+\subsubsection{\texorpdfstring{\cs{pdfsquarecomment}}{\textbackslash pdfsquarecomment}}
+\label{sec:pdfsquarecomment}
+Mögliche \margcs{\cmd\pdfsquarecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
 
+\bigskip
+\cmd\pdfsquarecomment{} setzt einen Kommentar in Form einer rechteckigen Box an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
+
+\subsubsection{\texorpdfstring{\cs{pdfcirclecomment}}{\textbackslash pdfcirclecomment}}
+\label{sec:pdfcirclecomment}
+Mögliche \margcs{\cmd\pdfcirclecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+
+\bigskip
+\cmd\pdfsquarecomment{} setzt einen Kommentar in Form eines Kreises oder einer Ellipse an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
+
+\subsubsection{\texorpdfstring{\cs{pdflinecomment}}{\textbackslash pdflinecomment}}
+\label{sec:pdflinecomment}
+Mögliche \margcs{\cmd\pdfsidelinecomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}
+
+\bigskip
+\cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
 
 \subsection{Allgemeine Befehle}
 
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index bd17961f093..85adf6f694d 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -20,7 +20,7 @@
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2009/03/09 pdfcomment.sty v1.3 - Josef Kleber (C) 2008-2009]%
+\ProvidesPackage{pdfcomment}[2009/04/01 pdfcomment.sty v1.4 - Josef Kleber (C) 2008-2009]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -38,6 +38,24 @@
 \gdef\pc@goptd@depth{0pt}%
 \gdef\pc@goptd@opacity{1.0}%
 \gdef\pc@goptd@markup{Highlight}%
+\gdef\pc@goptd@font{Helv}%
+\gdef\pc@goptd@fontsize{12bp}%
+\gdef\pc@goptd@fontcolor{0.0 0.0 0.0}%
+\gdef\pc@goptd@justification{0}%
+\gdef\pc@goptd@borderstyle{S}%
+\gdef\pc@goptd@linewidth{1bp}%
+\gdef\pc@goptd@dashstyle{3 3}%
+\gdef\pc@goptd@bse{S}%
+\gdef\pc@goptd@bsei{1}%
+\gdef\pc@goptd@type{freetext}%
+\gdef\pc@goptd@lineend{/OpenArrow}%
+\gdef\pc@goptd@linebegin{/None}%
+\gdef\pc@goptd@icolor{1 1 0}%
+\gdef\pc@goptd@line{50 50 300 600}%
+\gdef\pc@goptd@caption{inline}%
+\gdef\pc@goptd@captionhoffset{0pt}%
+\gdef\pc@goptd@captionvoffset{0pt}%
+\gdef\pc@goptd@linesep{0.5cm}%
 \gdef\pc@goptd@dvipdfmx{true}%
 %
 % values for global package options
@@ -54,6 +72,24 @@
 \gdef\pc@gopt@depth{}%
 \gdef\pc@gopt@opacity{}%
 \gdef\pc@gopt@markup{}%
+\gdef\pc@gopt@font{}%
+\gdef\pc@gopt@fontsize{}%
+\gdef\pc@gopt@fontcolor{}%
+\gdef\pc@gopt@justification{}%
+\gdef\pc@gopt@borderstyle{}%
+\gdef\pc@gopt@linewidth{}%
+\gdef\pc@gopt@dashstyle{}%
+\gdef\pc@gopt@bse{}%
+\gdef\pc@gopt@bsei{}%
+\gdef\pc@gopt@type{}%
+\gdef\pc@gopt@lineend{}%
+\gdef\pc@gopt@linebegin{}%
+\gdef\pc@gopt@icolor{}%
+\gdef\pc@gopt@line{}%
+\gdef\pc@gopt@caption{}%
+\gdef\pc@gopt@captionhoffset{}%
+\gdef\pc@gopt@captionvoffset{}%
+\gdef\pc@gopt@linesep{}%
 %
 % values for local command options
 \gdef\pc@lopt@subject{}%
@@ -69,6 +105,32 @@
 \gdef\pc@lopt@depth{}%
 \gdef\pc@lopt@opacity{}%
 \gdef\pc@lopt@markup{}%
+\gdef\pc@lopt@font{}%
+\gdef\pc@lopt@fontsize{}%
+\gdef\pc@lopt@fontcolor{}%
+\gdef\pc@lopt@justification{}%
+\gdef\pc@lopt@borderstyle{}%
+\gdef\pc@lopt@linewidth{}%
+\gdef\pc@lopt@dashstyle{}%
+\gdef\pc@lopt@bse{}%
+\gdef\pc@lopt@bsei{}%
+\gdef\pc@lopt@type{}%
+\gdef\pc@lopt@lineend{}%
+\gdef\pc@lopt@linebegin{}%
+\gdef\pc@lopt@icolor{}%
+\gdef\pc@lopt@line{}%
+\gdef\pc@lopt@caption{}%
+\gdef\pc@lopt@captionhoffset{}%
+\gdef\pc@lopt@captionvoffset{}%
+\gdef\pc@lopt@linesep{}%
+%
+\gdef\pc@lopt@c{}%
+\gdef\pc@lopt@ic{}%
+\gdef\pc@lopt@l{}%
+\gdef\pc@lopt@le{}%
+\gdef\pc@lopt@cap{}%
+\gdef\pc@lopt@cp{}%
+\gdef\pc@lopt@co{}%
 %
 \newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
 \newif\ifpc@gopt@final\pc@gopt@finalfalse%
@@ -215,6 +277,146 @@
   \gdef\pc@gopt@markup{#1}%
 }%
 %
+% define global style option font for setting the font of the pdf freetext annotations
+\define@key{pdfcomment.sty}{font}[\pc@goptd@font]%
+{%
+  \gdef\pc@gopt@font{#1}%
+}%
+%
+% define global style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfcomment.sty}{fontsize}[\pc@goptd@fontsize]%
+{%
+  \gdef\pc@gopt@fontsize{\pc@pttobp{#1}}%
+}%
+%
+% define global style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfcomment.sty}{fontcolor}[\pc@goptd@fontcolor]%
+{%
+  \gdef\pc@gopt@fontcolor{#1}%
+}%
+%
+% define global style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfcomment.sty}{justification}[\pc@gopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@justification{0}%
+  \or%
+    \gdef\pc@gopt@justification{1}%
+  \or%
+    \gdef\pc@gopt@justification{2}%
+  \fi%
+}%
+%
+% define global style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfcomment.sty}{borderstyle}[\pc@gopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@borderstyle{S}%
+  \or%
+    \gdef\pc@gopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define global style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfcomment.sty}{dashstyle}[\pc@goptd@dashstyle]%
+{%
+  \gdef\pc@gopt@dashstyle{#1}%
+}%
+%
+% define global style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfcomment.sty}{linewidth}[\pc@goptd@linewidth]%
+{%
+  \gdef\pc@gopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define global style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfcomment.sty}{bse}[\pc@gopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@bse{S}%
+  \or%
+    \gdef\pc@gopt@bse{C}%
+  \fi%
+}%
+%
+% define global style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfcomment.sty}{bsei}[\pc@goptd@bsei]%
+{%
+  \gdef\pc@gopt@bsei{#1}%
+}%
+%
+% define global style option type for setting the type of the pdf annotations
+\define@choicekey*{pdfcomment.sty}{type}[\pc@gopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@type{}%
+  \or%
+    \gdef\pc@gopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@gopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+}%
+%
+% define global style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfcomment.sty}{lineend}[\pc@goptd@lineend]%
+{%
+  \gdef\pc@gopt@lineend{#1}%
+}%
+%
+% define global style option linebegin for setting the line ends pdf line annotations
+\define@key{pdfcomment.sty}{linebegin}[\pc@goptd@linebegin]%
+{%
+  \gdef\pc@gopt@linebegin{#1}%
+}%
+%
+% define global style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfcomment.sty}{icolor}[\pc@goptd@icolor]%
+{%
+  \gdef\pc@gopt@icolor{#1}%
+}%
+%
+% define global style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfcomment.sty}{caption}[\pc@gopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@caption{none}%
+  \or%
+    \gdef\pc@gopt@caption{Inline}%
+  \or%
+    \gdef\pc@gopt@caption{Top}%
+  \fi%
+}%
+%
+% define global style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfcomment.sty}{line}[\pc@goptd@line]%
+{%
+  \gdef\pc@gopt@line{#1}%
+}%
+%
+% define global style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfcomment.sty}{captionhoffset}[\pc@goptd@captionhoffset]%
+{%
+  \gdef\pc@gopt@captionhoffset{\pc@pttobp{#1}}%
+}%
+%
+% define global style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfcomment.sty}{captionvoffset}[\pc@goptd@captionvoffset]%
+{%
+  \gdef\pc@gopt@captionvoffset{\pc@pttobp{#1}}%
+}%
+%
+% define global style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfcomment.sty}{linesep}[\pc@goptd@linesep]%
+{%
+  \gdef\pc@gopt@linesep{\pc@pttobp{#1}}%
+}%
+%
 % define global style option dvipdfmx for setting the output driver in DVI mode
 \define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
 {%
@@ -322,6 +524,123 @@
   \gdef\pc@lopt@opacity{#1}%
 }%
 %
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfcomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfcomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfcomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfcomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfcomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfcomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfcomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfcomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfcomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option borderstyle in command \pdfcomment ignored!}%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfcomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option dashstyle in command \pdfcomment ignored!}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfcomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linewidth in command \pdfcomment ignored!}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfcomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option bse in command \pdfcomment ignored!}%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfcomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfcomment ignored!}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfcomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option type in command \pdfcomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfcomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfcomment ignored!}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfcomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfcomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfcomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icolor in command \pdfcomment ignored!}%
+}%
+%
 % define local style option markup for setting the markup type of the pdf markup annotations
 \define@key{pdfcomment}{markup}[\pc@gopt@markup]%
 {%
@@ -329,6 +648,47 @@
   \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfcomment ignored!}%
 }%
 %
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfcomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdfcomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfcomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfcomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfcomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfcomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfcomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfcomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfcomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdfcomment ignored!}%
+}%
+%
 % define local style option avatar for setting a predefined set of options (Avatar)
 \define@key{pdfmargincomment}{avatar}[]%
 {%
@@ -418,6 +778,123 @@
   \gdef\pc@lopt@opacity{#1}%
 }%
 %
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfmargincomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfmargincomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfmargincomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfmargincomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfmargincomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option borderstyle in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfmargincomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option dashstyle in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfmargincomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linewidth in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfmargincomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option bse in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfmargincomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfmargincomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option type in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfmargincomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfmargincomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfmargincomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icolor in command \pdfmargincomment ignored!}%
+}%
+%
 % define local style option markup for setting the markup type of the pdf markup annotations
 \define@key{pdfmargincomment}{markup}[\pc@gopt@markup]%
 {%
@@ -425,6 +902,47 @@
   \PackageInfo{pdfcomment.sty}{Setting of option margin in command \pdfmargincomment ignored!}%
 }%
 %
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfmargincomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfmargincomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfmargincomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfmargincomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfmargincomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfmargincomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineseo in command \pdfmargincomment ignored!}%
+}%
+%
 % define local style option avatar for setting a predefined set of options (Avatar)
 \define@key{pdffreetextcomment}{avatar}[]%
 {%
@@ -468,6 +986,7 @@
 \define@key{pdffreetextcomment}{open}[\pc@gopt@open]%
 {%
   \gdef\pc@lopt@open{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdffreetextcomment ignored!}%
 }%
 %
 % define local command option hspace for setting the space after the pdf annotations
@@ -505,7 +1024,7 @@
 \define@key{pdffreetextcomment}{depth}[\pc@gopt@depth]%
 {%
   \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}%
+  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdffreetextcomment ignored!}%
 }%
 %
 % define local style option opacity for setting the opacity of the pdf annotations
@@ -514,11 +1033,156 @@
   \gdef\pc@lopt@opacity{#1}%
 }%
 %
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdffreetextcomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdffreetextcomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdffreetextcomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdffreetextcomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdffreetextcomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdffreetextcomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdffreetextcomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdffreetextcomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdffreetextcomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdffreetextcomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdffreetextcomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdffreetextcomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdffreetextcomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdffreetextcomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+}%
+%
 % define local style option markup for setting the markup type of the pdf markup annotations
 \define@key{pdffreetextcomment}{markup}[\pc@gopt@markup]%
 {%
   \gdef\pc@lopt@markup{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}%
+  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdffreetextcomment ignored!}%
+}%
+%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdffreetextcomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdffreetextcomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdffreetextcomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdffreetextcomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdffreetextcomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdffreetextcomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionoffset{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdffreetextcomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdffreetextcomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdffreetextcomment ignored!}%
 }%
 %
 % define local style option avatar for setting a predefined set of options (Avatar)
@@ -571,7 +1235,7 @@
 \define@key{pdfmarkupcomment}{hspace}[\pc@gopt@hspace]%
 {%
   \gdef\pc@lopt@hspace{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfmarkupcomment ignored!}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hspace in command \pdfmarkupcomment ignored!}%
 }%
 %
 % define local style option voffset for setting the vertical offset of the pdf annotations
@@ -615,13 +1279,1166 @@
   \gdef\pc@lopt@opacity{#1}%
 }%
 %
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfmarkupcomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfmarkupcomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfmarkupcomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfmarkupcomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfmarkupcomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option borderstyle in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfmarkupcomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option dashstyle in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfmarkupcomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linewidth in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfmarkupcomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option bse in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfmarkupcomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfmarkupcomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option type in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfmarkupcomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfmarkupcomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfmarkupcomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icolor in command \pdfmarkupcomment ignored!}%
+}%
+%
 % define local style option markup for setting the markup type of the pdf markup annotations
 \define@key{pdfmarkupcomment}{markup}[\pc@gopt@markup]%
 {%
   \gdef\pc@lopt@markup{#1}%
 }%
 %
-\ExecuteOptionsX{subject,color,author,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup}%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfmarkupcomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfmarkupcomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfmarkupcomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfmarkupcomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfmarkupcomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdfmarkupcomment ignored!}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfsquarecomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfsquarecomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdfsquarecomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfsquarecomment}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
+% define local command option subject for setting the subject of pdf annotations
+\define@key{pdfsquarecomment}{subject}[\pc@gopt@subject]%
+{%
+  \gdef\pc@lopt@subject{#1}%
+}%
+%
+% define local command option color for setting the color of pdf annotations
+\define@key{pdfsquarecomment}{color}[\pc@gopt@color]%
+{%
+  \gdef\pc@lopt@color{#1}%
+}%
+%
+% define local command option author for setting the author of pdf annotations
+\define@key{pdfsquarecomment}{author}[\pc@gopt@author]%
+{%
+  \gdef\pc@lopt@author{#1}%
+}%
+%
+% define local command option icon for setting the icon of pdf annotations
+\define@key{pdfsquarecomment}{icon}[\pc@gopt@icon]%
+{%
+  \gdef\pc@lopt@icon{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local command option open for setting the open status (true,false) of pdf annotations
+\define@key{pdfsquarecomment}{open}[\pc@gopt@open]%
+{%
+  \gdef\pc@lopt@open{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local command option hspace for setting the space after the pdf annotations
+\define@key{pdfsquarecomment}{hspace}[\pc@gopt@hspace]%
+{%
+  \gdef\pc@lopt@hspace{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hspace in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfsquarecomment}{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{pdfsquarecomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdfsquarecomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdfsquarecomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdfsquarecomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfsquarecomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfsquarecomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfsquarecomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfsquarecomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfsquarecomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfsquarecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfsquarecomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfsquarecomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfsquarecomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfsquarecomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfsquarecomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option type in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfsquarecomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfsquarecomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfsquarecomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+}%
+%
+% define local style option markup for setting the markup type of the pdf markup annotations
+\define@key{pdfsquarecomment}{markup}[\pc@gopt@markup]%
+{%
+  \gdef\pc@lopt@markup{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfsquarecomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfsquarecomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfsquarecomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfsquarecomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfsquarecomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdfsquarecomment ignored!}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfcirclecomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcirclecomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdfcirclecomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcirclecomment}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
+% define local command option subject for setting the subject of pdf annotations
+\define@key{pdfcirclecomment}{subject}[\pc@gopt@subject]%
+{%
+  \gdef\pc@lopt@subject{#1}%
+}%
+%
+% define local command option color for setting the color of pdf annotations
+\define@key{pdfcirclecomment}{color}[\pc@gopt@color]%
+{%
+  \gdef\pc@lopt@color{#1}%
+}%
+%
+% define local command option author for setting the author of pdf annotations
+\define@key{pdfcirclecomment}{author}[\pc@gopt@author]%
+{%
+  \gdef\pc@lopt@author{#1}%
+}%
+%
+% define local command option icon for setting the icon of pdf annotations
+\define@key{pdfcirclecomment}{icon}[\pc@gopt@icon]%
+{%
+  \gdef\pc@lopt@icon{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local command option open for setting the open status (true,false) of pdf annotations
+\define@key{pdfcirclecomment}{open}[\pc@gopt@open]%
+{%
+  \gdef\pc@lopt@open{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local command option hspace for setting the space after the pdf annotations
+\define@key{pdfcirclecomment}{hspace}[\pc@gopt@hspace]%
+{%
+  \gdef\pc@lopt@hspace{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hspace in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfcirclecomment}{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{pdfcirclecomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdfcirclecomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdfcirclecomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdfcirclecomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfcirclecomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfcirclecomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfcirclecomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfcirclecomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfcirclecomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfcirclecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfcirclecomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfcirclecomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfcirclecomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfcirclecomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfcirclecomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option type in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfcirclecomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfcirclecomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfcirclecomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+}%
+%
+% define local style option markup for setting the markup type of the pdf markup annotations
+\define@key{pdfcirclecomment}{markup}[\pc@gopt@markup]%
+{%
+  \gdef\pc@lopt@markup{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfcirclecomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option caption in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfcirclecomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfcirclecomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfcirclecomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfcirclecomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdfcirclecomment ignored!}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdflinecomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdflinecomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdflinecomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdflinecomment}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
+% define local command option subject for setting the subject of pdf annotations
+\define@key{pdflinecomment}{subject}[\pc@gopt@subject]%
+{%
+  \gdef\pc@lopt@subject{#1}%
+}%
+%
+% define local command option color for setting the color of pdf annotations
+\define@key{pdflinecomment}{color}[\pc@gopt@color]%
+{%
+  \gdef\pc@lopt@color{#1}%
+}%
+%
+% define local command option author for setting the author of pdf annotations
+\define@key{pdflinecomment}{author}[\pc@gopt@author]%
+{%
+  \gdef\pc@lopt@author{#1}%
+}%
+%
+% define local command option icon for setting the icon of pdf annotations
+\define@key{pdflinecomment}{icon}[\pc@gopt@icon]%
+{%
+  \gdef\pc@lopt@icon{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdflinecomment ignored!}%
+}%
+%
+% define local command option open for setting the open status (true,false) of pdf annotations
+\define@key{pdflinecomment}{open}[\pc@gopt@open]%
+{%
+  \gdef\pc@lopt@open{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdflinecomment ignored!}%
+}%
+%
+% define local command option hspace for setting the space after the pdf annotations
+\define@key{pdflinecomment}{hspace}[\pc@gopt@hspace]%
+{%
+  \gdef\pc@lopt@hspace{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hspace in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdflinecomment}{voffset}[\pc@gopt@voffset]%
+{%
+  \gdef\pc@lopt@voffset{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option voffset in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdflinecomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hoffset in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdflinecomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdflinecomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdflinecomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdflinecomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdflinecomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdflinecomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdflinecomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdflinecomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdflinecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdflinecomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdflinecomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdflinecomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option bse in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdflinecomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdflinecomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdflinecomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdflinecomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdflinecomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+}%
+%
+% define local style option markup for setting the markup type of the pdf markup annotations
+\define@key{pdflinecomment}{markup}[\pc@gopt@markup]%
+{%
+  \gdef\pc@lopt@markup{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdflinecomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdflinecomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdflinecomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdflinecomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdflinecomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option linesep in command \pdflinecomment ignored!}%
+}%
+%
+% define local style option avatar for setting a predefined set of options (Avatar)
+\define@key{pdfsidelinecomment}{avatar}[]%
+{%
+  \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfsidelinecomment}{\csname pc@avatar@#1\endcsname}}%
+  \pc@lopt@loadavatar%
+}%
+%
+% define local style option style for setting a predefined set of options (Style)
+\define@key{pdfsidelinecomment}{style}[]%
+{%
+  \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfsidelinecomment}{\csname pc@style@#1\endcsname}}%
+  \pc@lopt@loadstyle%
+}%
+%
+% define local command option subject for setting the subject of pdf annotations
+\define@key{pdfsidelinecomment}{subject}[\pc@gopt@subject]%
+{%
+  \gdef\pc@lopt@subject{#1}%
+}%
+%
+% define local command option color for setting the color of pdf annotations
+\define@key{pdfsidelinecomment}{color}[\pc@gopt@color]%
+{%
+  \gdef\pc@lopt@color{#1}%
+}%
+%
+% define local command option author for setting the author of pdf annotations
+\define@key{pdfsidelinecomment}{author}[\pc@gopt@author]%
+{%
+  \gdef\pc@lopt@author{#1}%
+}%
+%
+% define local command option icon for setting the icon of pdf annotations
+\define@key{pdfsidelinecomment}{icon}[\pc@gopt@icon]%
+{%
+  \gdef\pc@lopt@icon{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local command option open for setting the open status (true,false) of pdf annotations
+\define@key{pdfsidelinecomment}{open}[\pc@gopt@open]%
+{%
+  \gdef\pc@lopt@open{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local command option hspace for setting the space after the pdf annotations
+\define@key{pdfsidelinecomment}{hspace}[\pc@gopt@hspace]%
+{%
+  \gdef\pc@lopt@hspace{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hspace in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option voffset for setting the vertical offset of the pdf annotations
+\define@key{pdfsidelinecomment}{voffset}[\pc@gopt@voffset]%
+{%
+  \gdef\pc@lopt@voffset{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option voffset in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option hoffset for setting the horizontal offset of the pdf annotations
+\define@key{pdfsidelinecomment}{hoffset}[\pc@gopt@hoffset]%
+{%
+  \gdef\pc@lopt@hoffset{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option hoffset in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option width for setting the width of the pdf annotations
+\define@key{pdfsidelinecomment}{width}[\pc@gopt@width]%
+{%
+  \gdef\pc@lopt@width{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option height for setting the height of the pdf annotations
+\define@key{pdfsidelinecomment}{height}[\pc@gopt@height]%
+{%
+  \gdef\pc@lopt@height{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option depth for setting the depth of the pdf annotations
+\define@key{pdfsidelinecomment}{depth}[\pc@gopt@depth]%
+{%
+  \gdef\pc@lopt@depth{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option opacity for setting the opacity of the pdf annotations
+\define@key{pdfsidelinecomment}{opacity}[\pc@gopt@opacity]%
+{%
+  \gdef\pc@lopt@opacity{#1}%
+}%
+%
+% define local style option font for setting the font of the pdf freetext annotations
+\define@key{pdfsidelinecomment}{font}[\pc@gopt@font]%
+{%
+  \gdef\pc@lopt@font{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option fontsize for setting the fontsize of the pdf freetext annotations
+\define@key{pdfsidelinecomment}{fontsize}[\pc@gopt@fontsize]%
+{%
+  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option fontcolor for setting the font color of the pdf freetext annotations
+\define@key{pdfsidelinecomment}{fontcolor}[\pc@gopt@fontcolor]%
+{%
+  \gdef\pc@lopt@fontcolor{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option fontcolor in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option justification for setting the justification of the pdf freetext annotations
+\define@choicekey*{pdfsidelinecomment}{justification}[\pc@lopt@justification\nr]{left,center,right}[left]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@justification{0}%
+  \or%
+    \gdef\pc@lopt@justification{1}%
+  \or%
+    \gdef\pc@lopt@justification{2}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option justification in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option borderstyle for setting the borderstyle of the pdf annotations
+\define@choicekey*{pdfsidelinecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@borderstyle{S}%
+  \or%
+    \gdef\pc@lopt@borderstyle{D}%
+  \fi%
+}%
+%
+% define local style option dashstyle for setting the dashstyle of the pdf annotations
+\define@key{pdfsidelinecomment}{dashstyle}[\pc@gopt@dashstyle]%
+{%
+  \gdef\pc@lopt@dashstyle{#1}%
+}%
+%
+% define local style option linewidth for setting the linewidth of the pdf annotations
+\define@key{pdfsidelinecomment}{linewidth}[\pc@gopt@linewidth]%
+{%
+  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+}%
+%
+% define local style option bse for setting the border style effect of the pdf annotations
+\define@choicekey*{pdfsidelinecomment}{bse}[\pc@lopt@bse\nr]{none,cloudy}[none]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@bse{S}%
+  \or%
+    \gdef\pc@lopt@bse{C}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option bse in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option bsei for setting the border style effect intensity of the pdf annotations
+\define@key{pdfsidelinecomment}{bsei}[\pc@gopt@bsei]%
+{%
+  \gdef\pc@lopt@bsei{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option type for setting the type of the pdf freetext annotations
+\define@choicekey*{pdfsidelinecomment}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@type{}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+  \or%
+    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+  \or%
+    \gdef\pc@lopt@type{Line}%
+  \or%
+    \gdef\pc@lopt@type{PolyLine}%
+  \or%
+    \gdef\pc@lopt@type{Polygon}%
+  \fi%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option lineend for setting the line end of the callout line of the pdf freetext annotations
+\define@key{pdfsidelinecomment}{lineend}[\pc@gopt@lineend]%
+{%
+  \gdef\pc@lopt@lineend{#1}%
+}%
+%
+% define local style option linebegin for setting the line ends of the pdf line annotations
+\define@key{pdfsidelinecomment}{linebegin}[\pc@gopt@linebegin]%
+{%
+  \gdef\pc@lopt@linebegin{#1}%
+}%
+%
+% define local style option icolor for setting the "inner" color of the pdf annotations
+\define@key{pdfsidelinecomment}{icolor}[\pc@gopt@icolor]%
+{%
+  \gdef\pc@lopt@icolor{#1}%
+}%
+%
+% define local style option markup for setting the markup type of the pdf markup annotations
+\define@key{pdfsidelinecomment}{markup}[\pc@gopt@markup]%
+{%
+  \gdef\pc@lopt@markup{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option caption for setting the caption type of the pdf line annotations
+\define@choicekey*{pdfsidelinecomment}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@lopt@caption{none}%
+  \or%
+    \gdef\pc@lopt@caption{Inline}%
+  \or%
+    \gdef\pc@lopt@caption{Top}%
+  \fi%
+}%
+%
+% define local style option line for setting the line coordinates of the pdf line annotations
+\define@key{pdfsidelinecomment}{line}[\pc@gopt@line]%
+{%
+  \gdef\pc@lopt@line{#1}%
+  \PackageInfo{pdfcomment.sty}{Setting of option line in command \pdfsidelinecomment ignored!}%
+}%
+%
+% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
+\define@key{pdfsidelinecomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+{%
+  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+}%
+%
+% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
+\define@key{pdfsidelinecomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+{%
+  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+}%
+%
+% define local style option linesep for setting the linesep of the pdf sideline annotations
+\define@key{pdfsidelinecomment}{linesep}[\pc@gopt@linesep]%
+{%
+  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+}%
+%
+\ExecuteOptionsX{subject,color,author,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup,font,fontsize,fontcolor,justification,borderstyle,linewidth,dashstyle,bse,bsei,type,lineend,linebegin,icolor,line,caption,captionhoffset,captionvoffset,linesep}%
 %
 \ProcessOptionsX\relax%
 %
@@ -666,8 +2483,9 @@
   \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},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]%
+\newcommand{\pdfcomment}[2][]%
 {%
+  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -675,6 +2493,13 @@
   % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
   % and transform color input to pdf color
   \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
   \ifpc@gopt@final\else%
     % typeset text annotation (see: PDF Reference)
     \ifpdf%
@@ -744,8 +2569,9 @@
   \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},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]%
+\newcommand{\pdfmargincomment}[2][]%
 {%
+  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -753,6 +2579,13 @@
   % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
   % and transform color input to pdf color
   \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
   \ifpc@gopt@final\else%
     \begingroup%
     % center marginnotes!
@@ -830,8 +2663,9 @@
   \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},markup={\pc@gopt@markup}]%
+\newcommand{\pdffreetextcomment}[2][]%
 {%
+  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -839,6 +2673,19 @@
   % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
   % and transform color input to pdf color
   \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@type}{/IT /FreeTextTypewriter}}%
+  {%
+    \gdef\pc@lopt@c{}%
+    \gdef\pc@lopt@linewidth{0}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {}%
   %create options for \pdfannot
   \pc@create@pdfannotopt%
   \ifpc@gopt@final\else%
@@ -911,7 +2758,309 @@
   \fi%
 }%
 %
-\newcommand{\pdfmarkupcomment}[3][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},markup={\pc@gopt@markup}]%
+\newcommand{\pdfsquarecomment}[2][]%
+{%
+  \hspace*{0pt}%
+  % Copy all global options to local options
+  \pc@copy@gopt@lopt%
+  % Change local options if specified
+  \setkeys{pdfsquarecomment}{#1}%
+  % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
+  % and transform color input to pdf color
+  \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
+  \ifthenelse{\equal{\pc@lopt@icolor}{}}%
+  {%
+    \gdef\pc@lopt@ic{}%
+  }%
+  {%
+    \gdef\pc@lopt@ic{/IC [\pc@hyenc@icolor]}%
+  }%
+  %create options for \pdfannot
+  \pc@create@pdfannotopt%
+  \ifpc@gopt@final\else%
+    % typeset square 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 /Square\space%
+            \pc@annot@square%
+          }%
+        \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 /Square\space%
+                \pc@annot@square%
+              >>%
+            }%
+            \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 annotation
+            \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/Square,%
+              Raw={\pc@annot@square}%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \fi%
+    \fi%
+  \fi%
+}%
+%
+\newcommand{\pdfcirclecomment}[2][]%
+{%
+  \hspace*{0pt}%
+  % Copy all global options to local options
+  \pc@copy@gopt@lopt%
+  % Change local options if specified
+  \setkeys{pdfcirclecomment}{#1}%
+  % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
+  % and transform color input to pdf color
+  \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
+  \ifthenelse{\equal{\pc@lopt@icolor}{}}%
+  {%
+    \gdef\pc@lopt@ic{}%
+  }%
+  {%
+    \gdef\pc@lopt@ic{/IC [\pc@hyenc@icolor]}%
+  }%
+  %create options for \pdfannot
+  \pc@create@pdfannotopt%
+  \ifpc@gopt@final\else%
+    % typeset circle 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 /Circle\space%
+            % circle and square annatations differ only in /Subtype, so ...
+            \pc@annot@square%
+          }%
+        \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 /Circle\space%
+                \pc@annot@square%
+              >>%
+            }%
+            \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 annotation
+            \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/Circle,%
+              Raw={\pc@annot@square}%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \fi%
+    \fi%
+  \fi%
+}%
+%
+\newcommand{\pdflinecomment}[2][]%
+{%
+  \hspace*{0pt}%
+  % Copy all global options to local options
+  \pc@copy@gopt@lopt%
+  % Change local options if specified
+  \setkeys{pdflinecomment}{#1}%
+  % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
+  % and transform color input to pdf color
+  \pc@encode@PDF{#2}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
+  \ifthenelse{\equal{\pc@lopt@icolor}{}}%
+  {%
+    \gdef\pc@lopt@ic{}%
+  }%
+  {%
+    \gdef\pc@lopt@ic{/IC [\pc@hyenc@icolor]}%
+  }%
+  \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
+  \ifthenelse{\equal{\pc@lopt@type}{Line}}%
+  {%
+    \ifthenelse{\equal{\pc@lopt@caption}{none}}%
+    {%
+      \gdef\pc@lopt@cap{/Cap false}%
+      \gdef\pc@lopt@cp{}%
+    }%
+    {%
+      \gdef\pc@lopt@cap{/Cap true}%
+      \gdef\pc@lopt@cp{/CP /\pc@lopt@caption}%
+    }%
+    \gdef\pc@lopt@l{/L [\pc@lopt@line]}%
+    \gdef\pc@lopt@co{/CO [\pc@lopt@captionhoffset\space \pc@lopt@captionvoffset]}%
+  }%
+  {%
+    \gdef\pc@lopt@l{/Vertices [\pc@lopt@line]}%
+    \gdef\pc@lopt@cap{}%
+    \gdef\pc@lopt@cp{}%
+    \gdef\pc@lopt@co{}%
+  }%
+  %create options for \pdfannot
+  \pc@create@pdfannotopt%
+  \ifpc@gopt@final\else%
+    % typeset line annotation (see: PDF Reference)
+    \ifpdf%
+      \vbox to 0pt%
+      {%
+        \hsize=0pt%
+        \noindent%
+        \hbox to 0pt%
+        {%
+          \vsize=0pt%
+          \expandafter\pdfannot \pc@pdfannotopt%
+          {%
+            /Subtype /\pc@lopt@type\space%
+            \pc@annot@line%
+          }%
+        \hss%
+        }%
+      \vss%
+      }%
+    \else%
+      \ifpc@gopt@dvipdfmx%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \special{pdf: ann \pc@pdfannotopt%
+              <<%
+                /Subtype /\pc@lopt@type\space%
+                \pc@annot@line%
+              >>%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \else%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            %create dimensions of annotation
+            \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/\pc@lopt@type,%
+              Raw={\pc@annot@line}%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \fi%
+    \fi%
+  \fi%
+}%
+%
+\newcommand{\pdfmarkupcomment}[3][]%
 {%
   \hspace*{0pt}%
   % Copy all global options to local options
@@ -996,6 +3145,104 @@
   \fi%
 }%
 %
+\newenvironment{pdfsidelinecomment}[2][]%
+{%
+  \hspace*{0pt}%
+  % Copy all global options to local options
+  \pc@copy@gopt@lopt%
+  % Change local options if specified
+  \setkeys{pdfsidelinecomment}{#1}%
+  % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
+  % and transform color input to pdf color
+  \pc@encode@PDF{#2}%
+  \gdef\pc@lopt@type{Line}%
+  \ifthenelse{\equal{\pc@lopt@color}{}}%
+  {%
+    \gdef\pc@lopt@c{}%
+  }%
+  {%
+    \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
+  }%
+  \ifthenelse{\equal{\pc@lopt@icolor}{}}%
+  {%
+    \gdef\pc@lopt@ic{}%
+  }%
+  {%
+    \gdef\pc@lopt@ic{/IC [\pc@hyenc@icolor]}%
+  }%
+  \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
+  \ifthenelse{\equal{\pc@lopt@type}{Line}}%
+  {%
+    \ifthenelse{\equal{\pc@lopt@caption}{none}}%
+    {%
+      \gdef\pc@lopt@cap{/Cap false}%
+      \gdef\pc@lopt@cp{}%
+    }%
+    {%
+      \gdef\pc@lopt@cap{/Cap true}%
+      \gdef\pc@lopt@cp{/CP /\pc@lopt@caption}%
+    }%
+    \gdef\pc@lopt@l{/L [\pc@lopt@line]}%
+    \gdef\pc@lopt@co{/CO [\pc@lopt@captionhoffset\space \pc@lopt@captionvoffset]}%
+  }%
+  {%
+    \gdef\pc@lopt@l{/Vertices [\pc@lopt@line]}%
+    \gdef\pc@lopt@cap{}%
+    \gdef\pc@lopt@cp{}%
+    \gdef\pc@lopt@co{}%
+  }%
+  \zsavepos{pdfcomment:\thezref@unique}%
+  \zref@refused{pdfcomment:\thezref@unique}%
+  \setlength{\pc@Sposy}{\zposy{pdfcomment:\thezref@unique}sp}%
+  \refstepcounter{zref@unique}%
+  \setlength{\pc@Eposy}{\zposy{pdfcomment:\thezref@unique}sp}%
+  \settoheight{\pc@box@height}{Tq}%
+  \settoheight{\pc@box@depth}{Tq}%
+  \ifdim\pc@Sposy<\pc@Eposy\relax%
+    \pc@annot@samepagefalse%
+  \else%
+    \pc@annot@samepagetrue%
+  \fi%
+  \ifpc@annot@samepage\else%
+    \ifpc@gopt@final\else%
+      \pc@calc@sidelinepos%
+      \renewcommand{\pc@y@two}{\pc@y@bottom@text}
+      \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+      \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space/None]}%
+      \marginnote{\pc@create@annot@sideline}%
+      \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+      \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}%  
+      \marginnote{\pc@create@annot@sideline}%
+    \fi%
+  \fi%
+}%
+{%
+  \zsavepos{pdfcomment:\thezref@unique}%
+  \zref@refused{pdfcomment:\thezref@unique}%
+  \refstepcounter{zref@unique}%
+  \ifpc@gopt@final\else%
+    \ifpc@annot@samepage%
+      % annot complete on one page
+      \pc@calc@sidelinepos%
+      \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+      \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
+      \marginnote{\pc@create@annot@sideline}%
+      \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+      \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}%  
+      \marginnote{\pc@create@annot@sideline}%
+    \else%
+      \pc@calc@sidelinepos%
+      \renewcommand{\pc@y@one}{\pc@y@top@text}
+      \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+      \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@lineend]}%
+      \marginnote{\pc@create@annot@sideline}%
+      \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+      \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}%  
+      \marginnote{\pc@create@annot@sideline}%
+    \fi%
+  \fi%
+}%
+%
 % reset global options
 \newcommand{\pdfcommentsetup}[1]%
 {%
@@ -1031,6 +3278,24 @@
   \gdef\pc@lopt@depth{\pc@gopt@depth}%
   \gdef\pc@lopt@opacity{\pc@gopt@opacity}%
   \gdef\pc@lopt@markup{\pc@gopt@markup}%
+  \gdef\pc@lopt@font{\pc@gopt@font}%
+  \gdef\pc@lopt@fontsize{\pc@gopt@fontsize}%
+  \gdef\pc@lopt@fontcolor{\pc@gopt@fontcolor}%
+  \gdef\pc@lopt@justification{\pc@gopt@justification}%
+  \gdef\pc@lopt@borderstyle{\pc@gopt@borderstyle}%
+  \gdef\pc@lopt@linewidth{\pc@gopt@linewidth}%
+  \gdef\pc@lopt@dashstyle{\pc@gopt@dashstyle}%
+  \gdef\pc@lopt@bse{\pc@gopt@bse}%
+  \gdef\pc@lopt@bsei{\pc@gopt@bsei}%
+  \gdef\pc@lopt@type{\pc@gopt@type}%
+  \gdef\pc@lopt@lineend{\pc@gopt@lineend}%
+  \gdef\pc@lopt@linebegin{\pc@gopt@linebegin}%
+  \gdef\pc@lopt@icolor{\pc@gopt@icolor}%
+  \gdef\pc@lopt@line{\pc@gopt@line}%
+  \gdef\pc@lopt@caption{\pc@gopt@caption}%
+  \gdef\pc@lopt@captionhoffset{\pc@gopt@captionhoffset}%
+  \gdef\pc@lopt@captionvoffset{\pc@gopt@captionvoffset}%
+  \gdef\pc@lopt@linesep{\pc@gopt@linesep}%
 }%
 %
 \newcommand{\pc@encode@PDF}[1]%
@@ -1039,60 +3304,127 @@
   \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}%
   \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}%
   \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
+  \HyColor@XZeroOneThreeFour{\pc@lopt@fontcolor}{\pc@hyenc@fontcolor}{pdfcomment}{color}%
+  \HyColor@XZeroOneThreeFour{\pc@lopt@icolor}{\pc@hyenc@icolor}{pdfcomment}{color}%
 }%
 %
 \newcommand{\pc@annot@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%
+  \pc@lopt@c\space%
+  /CA \pc@lopt@opacity\space%
+  /T (\pc@pdfenc@author)\space%
+  /Subj (\pc@pdfenc@subject)\space%
+  /Name /\pc@lopt@icon\space%
+  /Contents (\pc@pdfenc@contents)\space%
+  /Open \pc@lopt@open\space%
+  /F 4\space%
 }%
 %
 \newcommand{\pc@annot@freetext}%
 {% 
-  /C [\pc@hyenc@color]%
-  /CA \pc@lopt@opacity%
-  /T (\pc@pdfenc@author)%
-  /Subj (\pc@pdfenc@subject)%
-  /Contents (\pc@pdfenc@contents)%
-  /F 4%
+  \pc@lopt@c\space%
+  /DA (/\pc@lopt@font\space \pc@lopt@fontsize\space Tf \pc@hyenc@fontcolor\space rg)\space%
+  /CA \pc@lopt@opacity\space%
+  /T (\pc@pdfenc@author)\space%
+  /Subj (\pc@pdfenc@subject)\space%
+  /Contents (\pc@pdfenc@contents)\space%
+  /F 4\space%
+  /Q \pc@lopt@justification\space%
+  /BS\space%
+  <<\space%
+    /W \pc@lopt@linewidth\space%
+    /S /\pc@lopt@borderstyle\space%
+    /D [\pc@lopt@dashstyle]\space%
+  >>\space%
+  /BE\space%
+  <<\space%
+    /S /\pc@lopt@bse\space%
+    /I \pc@lopt@bsei\space%
+  >>\space%
+  \pc@lopt@type\space%
+  /CL [\pc@lopt@line]\space%
+  /LE \pc@lopt@lineend\space%
+}%
+%
+\newcommand{\pc@annot@square}%
+{% 
+  \pc@lopt@c\space%
+  \pc@lopt@ic\space%
+  /CA \pc@lopt@opacity\space%
+  /T (\pc@pdfenc@author)\space%
+  /Subj (\pc@pdfenc@subject)\space%
+  /Contents (\pc@pdfenc@contents)\space%
+  /F 4\space%
+  /BS\space%
+  <<\space%
+    /W \pc@lopt@linewidth\space%
+    /S /\pc@lopt@borderstyle\space%
+    /D [\pc@lopt@dashstyle]\space%
+  >>\space%
+  /BE\space%
+  <<\space%
+    /S /\pc@lopt@bse\space%
+    /I \pc@lopt@bsei\space%
+  >>\space%
+}%
+%
+\newcommand{\pc@annot@line}%
+{% 
+  \pc@lopt@c\space%
+  \pc@lopt@ic\space%
+  /CA \pc@lopt@opacity\space%
+  /T (\pc@pdfenc@author)\space%
+  /Subj (\pc@pdfenc@subject)\space%
+  /Contents (\pc@pdfenc@contents)\space%
+  \pc@lopt@l\space%
+  \pc@lopt@le\space%
+  \pc@lopt@cap\space%
+  \pc@lopt@cp\space%
+  \pc@lopt@co\space%
+  /F 4\space%
+  /BS\space%
+  <<\space%
+    /W \pc@lopt@linewidth\space%
+    /S /\pc@lopt@borderstyle\space%
+    /D [\pc@lopt@dashstyle]\space%
+  >>\space%
+  /BE\space%
+  <<\space%
+    /S /\pc@lopt@bse\space%
+    /I \pc@lopt@bsei\space%
+  >>\space%
 }%
 %
 \newcommand{\pc@annot@markup@pdf}%
 {%
   \pdfannot width 0pt height 0pt depth 0pt%
   {%
-    /Subtype /\pc@lopt@markup%
-    /C [\pc@hyenc@color]%
-    /CA \pc@lopt@opacity%
-    /T (\pc@pdfenc@author)%
-    /Subj (\pc@pdfenc@subject)%
-    /Contents (\pc@pdfenc@contents)%
-    /Open \pc@lopt@open%
-    /QuadPoints [\pc@annot@quadpoints]%
-    /F 4%
+    /Subtype /\pc@lopt@markup\space%
+    /C [\pc@hyenc@color]\space%
+    /CA \pc@lopt@opacity\space%
+    /T (\pc@pdfenc@author)\space%
+    /Subj (\pc@pdfenc@subject)\space%
+    /Contents (\pc@pdfenc@contents)\space%
+    /Open \pc@lopt@open\space%
+    /QuadPoints [\pc@annot@quadpoints]\space%
+    /F 4\space%
   }%
 }%
 %
 \newcommand{\pc@annot@markup@dvipdfmx}%
 {%
   \special{pdf: ann width 0pt height 0pt depth 0pt%
-    <<%
-      /Subtype /\pc@lopt@markup%
-      /C [\pc@hyenc@color]%
-      /CA \pc@lopt@opacity%
-      /T (\pc@pdfenc@author)%
-      /Subj (\pc@pdfenc@subject)%
-      /Contents (\pc@pdfenc@contents)%
-      /Open \pc@lopt@open%
-      /QuadPoints [\pc@annot@quadpoints]%
-      /F 4%
-    >>%
+    <<\space%
+      /Subtype /\pc@lopt@markup\space%
+      /C [\pc@hyenc@color]\space%
+      /CA \pc@lopt@opacity\space%
+      /T (\pc@pdfenc@author)\space%
+      /Subj (\pc@pdfenc@subject)\space%
+      /Contents (\pc@pdfenc@contents)\space%
+      /Open \pc@lopt@open\space%
+      /QuadPoints [\pc@annot@quadpoints]\space%
+      /F 4\space%
+    >>\space%
   }%
 }%
 %
@@ -1103,15 +3435,14 @@
     pdfmark=/ANN,%
     Subtype=/\pc@lopt@markup,%
     Raw={
-      /Subtype /\pc@lopt@markup%
-      /C [\pc@hyenc@color]%
-      /CA \pc@lopt@opacity%
-      /T (\pc@pdfenc@author)%
-      /Subj (\pc@pdfenc@subject)%
-      /Contents (\pc@pdfenc@contents)%
-      /Open \pc@lopt@open%
-      /QuadPoints [\pc@annot@quadpoints]%
-      /F 4%
+      /C [\pc@hyenc@color]\space%
+      /CA \pc@lopt@opacity\space%
+      /T (\pc@pdfenc@author)\space%
+      /Subj (\pc@pdfenc@subject)\space%
+      /Contents (\pc@pdfenc@contents)\space%
+      /Open \pc@lopt@open\space%
+      /QuadPoints [\pc@annot@quadpoints]\space%
+      /F 4\space%
     }%
   }%
 }%
@@ -1177,6 +3508,72 @@
     \setlength{\pc@dimb}{\dimexpr \pc@Eposy - \pc@box@depth - 1pt\relax}%
 }%
 %
+\newcommand{\pc@create@annot@sideline}%
+{%
+%create options for \pdfannot
+  \pc@create@pdfannotopt%
+  \ifpc@gopt@final\else%
+    % typeset line annotation (see: PDF Reference)
+    \ifpdf%
+      \vbox to 0pt%
+      {%
+        \hsize=0pt%
+        \noindent%
+        \hbox to 0pt%
+        {%
+          \vsize=0pt%
+          \expandafter\pdfannot \pc@pdfannotopt%
+          {%
+          /Subtype /Line\space%
+          \pc@annot@line%
+          }%
+        \hss%
+        }%
+      \vss%
+      }%
+    \else%
+      \ifpc@gopt@dvipdfmx%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            \special{pdf: ann \pc@pdfannotopt%
+              <<%
+                /Subtype /Line\space%
+                \pc@annot@line%
+              >>%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \else%
+        \vbox to 0pt%
+        {%
+          \hsize=0pt%
+          \noindent%
+          \hbox to 0pt%
+          {%
+            \vsize=0pt%
+            %create dimensions of annotation
+            \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+            {%
+              pdfmark=/ANN,%
+              Subtype=/Line,%
+              Raw={\pc@annot@line}%
+            }%
+            \hss%
+          }%
+          \vss%
+        }%
+      \fi%
+    \fi%
+  \fi%
+}%
+%
 \newcommand{\pc@create@annot}%
 {%
   \ifdim\pc@dima=\pc@dimb%
@@ -1202,6 +3599,12 @@
     \renewcommand{\pc@annb@x@four}{\pc@x@right@text}%
     \renewcommand{\pc@annb@y@two}{\pc@anna@y@one}%
     \renewcommand{\pc@annb@y@four}{\pc@anna@y@three}%
+    \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+    {%
+      \edef\pc@annb@y@four{\pc@pttobp{\dimexpr \pc@annb@y@four bp + 1.5pt\relax}}%
+      \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@three bp + 1.5pt \relax}}%
+    }%
+    {}%
     \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}%
     \ifpdf%
       \pc@annot@markup@pdf%
@@ -1218,6 +3621,12 @@
     \renewcommand{\pc@annb@x@three}{\pc@x@left@text}%
     \renewcommand{\pc@annb@y@one}{\pc@anna@y@two}%
     \renewcommand{\pc@annb@y@three}{\pc@anna@y@four}%
+    \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+    {%
+      \edef\pc@annb@y@four{\pc@pttobp{\dimexpr \pc@annb@y@four bp + 1.5pt\relax}}%
+      \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@three bp + 1.5pt \relax}}%
+    }%
+    {}%
     \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}%
     \ifpdf%
       \pc@annot@markup@pdf%
@@ -1254,8 +3663,8 @@
         \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -0.5pt \relax}}%
       }%
       {%
-      \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 1pt\relax}}%
-      \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -1pt \relax}}%
+      \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 2pt\relax}}%
+      \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -2pt \relax}}%
       }% 
     \fi%
     \whiledo{\value{pc@annot@lines}>0}%
@@ -1296,5 +3705,25 @@
   \renewcommand{\pc@y@bottom@text}{\pc@pttobp{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep - \textheight\relax}}%
 }%
 %
+\newcommand{\pc@calc@sidelinepos}%
+{%
+  \if@twoside%
+    \ifodd\thepage%
+      \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}%
+      \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%
+    \else%
+      \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}%
+      \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%  
+    \fi%
+  \else%
+    \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}%
+    \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%
+  \fi%
+  \renewcommand{\pc@y@one}{\pc@pttobp{\dimexpr \pc@Sposy + \pc@box@height + 1pt\relax}}%
+  \renewcommand{\pc@y@two}{\pc@pttobp{\dimexpr \pc@Eposy - \pc@box@depth - 1pt\relax}}%
+  \renewcommand{\pc@y@top@text}{\pc@pttobp{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep\relax}}%
+  \renewcommand{\pc@y@bottom@text}{\pc@pttobp{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep - \textheight\relax}}%
+}%
+%
 %
 \endinput%
\ No newline at end of file