pdfcomment 1.5e (1jun10)

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

1 files changed, 564 insertions, 2155 deletions

diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 00ac643a548..3bc46e1d87b 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}[2010/03/16 pdfcomment.sty v1.5d - Josef Kleber (C) 2008-2010]%
+\ProvidesPackage{pdfcomment}[2010/06/01 pdfcomment.sty v1.5e - Josef Kleber (C) 2008-2010]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -192,7 +192,6 @@
 \gdef\pc@lpc@format{\pc@lopt@author\ - \pc@lopt@subject}%
 \gdef\pc@lopt@liststyle{AuthorSubject}%
 %
-% define global style option avatar for setting a predefined set of options (Avatar)
 \define@key{pdfcomment.sty}{avatar}[]%
 {% thanks to Ulrike Fischer Msg-Id: <rba0oaiflbjf.dlg@nililand.de>
   \edef\pc@edef@avatar{pc@avatar@#1}%
@@ -207,280 +206,33 @@
   }%
 }%
 %
-% define global style option style for setting a predefined set of options (Style)
-\define@key{pdfcomment.sty}{style}[]%
+\newcommand\pc@define@key@avatar[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@key{#1}{avatar}[]%
   {%
-    \edef\pc@gopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
-    \pc@gopt@loadstyle%
+    \edef\pc@edef@avatar{pc@avatar@##1}%
+    \@ifundefined{\pc@edef@avatar}%
+    {%
+      \PackageWarning{#1}{Unknown avatar ##1\MessageBreak%
+                          skip assignment}%
+    }%
+    {%
+      \edef\pc@lopt@loadavatar{\noexpand\setkeys{#1}{\csname pc@avatar@##1\endcsname}}%
+      \pc@lopt@loadavatar%
+    }%
   }%
 }%
 %
-% define global style option subject for setting the subject of pdf annotations
-\define@key{pdfcomment.sty}{subject}[\pc@goptd@subject]%
-{%
-  \gdef\pc@gopt@subject{#1}%
-}%
-%
-% define global style option color for setting the color of pdf annotations
-\define@key{pdfcomment.sty}{color}[\pc@goptd@color]%
-{%
-  \gdef\pc@gopt@color{#1}%
-}%
-%
-% define global style option author for setting the author of pdf annotations
-\define@key{pdfcomment.sty}{author}[\pc@goptd@author]%
-{%
-  \gdef\pc@gopt@author{#1}%
-}%
-%
-% define global command option deadline for setting a deadline in the pdf annotations
-\define@key{pdfcomment.sty}{deadline}[\pc@goptd@deadline]%
-{%
-  \gdef\pc@gopt@deadline{#1}%
-}%
-%
-% define global style option icon for setting the icon of pdf annotations
-\define@key{pdfcomment.sty}{icon}[\pc@goptd@icon]%
-{%
-  \gdef\pc@gopt@icon{#1}%
-}%
-%
-% define global style option open for setting the open status (true,false) of pdf annotations
-\define@key{pdfcomment.sty}{open}[\pc@goptd@open]%
-{%
-  \gdef\pc@gopt@open{#1}%
-}%
-%
-% define global style option hspace for setting the space after the pdf annotations
-\define@key{pdfcomment.sty}{hspace}[\pc@goptd@hspace]%
-{%
-  \gdef\pc@gopt@hspace{#1}%
-}%
-%
-% define global style option voffset for setting the vertical offset of the pdf annotations
-\define@key{pdfcomment.sty}{voffset}[\pc@goptd@voffset]%
-{%
-  \gdef\pc@gopt@voffset{#1}%
-}%
-%
-% define global style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdfcomment.sty}{hoffset}[\pc@goptd@hoffset]%
-{%
-  \gdef\pc@gopt@hoffset{#1}%
-}%
-%
-% define global style option width for setting the width of the pdf annotations
-\define@key{pdfcomment.sty}{width}[\pc@goptd@width]%
-{%
-  \gdef\pc@gopt@width{#1}%
-}%
-%
-% define global style option height for setting the height of the pdf annotations
-\define@key{pdfcomment.sty}{height}[\pc@goptd@height]%
-{%
-  \gdef\pc@gopt@height{#1}%
-}%
-%
-% define global style option depth for setting the depth of the pdf annotations
-\define@key{pdfcomment.sty}{depth}[\pc@goptd@depth]%
-{%
-  \gdef\pc@gopt@depth{#1}%
-}%
-%
-% define global style option opacity for setting the opacity of the pdf annotations
-\define@key{pdfcomment.sty}{opacity}[\pc@goptd@opacity]%
-{%
-  \gdef\pc@gopt@opacity{#1}%
-}%
+\pc@define@key@avatar{pdfcomment}%
+\pc@define@key@avatar{pdfmargincomment}%
+\pc@define@key@avatar{pdffreetextcomment}%
+\pc@define@key@avatar{pdfmarkupcomment}%
+\pc@define@key@avatar{pdfsquarecomment}%
+\pc@define@key@avatar{pdfcirclecomment}%
+\pc@define@key@avatar{pdflinecomment}%
+\pc@define@key@avatar{pdfsidelinecomment}%
 %
-% define global style option markup for setting the markup type of the pdf markup annotations
-\define@key{pdfcomment.sty}{markup}[\pc@goptd@markup]%
-{%
-  \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]%
-{%
-  \expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
-}%
-%
-% define global style option final for setting the output mode to final
-\define@key{pdfcomment.sty}{final}[]%
-{%
-  \pc@gopt@finaltrue%
-}%
-%
-% define global style option draft for setting the output mode to final
-\define@key{pdfcomment.sty}{draft}[]%
-{%
-  \pc@gopt@finalfalse%
-}%
-%
-% define local style option avatar for setting a predefined set of options (Avatar)
-\define@key{pdfcomment}{avatar}[]%
-{%
-  \edef\pc@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}%
-    \pc@lopt@loadavatar%
-  }%
-}%
-%
-% define local style option style for setting a predefined set of options (Style)
-\define@key{pdfcomment}{style}[]%
+\define@key{pdfcomment.sty}{style}[]%
 {%
   \edef\pc@edef@style{pc@style@#1}%
   \@ifundefined{\pc@edef@style}%
@@ -489,1541 +241,579 @@
                                 skip assignment}%
   }%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
-  }%
-}%
-%
-% define local command option subject for setting the subject of pdf annotations
-\define@key{pdfcomment}{subject}[\pc@gopt@subject]%
-{%
-  \gdef\pc@lopt@subject{#1}%
-}%
-%
-% define local command option color for setting the color of pdf annotations
-\define@key{pdfcomment}{color}[\pc@gopt@color]%
-{%
-  \gdef\pc@lopt@color{#1}%
-}%
-%
-% define local command option author for setting the author of pdf annotations
-\define@key{pdfcomment}{author}[\pc@gopt@author]%
-{%
-  \gdef\pc@lopt@author{#1}%
-}%
-%
-% define local command option deadline for setting a deadline in the pdf annotations
-\define@key{pdfcomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#1}%
-}%
-%
-% define local command option icon for setting the icon of pdf annotations
-\define@key{pdfcomment}{icon}[\pc@gopt@icon]%
-{%
-  \gdef\pc@lopt@icon{#1}%
-}%
-%
-% define local command option open for setting the open status (true,false) of pdf annotations
-\define@key{pdfcomment}{open}[\pc@gopt@open]%
-{%
-  \gdef\pc@lopt@open{#1}%
-}%
-%
-% define local command option hspace for setting the space after the pdf annotations
-\define@key{pdfcomment}{hspace}[\pc@gopt@hspace]%
-{%
-  \gdef\pc@lopt@hspace{#1}%
-}%
-%
-% define local style option voffset for setting the vertical offset of the pdf annotations
-\define@key{pdfcomment}{voffset}[\pc@gopt@voffset]%
-{%
-  \gdef\pc@lopt@voffset{#1}%
-}%
-%
-% define local style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdfcomment}{hoffset}[\pc@gopt@hoffset]%
-{%
-  \gdef\pc@lopt@hoffset{#1}%
-}%
-%
-% define local style option width for setting the width of the pdf annotations
-\define@key{pdfcomment}{width}[\pc@gopt@width]%
-{%
-  \gdef\pc@lopt@width{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfcomment ignored!}%
-}%
-%
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdfcomment}{height}[\pc@gopt@height]%
-{%
-  \gdef\pc@lopt@height{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfcomment ignored!}%
-}%
-%
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdfcomment}{depth}[\pc@gopt@depth]%
-{%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfcomment ignored!}%
-}%
-%
-% define local style option opacity for setting the opacity of the pdf annotations
-\define@key{pdfcomment}{opacity}[\pc@gopt@opacity]%
-{%
-  \gdef\pc@lopt@opacity{#1}%
-}%
-%
-% define local style option 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]%
-{%
-  \gdef\pc@lopt@markup{#1}%
-  \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}[]%
-{%
-  \edef\pc@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfmargincomment}{\csname pc@avatar@#1\endcsname}}%
-    \pc@lopt@loadavatar%
+    \edef\pc@gopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}%
+    \pc@gopt@loadstyle%
   }%
 }%
 %
-% define local style option style for setting a predefined set of options (Style)
-\define@key{pdfmargincomment}{style}[]%
+\newcommand\pc@define@key@style[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@key{#1}{style}[]%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfmargincomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \edef\pc@edef@style{pc@style@##1}%
+    \@ifundefined{\pc@edef@style}%
+    {%
+      \PackageWarning{#1}{Unknown style ##1\MessageBreak%
+                          skip assignment}%
+    }%
+    {%
+      \edef\pc@lopt@loadstyle{\noexpand\setkeys{#1}{\csname pc@style@##1\endcsname}}%
+      \pc@lopt@loadstyle%
+    }%
   }%
 }%
 %
-% define local command option subject for setting the subject of pdf annotations
-\define@key{pdfmargincomment}{subject}[\pc@gopt@subject]%
-{%
-  \gdef\pc@lopt@subject{#1}%
-}%
-%
-% define local command option color for setting the color of pdf annotations
-\define@key{pdfmargincomment}{color}[\pc@gopt@color]%
-{%
-  \gdef\pc@lopt@color{#1}%
-}%
-%
-% define local command option author for setting the author of pdf annotations
-\define@key{pdfmargincomment}{author}[\pc@gopt@author]%
-{%
-  \gdef\pc@lopt@author{#1}%
-}%
-%
-% define local command option deadline for setting a deadline in the pdf annotations
-\define@key{pdfmargincomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#1}%
-}%
-%
-% define local command option icon for setting the icon of pdf annotations
-\define@key{pdfmargincomment}{icon}[\pc@gopt@icon]%
-{%
-  \gdef\pc@lopt@icon{#1}%
-}%
-%
-% define local command option open for setting the open status (true,false) of pdf annotations
-\define@key{pdfmargincomment}{open}[\pc@gopt@open]%
-{%
-  \gdef\pc@lopt@open{#1}%
-}%
-%
-% define local command option hspace for setting the space after the pdf annotations
-\define@key{pdfmargincomment}{hspace}[\pc@gopt@hspace]%
-{%
-  \gdef\pc@lopt@hspace{#1}%
-}%
-%
-% define local style option voffset for setting the vertical offset of the pdf annotations
-\define@key{pdfmargincomment}{voffset}[\pc@gopt@voffset]%
-{%
-  \gdef\pc@lopt@voffset{#1}%
-}%
-%
-% define local style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdfmargincomment}{hoffset}[\pc@gopt@hoffset]%
-{%
-  \gdef\pc@lopt@hoffset{#1}%
-}%
-%
-% define local style option width for setting the width of the pdf annotations
-\define@key{pdfmargincomment}{width}[\pc@gopt@width]%
-{%
-  \gdef\pc@lopt@width{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfmargincomment ignored!}%
-}%
-%
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdfmargincomment}{height}[\pc@gopt@height]%
-{%
-  \gdef\pc@lopt@height{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfmargincomment ignored!}%
-}%
-%
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdfmargincomment}{depth}[\pc@gopt@depth]%
-{%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfmargincomment ignored!}%
-}%
-%
-% define local style option opacity for setting the opacity of the pdf annotations
-\define@key{pdfmargincomment}{opacity}[\pc@gopt@opacity]%
-{%
-  \gdef\pc@lopt@opacity{#1}%
-}%
-%
-% define local style option 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]%
-{%
-  \gdef\pc@lopt@markup{#1}%
-  \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!}%
-}%
+\pc@define@key@style{pdfcomment}%
+\pc@define@key@style{pdfmargincomment}%
+\pc@define@key@style{pdffreetextcomment}%
+\pc@define@key@style{pdfmarkupcomment}%
+\pc@define@key@style{pdfsquarecomment}%
+\pc@define@key@style{pdfcirclecomment}%
+\pc@define@key@style{pdflinecomment}%
+\pc@define@key@style{pdfsidelinecomment}%
 %
-% 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}[]%
+\define@key{pdfcomment.sty}{subject}[\pc@goptd@subject]%
 {%
-  \edef\pc@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdffreetextcomment}{\csname pc@avatar@#1\endcsname}}%
-    \pc@lopt@loadavatar%
-  }%
+  \gdef\pc@gopt@subject{#1}%
 }%
 %
-% define local style option style for setting a predefined set of options (Style)
-\define@key{pdffreetextcomment}{style}[]%
+\newcommand\pc@define@key@subject[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
+  \define@key{#1}{subject}[\pc@gopt@subject]%
   {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
+    \gdef\pc@lopt@subject{##1}%
   }%
-  {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdffreetextcomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
-  }%
-}%
-%
-% define local command option subject for setting the subject of pdf annotations
-\define@key{pdffreetextcomment}{subject}[\pc@gopt@subject]%
-{%
-  \gdef\pc@lopt@subject{#1}%
-}%
-%
-% define local command option color for setting the color of pdf annotations
-\define@key{pdffreetextcomment}{color}[\pc@gopt@color]%
-{%
-  \gdef\pc@lopt@color{#1}%
-}%
-%
-% define local command option author for setting the author of pdf annotations
-\define@key{pdffreetextcomment}{author}[\pc@gopt@author]%
-{%
-  \gdef\pc@lopt@author{#1}%
-}%
-%
-% define local command option deadline for setting a deadline in the pdf annotations
-\define@key{pdffreetextcomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#1}%
-}%
-%
-% define local command option icon for setting the icon of pdf annotations
-\define@key{pdffreetextcomment}{icon}[\pc@gopt@icon]%
-{%
-  \gdef\pc@lopt@icon{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}%
-}%
-%
-% define local command option open for setting the open status (true,false) of pdf annotations
-\define@key{pdffreetextcomment}{open}[\pc@gopt@open]%
-{%
-  \gdef\pc@lopt@open{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdffreetextcomment ignored!}%
-}%
-%
-% define local command option hspace for setting the space after the pdf annotations
-\define@key{pdffreetextcomment}{hspace}[\pc@gopt@hspace]%
-{%
-  \gdef\pc@lopt@hspace{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdffreetextcomment ignored!}%
-}%
-%
-% define local style option voffset for setting the vertical offset of the pdf annotations
-\define@key{pdffreetextcomment}{voffset}[\pc@gopt@voffset]%
-{%
-  \gdef\pc@lopt@voffset{#1}%
-}%
-%
-% define local style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdffreetextcomment}{hoffset}[\pc@gopt@hoffset]%
-{%
-  \gdef\pc@lopt@hoffset{#1}%
-}%
-%
-% define local style option width for setting the width of the pdf annotations
-\define@key{pdffreetextcomment}{width}[\pc@gopt@width]%
-{%
-  \gdef\pc@lopt@width{#1}%
-}%
-%
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdffreetextcomment}{height}[\pc@gopt@height]%
-{%
-  \gdef\pc@lopt@height{#1}%
-}%
-%
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdffreetextcomment}{depth}[\pc@gopt@depth]%
-{%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdffreetextcomment ignored!}%
-}%
-%
-% define local style option opacity for setting the opacity of the pdf annotations
-\define@key{pdffreetextcomment}{opacity}[\pc@gopt@opacity]%
-{%
-  \gdef\pc@lopt@opacity{#1}%
-}%
-%
-% 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 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!}%
-}%
+\pc@define@key@subject{pdfcomment}%
+\pc@define@key@subject{pdfmargincomment}%
+\pc@define@key@subject{pdffreetextcomment}%
+\pc@define@key@subject{pdfmarkupcomment}%
+\pc@define@key@subject{pdfsquarecomment}%
+\pc@define@key@subject{pdfcirclecomment}%
+\pc@define@key@subject{pdflinecomment}%
+\pc@define@key@subject{pdfsidelinecomment}%
 %
-% define local style option avatar for setting a predefined set of options (Avatar)
-\define@key{pdfmarkupcomment}{avatar}[]%
+\define@key{pdfcomment.sty}{color}[\pc@goptd@color]%
 {%
-  \edef\pc@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfmarkupcomment}{\csname pc@avatar@#1\endcsname}}%
-    \pc@lopt@loadavatar%
-  }%
+  \gdef\pc@gopt@color{#1}%
 }%
 %
-% define local style option style for setting a predefined set of options (Style)
-\define@key{pdfmarkupcomment}{style}[]%
+\newcommand\pc@define@key@color[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@key{#1}{color}[\pc@gopt@color]%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfmarkupcomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \gdef\pc@lopt@color{##1}%
   }%
 }%
 %
-% define local command option subject for setting the subject of pdf annotations
-\define@key{pdfmarkupcomment}{subject}[\pc@gopt@subject]%
-{%
-  \gdef\pc@lopt@subject{#1}%
-}%
+\pc@define@key@color{pdfcomment}%
+\pc@define@key@color{pdfmargincomment}%
+\pc@define@key@color{pdffreetextcomment}%
+\pc@define@key@color{pdfmarkupcomment}%
+\pc@define@key@color{pdfsquarecomment}%
+\pc@define@key@color{pdfcirclecomment}%
+\pc@define@key@color{pdflinecomment}%
+\pc@define@key@color{pdfsidelinecomment}%
 %
-% define local command option color for setting the color of pdf annotations
-\define@key{pdfmarkupcomment}{color}[\pc@gopt@color]%
-{%
-  \gdef\pc@lopt@color{#1}%
-}%
-%
-% define local command option author for setting the author of pdf annotations
-\define@key{pdfmarkupcomment}{author}[\pc@gopt@author]%
-{%
-  \gdef\pc@lopt@author{#1}%
-}%
-%
-% define local command option deadline for setting a deadline in the pdf annotations
-\define@key{pdfmarkupcomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#1}%
-}%
-%
-% define local command option icon for setting the icon of pdf annotations
-\define@key{pdfmarkupcomment}{icon}[\pc@gopt@icon]%
-{%
-  \gdef\pc@lopt@icon{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfmarkupcomment ignored!}%
-}%
-%
-% define local command option open for setting the open status (true,false) of pdf annotations
-\define@key{pdfmarkupcomment}{open}[\pc@gopt@open]%
-{%
-  \gdef\pc@lopt@open{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfmarkupcomment ignored!}%
-}%
-%
-% define local command option hspace for setting the space after the pdf annotations
-\define@key{pdfmarkupcomment}{hspace}[\pc@gopt@hspace]%
-{%
-  \gdef\pc@lopt@hspace{#1}%
-  \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
-\define@key{pdfmarkupcomment}{voffset}[\pc@gopt@voffset]%
-{%
-  \gdef\pc@lopt@voffset{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option voffset in command \pdfmarkupcomment ignored!}%
-}%
-%
-% define local style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdfmarkupcomment}{hoffset}[\pc@gopt@hoffset]%
-{%
-  \gdef\pc@lopt@hoffset{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option hoffset in command \pdfmarkupcomment ignored!}%
-}%
-%
-% define local style option width for setting the width of the pdf annotations
-\define@key{pdfmarkupcomment}{width}[\pc@gopt@width]%
+\define@key{pdfcomment.sty}{author}[\pc@goptd@author]%
 {%
-  \gdef\pc@lopt@width{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfmarkupcomment ignored!}%
+  \gdef\pc@gopt@author{#1}%
 }%
 %
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdfmarkupcomment}{height}[\pc@gopt@height]%
+\newcommand\pc@define@key@author[1]%
 {%
-  \gdef\pc@lopt@height{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{author}[\pc@gopt@author]%
+  {%
+    \gdef\pc@lopt@author{##1}%
+  }%
 }%
 %
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdfmarkupcomment}{depth}[\pc@gopt@depth]%
-{%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfmarkupcomment ignored!}%
-}%
+\pc@define@key@author{pdfcomment}%
+\pc@define@key@author{pdfmargincomment}%
+\pc@define@key@author{pdffreetextcomment}%
+\pc@define@key@author{pdfmarkupcomment}%
+\pc@define@key@author{pdfsquarecomment}%
+\pc@define@key@author{pdfcirclecomment}%
+\pc@define@key@author{pdflinecomment}%
+\pc@define@key@author{pdfsidelinecomment}%
 %
-% define local style option opacity for setting the opacity of the pdf annotations
-\define@key{pdfmarkupcomment}{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{pdfmarkupcomment}{font}[\pc@gopt@font]%
+\define@key{pdfcomment.sty}{deadline}[\pc@goptd@deadline]%
 {%
-  \gdef\pc@lopt@font{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfmarkupcomment ignored!}%
+  \gdef\pc@gopt@deadline{#1}%
 }%
 %
-% define local style option fontsize for setting the fontsize of the pdf freetext annotations
-\define@key{pdfmarkupcomment}{fontsize}[\pc@gopt@fontsize]%
+\newcommand\pc@define@key@deadline[1]%
 {%
-  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
-  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{deadline}[\pc@gopt@deadline]%
+  {%
+    \gdef\pc@lopt@deadline{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@deadline{pdfcomment}%
+\pc@define@key@deadline{pdfmargincomment}%
+\pc@define@key@deadline{pdffreetextcomment}%
+\pc@define@key@deadline{pdfmarkupcomment}%
+\pc@define@key@deadline{pdfsquarecomment}%
+\pc@define@key@deadline{pdfcirclecomment}%
+\pc@define@key@deadline{pdflinecomment}%
+\pc@define@key@deadline{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{icon}[\pc@goptd@icon]%
 {%
-  \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!}%
+  \gdef\pc@gopt@icon{#1}%
 }%
 %
-% define local style option dashstyle for setting the dashstyle of the pdf annotations
-\define@key{pdfmarkupcomment}{dashstyle}[\pc@gopt@dashstyle]%
+\newcommand\pc@define@key@icon[1]%
 {%
-  \gdef\pc@lopt@dashstyle{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option dashstyle in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{icon}[\pc@gopt@icon]%
+  {%
+    \gdef\pc@lopt@icon{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@icon{pdfcomment}%
+\pc@define@key@icon{pdfmargincomment}%
+\pc@define@key@icon{pdffreetextcomment}%
+\pc@define@key@icon{pdfmarkupcomment}%
+\pc@define@key@icon{pdfsquarecomment}%
+\pc@define@key@icon{pdfcirclecomment}%
+\pc@define@key@icon{pdflinecomment}%
+\pc@define@key@icon{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{open}[\pc@goptd@open]%
 {%
-  \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!}%
+  \gdef\pc@gopt@open{#1}%
 }%
 %
-% define local style option bsei for setting the border style effect intensity of the pdf annotations
-\define@key{pdfmarkupcomment}{bsei}[\pc@gopt@bsei]%
+\newcommand\pc@define@key@open[1]%
 {%
-  \gdef\pc@lopt@bsei{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{open}[\pc@gopt@open]%
+  {%
+    \gdef\pc@lopt@open{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@open{pdfcomment}%
+\pc@define@key@open{pdfmargincomment}%
+\pc@define@key@open{pdffreetextcomment}%
+\pc@define@key@open{pdfmarkupcomment}%
+\pc@define@key@open{pdfsquarecomment}%
+\pc@define@key@open{pdfcirclecomment}%
+\pc@define@key@open{pdflinecomment}%
+\pc@define@key@open{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{hspace}[\pc@goptd@hspace]%
 {%
-  \gdef\pc@lopt@lineend{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option lineend in command \pdfmarkupcomment ignored!}%
+  \gdef\pc@gopt@hspace{#1}%
 }%
 %
-% define local style option linebegin for setting the line ends of the pdf line annotations
-\define@key{pdfmarkupcomment}{linebegin}[\pc@gopt@linebegin]%
+\newcommand\pc@define@key@hspace[1]%
 {%
-  \gdef\pc@lopt@linebegin{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option linebegin in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{hspace}[\pc@gopt@hspace]%
+  {%
+    \gdef\pc@lopt@hspace{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@hspace{pdfcomment}%
+\pc@define@key@hspace{pdfmargincomment}%
+\pc@define@key@hspace{pdffreetextcomment}%
+\pc@define@key@hspace{pdfmarkupcomment}%
+\pc@define@key@hspace{pdfsquarecomment}%
+\pc@define@key@hspace{pdfcirclecomment}%
+\pc@define@key@hspace{pdflinecomment}%
+\pc@define@key@hspace{pdfsidelinecomment}%
 %
-% define local style option markup for setting the markup type of the pdf markup annotations
-\define@key{pdfmarkupcomment}{markup}[\pc@gopt@markup]%
+\define@key{pdfcomment.sty}{voffset}[\pc@goptd@voffset]%
 {%
-  \gdef\pc@lopt@markup{#1}%
+  \gdef\pc@gopt@voffset{#1}%
 }%
 %
-% 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]%
+\newcommand\pc@define@key@voffset[1]%
 {%
-  \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@key{#1}{voffset}[\pc@gopt@voffset]%
+  {%
+    \gdef\pc@lopt@voffset{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@voffset{pdfcomment}%
+\pc@define@key@voffset{pdfmargincomment}%
+\pc@define@key@voffset{pdffreetextcomment}%
+\pc@define@key@voffset{pdfmarkupcomment}%
+\pc@define@key@voffset{pdfsquarecomment}%
+\pc@define@key@voffset{pdfcirclecomment}%
+\pc@define@key@voffset{pdflinecomment}%
+\pc@define@key@voffset{pdfsidelinecomment}%
 %
-% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
-\define@key{pdfmarkupcomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+\define@key{pdfcomment.sty}{hoffset}[\pc@goptd@hoffset]%
 {%
-  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
-  \PackageInfo{pdfcomment.sty}{Setting of option captionhoffset in command \pdfmarkupcomment ignored!}%
+  \gdef\pc@gopt@hoffset{#1}%
 }%
 %
-% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
-\define@key{pdfmarkupcomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+\newcommand\pc@define@key@hoffset[1]%
 {%
-  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
-  \PackageInfo{pdfcomment.sty}{Setting of option captionvoffset in command \pdfmarkupcomment ignored!}%
+  \define@key{#1}{hoffset}[\pc@gopt@hoffset]%
+  {%
+    \gdef\pc@lopt@hoffset{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@hoffset{pdfcomment}%
+\pc@define@key@hoffset{pdfmargincomment}%
+\pc@define@key@hoffset{pdffreetextcomment}%
+\pc@define@key@hoffset{pdfmarkupcomment}%
+\pc@define@key@hoffset{pdfsquarecomment}%
+\pc@define@key@hoffset{pdfcirclecomment}%
+\pc@define@key@hoffset{pdflinecomment}%
+\pc@define@key@hoffset{pdfsidelinecomment}%
 %
-% define local style option avatar for setting a predefined set of options (Avatar)
-\define@key{pdfsquarecomment}{avatar}[]%
+\define@key{pdfcomment.sty}{width}[\pc@goptd@width]%
 {%
-  \edef\pc@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfsquarecomment}{\csname pc@avatar@#1\endcsname}}%
-    \pc@lopt@loadavatar%
-  }%
+  \gdef\pc@gopt@width{#1}%
 }%
 %
-% define local style option style for setting a predefined set of options (Style)
-\define@key{pdfsquarecomment}{style}[]%
+\newcommand\pc@define@key@width[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@key{#1}{width}[\pc@gopt@width]%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfsquarecomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \gdef\pc@lopt@width{##1}%
   }%
 }%
 %
-% define local command option subject for setting the subject of pdf annotations
-\define@key{pdfsquarecomment}{subject}[\pc@gopt@subject]%
-{%
-  \gdef\pc@lopt@subject{#1}%
-}%
+\pc@define@key@width{pdfcomment}%
+\pc@define@key@width{pdfmargincomment}%
+\pc@define@key@width{pdffreetextcomment}%
+\pc@define@key@width{pdfmarkupcomment}%
+\pc@define@key@width{pdfsquarecomment}%
+\pc@define@key@width{pdfcirclecomment}%
+\pc@define@key@width{pdflinecomment}%
+\pc@define@key@width{pdfsidelinecomment}%
 %
-% define local command option color for setting the color of pdf annotations
-\define@key{pdfsquarecomment}{color}[\pc@gopt@color]%
+\define@key{pdfcomment.sty}{height}[\pc@goptd@height]%
 {%
-  \gdef\pc@lopt@color{#1}%
+  \gdef\pc@gopt@height{#1}%
 }%
 %
-% define local command option author for setting the author of pdf annotations
-\define@key{pdfsquarecomment}{author}[\pc@gopt@author]%
+\newcommand\pc@define@key@height[1]%
 {%
-  \gdef\pc@lopt@author{#1}%
+  \define@key{#1}{height}[\pc@gopt@height]%
+  {%
+    \gdef\pc@lopt@height{##1}%
+  }%
 }%
 %
-% define local command option deadline for setting a deadline in the pdf annotations
-\define@key{pdfsquarecomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#1}%
-}%
+\pc@define@key@height{pdfcomment}%
+\pc@define@key@height{pdfmargincomment}%
+\pc@define@key@height{pdffreetextcomment}%
+\pc@define@key@height{pdfmarkupcomment}%
+\pc@define@key@height{pdfsquarecomment}%
+\pc@define@key@height{pdfcirclecomment}%
+\pc@define@key@height{pdflinecomment}%
+\pc@define@key@height{pdfsidelinecomment}%
 %
-% define local command option icon for setting the icon of pdf annotations
-\define@key{pdfsquarecomment}{icon}[\pc@gopt@icon]%
+\define@key{pdfcomment.sty}{depth}[\pc@goptd@depth]%
 {%
-  \gdef\pc@lopt@icon{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfsquarecomment ignored!}%
+  \gdef\pc@gopt@depth{#1}%
 }%
 %
-% define local command option open for setting the open status (true,false) of pdf annotations
-\define@key{pdfsquarecomment}{open}[\pc@gopt@open]%
+\newcommand\pc@define@key@depth[1]%
 {%
-  \gdef\pc@lopt@open{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfsquarecomment ignored!}%
+  \define@key{#1}{depth}[\pc@gopt@depth]%
+  {%
+    \gdef\pc@lopt@depth{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@depth{pdfcomment}%
+\pc@define@key@depth{pdfmargincomment}%
+\pc@define@key@depth{pdffreetextcomment}%
+\pc@define@key@depth{pdfmarkupcomment}%
+\pc@define@key@depth{pdfsquarecomment}%
+\pc@define@key@depth{pdfcirclecomment}%
+\pc@define@key@depth{pdflinecomment}%
+\pc@define@key@depth{pdfsidelinecomment}%
 %
-% define local style option voffset for setting the vertical offset of the pdf annotations
-\define@key{pdfsquarecomment}{voffset}[\pc@gopt@voffset]%
+\define@key{pdfcomment.sty}{opacity}[\pc@goptd@opacity]%
 {%
-  \gdef\pc@lopt@voffset{#1}%
+  \gdef\pc@gopt@opacity{#1}%
 }%
 %
-% define local style option hoffset for setting the horizontal offset of the pdf annotations
-\define@key{pdfsquarecomment}{hoffset}[\pc@gopt@hoffset]%
+\newcommand\pc@define@key@opacity[1]%
 {%
-  \gdef\pc@lopt@hoffset{#1}%
+  \define@key{#1}{opacity}[\pc@gopt@opacity]%
+  {%
+    \gdef\pc@lopt@opacity{##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}%
-}%
+\pc@define@key@opacity{pdfcomment}%
+\pc@define@key@opacity{pdfmargincomment}%
+\pc@define@key@opacity{pdffreetextcomment}%
+\pc@define@key@opacity{pdfmarkupcomment}%
+\pc@define@key@opacity{pdfsquarecomment}%
+\pc@define@key@opacity{pdfcirclecomment}%
+\pc@define@key@opacity{pdflinecomment}%
+\pc@define@key@opacity{pdfsidelinecomment}%
 %
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdfsquarecomment}{height}[\pc@gopt@height]%
+\define@key{pdfcomment.sty}{markup}[\pc@goptd@markup]%
 {%
-  \gdef\pc@lopt@height{#1}%
+  \gdef\pc@gopt@markup{#1}%
 }%
 %
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdfsquarecomment}{depth}[\pc@gopt@depth]%
+\newcommand\pc@define@key@markup[1]%
 {%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfsquarecomment ignored!}%
+  \define@key{#1}{markup}[\pc@gopt@markup]%
+  {%
+    \gdef\pc@lopt@markup{##1}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@markup{pdfcomment}%
+\pc@define@key@markup{pdfmargincomment}%
+\pc@define@key@markup{pdffreetextcomment}%
+\pc@define@key@markup{pdfmarkupcomment}%
+\pc@define@key@markup{pdfsquarecomment}%
+\pc@define@key@markup{pdfcirclecomment}%
+\pc@define@key@markup{pdflinecomment}%
+\pc@define@key@markup{pdfsidelinecomment}%
 %
-% define local style option font for setting the font of the pdf freetext annotations
-\define@key{pdfsquarecomment}{font}[\pc@gopt@font]%
+\define@key{pdfcomment.sty}{font}[\pc@goptd@font]%
 {%
-  \gdef\pc@lopt@font{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfsquarecomment ignored!}%
+  \gdef\pc@gopt@font{#1}%
 }%
 %
-% define local style option fontsize for setting the fontsize of the pdf freetext annotations
-\define@key{pdfsquarecomment}{fontsize}[\pc@gopt@fontsize]%
+\newcommand\pc@define@key@font[1]%
 {%
-  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
-  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfsquarecomment ignored!}%
+  \define@key{#1}{font}[\pc@gopt@font]%
+  {%
+    \gdef\pc@lopt@font{##1}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@font{pdfcomment}%
+\pc@define@key@font{pdfmargincomment}%
+\pc@define@key@font{pdffreetextcomment}%
+\pc@define@key@font{pdfmarkupcomment}%
+\pc@define@key@font{pdfsquarecomment}%
+\pc@define@key@font{pdfcirclecomment}%
+\pc@define@key@font{pdflinecomment}%
+\pc@define@key@font{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{fontsize}[\pc@goptd@fontsize]%
 {%
-  \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!}%
+  \gdef\pc@gopt@fontsize{\pc@pttobp{#1}}%
 }%
 %
-% define local style option borderstyle for setting the borderstyle of the pdf annotations
-\define@choicekey*{pdfsquarecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+\newcommand\pc@define@key@fontsize[1]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@borderstyle{S}%
-  \or%
-    \gdef\pc@lopt@borderstyle{D}%
-  \fi%
+  \define@key{#1}{fontsize}[\pc@gopt@fontsize]%
+  {%
+    \gdef\pc@lopt@fontsize{\pc@pttobp{##1}}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@fontsize{pdfcomment}%
+\pc@define@key@fontsize{pdfmargincomment}%
+\pc@define@key@fontsize{pdffreetextcomment}%
+\pc@define@key@fontsize{pdfmarkupcomment}%
+\pc@define@key@fontsize{pdfsquarecomment}%
+\pc@define@key@fontsize{pdfcirclecomment}%
+\pc@define@key@fontsize{pdflinecomment}%
+\pc@define@key@fontsize{pdfsidelinecomment}%
 %
-% define local style option linewidth for setting the linewidth of the pdf annotations
-\define@key{pdfsquarecomment}{linewidth}[\pc@gopt@linewidth]%
+\define@key{pdfcomment.sty}{fontcolor}[\pc@goptd@fontcolor]%
 {%
-  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \gdef\pc@gopt@fontcolor{#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]%
+\newcommand\pc@define@key@fontcolor[1]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@bse{S}%
-  \or%
-    \gdef\pc@lopt@bse{C}%
-  \fi%
+  \define@key{#1}{fontcolor}[\pc@gopt@fontcolor]%
+  {%
+    \gdef\pc@lopt@fontcolor{##1}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@fontcolor{pdfcomment}%
+\pc@define@key@fontcolor{pdfmargincomment}%
+\pc@define@key@fontcolor{pdffreetextcomment}%
+\pc@define@key@fontcolor{pdfmarkupcomment}%
+\pc@define@key@fontcolor{pdfsquarecomment}%
+\pc@define@key@fontcolor{pdfcirclecomment}%
+\pc@define@key@fontcolor{pdflinecomment}%
+\pc@define@key@fontcolor{pdfsidelinecomment}%
 %
-% 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]%
+\define@choicekey*{pdfcomment.sty}{justification}[\pc@gopt@justification\nr]{left,center,right}[left]%
 {%
   \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}%
+    \gdef\pc@gopt@justification{0}%
   \or%
-    \gdef\pc@lopt@type{PolyLine}%
+    \gdef\pc@gopt@justification{1}%
   \or%
-    \gdef\pc@lopt@type{Polygon}%
+    \gdef\pc@gopt@justification{2}%
   \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]%
+\newcommand\pc@define@key@justification[1]%
 {%
-  \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@choicekey*{#1}{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 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!}%
-}%
+\pc@define@key@justification{pdfcomment}%
+\pc@define@key@justification{pdfmargincomment}%
+\pc@define@key@justification{pdffreetextcomment}%
+\pc@define@key@justification{pdfmarkupcomment}%
+\pc@define@key@justification{pdfsquarecomment}%
+\pc@define@key@justification{pdfcirclecomment}%
+\pc@define@key@justification{pdflinecomment}%
+\pc@define@key@justification{pdfsidelinecomment}%
 %
-% 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]%
+\define@choicekey*{pdfcomment.sty}{borderstyle}[\pc@gopt@borderstyle\nr]{solid,dashed}[solid]%
 {%
   \ifcase\nr\relax%
-    \gdef\pc@lopt@caption{none}%
-  \or%
-    \gdef\pc@lopt@caption{Inline}%
+    \gdef\pc@gopt@borderstyle{S}%
   \or%
-    \gdef\pc@lopt@caption{Top}%
+    \gdef\pc@gopt@borderstyle{D}%
   \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@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \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}[]%
+\newcommand\pc@define@key@borderstyle[1]%
 {%
-  \edef\pc@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
+  \define@choicekey*{#1}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
   {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcirclecomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \ifcase\nr\relax%
+      \gdef\pc@lopt@borderstyle{S}%
+    \or%
+      \gdef\pc@lopt@borderstyle{D}%
+    \fi%
   }%
 }%
 %
-% 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 deadline for setting a deadline in the pdf annotations
-\define@key{pdfcirclecomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#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}%
-}%
+\pc@define@key@borderstyle{pdfcomment}%
+\pc@define@key@borderstyle{pdfmargincomment}%
+\pc@define@key@borderstyle{pdffreetextcomment}%
+\pc@define@key@borderstyle{pdfmarkupcomment}%
+\pc@define@key@borderstyle{pdfsquarecomment}%
+\pc@define@key@borderstyle{pdfcirclecomment}%
+\pc@define@key@borderstyle{pdflinecomment}%
+\pc@define@key@borderstyle{pdfsidelinecomment}%
 %
-% define local style option height for setting the height of the pdf annotations
-\define@key{pdfcirclecomment}{height}[\pc@gopt@height]%
+\define@key{pdfcomment.sty}{dashstyle}[\pc@goptd@dashstyle]%
 {%
-  \gdef\pc@lopt@height{#1}%
+  \gdef\pc@gopt@dashstyle{#1}%
 }%
 %
-% define local style option depth for setting the depth of the pdf annotations
-\define@key{pdfcirclecomment}{depth}[\pc@gopt@depth]%
+\newcommand\pc@define@key@dashstyle[1]%
 {%
-  \gdef\pc@lopt@depth{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfcirclecomment ignored!}%
+  \define@key{#1}{dashstyle}[\pc@gopt@dashstyle]%
+  {%
+    \gdef\pc@lopt@dashstyle{##1}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@dashstyle{pdfcomment}%
+\pc@define@key@dashstyle{pdfmargincomment}%
+\pc@define@key@dashstyle{pdffreetextcomment}%
+\pc@define@key@dashstyle{pdfmarkupcomment}%
+\pc@define@key@dashstyle{pdfsquarecomment}%
+\pc@define@key@dashstyle{pdfcirclecomment}%
+\pc@define@key@dashstyle{pdflinecomment}%
+\pc@define@key@dashstyle{pdfsidelinecomment}%
 %
-% define local style option font for setting the font of the pdf freetext annotations
-\define@key{pdfcirclecomment}{font}[\pc@gopt@font]%
+\define@key{pdfcomment.sty}{linewidth}[\pc@goptd@linewidth]%
 {%
-  \gdef\pc@lopt@font{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option font in command \pdfcirclecomment ignored!}%
+  \gdef\pc@gopt@linewidth{\pc@pttobp{#1}}%
 }%
 %
-% define local style option fontsize for setting the fontsize of the pdf freetext annotations
-\define@key{pdfcirclecomment}{fontsize}[\pc@gopt@fontsize]%
+\newcommand\pc@define@key@linewidth[1]%
 {%
-  \gdef\pc@lopt@fontsize{\pc@pttobp{#1}}%
-  \PackageInfo{pdfcomment.sty}{Setting of option fontsize in command \pdfcirclecomment ignored!}%
+  \define@key{#1}{linewidth}[\pc@gopt@linewidth]%
+  {%
+    \gdef\pc@lopt@linewidth{\pc@pttobp{##1}}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@linewidth{pdfcomment}%
+\pc@define@key@linewidth{pdfmargincomment}%
+\pc@define@key@linewidth{pdffreetextcomment}%
+\pc@define@key@linewidth{pdfmarkupcomment}%
+\pc@define@key@linewidth{pdfsquarecomment}%
+\pc@define@key@linewidth{pdfcirclecomment}%
+\pc@define@key@linewidth{pdflinecomment}%
+\pc@define@key@linewidth{pdfsidelinecomment}%
 %
-% 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]%
+\define@choicekey*{pdfcomment.sty}{bse}[\pc@gopt@bse\nr]{none,cloudy}[none]%
 {%
   \ifcase\nr\relax%
-    \gdef\pc@lopt@justification{0}%
-  \or%
-    \gdef\pc@lopt@justification{1}%
+    \gdef\pc@gopt@bse{S}%
   \or%
-    \gdef\pc@lopt@justification{2}%
+    \gdef\pc@gopt@bse{C}%
   \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]%
+\newcommand\pc@define@key@bse[1]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@borderstyle{S}%
-  \or%
-    \gdef\pc@lopt@borderstyle{D}%
-  \fi%
+  \define@choicekey*{#1}{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 dashstyle for setting the dashstyle of the pdf annotations
-\define@key{pdfcirclecomment}{dashstyle}[\pc@gopt@dashstyle]%
-{%
-  \gdef\pc@lopt@dashstyle{#1}%
-}%
+\pc@define@key@bse{pdfcomment}%
+\pc@define@key@bse{pdfmargincomment}%
+\pc@define@key@bse{pdffreetextcomment}%
+\pc@define@key@bse{pdfmarkupcomment}%
+\pc@define@key@bse{pdfsquarecomment}%
+\pc@define@key@bse{pdfcirclecomment}%
+\pc@define@key@bse{pdflinecomment}%
+\pc@define@key@bse{pdfsidelinecomment}%
 %
-% define local style option linewidth for setting the linewidth of the pdf annotations
-\define@key{pdfcirclecomment}{linewidth}[\pc@gopt@linewidth]%
+\define@key{pdfcomment.sty}{bsei}[\pc@goptd@bsei]%
 {%
-  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \gdef\pc@gopt@bsei{#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]%
+\newcommand\pc@define@key@bsei[1]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@bse{S}%
-  \or%
-    \gdef\pc@lopt@bse{C}%
-  \fi%
+  \define@key{#1}{bsei}[\pc@gopt@bsei]%
+  {%
+    \gdef\pc@lopt@bsei{##1}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@bsei{pdfcomment}%
+\pc@define@key@bsei{pdfmargincomment}%
+\pc@define@key@bsei{pdffreetextcomment}%
+\pc@define@key@bsei{pdfmarkupcomment}%
+\pc@define@key@bsei{pdfsquarecomment}%
+\pc@define@key@bsei{pdfcirclecomment}%
+\pc@define@key@bsei{pdflinecomment}%
+\pc@define@key@bsei{pdfsidelinecomment}%
 %
-% 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]%
+\define@choicekey*{pdfcomment.sty}{type}[\pc@gopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
 {%
   \ifcase\nr\relax%
-    \gdef\pc@lopt@type{}%
+    \gdef\pc@gopt@type{}%
   \or%
-    \gdef\pc@lopt@type{/IT /FreeTextCallout}%
+    \gdef\pc@gopt@type{/IT /FreeTextCallout}%
   \or%
-    \gdef\pc@lopt@type{/IT /FreeTextTypewriter}%
+    \gdef\pc@gopt@type{/IT /FreeTextTypewriter}%
   \or%
     \gdef\pc@lopt@type{Line}%
   \or%
@@ -2031,625 +821,245 @@
   \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]%
+\newcommand\pc@define@key@type[1]%
 {%
-  \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@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \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@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@choicekey*{#1}{type}[\pc@lopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdflinecomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \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 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 deadline for setting a deadline in the pdf annotations
-\define@key{pdflinecomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#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!}%
-}%
+\pc@define@key@type{pdfcomment}%
+\pc@define@key@type{pdfmargincomment}%
+\pc@define@key@type{pdffreetextcomment}%
+\pc@define@key@type{pdfmarkupcomment}%
+\pc@define@key@type{pdfsquarecomment}%
+\pc@define@key@type{pdfcirclecomment}%
+\pc@define@key@type{pdflinecomment}%
+\pc@define@key@type{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{lineend}[\pc@goptd@lineend]%
 {%
-  \gdef\pc@lopt@dashstyle{#1}%
+  \gdef\pc@gopt@lineend{#1}%
 }%
 %
-% define local style option linewidth for setting the linewidth of the pdf annotations
-\define@key{pdflinecomment}{linewidth}[\pc@gopt@linewidth]%
+\newcommand\pc@define@key@lineend[1]%
 {%
-  \gdef\pc@lopt@linewidth{\pc@pttobp{#1}}%
+  \define@key{#1}{lineend}[\pc@gopt@lineend]%
+  {%
+    \gdef\pc@lopt@lineend{##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!}%
-}%
+\pc@define@key@lineend{pdfcomment}%
+\pc@define@key@lineend{pdfmargincomment}%
+\pc@define@key@lineend{pdffreetextcomment}%
+\pc@define@key@lineend{pdfmarkupcomment}%
+\pc@define@key@lineend{pdfsquarecomment}%
+\pc@define@key@lineend{pdfcirclecomment}%
+\pc@define@key@lineend{pdflinecomment}%
+\pc@define@key@lineend{pdfsidelinecomment}%
 %
-% define local style option bsei for setting the border style effect intensity of the pdf annotations
-\define@key{pdflinecomment}{bsei}[\pc@gopt@bsei]%
+\define@key{pdfcomment.sty}{linebegin}[\pc@goptd@linebegin]%
 {%
-  \gdef\pc@lopt@bsei{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdflinecomment ignored!}%
+  \gdef\pc@gopt@linebegin{#1}%
 }%
 %
-% 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]%
+\newcommand\pc@define@key@linebegin[1]%
 {%
-  \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@key{#1}{linebegin}[\pc@gopt@linebegin]%
+  {%
+    \gdef\pc@lopt@linebegin{##1}%
+  }%
 }%
 %
-% 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}%
-}%
+\pc@define@key@linebegin{pdfcomment}%
+\pc@define@key@linebegin{pdfmargincomment}%
+\pc@define@key@linebegin{pdffreetextcomment}%
+\pc@define@key@linebegin{pdfmarkupcomment}%
+\pc@define@key@linebegin{pdfsquarecomment}%
+\pc@define@key@linebegin{pdfcirclecomment}%
+\pc@define@key@linebegin{pdflinecomment}%
+\pc@define@key@linebegin{pdfsidelinecomment}%
 %
-% define local style option linebegin for setting the line ends of the pdf line annotations
-\define@key{pdflinecomment}{linebegin}[\pc@gopt@linebegin]%
+\define@key{pdfcomment.sty}{icolor}[\pc@goptd@icolor]%
 {%
-  \gdef\pc@lopt@linebegin{#1}%
+  \gdef\pc@gopt@icolor{#1}%
 }%
 %
-% define local style option icolor for setting the "inner" color of the pdf annotations
-\define@key{pdflinecomment}{icolor}[\pc@gopt@icolor]%
+\newcommand\pc@define@key@icolor[1]%
 {%
-  \gdef\pc@lopt@icolor{#1}%
+  \define@key{#1}{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!}%
-}%
+\pc@define@key@icolor{pdfcomment}%
+\pc@define@key@icolor{pdfmargincomment}%
+\pc@define@key@icolor{pdffreetextcomment}%
+\pc@define@key@icolor{pdfmarkupcomment}%
+\pc@define@key@icolor{pdfsquarecomment}%
+\pc@define@key@icolor{pdfcirclecomment}%
+\pc@define@key@icolor{pdflinecomment}%
+\pc@define@key@icolor{pdfsidelinecomment}%
 %
-% 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]%
+\define@choicekey*{pdfcomment.sty}{caption}[\pc@gopt@caption\nr]{none,inline,top}[inline]%
 {%
   \ifcase\nr\relax%
-    \gdef\pc@lopt@caption{none}%
+    \gdef\pc@gopt@caption{none}%
   \or%
-    \gdef\pc@lopt@caption{Inline}%
+    \gdef\pc@gopt@caption{Inline}%
   \or%
-    \gdef\pc@lopt@caption{Top}%
+    \gdef\pc@gopt@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]%
+\newcommand\pc@define@key@caption[1]%
 {%
-  \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@edef@avatar{pc@avatar@#1}%
-  \@ifundefined{\pc@edef@avatar}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown avatar #1\MessageBreak%
-                                skip assignment}%
-  }%
-  {%
-    \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@edef@style{pc@style@#1}%
-  \@ifundefined{\pc@edef@style}%
-  {%
-    \PackageWarning{pdfcomment}{Unknown style #1\MessageBreak%
-                                skip assignment}%
-  }%
+  \define@choicekey*{#1}{caption}[\pc@lopt@caption\nr]{none,inline,top}[inline]%
   {%
-    \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfsidelinecomment}{\csname pc@style@#1\endcsname}}%
-    \pc@lopt@loadstyle%
+    \ifcase\nr\relax%
+      \gdef\pc@lopt@caption{none}%
+    \or%
+      \gdef\pc@lopt@caption{Inline}%
+    \or%
+      \gdef\pc@lopt@caption{Top}%
+    \fi%
   }%
 }%
 %
-% 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 deadline for setting a deadline in the pdf annotations
-\define@key{pdfsidelinecomment}{deadline}[\pc@gopt@deadline]%
-{%
-  \gdef\pc@lopt@deadline{#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!}%
-}%
+\pc@define@key@caption{pdfcomment}%
+\pc@define@key@caption{pdfmargincomment}%
+\pc@define@key@caption{pdffreetextcomment}%
+\pc@define@key@caption{pdfmarkupcomment}%
+\pc@define@key@caption{pdfsquarecomment}%
+\pc@define@key@caption{pdfcirclecomment}%
+\pc@define@key@caption{pdflinecomment}%
+\pc@define@key@caption{pdfsidelinecomment}%
 %
-% define local style option borderstyle for setting the borderstyle of the pdf annotations
-\define@choicekey*{pdfsidelinecomment}{borderstyle}[\pc@lopt@borderstyle\nr]{solid,dashed}[solid]%
+\define@key{pdfcomment.sty}{line}[\pc@goptd@line]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@borderstyle{S}%
-  \or%
-    \gdef\pc@lopt@borderstyle{D}%
-  \fi%
+  \gdef\pc@gopt@line{#1}%
 }%
 %
-% define local style option dashstyle for setting the dashstyle of the pdf annotations
-\define@key{pdfsidelinecomment}{dashstyle}[\pc@gopt@dashstyle]%
+\newcommand\pc@define@key@line[1]%
 {%
-  \gdef\pc@lopt@dashstyle{#1}%
+  \define@key{#1}{line}[\pc@gopt@line]%
+  {%
+    \gdef\pc@lopt@line{##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}}%
-}%
+\pc@define@key@line{pdfcomment}%
+\pc@define@key@line{pdfmargincomment}%
+\pc@define@key@line{pdffreetextcomment}%
+\pc@define@key@line{pdfmarkupcomment}%
+\pc@define@key@line{pdfsquarecomment}%
+\pc@define@key@line{pdfcirclecomment}%
+\pc@define@key@line{pdflinecomment}%
+\pc@define@key@line{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{captionhoffset}[\pc@goptd@captionhoffset]%
 {%
-  \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!}%
+  \gdef\pc@gopt@captionhoffset{\pc@pttobp{#1}}%
 }%
 %
-% define local style option bsei for setting the border style effect intensity of the pdf annotations
-\define@key{pdfsidelinecomment}{bsei}[\pc@gopt@bsei]%
+\newcommand\pc@define@key@captionhoffset[1]%
 {%
-  \gdef\pc@lopt@bsei{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option bsei in command \pdfsidelinecomment ignored!}%
+  \define@key{#1}{captionhoffset}[\pc@gopt@captionhoffset]%
+  {%
+    \gdef\pc@lopt@captionhoffset{\pc@pttobp{##1}}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@captionhoffset{pdfcomment}%
+\pc@define@key@captionhoffset{pdfmargincomment}%
+\pc@define@key@captionhoffset{pdffreetextcomment}%
+\pc@define@key@captionhoffset{pdfmarkupcomment}%
+\pc@define@key@captionhoffset{pdfsquarecomment}%
+\pc@define@key@captionhoffset{pdfcirclecomment}%
+\pc@define@key@captionhoffset{pdflinecomment}%
+\pc@define@key@captionhoffset{pdfsidelinecomment}%
 %
-% 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]%
+\define@key{pdfcomment.sty}{captionvoffset}[\pc@goptd@captionvoffset]%
 {%
-  \gdef\pc@lopt@lineend{#1}%
+  \gdef\pc@gopt@captionvoffset{\pc@pttobp{#1}}%
 }%
 %
-% define local style option linebegin for setting the line ends of the pdf line annotations
-\define@key{pdfsidelinecomment}{linebegin}[\pc@gopt@linebegin]%
+\newcommand\pc@define@key@captionvoffset[1]%
 {%
-  \gdef\pc@lopt@linebegin{#1}%
+  \define@key{#1}{captionvoffset}[\pc@gopt@captionvoffset]%
+  {%
+    \gdef\pc@lopt@captionvoffset{\pc@pttobp{##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}%
-}%
+\pc@define@key@captionvoffset{pdfcomment}%
+\pc@define@key@captionvoffset{pdfmargincomment}%
+\pc@define@key@captionvoffset{pdffreetextcomment}%
+\pc@define@key@captionvoffset{pdfmarkupcomment}%
+\pc@define@key@captionvoffset{pdfsquarecomment}%
+\pc@define@key@captionvoffset{pdfcirclecomment}%
+\pc@define@key@captionvoffset{pdflinecomment}%
+\pc@define@key@captionvoffset{pdfsidelinecomment}%
 %
-% define local style option markup for setting the markup type of the pdf markup annotations
-\define@key{pdfsidelinecomment}{markup}[\pc@gopt@markup]%
+\define@key{pdfcomment.sty}{linesep}[\pc@goptd@linesep]%
 {%
-  \gdef\pc@lopt@markup{#1}%
-  \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfsidelinecomment ignored!}%
+  \gdef\pc@gopt@linesep{\pc@pttobp{#1}}%
 }%
 %
-% 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]%
+\newcommand\pc@define@key@linesep[1]%
 {%
-  \ifcase\nr\relax%
-    \gdef\pc@lopt@caption{none}%
-  \or%
-    \gdef\pc@lopt@caption{Inline}%
-  \or%
-    \gdef\pc@lopt@caption{Top}%
-  \fi%
+  \define@key{#1}{linesep}[\pc@gopt@linesep]%
+  {%
+    \gdef\pc@lopt@linesep{\pc@pttobp{##1}}%
+  }%
 }%
 %
-% 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!}%
-}%
+\pc@define@key@linesep{pdfcomment}%
+\pc@define@key@linesep{pdfmargincomment}%
+\pc@define@key@linesep{pdffreetextcomment}%
+\pc@define@key@linesep{pdfmarkupcomment}%
+\pc@define@key@linesep{pdfsquarecomment}%
+\pc@define@key@linesep{pdfcirclecomment}%
+\pc@define@key@linesep{pdflinecomment}%
+\pc@define@key@linesep{pdfsidelinecomment}%
 %
-% define local style option captionhoffset for setting the caption hoffset of the pdf line annotations
-\define@key{pdfsidelinecomment}{captionhoffset}[\pc@gopt@captionhoffset]%
+\define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
 {%
-  \gdef\pc@lopt@captionhoffset{\pc@pttobp{#1}}%
+  \expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
 }%
 %
-% define local style option captionvoffset for setting the caption voffset of the pdf line annotations
-\define@key{pdfsidelinecomment}{captionvoffset}[\pc@gopt@captionvoffset]%
+\define@key{pdfcomment.sty}{final}[]%
 {%
-  \gdef\pc@lopt@captionvoffset{\pc@pttobp{#1}}%
+  \pc@gopt@finaltrue%
 }%
 %
-% define local style option linesep for setting the linesep of the pdf sideline annotations
-\define@key{pdfsidelinecomment}{linesep}[\pc@gopt@linesep]%
+\define@key{pdfcomment.sty}{draft}[]%
 {%
-  \gdef\pc@lopt@linesep{\pc@pttobp{#1}}%
+  \pc@gopt@finalfalse%
 }%
 %
-% define cammand option liststyle for \listofpdfcomments
 \define@key{listofpdfcomments}{liststyle}[AuthorSubject]%
 {%
   \gdef\pc@lopt@liststyle{#1}%
 }%
 %
-% define cammand option heading for \listofpdfcomments
 \define@key{listofpdfcomments}{heading}[\lpcname]%
 {%
   \renewcommand{\lpcname}{#1}%
@@ -2722,7 +1132,6 @@
 }%
 \newcommand{\pdfcomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -2738,6 +1147,7 @@
     \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
   }%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     \pc@create@lpc%
     % typeset text annotation (see: PDF Reference)
     \ifpdf%
@@ -2806,7 +1216,6 @@
 %
 \newcommand{\pdfmargincomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -2822,6 +1231,7 @@
     \gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
   }%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     \pc@create@lpc%
     \begingroup%
     % center marginnotes!
@@ -2898,7 +1308,6 @@
 %
 \newcommand{\pdffreetextcomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -2922,6 +1331,7 @@
   %create options for \pdfannot
   \pc@create@pdfannotopt%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     % typeset freetext annotation (see: PDF Reference)
     \ifpdf%
       \vbox to 0pt%
@@ -2996,7 +1406,6 @@
 %
 \newcommand{\pdfsquarecomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -3021,6 +1430,7 @@
   %create options for \pdfannot
   \pc@create@pdfannotopt%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     % typeset square annotation (see: PDF Reference)
     \ifpdf%
       \vbox to 0pt%
@@ -3095,7 +1505,6 @@
 %
 \newcommand{\pdfcirclecomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -3120,6 +1529,7 @@
   %create options for \pdfannot
   \pc@create@pdfannotopt%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     % typeset circle annotation (see: PDF Reference)
     \ifpdf%
       \vbox to 0pt%
@@ -3195,7 +1605,6 @@
 %
 \newcommand{\pdflinecomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -3241,6 +1650,7 @@
   %create options for \pdfannot
   \pc@create@pdfannotopt%
   \ifpc@gopt@final\else%
+    \hspace*{0pt}%
     \pc@create@lpc%
     % typeset line annotation (see: PDF Reference)
     \ifpdf%
@@ -3393,7 +1803,6 @@
 %
 \newenvironment{pdfsidelinecomment}[2][]%
 {%
-  \hspace*{0pt}%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified