pdfcomment (23may11)

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

17 files changed, 1026 insertions, 323 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index df41266afc6..0039060498f 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,12 +1,42 @@
 === pdfcomment.sty ===
 
+-- pdfcomment.sty (v2.2) (<- v2.1.8dev 2011/05/21) -- (svn rev 16 (-> SVN repository BerliOS))
+
+2011/05/23  revised documentation [jk]
+              added information about escape commands in \pdfstringdef
+              used for conversion of comments to PDFDocEncoding/PDFUnicode
+
+            feature request by: Max Funk
+
+2011/05/21  added support for mathmode in \pdftooltip [jk]
+
+2011/05/19  added \pdftooltip which allows annotating objects with tooltips [jk]
+
+2011/05/01  revised automatic deleting of StrikeOut markup comments (option printSOfinal), [jk]
+            if final=true or disable=true.
+            Option SOSpace is no longer needed
+
+2011/03/22  allow setting of disable globally [jk]
+              \pdfcommentsetup{disable} + \pdfcomment[disable=false]{comment}
+              => will enable this single PDF annotation
+
+            feature request by: Zvi Gilboa
+
+2011/01/18  added options printSOfinal,SOspace [jk]
+              printSOfinal=false will not typeset the markup text in a StrikeOut annotation
+              if the option final or disable is used!
+              SOspace=false will not add a space in front of the markup text,
+              which is not wanted in some cases (e.g. start of a new paragraph)
+
+            feature request by: Marcel Dausend
+
 -- pdfcomment.sty (v2.1) (<- v2.02dev 2010/12/11) -- (svn rev 61)
 
 2010/12/11  added support for PDF reply system [jk]
               \pdfcomment[avatar=Joe,id=1]{comment}
               \pdfreply[avatar=Bob,id=2,replyto=1]{reply to comment}
             works for pdflatex only!
-			
+
 2010/11/25  added options id,date,timezone [jk]
 
 2010/11/25  added support for new icon CrossHairs (Adobe Reader X) [jk]
@@ -17,19 +47,19 @@
 
 2010/11/08  Bugfix: unwanted whitespace before comment commands [jk]
                     -> added \unskip
-					This removes whitespace before comment commands
-					and may change the reference point for hoffset
-					-> added global option version (1|2(default)) 
-					   version=1 will preserve the old behavior
-					   for old documents
+                    This removes whitespace before comment commands
+                    and may change the reference point for hoffset
+                    -> added global option version (1|2(default))
+                       version=1 will preserve the old behavior
+                       for old documents
 
             reported by: Stefan Pinnow
-			
+
 2010/11/05  added local option disable to all comment commands [jk]
             to "switch off" single comments
 
             feature request by: Stefan Pinnow
-			
+
 2010/11/05  changed definitions of options open and disable [jk]
             to choicekey* to check valid option values (true|false)
 
@@ -56,7 +86,7 @@
                     of LaTeX commands like \$ or \textCR to PDFDocEncoding or
                     PDFUnicode in comments
 
-            reported by: Guillaume Millet 
+            reported by: Guillaume Millet
 
 -- pdfcomment.sty (v1.5c) (<- v1.5b 2009/11/10) -- (svn rev 45)
 
@@ -107,7 +137,7 @@
 -- pdfcomment.sty (v1.4a) (<- v1.4 2009/04/01) -- (svn rev 39)
 
 2009/07/13  Bugfix: (pdf}latex crashed with pdf text annoatations in tabulars [jk] (svn rev 39)
-              error with \vskip in hmode within \marginnote 
+              error with \vskip in hmode within \marginnote
               changed to \vspace in \pdfcomment and \pdfmargincomment / deleted \vss [uf]
               changed \baselineskip (=0 in tables) -> \normalbaselineskip [hv]
               see Msg-ID: <h377a3$avp$1@kleberj.eternal-september.org> ff
@@ -141,7 +171,7 @@
                  new option: icolor ("inner" color)
 
 2009/03/16  revision of \pdffreetextcomment [jk] (svn rev 28)
-              implementation of more features of pdf freetext annotations   
+              implementation of more features of pdf freetext annotations
               -> new options: font, fontsize, fontcolor, justification,
                  borderstyle, dashstyle, linewidth, bse, bsei,
                  type, calloutline, lineend
@@ -157,12 +187,12 @@
 2009/02/21  code clean up [jk] (svn rev 13)
               moved repeated code into commands
 
-  
+
 -- pdfcomment.sty (v1.2) (<- v1.13dev 2009/02/19) -- (svn rev 12)
 
 2009/02/15  new annotation type FreeText [jk] (svn rev 11)
               \pdffreetextcomment
-  
+
 2009/02/15  added style system [jk]
               for logical split in avatar system
               personal options -> avatar
@@ -185,14 +215,14 @@
 -- pdfcomment.sty (v1.1) (<- v1.05dev 2008/12/12) -- (svn rev 6)
 
 2008/12/12  disabled global options draft, final, dvipdfmx at "\AtBeginDocument" [jk] (svn rev 5)
-              Using the options draft, final and dvipdfmx in \pdfcommentsetup 
-              makes absolutely no sense! Therefore, they are switched off at 
-              "\AtBeginDocument" and a warning is issued by xkeyval.sty, if used.              
+              Using the options draft, final and dvipdfmx in \pdfcommentsetup
+              makes absolutely no sense! Therefore, they are switched off at
+              "\AtBeginDocument" and a warning is issued by xkeyval.sty, if used.
 
 2008/12/10  problems with too old versions of hyperref [jk] (svn rev 4)
               no \HyColor@XZeroOneThreeFour (hycolor.sty)
-              Change: \RequirePackage{hyperref}[2007/04/09] (v6.76a)              
-  
+              Change: \RequirePackage{hyperref}[2007/04/09] (v6.76a)
+
             reported by Gabriel Cardona
 
 2008/12/10  implementation of two new global options [jk] (svn rev 4)
@@ -203,7 +233,7 @@
               various changes for the support of
               latex->dvips->ps2pdf, latex->dvipdfmx, xelatex
               new option dvipdfmx
-  
+
             contributed by Alexander Grahn
 
 
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/INSTALL b/Master/texmf-dist/doc/latex/pdfcomment/INSTALL
index 1813399186f..5c491c77b1b 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/INSTALL
+++ b/Master/texmf-dist/doc/latex/pdfcomment/INSTALL
@@ -1,5 +1,5 @@
   pdfcomment.sty -- INSTALL
-============================
+=============================
 
 All the files ending with .sty  have to be installed where TeX can 
 find them. Please refer to your TeX distribution's manual for how
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 1b460e11ab5..45127a3b4df 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,15 +15,24 @@ Adobe Reader.
 
 License: LPPL
 
-Changes in v2.1:
+Changes in v2.2:
+
+- added \pdftooltip which allows annotating objects with tooltips
   
-- added support for PDF reply system
-    \pdfcomment[avatar=Joe,id=1]{comment}
-    \pdfreply[avatar=Bob,id=2,replyto=1]{reply to comment}
-  works for pdflatex only!
+- allow setting of disable globally
+    \pdfcommentsetup{disable} + \pdfcomment[disable=false]{comment}
+    => will enable this single PDF annotation
+
+  feature request by: Zvi Gilboa
+
+- added option printSOfinal
+    printSOfinal=false will not typeset the markup text in a StrikeOut annotation
+    if the option final or disable is used!
 
-- added options id,date,timezone
+  feature request by: Marcel Dausend
 
-- added support for new icon CrossHairs (Adobe Reader X)
+- revised documentation
+    added information about escape commands in \pdfstringdef
+    used for conversion of comments to PDFDocEncoding/PDFUnicode
 
-- Bugfix: problem with \pdfmarkupcomment with page break
\ No newline at end of file
+  feature request by: Max Funk
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index 9d7d1069afa..37c2c221730 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.tex b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
index 9027b8b60c9..ee36c60bb2b 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -9,8 +9,9 @@
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage[absolute]{textpos}
 \usepackage{tikz}
+\usetikzlibrary{calc}
 \usepackage{amssymb,amsmath,array,bm}
-\usepackage[subject={Top1},author={\AA{}nsgar Lund},version=1]{pdfcomment}
+\usepackage[printSOfinal=false,subject={Top1},author={\AA{}nsgar Lund},version=1]{pdfcomment}
 \begin{document}
 \defineavatar{Joe}{author=Joe,color=yellow}
 \defineavatar{Bob}{author=Bob,color=green}
@@ -124,4 +125,66 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
 \end{array}
 \]
 
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textbullet}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
+\bigskip\bigskip
+You can use tooltips with simple \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or chemical notation like: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$ 
+
+\bigskip\bigskip
+It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
 \end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
index d93a4d03cd7..223d5963063 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
index f31ab2116b6..58215ea3c23 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -11,6 +11,7 @@
 % define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf
 \def\pgfsysdriver{pgfsys-dvipdfm.def}
 \usepackage{tikz}
+\usetikzlibrary{calc}
 \usepackage{amssymb,amsmath,array,bm}
 \usepackage[subject={Top1},author={\AA{}nsgar Lund},dvipdfmx,version=1]{pdfcomment}
 \begin{document}
@@ -127,4 +128,66 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
 \end{array}
 \]
 
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textbullet}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
+\bigskip\bigskip
+You can use tooltips with simple \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or chemical notation like: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$ 
+
+\bigskip\bigskip
+It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
 \end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
index f84b8352147..7f5f95907f5 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
index e764ed48162..66f513b2dd1 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex
@@ -8,6 +8,7 @@
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage[absolute]{textpos}
 \usepackage{tikz}
+\usetikzlibrary{calc}
 \usepackage{amssymb,amsmath,array,bm}
 \usepackage[subject={Top1},author={\AA{}nsgar Lund},version=1]{pdfcomment}
 \begin{document}
@@ -124,4 +125,66 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
 \end{array}
 \]
 
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textcolor{red}{\textbullet}}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
+\bigskip\bigskip
+You can use tooltips with simple \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or chemical notation like: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$ 
+
+\bigskip\bigskip
+It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
 \end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdf
index c31783e794b..a85829683d4 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index 2840f2dae7a..e631b22f652 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
index 11f3d391f2f..1fc4e3ac124 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -13,6 +13,7 @@
 \usepackage{lipsum}
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage{tikz}
+\usetikzlibrary{calc}
 \usepackage{amsmath,array,bm}
 \usepackage[absolute]{textpos}
 \usepackage[subject={Top1},author={Ã…nsgar Lund},version=1]{pdfcomment}
@@ -132,4 +133,66 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
 \end{array}
 \]
 
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textbullet}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
+\bigskip\bigskip
+You can use tooltips with simple \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or chemical notation like: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$ 
+
+\bigskip\bigskip
+It also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index e0ba66b017c..b5539a277c1 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
index 93d5055ca78..6bcda5aca8a 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -12,6 +12,7 @@
 \usepackage[svgnames,rgb]{xcolor}%
 \usepackage{amsmath,array}%
 \usepackage{tikz}%
+\usetikzlibrary{calc}%
 \usepackage{ragged2e}%
 \usepackage{url}%
 \usepackage[automark,nouppercase]{scrpage2}
@@ -137,7 +138,7 @@
 \title{\filename}%
 \Subtitle{A user-friendly interface to PDF annotations}%
 \author{Josef Kleber}
-\Fileversion{v2.1}
+\Fileversion{v2.2}
 \Refline{\href{mailto:kleberj@users.berlios.de}{\texttt{kleberj@users.berlios.de}}\\\href{http://pdfcomment.berlios.de}{\texttt{http://pdfcomment.berlios.de}}}
 \maketitle
 \Headline{Abstract}
@@ -188,9 +189,7 @@ I want to thank the following persons for contributions to the development of th
 \item \textbf{Herbert Voß} also for answering my stupid questions on d.c.t.t.
 \end{itemize}
 
-I also want to thank the following persons for bug reports, feature requests, ...:
-
-Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Thomas König, Marc-André Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
+I also want to thank the following persons for bug reports, feature requests, ...: Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Marcel Dausend, Max Funk, Zvi Gilboa, Thomas König, Marc-André Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
 \clearpage
 \section{Options}
 \subsection{Global options}
@@ -203,7 +202,7 @@ If you want to use the driver \texttt{dvipdfmx} for creating your documents, you
 \subsubsection[\texttt{version}]{\styleoption{version}}\label{sec:version}
 Version v2.0 of \texttt{pdfcomment.sty} introduced a bugfix that removes unwanted whitespace before the comment commands. This may also change the reference point for options like \styleoption{hoffset}. If you want to preserve the old behavior for older documents simply use \texttt{version=1}. Otherwise \texttt{version=2} is used by default! 
 \subsection{Local options}
-The following options are useable as options for the commands presented in sections \ref{sec:kommentarumgebungen} and \ref{sec:kommentarbefehle}, as well as style options. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten. 
+The following options are useable as options for the commands presented in sections \ref{sec:umgebungen} and \ref{sec:befehle}, as well as style options. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten. 
 
 \subsubsection[\texttt{id}]{\styleoption{id}}\label{sec:id}
 You can use the option \styleoption{id} to define a unique ID for referencing in a PDF reply (see \ref{sec:pdfreply}).
@@ -214,23 +213,23 @@ You can use the option \styleoption{subject} for defining the subject of the PDF
 \subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
 You can use the option \styleoption{author} for defining the author of the PDF popup annotations.
 
-\subsubsection[\texttt{opacity}]{\styleoption{opacity}}\label{sec:opacity}
-You can use the option \styleoption{opacity} for defining the opacity of PDF annotations with values between 0 (transparent) and 1 (not transparent, default). If you want to print PDF popup annotations with transparency you will have to use the option \styleoption{open} = \texttt{true}.
+\subsubsection[\texttt{opacity}]{\styleoption{opacity} (\underline{\texttt{1.0}})}\label{sec:opacity}
+You can use the option \styleoption{opacity} for defining the opacity of PDF annotations with values between 0 (transparent) and 1 (not transparent). If you want to print PDF popup annotations with transparency you will have to use the option \styleoption{open}\texttt{=true}.
 
-\subsubsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
+\subsubsection[\texttt{icon}]{\styleoption{icon} (\underline{\texttt{Comment}})}\label{sec:icon}
 You can use the option \styleoption{icon} for defining the graphic used for the PDF text annotations. The following icons are defined as mandatory by the PDF reference:
 
 \pdfcommentsetup{author={Josef Kleber},subject={Icon Übersicht},width=17mm}
 {\renewcommand{\arraystretch}{2.5}
 \begin{center}
 \begin{tabular}{rlrlrl}
-\texttt{Comment} & \pdfcomment[icon=Comment,color=Ivory,hspace=1.5cm]{Optionen: icon=Comment,color=Ivory} &
-\texttt{Key} & \pdfcomment[icon=Key,color=Khaki,hspace=1.5cm]{Optionen: icon=Key,color=Khaki} &
-\texttt{Note} & \pdfcomment[icon=Note,color=LavenderBlush,hspace=1.5cm]{Optionen: icon=Note,color=LavenderBlush}\\
-\texttt{Help} & \pdfcomment[icon=Help,color=CornflowerBlue,hspace=1.5cm]{Optionen: icon=Help,color=CornflowerBlue} &
-\texttt{NewParagraph} & \pdfcomment[icon=NewParagraph,color=SkyBlue,hspace=1.5cm]{Optionen: icon=NewParagraph,color=SkyBlue}\\
-\texttt{Paragraph} & \pdfcomment[icon=Paragraph,color=SpringGreen,hspace=1.5cm]{Optionen: icon=Paragraph,color=SpringGreen} &
-\texttt{Insert} & \pdfcomment[icon=Insert,color=PaleTurquoise,hspace=1.5cm]{Optionen: Insert,color=PaleTurquoise} &
+\texttt{Comment} & \pdfcomment[icon=Comment,color=Ivory,hspace=1.5cm]{options: icon=Comment,color=Ivory} &
+\texttt{Key} & \pdfcomment[icon=Key,color=Khaki,hspace=1.5cm]{options: icon=Key,color=Khaki} &
+\texttt{Note} & \pdfcomment[icon=Note,color=LavenderBlush,hspace=1.5cm]{options: icon=Note,color=LavenderBlush}\\
+\texttt{Help} & \pdfcomment[icon=Help,color=CornflowerBlue,hspace=1.5cm]{options: icon=Help,color=CornflowerBlue} &
+\texttt{NewParagraph} & \pdfcomment[icon=NewParagraph,color=SkyBlue,hspace=1.5cm]{options: icon=NewParagraph,color=SkyBlue}\\
+\texttt{Paragraph} & \pdfcomment[icon=Paragraph,color=SpringGreen,hspace=1.5cm]{options: icon=Paragraph,color=SpringGreen} &
+\texttt{Insert} & \pdfcomment[icon=Insert,color=PaleTurquoise,hspace=1.5cm]{options: Insert,color=PaleTurquoise} &
  & \\
 \end{tabular}
 \end{center}
@@ -242,15 +241,15 @@ Furthermore the following icons are also supported by \texttt{Adobe Reader} and
 {\renewcommand{\arraystretch}{2.5}
 \begin{center}
 \begin{tabular}{rlrlrl}
-\texttt{Check} & \pdfcomment[icon=Check,color=Orchid,hspace=1cm]{Optionen: icon=Check,color=Orchid} &
-\texttt{Circle} & \pdfcomment[icon=Circle,color=LightCyan,hspace=1cm]{Optionen: icon=Circle,color=LightCyan} &
-\texttt{Cross} & \pdfcomment[icon=Cross,color=Bisque,hspace=1cm]{Optionen: icon=Cross,color=Bisque}\\
-\texttt{Star} & \pdfcomment[icon=Star,color=Aquamarine,hspace=1cm]{Optionen: icon=Star,color=Aquamarine} &
-\texttt{RightArrow} & \pdfcomment[icon=RightArrow,color=Gainsboro,hspace=1cm]{Optionen: icon=RightArrow,color=Gainsboro} &
-\texttt{RightPointer} & \pdfcomment[icon=RightPointer,color=Salmon,hspace=1cm]{Optionen: icon=RightPointer,color=Salmon}\\
-\texttt{UpArrow} & \pdfcomment[icon=UpArrow,color=Teal,hspace=1cm]{Optionen: icon=UpArrow,color=Teal} &
-\texttt{UpLeftArrow} & \pdfcomment[icon=UpLeftArrow,color=Magenta,hspace=1cm]{Optionen: icon=UpLeftArrow,color=Magenta} &
-\texttt{CrossHairs (AR X)} & \pdfcomment[icon=CrossHairs,color=green,hspace=1cm]{Optionen: icon=CrossHairs,color=green}
+\texttt{Check} & \pdfcomment[icon=Check,color=Orchid,hspace=1cm]{options: icon=Check,color=Orchid} &
+\texttt{Circle} & \pdfcomment[icon=Circle,color=LightCyan,hspace=1cm]{options: icon=Circle,color=LightCyan} &
+\texttt{Cross} & \pdfcomment[icon=Cross,color=Bisque,hspace=1cm]{options: icon=Cross,color=Bisque}\\
+\texttt{Star} & \pdfcomment[icon=Star,color=Aquamarine,hspace=1cm]{options: icon=Star,color=Aquamarine} &
+\texttt{RightArrow} & \pdfcomment[icon=RightArrow,color=Gainsboro,hspace=1cm]{options: icon=RightArrow,color=Gainsboro} &
+\texttt{RightPointer} & \pdfcomment[icon=RightPointer,color=Salmon,hspace=1cm]{options: icon=RightPointer,color=Salmon}\\
+\texttt{UpArrow} & \pdfcomment[icon=UpArrow,color=Teal,hspace=1cm]{options: icon=UpArrow,color=Teal} &
+\texttt{UpLeftArrow} & \pdfcomment[icon=UpLeftArrow,color=Magenta,hspace=1cm]{options: icon=UpLeftArrow,color=Magenta} &
+\texttt{CrossHairs (AR X)} & \pdfcomment[icon=CrossHairs,color=green,hspace=1cm]{options: icon=CrossHairs,color=green}
 \end{tabular}
 \end{center}
 }
@@ -259,7 +258,7 @@ Furthermore the following icons are also supported by \texttt{Adobe Reader} and
 \subsubsection[\texttt{deadline}]{\styleoption{deadline}}\label{sec:deadline}
 You can use the option \styleoption{deadline} for defining a time limit until a problem has to be solved. The deadline will be added at the end of the comment, as well as in the list of comments, if an appropriate list style is chosen.
 
-\subsubsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
+\subsubsection[\texttt{color}]{\styleoption{color}  (\underline{\texttt{\lbrack 0 0 1\rbrack}} (blue))}\label{sec:color}
 You can use the option \styleoption{color} for defining the color of PDF annotations in the form \{0.34 0.56 0.12\} (RGB). If you are using the additional package \package{xcolor} you can use predefined color names, as well as the available optional color names. Furthermore you can use the command \cmd\definecolor{} to define your own named colors. Please take a look at the attached example \file{example.tex}.\marginnote{\attachfile[author={Josef Kleber},subject={example.tex},description={source code: example.tex} ,mimetype={text/plain}, icon={Tag}]{example.tex}} It shows the different possibilities of defining colors.
 
 By definition the PDF specification allows four different color spaces with different numbers of color values:
@@ -278,12 +277,12 @@ By definition the PDF specification allows four different color spaces with diff
 \subsubsection[\texttt{icolor}]{\styleoption{icolor}}\label{sec:icolor}
 You can use the option \styleoption{icolor} for defining the so called 'inner color', which is used by some PDF annotations, like arrowheads or the inner area of PDF circle annotation. For the rest, the provisions of the option \styleoption{color} shall apply.
 
-\subsubsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
-You can use the option \styleoption{open} for defining the opening status of the PDF popup annotations. Possible values are \texttt{true} or \texttt{false} (default).
+\subsubsection[\texttt{open}]{\styleoption{open}  (\texttt{true},\underline{\texttt{false}})}\label{sec:open}
+You can use the option \styleoption{open} for defining the opening status of the PDF popup annotations.
 
-If you want to print the PDF popup annotations (with transparency) you will have to use the option \styleoption{open} = \texttt{true}.
+If you want to print the PDF popup annotations (with transparency) you will have to use the option \styleoption{open}\texttt{=true}.
 
-\subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
+\subsubsection[\texttt{hspace}]{\styleoption{hspace}  (\underline{\texttt{0pt}})}\label{sec:hspace}
 You can use the option \styleoption{hspace} for defining the horizontal space after the PDF text annotations, otherwise the PDF text annoations will overlay the text.
 
 \subsubsection[\texttt{type}]{\styleoption{type}}\label{sec:type}
@@ -294,19 +293,19 @@ You can use the option \styleoption{type} for defining the type of PDF annotatio
 \begin{tabular}{ll}
 \multicolumn{1}{c}{comment command} & \multicolumn{1}{c}{possible types}\\
 \hline
-\cs{pdffreetextcomment} & freetext, callout, typewriter \\
-\cs{pdflinecomment} & line, polyline, polygon \\
+\cs{pdffreetextcomment} & \underline{freetext}, callout, typewriter \\
+\cs{pdflinecomment} & \underline{line}, polyline, polygon \\
 \end{tabular}
 \end{center}}
 
 
-\subsubsection[\texttt{font}]{\styleoption{font}}\label{sec:font}
+\subsubsection[\texttt{font}]{\styleoption{font} (\underline{\texttt{Helv}})}\label{sec:font}
 You can use the option \styleoption{font} for defining the font of PDF freetext annotations, like all fonts installed in the system, which don't contain a space in their name. Although \texttt{Adobe Reader} shows these fonts as embedded, they are not embedded in reality, but the PDF file just contains a reference\footnote{Adobe Acrobat offers the possibility to embed the fonts in the PS $\rightarrow$ PDF conversion} to the font (default: Helvetica)! Therefore you should use this option quite carefully. In the case of document exchange between several authors you should just use fonts, which are available on all computer systems, like the so called  'standard 14 fonts'. \pdfcomment[icon=Help,color=blue,open=true,subject={standard 14 fonts}]{Times-Roman (TiRo), Times-Bold (TiBo), Times-Italic (TiIt), Times-BoldItalic (TiBI), Helvetica (Helv), Helvetica-Bold (HeBo), Helvetica-Oblique (HeOb), Helvetica-BoldOblique (HeBO), Courier (Cour), Courier-Bold (CoBo), Courier-Oblique (CoOb), Courier-BoldOblique (CoBO), ZapfDingbats (ZaDb), Symbol (Symb)}
 
-\subsubsection[\texttt{fontsize}]{\styleoption{fontsize}}\label{sec:fontsize}
+\subsubsection[\texttt{fontsize}]{\styleoption{fontsize} (\underline{\texttt{12bp}})}\label{sec:fontsize}
 You can use the option \styleoption{fontsize} for defining the fontsize of PDF freetext annotations.
 
-\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor}}\label{sec:fontcolor}
+\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor} (\underline{\texttt{\lbrack 0 0 0\rbrack}} (black))}\label{sec:fontcolor}
 You can use the option \styleoption{fontcolor} for defining the font color in PDF freetext annotations, which must be a RGB color. 
 
 \subsubsection[\texttt{line}]{\styleoption{line}}\label{sec:line}
@@ -325,60 +324,60 @@ callout line & $n = 3$ \\
 
 In general, the points must be given from line begin to line end. For callout lines the points must be given from line end to line begin. Please note the example file \LinkEx!
 
-To avoid the method 'trail and error' you can load the PDF file with the Ghostscript viewer, which is capable of showing the cursor position in it's status line.
+To avoid the method 'trail and error' you can load the PDF file with the Ghostscript viewer, which is capable of showing the cursor position in its status line.
 
-\subsubsection[\texttt{linewidth}]{\styleoption{linewidth}}\label{sec:linewidth}
+\subsubsection[\texttt{linewidth}]{\styleoption{linewidth} (\underline{\texttt{1bp}})}\label{sec:linewidth}
 You can use the option \styleoption{linewidth} for defining the line width of PDF annoations.
 
-\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
+\subsubsection[\texttt{linebegin}]{\styleoption{linebegin} (\underline{\texttt{/None})}}\label{sec:linebegin}
 You can use the option \styleoption{linebegin} for defining the arrow type at the line begin. The example file \LinkEx{} shows all possible types of arrows. \pdfcomment[icon=Help,color=blue,open=true,subject={arrow types}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)} 
 
 
-\subsubsection[\texttt{lineend}]{\styleoption{lineend}}\label{sec:lineend}
+\subsubsection[\texttt{lineend}]{\styleoption{lineend} (\underline{\texttt{/OpenArrow}})}\label{sec:lineend}
 You can use the option \styleoption{lineend} for defining the arrow type at the line end.
 
-\subsubsection[\texttt{linesep}]{\styleoption{linesep}}\label{sec:linesep}
+\subsubsection[\texttt{linesep}]{\styleoption{linesep} (\underline{\texttt{0.5cm}})}\label{sec:linesep}
 You can use the option \styleoption{linesep} for defining the horizontal space between text and line in the command \cs{pdfsidelinecomment}.
 
-\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle}}\label{sec:borderstyle}
-You can use the option \styleoption{borderstyle} for defining the line style.Possible values are: \styleoption{solid} (default) and \styleoption{dashed}
+\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle} (\underline{\texttt{solid}},\texttt{dashed})}\label{sec:borderstyle}
+You can use the option \styleoption{borderstyle} for defining the line style.
 
-\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle}}\label{sec:dashstyle}
+\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle} (\underline{\texttt{\{3 3\}}})}\label{sec:dashstyle}
 You can use the option \styleoption{dashstyle} for defining the dash style, e.\,g. \{5 3\} (5 points line, 3 points space).
 
-\subsubsection[\texttt{bse}]{\styleoption{bse}}\label{sec:bse}
-You can use the option \styleoption{bse} for defining the 'border style effect'. Possible values are: \styleoption{none} (default) and \styleoption{cloudy}
+\subsubsection[\texttt{bse}]{\styleoption{bse} (\underline{\texttt{none}},\texttt{cloudy})}\label{sec:bse}
+You can use the option \styleoption{bse} for defining the 'border style effect'.
 
-\subsubsection[\texttt{bsei}]{\styleoption{bsei}}\label{sec:bsei}
+\subsubsection[\texttt{bsei}]{\styleoption{bsei} (\underline{\texttt{1}})}\label{sec:bsei}
 You can use the option \styleoption{bsei} for defining the 'border style effect intensity' (size of cloud elements). The PDF reference suggests values between 1 and 2. 
 
-\subsubsection[\texttt{caption}]{\styleoption{caption}}\label{sec:caption}
-You can use the option \styleoption{caption} for defining the caption type of lines. Possible values are: none, inline (default), top
+\subsubsection[\texttt{caption}]{\styleoption{caption} (\texttt{none},\underline{\texttt{inline}},\texttt{top})}\label{sec:caption}
+You can use the option \styleoption{caption} for defining the caption type of lines.
 
 The options \styleoption{inline} and \styleoption{top} shows the comment 'inline' and on top of the line. While using \styleoption{none} the comment will be shown in a PDF popup annotation. 
 
-\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset}}\label{sec:captionhoffset}
+\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset} (\underline{\texttt{0pt}})}\label{sec:captionhoffset}
 You can use the option \styleoption{captionhoffset} for defining a horizontal offset, that is a horizontal shift of the line caption.
 
-\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset}}\label{sec:captionvoffset}
+\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset} (\underline{\texttt{0pt}})}\label{sec:captionvoffset}
 You can use the option \styleoption{captionvoffset} for definig a vertical offset of the line caption.
 
-\subsubsection[\texttt{voffset}]{\styleoption{voffset}}\label{sec:voffset}
+\subsubsection[\texttt{voffset}]{\styleoption{voffset} (\underline{\texttt{0pt}})}\label{sec:voffset}
 You can use the option \styleoption{voffset} for defining a vertical offset of the PDF annotations, that is a vertical shift for the given length.
 
-\subsubsection[\texttt{hoffset}]{\styleoption{hoffset}}\label{sec:hoffset}
+\subsubsection[\texttt{hoffset}]{\styleoption{hoffset} (\underline{\texttt{0pt}})}\label{sec:hoffset}
 You can use the option \styleoption{hoffset} for defining a horizontal offset of the PDF annotations.
 
-\subsubsection[\texttt{width}]{\styleoption{width}}\label{sec:width}
+\subsubsection[\texttt{width}]{\styleoption{width} (\underline{\texttt{0pt}})}\label{sec:width}
 You can use the option \styleoption{width} for defining the width of PDF annotations, e.\,g. the width of FreeText annotations. PDF text annatations have a width of 0pt by definition.
 
-\subsubsection[\texttt{height}]{\styleoption{height}}\label{sec:height}
+\subsubsection[\texttt{height}]{\styleoption{height} (\underline{\texttt{0pt}})}\label{sec:height}
 You can use the option \styleoption{height} for definig the height of PDF annotations. PDF text annatations have a height of \cmd\baselineskip{} by definition.
 
-\subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
-You can use the option \styleoption{markup} for defining the type of the PDF text markup annotation. Possible values are: Highlight, Underline, Squiggly und StrikeOut.
+\subsubsection[\texttt{markup}]{\styleoption{markup} (\underline{\texttt{Highlight}},\texttt{Underline},\texttt{Squiggly},\texttt{StrikeOut})}\label{sec:markup}
+You can use the option \styleoption{markup} for defining the type of the PDF text markup annotation.
 
-\subsubsection[\texttt{disable}]{\styleoption{disable}}\label{sec:disable}
+\subsubsection[\texttt{disable}]{\styleoption{disable} (\underline{\texttt{true}},\texttt{false})}\label{sec:disable}
 You can use the option \styleoption{disable} for switching off single PDF annotation. For switching off all PDF annotations use the global option \styleoption{final}.
 
 \subsubsection[\texttt{date}]{\styleoption{date}}\label{sec:date}
@@ -391,7 +390,7 @@ D:20101224153657+01'00'
 \end{tabular}
 \end{center}
 
-\subsubsection[\texttt{timezone}]{\styleoption{timezone}}\label{sec:timezone}
+\subsubsection[\texttt{timezone}]{\styleoption{timezone} (\underline{\texttt{+00'00'}})}\label{sec:timezone}
 You only have to use the option \styleoption{timezone}, if you are using automatic date setting and \XeLaTeX\ or \texttt{pdflatex} < v1.30.0. Otherwise the \texttt{pdflatex} command \string\pdfcreationdate\ will be used. \styleoption{timezone}=+01'00' sets the timezone to middle european time (default: +00'00' (GMT)).
 
 \subsubsection[\texttt{avatar}]{\styleoption{avatar}}\label{sec:avatar}
@@ -400,8 +399,11 @@ With the option \styleoption{avatar} you can load the option lists, that were pr
 \subsubsection[\texttt{style}]{\styleoption{style}}\label{sec:style}
 With the option \styleoption{style} you can also load predefined option lists for spliting personal and stylistic options, e.\,g. \texttt{avatar=Josef, style=MyComment}.
 
-\subsubsection[\texttt{mathstyle}]{\styleoption{mathstyle}}\label{sec:mathstyle}
-With the option \styleoption{mathstyle} you can correct the wrong size of PDF annotations produced with \texttt{\string\pdfmarkupcomment} in math mode by setting the math style to \texttt{\string\textstyle}, \texttt{\string\displaystyle}, \texttt{\string\scriptstyle} or \texttt{\string\scriptscriptstyle}. This option is only defined for \texttt{\string\pdfmarkupcomment}, so you can not set it globally! 
+\subsubsection[\texttt{mathstyle}]{\styleoption{mathstyle} (\underline{\texttt{\string\textstyle}})}\label{sec:mathstyle}
+With the option \styleoption{mathstyle} you can correct the wrong size of PDF annotations produced with \texttt{\string\pdfmarkupcomment} or \texttt{\string\pdftooltip} in math mode by setting the math style to \texttt{\string\textstyle}, \texttt{\string\displaystyle}, \texttt{\string\scriptstyle} or \texttt{\string\scriptscriptstyle}. This option is only defined for \texttt{\string\pdfmarkupcomment} and \texttt{\string\pdftooltip}, so you can not set it globally! 
+
+\subsubsection[\texttt{printSOfinal}]{\styleoption{printSOfinal} (\underline{\texttt{true}},\texttt{false})}\label{sec:printSOfinal}
+With the option \styleoption{printSOfinal} you can automatically delete PDF StrikeOut markup annotations including the text while using one of the options \styleoption{final} or \styleoption{disable}.
 
 \section{Environments}\label{sec:umgebungen}
 
@@ -409,7 +411,7 @@ With the option \styleoption{mathstyle} you can correct the wrong size of PDF an
 
 \subsubsection{\texorpdfstring{\cs{pdfsidelinecomment}}{\textbackslash pdfsidelinecomment}}
 \label{sec:sidelinecomment}
-Possible \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{options}\marg{comment}\\\dots\\\enve{pdfsidelinecomment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}
+Possible \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{options}\marg{comment}\\\dots\\\enve{pdfsidelinecomment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 With the environment \env{pdfsidelinecomment} you can comment complete parts of a page in the form of two lines in the margins.
@@ -433,21 +435,33 @@ You can use the following commands for commenting your documents.
 
 \subsubsection{\texorpdfstring{\cs{pdfcomment}}{\textbackslash pdfcomment}}
 \label{sec:pdfcomment}
-Possible \margcs{\cmd\pdfcomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdfcomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfcomment{} will typeset an annotation into the text at the current \pdfcommentsetup{subject={\textbackslash pdfcomment test},hspace=18pt}\pdfcomment[icon=Star,color=YellowGreen]{This is a comment in the text} position.
 
+Internally, the argument \marg{comment} needs to be converted to PDFDocEncoding/PDFUnicode\footnote{\cmd\hypersetup\{unicode\}}. Some chars with special meaning in \LaTeX{} (\texttt{\&}, \texttt{\%,} ...) must be escaped or replaced with their command form, e.\,g. \texttt{\string\_} or \texttt{\string\textunderscore} \cite[6.2 Definition of \texttt{\string\pdfstringdef}]{bib:hyperref}. Furthermore there are some commands for formatting:
+
+\begin{center}
+\begin{tabular}{cl}
+\hline
+\cmd\textHT & horizontal tab \\
+\cmd\textLF & line feed \\
+\cmd\textCR & carriage return \\
+\hline
+\end{tabular}
+\end{center}
+
 \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}}
 \label{sec:pdfmargincomment}
-Possible \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfmargincomment{} will typeset an annotation into the margin. Please note the positioning of the annotation in this example. This documentation was written with the \LaTeX{} class \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{This is a comment in the margin}. Therefore the annotation is typeset into the left margin.
 
 \subsubsection{\texorpdfstring{\cs{pdfmarkupcomment}}{\textbackslash pdfmarkupcomment}}
 \label{sec:pdfmarkupcomment}
-Possible \margcs{\cmd\pdfmarkupcomment\oarg{options}\\\marg{markup text}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}, \styleoption{mathstyle}
+Possible \margcs{\cmd\pdfmarkupcomment\oarg{options}\\\marg{markup text}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}, \styleoption{mathstyle}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfmarkupcomment{} will typeset so called PDF text markup annotations over the text specified in the argument \marg{markup text}. Possible types for the option \styleoption{markup} are: \pdfcommentsetup{subject={\textbackslash pdfmarkupcomment test}}\pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{This is a Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{This is a Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{This is a Squiggly markup annotation!} and \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{This is a StrikeOut markup annotation!}
@@ -487,14 +501,14 @@ Also see \LinkExMath{} for a more detailed explanation of the possibilities!
  
 \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
 \label{sec:pdffreetextcomment}
-Possible \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
-\cmd\pdffreetextcomment{} (type=freetext) will typeset a comment in form of a freely positioned box on the wished spot of the page.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-4.7cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} By using the option \styleoption{type} = \texttt{callout} the box will have an additional so called callout line, to bind the box to a certain element of the page. With the option \styleoption{type} = \texttt{typewriter} you can write a comment everywhere on the page with a virtual 'typewriter'. These PDF freetext annotation do have no frame and a transparent background for 'overwriting' arbitrary parts of the page. Please note the example file \LinkEx!
+\cmd\pdffreetextcomment{} (\texttt{type=freetext}) will typeset a comment in form of a freely positioned box on the wished spot of the page.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-3.7cm,hoffset=-2.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} By using the option \styleoption{type}\texttt{=callout} the box will have an additional so called callout line, to bind the box to a certain element of the page. With the option \styleoption{type}\texttt{=typewriter} you can write a comment everywhere on the page with a virtual 'typewriter'. These PDF freetext annotation do have no frame and a transparent background for 'overwriting' arbitrary parts of the page. Please note the example file \LinkEx!
 
 \subsubsection{\texorpdfstring{\cs{pdfsquarecomment}}{\textbackslash pdfsquarecomment}}
 \label{sec:pdfsquarecomment}
-Possible \margcs{\cmd\pdfsquarecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdfsquarecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfsquarecomment{} will typeset a rectangular box at the wished spot of a page (see: \LinkEx).
@@ -502,23 +516,24 @@ Possible \margcs{\cmd\pdfsquarecomment\\\oarg{options}\marg{comment}} options: \
 
 \subsubsection{\texorpdfstring{\cs{pdfcirclecomment}}{\textbackslash pdfcirclecomment}}
 \label{sec:pdfcirclecomment}
-Possible \margcs{\cmd\pdfcirclecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Possible \margcs{\cmd\pdfcirclecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfsquarecomment{} will typeset a comment in form of a circle or ellipse at the wished spot of the page (see: \LinkEx).
 
 \subsubsection{\texorpdfstring{\cs{pdflinecomment}}{\textbackslash pdflinecomment}}
 \label{sec:pdflinecomment}
-Possible \margcs{\cmd\pdfsidelinecomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}
+Possible \margcs{\cmd\pdfsidelinecomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \LinkEx).
 
-\subsection{Reply command}
+\clearpage
+\subsection{Replys}
 
 \subsubsection{\texorpdfstring{\cs{pdfreply}}{\textbackslash pdfreply}}
 \label{sec:pdfreply}
-Possible \margcs{\cmd\pdfreply\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}
+Possible \margcs{\cmd\pdfreply\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \defineavatar{Joe}{author=Joe,color=yellow}
@@ -530,6 +545,79 @@ With the command \cmd\pdfreply{} you can compose replys to comments. The option
 \pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101213095512+01'00']{Just another reply}
 Furthermore the command can not support page breaks (\string\pdfmarkupcomment, \string\pdfsidelinecomment). The replys will only appear in the PDF annotations on the second page. Replys to comments without page break work smoothly!
 
+\subsection{Tooltips}
+
+\subsubsection{\texorpdfstring{\cs{pdftooltip}}{\textbackslash pdftooltip}}
+\label{sec:pdftooltip}
+Possible \margcs{\cmd\pdftooltip\oarg{Optionen}\\\marg{Objekt}\marg{Kommentar}}options: \styleoption{disable}, \styleoption{mathstyle}
+
+\bigskip
+With the command \cmd\pdftooltip{} you can annotate any object with a tooltip - provided the the object can be set into a box to measure its size. Therefore you can smoothly use tooltips with \pdftooltip{\textcolor{red}{words}}{This is a tooltip!} or in a chemical notation: $\pdftooltip{H_{2}SO_{4}}{Sulfuric acid}$ 
+
+Of course, it also works in equations: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{little Gauß}\]
+
+Please notice the comments about usage in math mode in section \ref{sec:pdfmarkupcomment}.
+
+If you want to annotate parts of a graphic with tooltips, special methods are needed, because \cmd\pdftooltip{} can not measure the size (see: \LinkEx).
+
+\bigskip
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textbullet}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
 \subsection{Misc. commands}
 
 \subsubsection{\texorpdfstring{\cs{pdfcommentsetup}}{\textbackslash pdfcommentsetup}}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 2c3ed634b10..803e37e6deb 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
index 0bf0110ef3e..2fe31ab73e1 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -12,6 +12,7 @@
 \usepackage[svgnames,rgb]{xcolor}%
 \usepackage{amsmath,array}%
 \usepackage{tikz}%
+\usetikzlibrary{calc}%
 \usepackage{ragged2e}%
 \usepackage{url}%
 \usepackage[automark,nouppercase]{scrpage2}
@@ -151,7 +152,7 @@
 \title{\filename}%
 \Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
 \author{Josef Kleber}
-\Fileversion{v2.1}
+\Fileversion{v2.2}
 \Refline{\href{mailto:kleberj@users.berlios.de}{\texttt{kleberj@users.berlios.de}}\\\href{http://pdfcomment.berlios.de}{\texttt{http://pdfcomment.berlios.de}}}
 \maketitle
 \Headline{Zusammenfassung}%
@@ -202,9 +203,7 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
 \item \textbf{Herbert Voß} ebenfalls für das Beantworten meiner dummen Fragen in d.c.t.t.
 \end{itemize}
 
-Außerdem möchte ich folgenden Personen danken für bug reports, feature requests, ...:
-
-Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Thomas König, Marc-André Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
+Außerdem möchte ich folgenden Personen danken für bug reports, feature requests, ...: Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Marcel Dausend, Max Funk, Zvi Gilboa, Thomas König, Marc-André Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
 \clearpage
 \section{Optionen}
 \subsection{Globale Styleoptionen}
@@ -217,7 +216,7 @@ Falls Sie für die Erstellung Ihrer Dokumente den Treiber \texttt{dvipdfmx} einse
 \subsubsection[\texttt{version}]{\styleoption{version}}\label{sec:version}
 Mit der Version v2.0 von \texttt{pdfcomment.sty} wurde ein Bugfix hinzugefügt, der ungewollten Whitespace vor den Kommentarbefehlen entfernt. Das ändert u.\,U. auch den  Referenzpunkt für Optionen wie \styleoption{hoffset}. Möchten Sie das ursprüngliche Verhalten erhalten - etwa für alte Dokumente - verwenden Sie die Option  \texttt{version=1}. Ansonsten wird die Option \texttt{version=2} als Default verwendet!
 \subsection{Lokale Optionen}
-Die anschließend vorgestellten Optionen sind für die in den Abschnitten \ref{sec:kommentarumgebungen} und \ref{sec:kommentarbefehle} vorgestellten Befehle anwendbar, allerdings können sie auch als Styleoptionen benutzt werden. Als Styleoptionen besitzen sie globale Wirkung, während sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht überschreiben. 
+Die anschließend vorgestellten Optionen sind für die in den Abschnitten \ref{sec:umgebungen} und \ref{sec:befehle} vorgestellten Befehle anwendbar, allerdings können sie auch als Styleoptionen benutzt werden. Als Styleoptionen besitzen sie globale Wirkung, während sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht überschreiben. 
 
 \subsubsection[\texttt{id}]{\styleoption{id}}\label{sec:id}
 Die Option \styleoption{id} dient der Festlegung einer eindeutigen ID für die Referenzierung in einer PDF-Antwort (siehe \ref{sec:pdfreply}).
@@ -228,10 +227,10 @@ Die Option \styleoption{subject} dient der Festlegung der Überschriften der PDF
 \subsubsection[\texttt{author}]{\styleoption{author}}\label{sec:author}
 Die Option \styleoption{author} dient der Festlegung des Verfassers der PDF popup annotations.
 
-\subsubsection[\texttt{opacity}]{\styleoption{opacity}}\label{sec:opacity}
-Die Option \styleoption{opacity} dient der Festlegung der Transparenz der PDF annotations. Die Werte liegen dabei zwischen 0 (transparent) und 1 (nicht transparent, default). Möchten Sie die PDF popup annotations mit Transparenz drucken, funktioniert das nur zuverlässig, falls sie mit der Option \styleoption{open} = \texttt{true} erstellt werden.
+\subsubsection[\texttt{opacity}]{\styleoption{opacity} (\underline{\texttt{1.0}})}\label{sec:opacity}
+Die Option \styleoption{opacity} dient der Festlegung der Transparenz der PDF annotations. Die Werte liegen dabei zwischen 0 (transparent) und 1 (nicht transparent). Möchten Sie die PDF popup annotations mit Transparenz drucken, funktioniert das nur zuverlässig, falls sie mit der Option \styleoption{open}\texttt{=true} erstellt werden.
 
-\subsubsection[\texttt{icon}]{\styleoption{icon}}\label{sec:icon}
+\subsubsection[\texttt{icon}]{\styleoption{icon} (\underline{\texttt{Comment}})}\label{sec:icon}
 Die Option \styleoption{icon} dient der Festlegung der Grafik, die für die PDF text annotations benutzt werden sollen. Die folgenden Icons werden in der PDF-Referenz als verbindlich festgelegt:
 
 \pdfcommentsetup{author={Josef Kleber},subject={Icon Übersicht},width=17mm}
@@ -273,7 +272,7 @@ Außerdem werden vom \texttt{Adobe Reader} und einigen anderen Viewern auch diese
 \subsubsection[\texttt{deadline}]{\styleoption{deadline}}\label{sec:deadline}
 Die Option \styleoption{deadline} dient der Festlegung einer Frist zur Behebung eines Problems. Die Frist wird an das Ende des Kommentars angefügt, sowie gegebenenfalls - bei entsprechendem Listenstil - auch in die Liste der Kommentare aufgenommen.
 
-\subsubsection[\texttt{color}]{\styleoption{color}}\label{sec:color}
+\subsubsection[\texttt{color}]{\styleoption{color} (\underline{\texttt{\lbrack 0 0 1\rbrack}} (blau))}\label{sec:color}
 Die Option \styleoption{color} dient der Festlegung der Farbe der PDF annotations z.\,B. in der Form \{0.34 0.56 0.12\} (RGB). Bei Verwendung des Zusatzpakets \package{xcolor} kann man auch vordefinierte Basisfarbnamen, sowie die zusätzlich verfügbaren optionalen Farbnamen verwenden. Außerdem kann man mit dem Befehl \cmd\definecolor{} eigene benannte Farben definieren. Bitte beachten Sie das beigefügte Beispiel \file{example.tex}.\marginnote{\attachfile[author={Josef Kleber},subject={example.tex},description={Sourcecode: example.tex} ,mimetype={text/plain}, icon={Tag}]{example.tex}} Es bietet einen Überblick über die unterschiedlichen Möglichkeiten zur Festlegung der Farbe.
 
 Grundsätzlich erlaubt die PDF Spezifikation vier unterschiedliche Farbräume, die sich in der Anzahl der Farbwertangaben unterscheiden:
@@ -292,12 +291,12 @@ Grundsätzlich erlaubt die PDF Spezifikation vier unterschiedliche Farbräume, die
 \subsubsection[\texttt{icolor}]{\styleoption{icolor}}\label{sec:icolor}
 Die Option \styleoption{icolor} dient der Festlegung der bei einigen PDF annotations genutzten sogenannten 'inner color', etwa in Pfeilspitzen oder die Innenfläche der PDF circle annotation. Im Übrigen gelten dieselben Bestimmungen wie bei der Option \styleoption{color}.
 
-\subsubsection[\texttt{open}]{\styleoption{open}}\label{sec:open}
-Die Option \styleoption{open} dient der Festlegung des Öffnungsstatus der PDF popup annotations. Mögliche Werte sind dabei \texttt{true} oder \texttt{false} (Default).
+\subsubsection[\texttt{open}]{\styleoption{open} (\texttt{true},\underline{\texttt{false}})}\label{sec:open}
+Die Option \styleoption{open} dient der Festlegung des Öffnungsstatus der PDF popup annotations.
 
 Möchten Sie die PDF popup annotations (mit Transparenz) drucken, funktioniert das nur mit PDF annotations, die mit der Option \styleoption{open} = \texttt{true} erstellt wurden.
 
-\subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace}
+\subsubsection[\texttt{hspace}]{\styleoption{hspace} (\underline{\texttt{0pt}})}\label{sec:hspace}
 Die Option \styleoption{hspace} dient der Anpassung des horizontalen Abstands hinter den PDF text annotations, falls der Text nicht durch die PDF text annotations überschrieben werden sollen.
 
 \subsubsection[\texttt{type}]{\styleoption{type}}\label{sec:type}
@@ -308,18 +307,18 @@ Die Option \styleoption{type} dient der Festlegung des jeweiligen Typs der PDF a
 \begin{tabular}{ll}
 \multicolumn{1}{c}{Kommentarbefehl} & \multicolumn{1}{c}{mögliche Typen}\\
 \hline
-\cs{pdffreetextcomment} & freetext, callout, typewriter \\
-\cs{pdflinecomment} & line, polyline, polygon \\
+\cs{pdffreetextcomment} & \underline{freetext}, callout, typewriter \\
+\cs{pdflinecomment} & \underline{line}, polyline, polygon \\
 \end{tabular}
 \end{center}}
 
-\subsubsection[\texttt{font}]{\styleoption{font}}\label{sec:font}
+\subsubsection[\texttt{font}]{\styleoption{font} (\underline{\texttt{Helv}})}\label{sec:font}
 Die Option \styleoption{font} dient der Festlegung der Schriftart in PDF freetext annotations. Möglich sind dabei alle im System installierten Schriften, die keine Leerzeichen im Namen enthalten. Obwohl \texttt{Adobe Reader} diese Schrift als eingebettet kennzeichnet, ist sie das in der Realität nicht und die PDF-Datei enthält nur eine Referenz\footnote{Adobe Acrobat bietet die Möglichkeit Schriften bei der Konvertierung PS $\rightarrow$ PDF nachträglich einzubetten} auf die Schrift (default: Helvetica)! Daher sollte man diese Option nur sehr vorsichtig nutzen und z.\,B. beim Austausch des Dokuments unter mehreren Autoren nur Schriften nutzen, die auf allen beteiligten Computersystemen vorhanden sind. Das sind etwa die sogenannten 'standard 14 fonts'. \pdfcomment[icon=Help,color=blue,open=true,subject={Standard 14 fonts}]{Times-Roman (TiRo), Times-Bold (TiBo), Times-Italic (TiIt), Times-BoldItalic (TiBI), Helvetica (Helv), Helvetica-Bold (HeBo), Helvetica-Oblique (HeOb), Helvetica-BoldOblique (HeBO), Courier (Cour), Courier-Bold (CoBo), Courier-Oblique (CoOb), Courier-BoldOblique (CoBO), ZapfDingbats (ZaDb), Symbol (Symb)}
 
-\subsubsection[\texttt{fontsize}]{\styleoption{fontsize}}\label{sec:fontsize}
+\subsubsection[\texttt{fontsize}]{\styleoption{fontsize} (\underline{\texttt{12bp}})}\label{sec:fontsize}
 Die Option \styleoption{fontsize} dient der Festlegung der Schriftgröße in PDF freetext annotations.
 
-\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor}}\label{sec:fontcolor}
+\subsubsection[\texttt{fontcolor}]{\styleoption{fontcolor} (\underline{\texttt{\lbrack 0 0 0\rbrack}} (schwarz))}\label{sec:fontcolor}
 Die Option \styleoption{fontcolor} dient der Festlegung der Schriftfarbe in PDF freetext annotations und erwartet dabei zwingend eine RGB-Farbe. 
 
 \subsubsection[\texttt{line}]{\styleoption{line}}\label{sec:line}
@@ -340,58 +339,58 @@ Callout Linie & $n = 3$ \\
 
 Zur Vermeidung der Methode 'Versuch und Irrtum' kann man die PDF-Datei mit dem Ghostscript Viewer laden, der in der Lage ist die aktuelle Position des Cursors in der Statuszeile anzuzeigen.
  
-\subsubsection[\texttt{linewidth}]{\styleoption{linewidth}}\label{sec:linewidth}
+\subsubsection[\texttt{linewidth}]{\styleoption{linewidth} (\underline{\texttt{1bp}})}\label{sec:linewidth}
 Die Option \styleoption{linewidth} dient der Festlegung der Liniendicke in PDF annoations.
 
-\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
+\subsubsection[\texttt{linebegin}]{\styleoption{linebegin} (\underline{\texttt{/None})}}\label{sec:linebegin}
 Die Option \styleoption{linebegin} dient der Festlegung des Pfeiltyps am Linienanfang. Die Beispieldatei \LinkEx{} zeigt alle möglichen Pfeiltypen. \pdfcomment[icon=Help,color=blue,open=true,subject={Pfeiltypen}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)} 
 
-\subsubsection[\texttt{lineend}]{\styleoption{lineend}}\label{sec:lineend}
+\subsubsection[\texttt{lineend}]{\styleoption{lineend} (\underline{\texttt{/OpenArrow}})}\label{sec:lineend}
 Die Option \styleoption{lineend} dient der Festlegung des Pfeiltyps am Linienende.
 
-\subsubsection[\texttt{linesep}]{\styleoption{linesep}}\label{sec:linesep}
+\subsubsection[\texttt{linesep}]{\styleoption{linesep} (\underline{\texttt{0.5cm}})}\label{sec:linesep}
 Die Option \styleoption{linesep} dient der Festlegung des horizontalen Abstands der Linie beim Befehl \cs{pdfsidelinecomment}.
 
-\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle}}\label{sec:borderstyle}
-Die Option \styleoption{borderstyle} dient der Festlegung des Linienstils. Mögliche Werte sind dabei: \styleoption{solid} (default) und \styleoption{dashed}
+\subsubsection[\texttt{borderstyle}]{\styleoption{borderstyle} (\underline{\texttt{solid}},\texttt{dashed})}\label{sec:borderstyle}
+Die Option \styleoption{borderstyle} dient der Festlegung des Linienstils.
 
-\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle}}\label{sec:dashstyle}
+\subsubsection[\texttt{dashstyle}]{\styleoption{dashstyle} (\underline{\texttt{\{3 3\}}})}\label{sec:dashstyle}
 Die Option \styleoption{dashstyle} dient der Festlegung des Strichlinienstils, z.\,B. \{5 3\} (5 Punkte Linie, 3 Punkte Abstand).
 
-\subsubsection[\texttt{bse}]{\styleoption{bse}}\label{sec:bse}
-Die Option \styleoption{bse} dient der Festlegung des 'border style effect'. Mögliche Werte sind dabei: \styleoption{none} (default) und \styleoption{cloudy}
+\subsubsection[\texttt{bse}]{\styleoption{bse} (\underline{\texttt{none}},\texttt{cloudy})}\label{sec:bse}
+Die Option \styleoption{bse} dient der Festlegung des 'border style effect'.
 
-\subsubsection[\texttt{bsei}]{\styleoption{bsei}}\label{sec:bsei}
+\subsubsection[\texttt{bsei}]{\styleoption{bsei} (\underline{\texttt{1}})}\label{sec:bsei}
 Die Option \styleoption{bsei} dient der Festlegung der 'border style effect intensity' (Größe der Wolkenelemente). Die PDF-Referenz empfiehlt dabei Werte zwischen 1 und 2. 
 
-\subsubsection[\texttt{caption}]{\styleoption{caption}}\label{sec:caption}
-Die Option \styleoption{caption} dient der Festlegung des Typs der Linienüberschriften. Mögliche Werte sind dabei: none, inline (default), top
+\subsubsection[\texttt{caption}]{\styleoption{caption} (\texttt{none},\underline{\texttt{inline}},\texttt{top})}\label{sec:caption}
+Die Option \styleoption{caption} dient der Festlegung des Typs der Linienüberschriften.
 
 Die beiden Optionen \styleoption{inline} und \styleoption{top} zeigen den Kommentar in der Linie bzw. über der Linie. Bei Verwendung der Option \styleoption{none} erscheint der Kommentar in einer PDF popup annotation. 
 
-\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset}}\label{sec:captionhoffset}
+\subsubsection[\texttt{captionhoffset}]{\styleoption{captionhoffset} (\underline{\texttt{0pt}})}\label{sec:captionhoffset}
 Die Option \styleoption{captionhoffset} dient der Festlegung eines horizontalen Offsets, d.\,h. einer seitlichen Verschiebung, der Linienüberschrift.
 
-\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset}}\label{sec:captionvoffset}
+\subsubsection[\texttt{captionvoffset}]{\styleoption{captionvoffset} (\underline{\texttt{0pt}})}\label{sec:captionvoffset}
 Die Option \styleoption{captionvoffset} dient der Festlegung eines vertikalen Offsets der Linienüberschrift.
 
-\subsubsection[\texttt{hoffset}]{\styleoption{hoffset}}\label{sec:hoffset}
+\subsubsection[\texttt{hoffset}]{\styleoption{hoffset} (\underline{\texttt{0pt}})}\label{sec:hoffset}
 Die Option \styleoption{hoffset} dient der Festlegung eines horizontalen Offsets der PDF annotations.
 
-\subsubsection[\texttt{voffset}]{\styleoption{voffset}}\label{sec:voffset}
+\subsubsection[\texttt{voffset}]{\styleoption{voffset} (\underline{\texttt{0pt}})}\label{sec:voffset}
 Die Option \styleoption{voffset} dient der Festlegung eines vertikalen Offsets, d.\,h. einer vertikalen Verschiebung um den angegebenen Wert.
 
-\subsubsection[\texttt{width}]{\styleoption{width}}\label{sec:width}
+\subsubsection[\texttt{width}]{\styleoption{width} (\underline{\texttt{0pt}})}\label{sec:width}
 Die Option \styleoption{width} dient der Festlegung der Breite der PDF annotations, speziell der Breite der FreeText annotations. PDF text annatations haben grundsätzlich eine Breite von 0pt.
 
-\subsubsection[\texttt{height}]{\styleoption{height}}\label{sec:height}
+\subsubsection[\texttt{height}]{\styleoption{height} (\underline{\texttt{0pt}})}\label{sec:height}
 Die Option \styleoption{height} dient der Festlegung der Höhe der PDF annotations. Bei PDF text annotations wurde die Höhe auf \cmd\baselineskip{} festgelegt.
 
-\subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
-Die Option \styleoption{markup} dient der Festlegung des Typs der text markup annotations. Mögliche Werte sind dabei: Highlight, Underline, Squiggly und StrikeOut.
+\subsubsection[\texttt{markup}]{\styleoption{markup} (\underline{\texttt{Highlight}},\texttt{Underline},\texttt{Squiggly},\texttt{StrikeOut})}\label{sec:markup}
+Die Option \styleoption{markup} dient der Festlegung des Typs der text markup annotations.
 
-\subsubsection[\texttt{disable}]{\styleoption{disable}}\label{sec:disable}
-Mit der Option \styleoption{disable} kann man einzelne PDF annotations abschalten. Möchten Sie alle PDF annotations abschalten, benuzten Sie die globale Option \styleoption{final}.
+\subsubsection[\texttt{disable}]{\styleoption{disable} (\underline{\texttt{true}},\texttt{false})}\label{sec:disable}
+Mit der Option \styleoption{disable} kann man einzelne PDF annotations abschalten. Benützt man die Option \styleoption{disable} global kann man auch mit der Option \styleoption{disable}\texttt{=false} lokal einzelne PDF annotations einschalten.
 
 \subsubsection[\texttt{date}]{\styleoption{date}}\label{sec:date}
 Mit der Option \styleoption{date} kann man den PDF annotations ein Datum zuordnen. Falls kein explizites Datum gesetzt wird, wird das Datum und die Uhrzeit der PDF-Dokument-Erstellung verwendet. Die Eingabe muß im PDF-Datumformat erfolgen, z.B.:
@@ -403,8 +402,8 @@ D:20101224153657+01'00'
 \end{tabular}
 \end{center}
 
-\subsubsection[\texttt{timezone}]{\styleoption{timezone}}\label{sec:timezone}
-Sie müssen die Option \styleoption{timezone} nur benutzen, falls Sie die automatische Datumssetzung und \XeLaTeX\ oder \texttt{pdflatex} < v1.30.0 verwenden. Ansonsten wird der \texttt{pdflatex}-Befehl \string\pdfcreationdate\ verwendet. \styleoption{timezone}=+01'00' setzt die Zeitzone auf mitteleuropäische Zeit (Default: +00'00' (GMT)).
+\subsubsection[\texttt{timezone}]{\styleoption{timezone} (\underline{\texttt{+00'00'}})}\label{sec:timezone}
+Sie müssen die Option \styleoption{timezone} nur benutzen, falls Sie die automatische Datumssetzung und \XeLaTeX\ oder \texttt{pdflatex} < v1.30.0 verwenden. Ansonsten wird der \texttt{pdflatex}-Befehl \string\pdfcreationdate\ verwendet. \styleoption{timezone}=+01'00' setzt die Zeitzone auf mitteleuropäische Zeit.
 
 \subsubsection[\texttt{avatar}]{\styleoption{avatar}}\label{sec:avatar}
 Mit der Option \styleoption{avatar} kann man die mit dem Befehl \cmd\defineavatar{} vordefinierten Optionslisten laden, um lästige Tipparbeit zu vermeiden. 
@@ -412,8 +411,11 @@ Mit der Option \styleoption{avatar} kann man die mit dem Befehl \cmd\defineavata
 \subsubsection[\texttt{style}]{\styleoption{style}}\label{sec:style}
 Die Option \styleoption{style} dient ebenfalls dem Laden vordefinierter Optionslisten zur Trennung personenbezogener und stylister Optionen, z.\,B. \texttt{avatar=Josef, style=MyComment}.
 
-\subsubsection[\texttt{mathstyle}]{\styleoption{mathstyle}}\label{sec:mathstyle}
-Die Option \styleoption{mathstyle} dient der Korrektur der Größe von PDF annotations - die mit \texttt{\string\pdfmarkupcomment} im math mode erzeugt wurden - durch Setzen des math style auf \texttt{\string\textstyle}, \texttt{\string\displaystyle}, \texttt{\string\scriptstyle} oder \texttt{\string\scriptscriptstyle}. Diese Option ist nur für \texttt{\string\pdfmarkupcomment} definiert, daher kann sie nicht global gesetzt werden!
+\subsubsection[\texttt{mathstyle}]{\styleoption{mathstyle} (\underline{\texttt{\string\textstyle}})}\label{sec:mathstyle}
+Die Option \styleoption{mathstyle} dient der Korrektur der Größe von PDF annotations - die mit \texttt{\string\pdfmarkupcomment} oder \texttt{\string\pdftooltip} im math mode erzeugt wurden - durch Setzen des math style auf \texttt{\string\textstyle}, \texttt{\string\displaystyle}, \texttt{\string\scriptstyle} oder \texttt{\string\scriptscriptstyle}. Diese Option ist nur lokal für \texttt{\string\pdfmarkupcomment} und \texttt{\string\pdftooltip} definiert, daher kann sie nicht global gesetzt werden!
+
+\subsubsection[\texttt{printSOfinal}]{\styleoption{printSOfinal} (\underline{\texttt{true}},\texttt{false})}\label{sec:printSOfinal}
+Mit der Option \styleoption{printSOfinal} kann man die PDF StrikeOut markup annotations inklusive Text automatisch löschen bei gleichzeitiger Nutzung der Option \styleoption{final} oder \styleoption{disable}.
 
 \section{Umgebungen}\label{sec:umgebungen}
 
@@ -421,7 +423,7 @@ Die Option \styleoption{mathstyle} dient der Korrektur der Größe von PDF annotat
 
 \subsubsection{\texttt{pdfsidelinecomment}}
 \label{sec:sidelinecomment}
-Mögliche \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{Optionen}\marg{Kommentar}\\\dots\\\enve{pdfsidelinecomment}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}
+Mögliche \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{Optionen}\marg{Kommentar}\\\dots\\\enve{pdfsidelinecomment}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{linesep}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 Mit der Umgebung \env{pdfsidelinecomment} kann man ganze Seitenbereiche in Form zweier Linien in den Randspalten mit einem Kommentar kennzeichnen.
@@ -444,21 +446,34 @@ Die folgenden Befehlen können Sie zur Kommentierung Ihres Dokuments einsetzen.
 
 \subsubsection{\texorpdfstring{\cs{pdfcomment}}{\textbackslash pdfcomment}}
 \label{sec:pdfcomment}
-Mögliche \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfcomment{} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=20pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext.
 
+Das Argument \marg{Kommentar} muß dazu intern in PDFDocEncoding/PDFUni\-code\footnote{\cmd\hypersetup\{unicode\}} umgewandelt werden. Einige Zeichen mit spezieller \LaTeX{}-Bedeutung (\texttt{\&}, \texttt{\%,} ...) muß man daher escapen oder mit ihrer Befehlsform ersetzen, z.\,B. \texttt{\string\_} bzw. \texttt{\string\textunderscore} \cite[6.2 Definition of \texttt{\string\pdfstringdef}]{bib:hyperref}. Zusätzlich gibt es für die Formatierung die folgenden Befehle:
+
+\begin{center}
+\begin{tabular}{cl}
+\hline
+\cmd\textHT & horizontal tab \\
+\cmd\textLF & line feed \\
+\cmd\textCR & carriage return \\
+\hline
+\end{tabular}
+\end{center}
+
+
 \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}}
 \label{sec:pdfmargincomment}
-Mögliche \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfmargincomment{} setzt den Kommentar in Höhe der aktuellen Zeile in die Randspalte. Bitte beachten Sie in diesem Beispiel die Positionierung des Kommentars. Diese Dokumentation wurde mit der \LaTeX{}-Klasse \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment Test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{Das ist ein Kommentar in der Randspalte} erstellt. Daher erscheint der Kommentar in der linken Randspalte.
 
 \subsubsection{\texorpdfstring{\cs{pdfmarkupcomment}}{\textbackslash pdfmarkupcomment}}
 \label{sec:pdfmarkupcomment}
-Mögliche \margcs{\cmd\pdfmarkupcomment\oarg{Optionen}\\\marg{Markup Text}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}, \styleoption{mathstyle}
+Mögliche \margcs{\cmd\pdfmarkupcomment\oarg{Optionen}\\\marg{Markup Text}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup}, \styleoption{mathstyle}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfmarkupcomment{} setzt eine sogenannte PDF text markup annotation über den mit dem Argument \marg{Markup Text} festgelegten Text. Mögliche Typen für die Option \styleoption{markup} sind dabei: \pdfcommentsetup{subject={\textbackslash pdfmarkupcomment Test}}\pdfmarkupcomment[color=yellow,markup=Highlight]{Highlight}{Das ist eine Highlight markup annotation!}, \pdfmarkupcomment[color=red,markup=Underline]{Underline}{Das ist eine Underline markup annotation!}, \pdfmarkupcomment[color=Teal,markup=Squiggly]{Squiggly}{Das ist eine Squiggly markup annotation!} und \pdfmarkupcomment[color=red,markup=StrikeOut]{StrikeOut}{Das ist eine StrikeOut markup annotation!}
@@ -498,37 +513,37 @@ Beachten Sie bitte auch \LinkExMath{} für eine genauere Beschreibung der neuen M
 
 \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}}
 \label{sec:pdffreetextcomment}
-Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{font}, \styleoption{fontsize}, \styleoption{fontcolor}, \styleoption{opacity}, \styleoption{line}, \styleoption{linewidth}, \styleoption{lineend}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{type}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
-\cmd\pdffreetextcomment{} (type=freetext) setzt einen Kommentar in Form einer frei positionierbaren Box an die gewünschte Stelle der Seite\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-4.1cm,hoffset=-2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}. Bei Verwendung der Option \styleoption{type} = \texttt{callout} verfügt die Box zusätzlich über eine sogenannte Callout Linie, um die Box an ein bestimmtes Element der Seite zu binden. Mit der Option \styleoption{type} = \texttt{typewriter} kann man einen Kommentar an einer beliebigen Stelle mit einer virtuellen 'Schreibmaschine' schreiben. Diese PDF freetext annotation haben keinen Rand und einen transparenten Hintergrund. Dadurch kann man beliebige Stellen 'überschreiben'. Bitte beachten Sie dazu die Beispieldatei \LinkEx!
+\cmd\pdffreetextcomment{} (\texttt{type=freetext}) setzt einen Kommentar in Form einer frei positionierbaren Box an die gewünschte Stelle der Seite\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-4.1cm,hoffset=-2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}. Bei Verwendung der Option \styleoption{type}\texttt{=callout} verfügt die Box zusätzlich über eine sogenannte Callout Linie, um die Box an ein bestimmtes Element der Seite zu binden. Mit der Option \styleoption{type}\texttt{=typewriter} kann man einen Kommentar an einer beliebigen Stelle mit einer virtuellen 'Schreibmaschine' schreiben. Diese PDF freetext annotation haben keinen Rand und einen transparenten Hintergrund. Dadurch kann man beliebige Stellen 'überschreiben'. Bitte beachten Sie dazu die Beispieldatei \LinkEx!
 
 \subsubsection{\texorpdfstring{\cs{pdfsquarecomment}}{\textbackslash pdfsquarecomment}}
 \label{sec:pdfsquarecomment}
-Mögliche \margcs{\cmd\pdfsquarecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdfsquarecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfsquarecomment{} setzt einen Kommentar in Form einer rechteckigen Box an die gewünschte Stelle der Seite (siehe: \LinkEx).
 
 \subsubsection{\texorpdfstring{\cs{pdfcirclecomment}}{\textbackslash pdfcirclecomment}}
 \label{sec:pdfcirclecomment}
-Mögliche \margcs{\cmd\pdfcirclecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
+Mögliche \margcs{\cmd\pdfcirclecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei},  \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdfsquarecomment{} setzt einen Kommentar in Form eines Kreises oder einer Ellipse an die gewünschte Stelle der Seite (siehe: \LinkEx).
 
 \subsubsection{\texorpdfstring{\cs{pdflinecomment}}{\textbackslash pdflinecomment}}
 \label{sec:pdflinecomment}
-Mögliche \margcs{\cmd\pdfsidelinecomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}
+Mögliche \margcs{\cmd\pdfsidelinecomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{type}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{caption}, \styleoption{captionhoffset}, \styleoption{captionvoffset},  \styleoption{linewidth}, \styleoption{linebegin}, \styleoption{lineend}, \styleoption{line}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \LinkEx).
 
-\subsection{Antwortbefehl}
+\subsection{Antworten}
 
 \subsubsection{\texorpdfstring{\cs{pdfreply}}{\textbackslash pdfreply}}
 \label{sec:pdfreply}
-Mögliche \margcs{\cmd\pdfreply\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}
+Mögliche \margcs{\cmd\pdfreply\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{id}, \styleoption{replyto}, \styleoption{color}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
 
 \bigskip
 \defineavatar{Anton}{author=Anton,color=yellow}
@@ -540,6 +555,79 @@ Mit dem Befehl \cmd\pdfreply{} kann man Antworten zu Kommentaren verfassen. Dabe
 \pdfreply[id=5,avatar=Berti,replyto=1,date=D:20101213095512+01'00']{Nur eine andere Antwort}
 Weiterhin unterstützt der Befehl keinen Seitenumbruch (\string\pdfmarkupcomment, \string\pdfsidelinecomment). Hier erscheinen die Antworten nur bei den PDF annotations auf der zweiten Seite. Antworten auf Kommentare ohne Seitenumbruch funktionieren problemlos!
 
+\subsection{Tooltips}
+
+\subsubsection{\texorpdfstring{\cs{pdftooltip}}{\textbackslash pdftooltip}}
+\label{sec:pdftooltip}
+Mögliche \margcs{\cmd\pdftooltip\oarg{Optionen}\\\marg{Objekt}\marg{Kommentar}}Optionen: \styleoption{disable}, \styleoption{mathstyle}
+
+\bigskip
+Mit dem Befehl \cmd\pdftooltip{} kann man beliebige Objekte mit einem Tooltip versehen - vorausgesetzt man kann das Objekt in eine Box setzen, um die Größe zu messen. Sie können die Tooltips daher problemlos mit \pdftooltip{\textcolor{red}{Wörtern}}{Das ist ein Tooltip!} verwenden oder in chemischen Formeln: $\pdftooltip{H_{2}SO_{4}}{Schwefelsäure}$ 
+
+Es funktioniert natürlich auch in abgesetzten Formeln: \[\pdftooltip[mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{kleiner Gauß}\]
+
+Bitte beachten Sie auch die Hinweise im Abschnitt \ref{sec:pdfmarkupcomment} zur Verwendung im Mathemodus.
+
+Möchten Sie Teile einer Grafik mit Tooltips versehen bedarf es spezieller Methoden, da \cmd\pdftooltip{} in diesen Fällen die Größe nicht selbst bestimmen kann. Bitte beachten Sie dazu die Beispieldatei \LinkEx!
+
+\bigskip
+\begin{tikzpicture}
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3,0) node (xaxis) [right] {$x$};
+    \draw (0,0) coordinate (a_1) -- (2,1.8) coordinate (a_2);
+    \draw (0,1.5) coordinate (b_1) -- (2.5,0) coordinate (b_2);
+    \coordinate (c) at (intersection of a_1--a_2 and b_1--b_2);
+    \draw[dashed] (yaxis |- c) node[left] {$y'$}
+        -| (xaxis -| c) node[below] {$x'$};
+    %
+    \fill[red] (0,0) circle (2pt);
+    \draw (0,0) node {\pdftooltip{\rule{0pt}{0.5cm}\rule{0.5cm}{0pt}}{Origin}};
+    %
+    \draw[red] (1.5,2) node {\pdftooltip{\textbullet}{1.5,2.0}};
+    %
+    \fill[red] (c) circle (2pt)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {This is the intersection point\textCR of the two lines!}};   
+\end{tikzpicture}
+\hspace{1cm}
+\begin{tikzpicture}
+    \draw (1.5,0) node[below] {countries};
+    \draw (0,1) node[left] {\pdftooltip{SCI}{Sausage Consumption Index}};
+    \fill[blue] (0.5,0) rectangle (1,1.2)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    % these calculations are based on scale factor 1 otherwise use:
+    % \dimexpr(scale factor)\dimexpr\x2-\x1\relax\relax
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {USA: 120}};
+    \fill[red] (1.5,0) rectangle (2,1.8)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {Germany: 180}};
+    \fill[green] (2.5,0) rectangle (3,0.65)
+    let
+        \p1 = (current path bounding box.south west),
+        \p2 = (current path bounding box.north east)
+    in
+    node at (current path bounding box)
+    {\pdftooltip{\rule{\dimexpr\x2-\x1\relax}{0pt}\rule{0pt}{\dimexpr\y2-\y1\relax}}%
+    {South Africa: 65}};
+    \draw [<->,thick] (0,2) node (yaxis) [above] {$y$}
+        |- (3.5,0) node (xaxis) [right] {$x$};
+\end{tikzpicture}
+
 \subsection{Allgemeine Befehle}
 
 \subsubsection{\texorpdfstring{\cs{pdfcommentsetup}}{\textbackslash pdfcommentsetup}}
@@ -604,6 +692,7 @@ Der Schlüssel ist für andere Versionen bis auf die Versionsnummer und Groß- und
 
 Öffnen oder erstellen Sie (bei geschlossenem \texttt{Adobe Reader}) den Schlüssel \texttt{bprintCommentPopups} und ändern Sie den Wert auf 1 (dword).
 
+\clearpage
 \item[Linux:] Öffnen Sie die Konfigurationsdatei:
 
 \nolinkurl{~/.adobe/Acrobat/8.0/Preferences/reader_prefs}
@@ -614,6 +703,7 @@ mit einem Text-Editor und ändern Sie den Eintrag
 \end{description}
 
 Bitte beachten Sie, daß nur geöffnete popup annotations gedruckt werden!
+
 {
 \clearpage
 \raggedright
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 160ee501ce8..e1250d6b9c6 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -1,26 +1,26 @@
 %%
-%% Copyright (C) 2008-2010 by:
+%% Copyright (C) 2008-2011 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
-%% 
+%%
 %% This file may be distributed and/or modified under the conditions of
 %% the LaTeX Project Public License, either version 1.3 of this license
 %% or (at your option) any later version.  The latest version of this
 %% license is in:
-%% 
+%%
 %%    http://www.latex-project.org/lppl.txt
-%% 
+%%
 %% and version 1.3 or later is part of all distributions of LaTeX version
 %% 2003/12/01 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status "author-maintained".
-%% 
+%%
 %% The Current Maintainer of this work is Josef Kleber.
 %%
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2010/12/11 pdfcomment.sty v2.1 - Josef Kleber (C) 2008-2010]%
+\ProvidesPackage{pdfcomment}[2011/05/21 pdfcomment.sty v2.2 - Josef Kleber (C) 2008-2011]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -62,6 +62,7 @@
 \gdef\pc@goptd@date{}%
 \gdef\pc@goptd@timezone{+00'00'}%
 \gdef\pc@goptd@dvipdfmx{true}%
+\gdef\pc@goptd@printSOfinal{true}%
 %
 % values for global package options
 \gdef\pc@gopt@subject{}%
@@ -100,6 +101,7 @@
 \gdef\pc@gopt@id{}%
 \gdef\pc@gopt@date{}%
 \gdef\pc@gopt@timezone{}%
+\gdef\pc@gopt@printSOfinal{}%
 %
 % values for local command options
 \gdef\pc@lopt@subject{}%
@@ -140,6 +142,7 @@
 \gdef\pc@lopt@date{}%
 \gdef\pc@lopt@replyto{}%
 \gdef\pc@lopt@timezone{}%
+\gdef\pc@lopt@printSOfinal{}%
 %
 \gdef\pc@lopt@c{}%
 \gdef\pc@lopt@ic{}%
@@ -153,10 +156,12 @@
 \newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
 \newif\ifpc@gopt@final\pc@gopt@finalfalse%
 \newif\ifpc@lopt@disable\pc@lopt@disablefalse%
+\newif\ifpc@gopt@disable\pc@gopt@disablefalse%
 \newif\ifpc@opt@unskip\pc@opt@unskiptrue%
 \newif\ifpc@annot@samepage\pc@annot@samepagetrue%
 \newif\ifpc@annot@secondpage\pc@annot@secondpagefalse%
 \newif\ifpc@afterpage\pc@afterpagefalse%
+\newif\ifpc@ignorespaces\pc@ignorespacesfalse%
 %
 \newcounter{pc@annot@lines}%
 %
@@ -260,6 +265,7 @@
 \pc@define@key@avatar{pdflinecomment}%
 \pc@define@key@avatar{pdfsidelinecomment}%
 \pc@define@key@avatar{pdfreply}%
+\pc@define@key@avatar{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{style}[]%
 {%
@@ -301,6 +307,7 @@
 \pc@define@key@style{pdflinecomment}%
 \pc@define@key@style{pdfsidelinecomment}%
 \pc@define@key@style{pdfreply}%
+\pc@define@key@style{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{subject}[\pc@goptd@subject]%
 {%
@@ -324,6 +331,7 @@
 \pc@define@key@subject{pdflinecomment}%
 \pc@define@key@subject{pdfsidelinecomment}%
 \pc@define@key@subject{pdfreply}%
+\pc@define@key@subject{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{color}[\pc@goptd@color]%
 {%
@@ -347,6 +355,7 @@
 \pc@define@key@color{pdflinecomment}%
 \pc@define@key@color{pdfsidelinecomment}%
 \pc@define@key@color{pdfreply}%
+\pc@define@key@color{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{author}[\pc@goptd@author]%
 {%
@@ -370,6 +379,7 @@
 \pc@define@key@author{pdflinecomment}%
 \pc@define@key@author{pdfsidelinecomment}%
 \pc@define@key@author{pdfreply}%
+\pc@define@key@author{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{deadline}[\pc@goptd@deadline]%
 {%
@@ -393,6 +403,7 @@
 \pc@define@key@deadline{pdflinecomment}%
 \pc@define@key@deadline{pdfsidelinecomment}%
 \pc@define@key@deadline{pdfreply}%
+\pc@define@key@deadline{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{icon}[\pc@goptd@icon]%
 {%
@@ -416,6 +427,7 @@
 \pc@define@key@icon{pdflinecomment}%
 \pc@define@key@icon{pdfsidelinecomment}%
 \pc@define@key@icon{pdfreply}%
+\pc@define@key@icon{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{open}[\pc@gopt@open\nr]{true,false}[false]%
 {%
@@ -447,6 +459,7 @@
 \pc@define@key@open{pdflinecomment}%
 \pc@define@key@open{pdfsidelinecomment}%
 \pc@define@key@open{pdfreply}%
+\pc@define@key@open{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{hspace}[\pc@goptd@hspace]%
 {%
@@ -470,6 +483,7 @@
 \pc@define@key@hspace{pdflinecomment}%
 \pc@define@key@hspace{pdfsidelinecomment}%
 \pc@define@key@hspace{pdfreply}%
+\pc@define@key@hspace{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{voffset}[\pc@goptd@voffset]%
 {%
@@ -493,6 +507,7 @@
 \pc@define@key@voffset{pdflinecomment}%
 \pc@define@key@voffset{pdfsidelinecomment}%
 \pc@define@key@voffset{pdfreply}%
+\pc@define@key@voffset{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{hoffset}[\pc@goptd@hoffset]%
 {%
@@ -516,6 +531,7 @@
 \pc@define@key@hoffset{pdflinecomment}%
 \pc@define@key@hoffset{pdfsidelinecomment}%
 \pc@define@key@hoffset{pdfreply}%
+\pc@define@key@hoffset{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{width}[\pc@goptd@width]%
 {%
@@ -539,6 +555,7 @@
 \pc@define@key@width{pdflinecomment}%
 \pc@define@key@width{pdfsidelinecomment}%
 \pc@define@key@width{pdfreply}%
+\pc@define@key@width{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{height}[\pc@goptd@height]%
 {%
@@ -562,6 +579,7 @@
 \pc@define@key@height{pdflinecomment}%
 \pc@define@key@height{pdfsidelinecomment}%
 \pc@define@key@height{pdfreply}%
+\pc@define@key@height{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{depth}[\pc@goptd@depth]%
 {%
@@ -585,6 +603,7 @@
 \pc@define@key@depth{pdflinecomment}%
 \pc@define@key@depth{pdfsidelinecomment}%
 \pc@define@key@depth{pdfreply}%
+\pc@define@key@depth{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{opacity}[\pc@goptd@opacity]%
 {%
@@ -608,6 +627,7 @@
 \pc@define@key@opacity{pdflinecomment}%
 \pc@define@key@opacity{pdfsidelinecomment}%
 \pc@define@key@opacity{pdfreply}%
+\pc@define@key@opacity{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{markup}[\pc@goptd@markup]%
 {%
@@ -631,6 +651,7 @@
 \pc@define@key@markup{pdflinecomment}%
 \pc@define@key@markup{pdfsidelinecomment}%
 \pc@define@key@markup{pdfreply}%
+\pc@define@key@markup{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{font}[\pc@goptd@font]%
 {%
@@ -654,6 +675,7 @@
 \pc@define@key@font{pdflinecomment}%
 \pc@define@key@font{pdfsidelinecomment}%
 \pc@define@key@font{pdfreply}%
+\pc@define@key@font{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{fontsize}[\pc@goptd@fontsize]%
 {%
@@ -677,6 +699,7 @@
 \pc@define@key@fontsize{pdflinecomment}%
 \pc@define@key@fontsize{pdfsidelinecomment}%
 \pc@define@key@fontsize{pdfreply}%
+\pc@define@key@fontsize{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{fontcolor}[\pc@goptd@fontcolor]%
 {%
@@ -700,6 +723,7 @@
 \pc@define@key@fontcolor{pdflinecomment}%
 \pc@define@key@fontcolor{pdfsidelinecomment}%
 \pc@define@key@fontcolor{pdfreply}%
+\pc@define@key@fontcolor{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{justification}[\pc@gopt@justification\nr]{left,center,right}[left]%
 {%
@@ -735,6 +759,7 @@
 \pc@define@key@justification{pdflinecomment}%
 \pc@define@key@justification{pdfsidelinecomment}%
 \pc@define@key@justification{pdfreply}%
+\pc@define@key@justification{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{borderstyle}[\pc@gopt@borderstyle\nr]{solid,dashed}[solid]%
 {%
@@ -766,6 +791,7 @@
 \pc@define@key@borderstyle{pdflinecomment}%
 \pc@define@key@borderstyle{pdfsidelinecomment}%
 \pc@define@key@borderstyle{pdfreply}%
+\pc@define@key@borderstyle{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{dashstyle}[\pc@goptd@dashstyle]%
 {%
@@ -789,6 +815,7 @@
 \pc@define@key@dashstyle{pdflinecomment}%
 \pc@define@key@dashstyle{pdfsidelinecomment}%
 \pc@define@key@dashstyle{pdfreply}%
+\pc@define@key@dashstyle{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{linewidth}[\pc@goptd@linewidth]%
 {%
@@ -812,6 +839,7 @@
 \pc@define@key@linewidth{pdflinecomment}%
 \pc@define@key@linewidth{pdfsidelinecomment}%
 \pc@define@key@linewidth{pdfreply}%
+\pc@define@key@linewidth{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{bse}[\pc@gopt@bse\nr]{none,cloudy}[none]%
 {%
@@ -843,6 +871,7 @@
 \pc@define@key@bse{pdflinecomment}%
 \pc@define@key@bse{pdfsidelinecomment}%
 \pc@define@key@bse{pdfreply}%
+\pc@define@key@bse{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{bsei}[\pc@goptd@bsei]%
 {%
@@ -866,6 +895,7 @@
 \pc@define@key@bsei{pdflinecomment}%
 \pc@define@key@bsei{pdfsidelinecomment}%
 \pc@define@key@bsei{pdfreply}%
+\pc@define@key@bsei{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{type}[\pc@gopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]%
 {%
@@ -913,6 +943,7 @@
 \pc@define@key@type{pdflinecomment}%
 \pc@define@key@type{pdfsidelinecomment}%
 \pc@define@key@type{pdfreply}%
+\pc@define@key@type{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{lineend}[\pc@goptd@lineend]%
 {%
@@ -936,6 +967,7 @@
 \pc@define@key@lineend{pdflinecomment}%
 \pc@define@key@lineend{pdfsidelinecomment}%
 \pc@define@key@lineend{pdfreply}%
+\pc@define@key@lineend{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{linebegin}[\pc@goptd@linebegin]%
 {%
@@ -959,6 +991,7 @@
 \pc@define@key@linebegin{pdflinecomment}%
 \pc@define@key@linebegin{pdfsidelinecomment}%
 \pc@define@key@linebegin{pdfreply}%
+\pc@define@key@linebegin{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{icolor}[\pc@goptd@icolor]%
 {%
@@ -982,6 +1015,7 @@
 \pc@define@key@icolor{pdflinecomment}%
 \pc@define@key@icolor{pdfsidelinecomment}%
 \pc@define@key@icolor{pdfreply}%
+\pc@define@key@icolor{pdftooltip}%
 %
 \define@choicekey*{pdfcomment.sty}{caption}[\pc@gopt@caption\nr]{none,inline,top}[inline]%
 {%
@@ -1017,6 +1051,7 @@
 \pc@define@key@caption{pdflinecomment}%
 \pc@define@key@caption{pdfsidelinecomment}%
 \pc@define@key@caption{pdfreply}%
+\pc@define@key@caption{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{line}[\pc@goptd@line]%
 {%
@@ -1040,6 +1075,7 @@
 \pc@define@key@line{pdflinecomment}%
 \pc@define@key@line{pdfsidelinecomment}%
 \pc@define@key@line{pdfreply}%
+\pc@define@key@line{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{captionhoffset}[\pc@goptd@captionhoffset]%
 {%
@@ -1063,6 +1099,7 @@
 \pc@define@key@captionhoffset{pdflinecomment}%
 \pc@define@key@captionhoffset{pdfsidelinecomment}%
 \pc@define@key@captionhoffset{pdfreply}%
+\pc@define@key@captionhoffset{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{captionvoffset}[\pc@goptd@captionvoffset]%
 {%
@@ -1086,6 +1123,7 @@
 \pc@define@key@captionvoffset{pdflinecomment}%
 \pc@define@key@captionvoffset{pdfsidelinecomment}%
 \pc@define@key@captionvoffset{pdfreply}%
+\pc@define@key@captionvoffset{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{linesep}[\pc@goptd@linesep]%
 {%
@@ -1109,6 +1147,16 @@
 \pc@define@key@linesep{pdflinecomment}%
 \pc@define@key@linesep{pdfsidelinecomment}%
 \pc@define@key@linesep{pdfreply}%
+\pc@define@key@linesep{pdftooltip}%
+%
+\define@choicekey*{pdfcomment.sty}{disable}[\pc@gopt@disable\nr]{true,false}[true]%
+{%
+  \ifcase\nr\relax%
+    \global\pc@gopt@disabletrue%
+  \or%
+    \global\pc@gopt@disablefalse%
+  \fi%
+}%
 %
 \newcommand\pc@define@key@disable[1]%
 {%
@@ -1131,6 +1179,7 @@
 \pc@define@key@disable{pdflinecomment}%
 \pc@define@key@disable{pdfsidelinecomment}%
 \pc@define@key@disable{pdfreply}%
+\pc@define@key@disable{pdftooltip}%
 %
 \newcommand\pc@define@key@id[1]%
 {%
@@ -1149,6 +1198,7 @@
 \pc@define@key@id{pdflinecomment}%
 \pc@define@key@id{pdfsidelinecomment}%
 \pc@define@key@id{pdfreply}%
+\pc@define@key@id{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{date}[\pc@goptd@date]%
 {%
@@ -1172,6 +1222,7 @@
 \pc@define@key@date{pdflinecomment}%
 \pc@define@key@date{pdfsidelinecomment}%
 \pc@define@key@date{pdfreply}%
+\pc@define@key@date{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{timezone}[\pc@goptd@timezone]%
 {%
@@ -1195,6 +1246,39 @@
 \pc@define@key@timezone{pdflinecomment}%
 \pc@define@key@timezone{pdfsidelinecomment}%
 \pc@define@key@timezone{pdfreply}%
+\pc@define@key@timezone{pdftooltip}%
+%
+\define@choicekey*{pdfcomment.sty}{printSOfinal}[\pc@gpSOf\nr]{true,false}[true]%
+{%
+  \ifcase\nr\relax%
+    \gdef\pc@gopt@printSOfinal{true}%
+  \or%
+    \gdef\pc@gopt@printSOfinal{false}%
+  \fi%
+}%
+%
+\newcommand\pc@define@key@printSOfinal[1]%
+{%
+  \define@choicekey*{#1}{printSOfinal}[\pc@lpSOf\nr]{true,false}[true]%
+  {%
+    \ifcase\nr\relax%
+      \gdef\pc@lopt@printSOfinal{true}%
+    \or%
+      \gdef\pc@lopt@printSOfinal{false}%
+    \fi%
+  }%
+}%
+%
+\pc@define@key@printSOfinal{pdfcomment}%
+\pc@define@key@printSOfinal{pdfmargincomment}%
+\pc@define@key@printSOfinal{pdffreetextcomment}%
+\pc@define@key@printSOfinal{pdfmarkupcomment}%
+\pc@define@key@printSOfinal{pdfsquarecomment}%
+\pc@define@key@printSOfinal{pdfcirclecomment}%
+\pc@define@key@printSOfinal{pdflinecomment}%
+\pc@define@key@printSOfinal{pdfsidelinecomment}%
+\pc@define@key@printSOfinal{pdfreply}%
+\pc@define@key@printSOfinal{pdftooltip}%
 %
 \define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
 {%
@@ -1225,6 +1309,11 @@
   \gdef\pc@lopt@mathstyle{#1}%
 }%
 %
+\define@key{pdftooltip}{mathstyle}%
+{%
+  \gdef\pc@lopt@mathstyle{#1}%
+}%
+%
 \define@key{pdfreply}{replyto}%
 {%
   \gdef\pc@lopt@replyto{#1}%
@@ -1240,7 +1329,7 @@
   \renewcommand{\lpcname}{#1}%
 }%
 %
-\ExecuteOptionsX{subject,color,author,deadline,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup,font,fontsize,fontcolor,justification,borderstyle,linewidth,dashstyle,bse,bsei,type,lineend,linebegin,icolor,line,caption,captionhoffset,captionvoffset,linesep,version,date,timezone}%
+\ExecuteOptionsX{subject,color,author,deadline,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup,font,fontsize,fontcolor,justification,borderstyle,linewidth,dashstyle,bse,bsei,type,lineend,linebegin,icolor,line,caption,captionhoffset,captionvoffset,linesep,version,date,timezone,printSOfinal}%
 %
 \ProcessOptionsX\relax%
 %
@@ -1262,8 +1351,8 @@
     \RequirePackage[pdftex]{hyperref}[2007/04/09]%
   }%
 \else%
-  % to avoid problems with different default page size in 
-  % pdflatex (dvi mode) and dvipdfmx/dvips 
+  % to avoid problems with different default page size in
+  % pdflatex (dvi mode) and dvipdfmx/dvips
   \pdfpageheight=\paperheight%
   \pdfpagewidth=\paperwidth%
   %auto-set dvipdfmx driver in case of xetex
@@ -1298,7 +1387,7 @@
 \fi%
 %
 % Using the options draft, final and dvipdfmx in \pdfcommentsetup makes absolutely no sense!
-% Therefore, they are switched off at "\AtBeginDocument" 
+% Therefore, they are switched off at "\AtBeginDocument"
 % and a warning is issued by xkeyval.sty, if used.
 \AtBeginDocument%
 {%
@@ -1351,12 +1440,12 @@
               /Subtype /Text%
               \pc@annot@text%
             }%
-			\ifthenelse{\equal{\pc@lopt@id}{}}%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {%
-			  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			  \pc@save@PDFOBJID{\pc@lopt@id}%
-			}%
+              \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+              \pc@save@PDFOBJID{\pc@lopt@id}%
+            }%
             \hss%
           }%
         }%
@@ -1457,12 +1546,12 @@
                   /Subtype /Text%
                   \pc@annot@text%
                 }
-				\ifthenelse{\equal{\pc@lopt@id}{}}%
+                \ifthenelse{\equal{\pc@lopt@id}{}}%
                 {}%
                 {%
-			      \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			      \pc@save@PDFOBJID{\pc@lopt@id}%
-			    }%
+                  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+                  \pc@save@PDFOBJID{\pc@lopt@id}%
+                }%
                 \hss%
               }%
             }%
@@ -1567,12 +1656,12 @@
             /Subtype /FreeText%
             \pc@annot@freetext%
             }%
-			\ifthenelse{\equal{\pc@lopt@id}{}}%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {%
-			  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			  \pc@save@PDFOBJID{\pc@lopt@id}%
-			}%
+              \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+              \pc@save@PDFOBJID{\pc@lopt@id}%
+            }%
           \hss%
           }%
         \vss%
@@ -1625,7 +1714,7 @@
           }%
         \fi%
       \fi%
-	\fi%
+    \fi%
   \fi%
 }%
 %
@@ -1682,12 +1771,12 @@
               /Subtype /Square\space%
               \pc@annot@square%
             }%
-			\ifthenelse{\equal{\pc@lopt@id}{}}%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {%
-			  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			  \pc@save@PDFOBJID{\pc@lopt@id}%
-			}%
+              \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+              \pc@save@PDFOBJID{\pc@lopt@id}%
+            }%
             \hss%
           }%
           \vss%
@@ -1740,7 +1829,7 @@
           }%
         \fi%
       \fi%
-	\fi%
+    \fi%
   \fi%
 }%
 %
@@ -1798,12 +1887,12 @@
               % circle and square annatations differ only in /Subtype, so ...
               \pc@annot@square%
             }%
-			\ifthenelse{\equal{\pc@lopt@id}{}}%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {%
-			  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			  \pc@save@PDFOBJID{\pc@lopt@id}%
-			}%
+              \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+              \pc@save@PDFOBJID{\pc@lopt@id}%
+            }%
             \hss%
           }%
           \vss%
@@ -1856,7 +1945,7 @@
           }%
         \fi%
       \fi%
-	\fi%
+    \fi%
   \fi%
 }%
 %
@@ -1932,12 +2021,12 @@
               /Subtype /\pc@lopt@type\space%
               \pc@annot@line%
             }%
-			\ifthenelse{\equal{\pc@lopt@id}{}}%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {%
-			  \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
-			  \pc@save@PDFOBJID{\pc@lopt@id}%
-			}%
+              \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}%
+              \pc@save@PDFOBJID{\pc@lopt@id}%
+            }%
             \hss%
           }%
           \vss%
@@ -1982,13 +2071,13 @@
           }%
         \fi%
       \fi%
-	\fi%
+    \fi%
   \fi%
 }%
 %
 \newcommand{\pdfmarkupcomment}[3][]%
 {%
-  \hspace*{0pt}%
+  \leavevmode%
   % Copy all global options to local options
   \pc@copy@gopt@lopt%
   % Change local options if specified
@@ -2009,7 +2098,7 @@
   \setlength{\pc@Eposy}{\zposy{pdfcomment:\thezref@unique}sp}%
   \ifmmode%
     \ifpc@gopt@final\else%
-	  \ifpc@lopt@disable\else%
+      \ifpc@lopt@disable\else%
         %changed \pc@encode@PDF, \pdfstringdef does not work in math mode
         \marginnote{\pc@encode@PDF@math{#3}}%
         \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
@@ -2034,7 +2123,7 @@
             \fi%
           \fi%
         }%
-		\ifthenelse{\equal{\pc@lopt@id}{}}%
+        \ifthenelse{\equal{\pc@lopt@id}{}}%
         {}%
         {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
         \wd\pc@mathannot@box\z@%
@@ -2043,8 +2132,32 @@
         \box\pc@mathannot@box%
         \nobreak%
       \fi%
-	\fi%
-    #2%
+    \fi%
+    \ifpc@gopt@final%
+      \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+      {%
+        \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}%
+        {#2\global\pc@ignorespacesfalse}%
+        {\global\pc@ignorespacestrue}%
+      }%
+      {%
+        #2\global\pc@ignorespacesfalse%
+      }%
+    \else%
+      \ifpc@lopt@disable%
+        \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+        {%
+          \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}%
+          {#2\global\pc@ignorespacesfalse}%
+          {\global\pc@ignorespacestrue}%
+        }%
+        {%
+          #2\global\pc@ignorespacesfalse%
+        }%
+      \else%
+        #2\global\pc@ignorespacesfalse%
+      \fi%
+    \fi%
   \else%
     \pc@encode@PDF{#3}%
     \settoheight{\pc@box@height}{#2}%
@@ -2062,7 +2175,7 @@
     \fi%
     \ifpc@annot@samepage\else%
       \ifpc@gopt@final\else%
-	    \ifpc@lopt@disable\else%
+        \ifpc@lopt@disable\else%
           % 1st part of annotation on 1st page
           \pc@annot@calc@pos%
           \pc@copy@xy@to@anna%
@@ -2075,26 +2188,50 @@
           {%
             \addtolength\pc@dimc{-\the\baselineskip}%
           }%
-		  % one too much
-		  \addtolength\pc@dimc{\the\baselineskip}%
+          % one too much
+          \addtolength\pc@dimc{\the\baselineskip}%
           \renewcommand{\pc@anna@y@four}{\pc@pttobp{\pc@dimc}}%
           \renewcommand{\pc@anna@y@two}{\pc@pttobp{\pc@dimc + \pc@box@depth + \pc@box@height +2pt}}%
           \pc@annot@secondpagefalse%
           \pc@create@annot%
         \fi%
-	  \fi%
+      \fi%
     \fi%
     \ifpc@gopt@final\else%
-	  \ifpc@lopt@disable\else%
+      \ifpc@lopt@disable\else%
         \pc@create@lpc%
-	  \fi%
+      \fi%
+    \fi%
+    \ifpc@gopt@final%
+      \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+      {%
+        \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}%
+        {#2\global\pc@ignorespacesfalse}%
+        {\global\pc@ignorespacestrue}%
+      }%
+      {%
+        #2\global\pc@ignorespacesfalse%
+      }%
+    \else%
+      \ifpc@lopt@disable%
+        \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
+        {%
+          \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}%
+          {#2\global\pc@ignorespacesfalse}%
+          {\global\pc@ignorespacestrue}%
+        }%
+        {%
+          #2\global\pc@ignorespacesfalse%
+        }%
+      \else%
+        #2\global\pc@ignorespacesfalse%
+      \fi%
     \fi%
-    #2%
     \zsavepos{pdfcomment:\thezref@unique}%
     \zref@refused{pdfcomment:\thezref@unique}%
     \refstepcounter{zref@unique}%
     \ifpc@gopt@final\else%
-	  \ifpc@lopt@disable\else%
+      \ifpc@lopt@disable\else%
         \ifpc@annot@samepage%
           % annot complete on one page
           \pc@annot@calc@pos%
@@ -2103,11 +2240,11 @@
           \pc@create@annot%
         \else%
           % 2nd part of annotation on 2nd page
-		  \ifthenelse{\equal{\pc@lopt@id}{}}%
+          \ifthenelse{\equal{\pc@lopt@id}{}}%
           {}%
           {%
-		    \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}%
-	      }%
+            \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}%
+          }%
           \pc@annot@calc@pos%
           \pc@copy@xy@to@anna%
           \renewcommand{\pc@anna@x@one}{\pc@x@left@text}%
@@ -2125,7 +2262,7 @@
           \pc@annot@secondpagetrue%
           \pc@create@annot%
         \fi%
-	  \fi%
+      \fi%
     \fi%
   \fi%
   %only local!
@@ -2134,6 +2271,9 @@
   \ifthenelse{\equal{\pc@lopt@id}{}}%
   {}%
   {\pc@save@PDFOBJID{\pc@lopt@id}}%
+  \ifpc@ignorespaces%
+    \ignorespaces%
+  \fi%
 }%
 %
 \newenvironment{pdfsidelinecomment}[2][]%
@@ -2203,18 +2343,18 @@
   \fi%
   \ifpc@annot@samepage\else%
     \ifpc@gopt@final\else%
-	  \ifpc@lopt@disable\else%
-	    \pc@annot@secondpagefalse%
+      \ifpc@lopt@disable\else%
+        \pc@annot@secondpagefalse%
         \pc@calc@sidelinepos%
         \renewcommand{\pc@y@two}{\pc@y@bottom@text}
         \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
         \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space/None]}%
         \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
         \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
-        \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}%  
+        \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}%
         \marginnote{\pc@create@annot@sideline}%
       \fi%
-	\fi%
+    \fi%
   \fi%
 }%
 {%
@@ -2230,20 +2370,20 @@
         \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
         \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
         \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
-        \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}%  
+        \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}%
         \marginnote{\pc@create@annot@sideline}%
       \else%
-	    \pc@annot@secondpagetrue%
+        \pc@annot@secondpagetrue%
         \pc@calc@sidelinepos%
         \renewcommand{\pc@y@one}{\pc@y@top@text}
         \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
         \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@lineend]}%
         \marginnote{\pc@create@annot@sideline}%
         \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
-        \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}%  
+        \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}%
         \marginnote{\pc@create@annot@sideline}%
       \fi%
-	\fi%
+    \fi%
   \fi%
   \ifthenelse{\equal{\pc@lopt@id}{}}%
   {}%
@@ -2279,54 +2419,51 @@
       \hspace*{0pt}%
       %\pc@create@lpc%
       % typeset text annotation (see: PDF Reference)
-	  \xdef\pc@zref@PDFOBJID{\pc@get@PDFOBJID{\pc@lopt@replyto}}%
-	  \pc@afterpagefalse%
+      \xdef\pc@zref@PDFOBJID{\pc@get@PDFOBJID{\pc@lopt@replyto}}%
+      \pc@afterpagefalse%
       \ifpdf%
-	    \@for\pc@for@PDFOBJID:={\pc@zref@PDFOBJID}\do%
+        \@for\pc@for@PDFOBJID:={\pc@zref@PDFOBJID}\do%
         {%
-		  \ifthenelse{\equal{\pc@for@PDFOBJID}{A}}%
-		  {%
-		    \pc@afterpagetrue%
-		    \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}%
-		  }%
-		  {%
-	        \ifthenelse{\equal{\pc@for@PDFOBJID}{S}}%
-		    {}%
-		    {%
-		      %\ifpc@afterpage%
-			    \edef\pc@irt{/IRT \pc@for@PDFOBJID\space 0 R\space}%
-                \vbox%
+          \ifthenelse{\equal{\pc@for@PDFOBJID}{A}}%
+          {%
+            \pc@afterpagetrue%
+            \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}%
+          }%
+          {%
+            \ifthenelse{\equal{\pc@for@PDFOBJID}{S}}%
+            {}%
+            {%
+              \edef\pc@irt{/IRT \pc@for@PDFOBJID\space 0 R\space}%
+              \vbox%
+              {%
+                \hsize=0pt%
+                \noindent%
+                \vspace{\pc@lopt@voffset}%
+                \hbox to 0pt%
                 {%
-                  \hsize=0pt%
-                  \noindent%
-                  \vspace{\pc@lopt@voffset}%
-                  \hbox to 0pt%
+                  \vsize=0pt%
+                  \hskip\pc@lopt@hoffset%
+                  \pdfannot width 0pt height \normalbaselineskip depth 0pt%
                   {%
-                    \vsize=0pt%
-                    \hskip\pc@lopt@hoffset%
-                    \pdfannot width 0pt height \normalbaselineskip depth 0pt%
-                    {%
-                      /Subtype /Text%
-			          \pc@lopt@c\space%
-			          \pc@lopt@cdate\space%
-                      /T (\pc@pdfenc@author)\space%
-                      /Subj (\pc@pdfenc@subject)\space%
-                      /Contents (\pc@pdfenc@contents)\space%
-                      \pc@irt%%
-                      /F 4\space%
-                    }%
-			        \ifthenelse{\equal{\pc@lopt@id}{}}%
-                    {}%
-                    {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}
-					}%
-                    \hss%
+                    /Subtype /Text%
+                      \pc@lopt@c\space%
+                    \pc@lopt@cdate\space%
+                    /T (\pc@pdfenc@author)\space%
+                    /Subj (\pc@pdfenc@subject)\space%
+                    /Contents (\pc@pdfenc@contents)\space%
+                    \pc@irt%%
+                    /F 4\space%
                   }%
+                  \ifthenelse{\equal{\pc@lopt@id}{}}%
+                  {}%
+                  {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
+                  \hss%
                 }%
-			  %\fi%
-			}%
-		  }%
-	    }%
-		\ifthenelse{\equal{\pc@lopt@id}{}}%
+              }%
+            }%
+          }%
+        }%
+        \ifthenelse{\equal{\pc@lopt@id}{}}%
         {}%
         {\pc@save@PDFOBJID{\pc@lopt@id}}%
       \else%
@@ -2344,6 +2481,88 @@
   \fi%
 }%
 %
+\newcommand{\pdftooltip}[3][]%
+{%
+  \leavevmode%
+  % Copy all global options to local options
+  \pc@copy@gopt@lopt%
+  % Change local options if specified
+  \setkeys{pdftooltip}{#1}%
+  \ifmmode%
+    \marginnote{\pc@encode@PDF@math{#3}}%
+    \ifpc@lopt@disable
+      #2%
+    \else%
+      \settowidth{\pc@box@width}{$\pc@lopt@mathstyle#2$}%
+      \settoheight{\pc@box@height}{$\pc@lopt@mathstyle#2$}%
+      \settodepth{\pc@box@depth}{$\pc@lopt@mathstyle#2$}%
+      \ifpdf%
+        \pdfannot width \the\pc@box@width height \the\pc@box@height depth \the\pc@box@depth%
+        {%
+          /Subtype /Widget\space%
+          \pc@annot@tooltip%
+        }%
+        #2%
+      \else%
+        \ifpc@gopt@dvipdfmx%
+          \special{pdf: ann width \the\pc@box@width\space height \the\pc@box@height\space depth \the\pc@box@depth%
+            <<%
+              /Subtype /Widget\space%
+              \pc@annot@tooltip%
+            >>%
+          }%
+          #2%
+        \else%
+          \pdfmark[\pc@lopt@mathstyle#2]%
+          {%
+            pdfmark=/ANN,%
+            Subtype=/Widget,%
+            Raw={\pc@annot@tooltip}%
+          }%
+        \fi%
+      \fi%
+    \fi%
+  \else%
+    \pc@encode@PDF{#3}%
+    \ifpc@lopt@disable%
+      #2%
+    \else%
+      \hspace*{0pt}%
+      \settowidth{\pc@box@width}{#2}%
+      \settoheight{\pc@box@height}{#2}%
+      \settodepth{\pc@box@depth}{#2}%
+      \ifpdf%
+        \pdfannot width \the\pc@box@width height \the\pc@box@height depth \the\pc@box@depth%
+        {%
+          /Subtype /Widget\space%
+          \pc@annot@tooltip%
+        }%
+        #2%
+      \else%
+        \ifpc@gopt@dvipdfmx%
+          \special{pdf: ann width \the\pc@box@width\space height \the\pc@box@height\space depth \the\pc@box@depth%
+            <<%
+              /Subtype /Widget\space%
+              \pc@annot@tooltip%
+            >>%
+          }%
+          #2%
+        \else%
+          \pdfmark[#2]%
+          {%
+            pdfmark=/ANN,%
+            Subtype=/Widget,%
+            Raw={\pc@annot@tooltip}%
+          }%
+        \fi%
+      \fi%
+    \fi%
+  \fi%
+  \refstepcounter{zref@unique}%
+  %only local!
+  \gdef\pc@lopt@mathstyle{}%
+}%
+%
 % reset global options
 \newcommand{\pdfcommentsetup}[1]%
 {%
@@ -2488,6 +2707,12 @@
   \gdef\pc@lopt@id{}%
   \gdef\pc@collect@PDFOBJID{S}%
   \pc@lopt@disablefalse%
+  \gdef\pc@lopt@printSOfinal{\pc@gopt@printSOfinal}%
+  \ifpc@gopt@disable%
+    \global\pc@lopt@disabletrue%
+  \else%
+    \global\pc@lopt@disablefalse%
+  \fi%
 }%
 %
 \newcommand{\pc@encode@PDF}[1]%
@@ -2539,7 +2764,7 @@
 }%
 %
 \newcommand{\pc@annot@freetext}%
-{% 
+{%
   \pc@lopt@c\space%
   \pc@lopt@cdate\space%
   /DA (/\pc@lopt@font\space \pc@lopt@fontsize\space Tf\space \pc@hyenc@fontcolor\space rg)\space%
@@ -2566,7 +2791,7 @@
 }%
 %
 \newcommand{\pc@annot@square}%
-{% 
+{%
   \pc@lopt@c\space%
   \pc@lopt@ic\space%
   \pc@lopt@cdate\space%
@@ -2589,7 +2814,7 @@
 }%
 %
 \newcommand{\pc@annot@line}%
-{% 
+{%
   \pc@lopt@c\space%
   \pc@lopt@ic\space%
   \pc@lopt@cdate\space%
@@ -2622,7 +2847,7 @@
   {%
     /Subtype /\pc@lopt@markup\space%
     /C [\pc@hyenc@color]\space%
-	\pc@lopt@cdate\space%
+    \pc@lopt@cdate\space%
     /CA \pc@lopt@opacity\space%
     /T (\pc@pdfenc@author)\space%
     /Subj (\pc@pdfenc@subject)\space%
@@ -2639,7 +2864,7 @@
     <<\space%
       /Subtype /\pc@lopt@markup\space%
       /C [\pc@hyenc@color]\space%
-	  \pc@lopt@cdate\space%
+      \pc@lopt@cdate\space%
       /CA \pc@lopt@opacity\space%
       /T (\pc@pdfenc@author)\space%
       /Subj (\pc@pdfenc@subject)\space%
@@ -2659,7 +2884,7 @@
     Subtype=/\pc@lopt@markup,%
     Raw={
       /C [\pc@hyenc@color]\space%
-	  \pc@lopt@cdate\space%
+      \pc@lopt@cdate\space%
       /CA \pc@lopt@opacity\space%
       /T (\pc@pdfenc@author)\space%
       /Subj (\pc@pdfenc@subject)\space%
@@ -2671,6 +2896,15 @@
   }%
 }%
 %
+\newcommand{\pc@annot@tooltip}%
+{%
+  /TU (\pc@pdfenc@contents)\space%
+  /T (tooltip \thezref@unique)\space%
+  /FT/Btn\space%
+  /Ff/65536\space%
+  /H/N\space%
+}%
+%
 \newcommand{\pc@create@pdfannotopt}%
 {%
   \gdef\pc@pdfannotopt{}%
@@ -2781,18 +3015,18 @@
         }%
         \vss%
       }%
-	  \ifpc@annot@samepage%
-	    \ifthenelse{\equal{\pc@lopt@id}{}}%
+      \ifpc@annot@samepage%
+        \ifthenelse{\equal{\pc@lopt@id}{}}%
         {}%
         {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-	  \else%
-	    \ifpc@annot@secondpage%
-		  \ifthenelse{\equal{\pc@lopt@id}{}}%
+      \else%
+        \ifpc@annot@secondpage%
+          \ifthenelse{\equal{\pc@lopt@id}{}}%
           {}%
           {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-		\else%
-		\fi%
-	  \fi%
+        \else%
+        \fi%
+      \fi%
     \else%
       \ifpc@gopt@dvipdfmx%
         \vbox to 0pt%
@@ -2844,7 +3078,7 @@
     \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}%
     \ifpdf%
       \pc@annot@markup@pdf%
-	  \ifthenelse{\equal{\pc@lopt@id}{}}%
+      \ifthenelse{\equal{\pc@lopt@id}{}}%
       {}%
       {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
     \else%
@@ -2861,20 +3095,20 @@
     \pc@calc@textblockpos%
     \pc@copy@anna@to@annb%
     \setlength{\pc@dimf}{\dimexpr \pc@annb@y@one bp\relax}%
-	\setlength{\pc@dimg}{\dimexpr \pc@y@top@text bp\relax}%
-	\setlength{\pc@dimh}{\pc@dimg-\pc@dimf}%
-	\setlength{\pc@dimi}{\pc@dimb-\pc@dimg+\the\baselineskip+\the\baselineskip}%
-	% set new right border only if more than 1 line on second page
-	\ifdim\pc@dimi<0pt%
-	  \ifdim\pc@dimh<\the\baselineskip%
+    \setlength{\pc@dimg}{\dimexpr \pc@y@top@text bp\relax}%
+    \setlength{\pc@dimh}{\pc@dimg-\pc@dimf}%
+    \setlength{\pc@dimi}{\pc@dimb-\pc@dimg+\the\baselineskip+\the\baselineskip}%
+    % set new right border only if more than 1 line on second page
+    \ifdim\pc@dimi<0pt%
+      \ifdim\pc@dimh<\the\baselineskip%
         \renewcommand{\pc@annb@x@two}{\pc@x@right@text}%
         \renewcommand{\pc@annb@x@four}{\pc@x@right@text}%
-	  \fi%	
-	\fi%
-	\ifpc@annot@samepage%
-	  \renewcommand{\pc@annb@x@two}{\pc@x@right@text}%
+      \fi%
+    \fi%
+    \ifpc@annot@samepage%
+      \renewcommand{\pc@annb@x@two}{\pc@x@right@text}%
       \renewcommand{\pc@annb@x@four}{\pc@x@right@text}%
-	\fi%
+    \fi%
     \renewcommand{\pc@annb@y@two}{\pc@anna@y@one}%
     \renewcommand{\pc@annb@y@four}{\pc@anna@y@three}%
     \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}%
@@ -2884,20 +3118,20 @@
     }%
     {}%
     \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}%
-	\ifpdf%
+    \ifpdf%
       \pc@annot@markup@pdf%
-	  \ifpc@annot@samepage%
-	    \ifthenelse{\equal{\pc@lopt@id}{}}%
+      \ifpc@annot@samepage%
+        \ifthenelse{\equal{\pc@lopt@id}{}}%
         {}%
         {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-	  \else%
-	    \ifpc@annot@secondpage%
-		  \ifthenelse{\equal{\pc@lopt@id}{}}%
+      \else%
+        \ifpc@annot@secondpage%
+          \ifthenelse{\equal{\pc@lopt@id}{}}%
           {}%
           {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-		\else%
-		\fi%
-	  \fi%
+        \else%
+        \fi%
+      \fi%
     \else%
       \ifpc@gopt@dvipdfmx%
         \pc@annot@markup@dvipdfmx%
@@ -2916,26 +3150,26 @@
       \edef\pc@annb@y@four{\pc@pttobp{\dimexpr \pc@annb@y@four bp + 1.5pt\relax}}%
       \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@three bp + 1.5pt \relax}}%
     }%
-    {}%	
+    {}%
     \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}%
     \setlength{\pc@dimg}{\dimexpr \pc@annb@y@one bp\relax}%
-	\setlength{\pc@dimh}{\pc@dimg-\pc@dimf+3pt}%
-	% only 1 line on first page? => no annotation for last line
-	\ifdim\pc@dimh<0pt%
-	  \ifpdf%
+    \setlength{\pc@dimh}{\pc@dimg-\pc@dimf+3pt}%
+    % only 1 line on first page? => no annotation for last line
+    \ifdim\pc@dimh<0pt%
+      \ifpdf%
         \pc@annot@markup@pdf%
-	    \ifpc@annot@samepage%
-	      \ifthenelse{\equal{\pc@lopt@id}{}}%
+        \ifpc@annot@samepage%
+          \ifthenelse{\equal{\pc@lopt@id}{}}%
           {}%
           {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-	    \else%
-	      \ifpc@annot@secondpage%
-		    \ifthenelse{\equal{\pc@lopt@id}{}}%
+        \else%
+          \ifpc@annot@secondpage%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-		  \else%
-		  \fi%
-	    \fi%
+          \else%
+          \fi%
+        \fi%
       \else%
         \ifpc@gopt@dvipdfmx%
           \pc@annot@markup@dvipdfmx%
@@ -2943,17 +3177,17 @@
           \pc@annot@markup@dvips%
         \fi%
       \fi%
-	\fi%
+    \fi%
     %middle lines
     \pc@copy@anna@to@annb%
     \setlength{\pc@dimc}{\dimexpr \pc@annb@y@one bp + 0.1pt\relax}%
-	\ifpc@annot@samepage%
+    \ifpc@annot@samepage%
       \setlength{\pc@dimd}{\dimexpr \pc@annb@y@two bp\relax}%
     \fi%
-	\ifpc@annot@secondpage%
+    \ifpc@annot@secondpage%
       \setlength{\pc@dimd}{\dimexpr \pc@annb@y@two bp\relax}%
     \fi%
-	\setcounter{pc@annot@lines}{0}%
+    \setcounter{pc@annot@lines}{0}%
     \setlength{\pc@dime}{\pc@dimc}%
     \addtolength{\pc@dime}{-\pc@dimd}%
     % count lines
@@ -2977,7 +3211,7 @@
       {%
       \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 2pt\relax}}%
       \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -2pt \relax}}%
-      }% 
+      }%
     \fi%
     \whiledo{\value{pc@annot@lines}>0}%
     {%
@@ -2987,18 +3221,18 @@
       \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@one\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@three}%
       \ifpdf%
         \pc@annot@markup@pdf%
-		  \ifpc@annot@samepage%
-	      \ifthenelse{\equal{\pc@lopt@id}{}}%
+          \ifpc@annot@samepage%
+          \ifthenelse{\equal{\pc@lopt@id}{}}%
           {}%
           {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-	    \else%
-	      \ifpc@annot@secondpage%
-		    \ifthenelse{\equal{\pc@lopt@id}{}}%
+        \else%
+          \ifpc@annot@secondpage%
+            \ifthenelse{\equal{\pc@lopt@id}{}}%
             {}%
             {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}%
-		  \else%
-		  \fi%
-	    \fi%
+          \else%
+          \fi%
+        \fi%
       \else%
         \ifpc@gopt@dvipdfmx%
           \pc@annot@markup@dvipdfmx%
@@ -3006,7 +3240,7 @@
           \pc@annot@markup@dvips%
         \fi%
       \fi%
-    }%      
+    }%
   }%
   \fi%
 }%
@@ -3019,7 +3253,7 @@
       \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth\relax}}%
     \else%
       \renewcommand{\pc@x@left@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin \relax}}%
-      \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth\relax}}%  
+      \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth\relax}}%
     \fi%
   \else%
     \renewcommand{\pc@x@left@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin \relax}}%
@@ -3037,7 +3271,7 @@
       \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%
     \else%
       \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}%
-      \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%  
+      \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}%
     \fi%
   \else%
     \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}%