pdfcomment (15jun16)

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

19 files changed, 75 insertions, 64 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index edbb06e0a8f..455e3d1a0e7 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,17 @@
 === pdfcomment.sty ===
 
+-- pdfcomment.sty (v2.4) (<- v2.3.2dev 2016/06/13) (Commit: 0ce1f75284cf0cba7956076ebccac32c7f181f31)
+
+2016/05/29  compatibility fix for luatex v0.85+ [jk]
+            by loading the luatex85 package
+
+2016/05/29  upgraded obsolete datetime to datetime2 [jk]
+            
+2016/06/13  Bugfix: incorrect positions of PDF text annotations with dvips [jk]
+            removed \vspace{\normalbaselineskip}            
+            
+            
+            
 -- pdfcomment.sty (v2.3b) (<- v2.3.1dev 2015/04/10) (Commit: 382b38b2e17e4853fbc537250aabc6c42160df2a)
 
 2012/09/30  added 'pdfencoding=auto' while loading hyperref [jk]
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README.md b/Master/texmf-dist/doc/latex/pdfcomment/README.md
index 714bea61372..88cfc8fea58 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README.md
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README.md
@@ -16,26 +16,10 @@ The reference viewer for the development of this package is Adobe Reader.
 
 License: **LPPL**
 
-Changes in v2.3b:
+Changes in v2.4:
 
-* Bugfix: incorrect vertical position of superscripts in `\pdftooltip`
-            
-reported and patched by Ross Moore
+* compatibility fix for luatex v0.85+
 
-* Bugfix: change zero width in `\pdfcomment` and `\pdfmargincomment`
-          to make the comments visible in both Evince and the internal viewer of TeXStudio
+* upgraded obsolete datetime to datetime2
 
-reported by shaniaki (BitBucket #7)
-
-* improve appearance of tooltips with Mac Preview (at least)
-
-feature request by Ross Moore
-
-* expand comment argument in `\pdftooltip` before pushing it through `\pdfstringdef`
-
-feature request by Robert Terwilliger (Bitbucket #18)
-
-* added `pdfencoding=auto` while loading `hyperref`
-  Needed for Unicode bookmarks in `XeTeX` and `LuaTeX`
-  
-* dropped support for `\pdfreply`
\ No newline at end of file
+* Bugfix: incorrect positions of PDF text annotations with dvips
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index f87b3bfe807..de8c65051ae 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 388e1b4df9f..dce20cbad93 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -17,7 +17,6 @@
 \defineavatar{Bob}{author=Bob,color=green}
 \definecolor{myblue}{rgb}{0.045,0.278,0.643}
 \colorlet{myorange}{red!30!yellow}
-\pdfcommentsetup{date=D:20101211153723+01'00'}
 A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,subject={Comment2},icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
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 e8526d772bd..f94a212c6d1 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 b4a96566595..16c61a746bd 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -18,7 +18,6 @@
 \defineavatar{Bob}{author=Bob,color=green}
 \definecolor{myblue}{rgb}{0.045,0.278,0.643}
 \colorlet{myorange}{red!30!yellow}
-\pdfcommentsetup{date=D:20101211153723+01'00'}
 A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
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 115533323e0..8880e4c6eef 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 4bb4fc22e4a..77b8e66f0bb 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
@@ -16,7 +16,6 @@
 \defineavatar{Bob}{author=Bob,color=green}
 \definecolor{myblue}{rgb}{0.045,0.278,0.643}
 \colorlet{myorange}{red!30!yellow}
-\pdfcommentsetup{date=D:20101211153723+01'00'}
 A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[id=1,color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
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 953446e1498..ca31059a791 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_math_markup.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
index 8820c85b0a1..4b1bb9018ce 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
@@ -9,7 +9,6 @@
 \begin{document}
 \defineavatar{Joe}{author=Joe,color=yellow}
 \defineavatar{Bob}{author=Bob,color=green}
-\pdfcommentsetup{date=D:20101211153723+01'00'}
 \setlength{\parindent}{0pt}
 \addtokomafont{section}{\normalfont\normalcolor\bfseries}
 \setkomafont{title}{\normalfont\normalcolor\bfseries}
@@ -115,5 +114,4 @@ mathstyle=\displaystyle]
 \end{lstlisting}
 \end{minipage}
 \end{tabular}
-
 \end{document} 
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index e7a19c4c72a..32a01b2bd2d 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 5984ac39f9a..780ac8e5cf0 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -24,7 +24,7 @@
 \defineavatar{Bob}{author=Bob,color=green}
 \definecolor{myblue}{rgb}{0.045,0.278,0.643}
 \colorlet{myorange}{red!30!yellow}
-\pdfcommentsetup{date=D:20101211153723+01'00',timezone=+01'00'}
+\pdfcommentsetup{timezone={+01'00'}}
 A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
index 698cf346280..2e839c41d6a 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
+++ b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
@@ -25,7 +25,7 @@ example_xelatex.pdf
 
 -- Misc. Files --
 
-README
+README.md
 manifest.txt
 INSTALL
 CHANGES
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 82e2c9bdb9e..851b90149f1 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 1179362565d..5950ab8a1d6 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -134,20 +134,21 @@
 \hypersetup{pdfauthor={Josef Kleber},pdftitle={A user-friendly interface to PDF annotations},pdfsubject={Documentation for LaTeX style \filename}}%
 %
 \begin{document}
-\pdfcommentsetup{date=D:20101212153723+01'00'}
+%\pdfcommentsetup{date=D:20101212153723+01'00'}
+\date{2016/06/13}
 \bibliographystyle{alphadin}
 \title{\filename}%
 \Subtitle{A user-friendly interface to PDF annotations}%
 \author{Josef Kleber}
-\Fileversion{v2.3b}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
+\Fileversion{v2.4}
+\Refline{\href{mailto:pdfcomment@jklatex.de}{\texttt{pdfcomment@jklatex.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
 \maketitle
 \Headline{Abstract}
 \begin{abstract}
 For a long time \texttt{pdflatex} has offered the command \cmd\pdfannot{} for inserting arbitrary PDF annotations. However, the command is presented in a form where additional knowledge of the definition of the PDF format is indispensable. This package is an answer to the -- occasional -- questions in newsgroups, about how one could use the comment function of \texttt{Adobe Reader}. At least for the writer of \LaTeX{} code, the package offers a convenient and user-friendly means of using \cmd\pdfannot{} to provide comments in PDF files. Since version v1.1, \texttt{\filename{}} also supports: 
 
 \medskip
-\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{only with style option \texttt{dvipdfmx}} \XeLaTeX and \LuaLaTeX}.\hfill
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{only with style option \texttt{dvipdfmx}} \XeLaTeX\ and \LuaLaTeX}.\hfill
 \medskip
 
 Unfortunately, support of PDF annotations by PDF viewers may vary. The reference viewer for the development of this package is \texttt{Adobe Reader}.
@@ -157,7 +158,7 @@ If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test
 \vfill
 \begin{center}
 \subsubsection*{Required packages for using \substyle{\filename}}
-\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote}, \package{datetime}, \package{refcount}, \package{soulpos} and the packages loaded by them.}}
+\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{etoolbox}, \package{luatex85}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote}, \package{datetime2}, \package{refcount}, \package{soulpos} and the packages loaded by them.}}
 \end{center}
 \vfill
 \clearpage
@@ -181,7 +182,7 @@ I want to thank the following persons for contributions to the development of th
 \noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} and \XeLaTeX}.\hfill
 \medskip
 
-\item \textbf{Ulrike Fischer} for answering my stupid questions on d.c.t.t. for making possible the avatar and style system and much more.
+\item \textbf{Ulrike Fischer} for answering my stupid questions on d.c.t.t. for making the avatar and style system possible and much more.
 
 \item \textbf{Christian Feuersänger} for contributing new ideas in form of his package \package{pdfmarginpar.sty} and for solving the printing problem\footnote{see section \ref{sec:print}} of PDF annotations and popups.
 
@@ -205,7 +206,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: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. 
+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.
 
 \subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
 You can use the option \styleoption{subject} for defining the subject of the PDF popup annotations.
@@ -372,7 +373,7 @@ You can use the option \styleoption{hoffset} for defining a horizontal offset of
 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} (\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.
+You can use the option \styleoption{height} for definig the height of PDF annotations. PDF text annatations have a height of \cmd\normalbaselineskip{} by definition.
 
 \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.
@@ -385,13 +386,13 @@ You can use the option \styleoption{date} to assign a date to PDF annotations. I
 
 \begin{center}
 \begin{tabular}{l}
-D:YYYYMMDDhhmmss+TZ\\
-D:20101224153657+01'00'
+\texttt{D:YYYYMMDDhhmmss+TZ}\\
+\texttt{D:20101224153657+01'00'}
 \end{tabular}
 \end{center}
 
 \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)).
+You only have to use the option \styleoption{timezone}, if you are using automatic date setting and \XeLaTeX. Otherwise the \texttt{pdflatex} primitive \string\pdfcreationdate\ will be used. \styleoption{timezone}=+01'00' sets the timezone to central european time CET (default: +00'00' (GMT)).
 
 \subsubsection[\texttt{avatar}]{\styleoption{avatar}}\label{sec:avatar}
 With the option \styleoption{avatar} you can load the option lists, that were predefined with the command \cmd\defineavatar{} to avoid annoying typing. 
@@ -504,7 +505,7 @@ Also see \LinkExMath{} for a more detailed explanation of the possibilities!
 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{} (\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!
+\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 don't have a frame but 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}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index bf9a8b5ddbd..f18874d8876 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 387674d1d5b..0e91159572b 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -148,20 +148,21 @@
 \hypersetup{pdfauthor={Josef Kleber},pdftitle={Ein benutzerfreundliches Interface zu PDF-Kommentaren},pdfsubject={Dokumentation für den LaTeX style \filename}}
 %
 \begin{document}
-\pdfcommentsetup{date=D:20101212153723+01'00'}
+%\pdfcommentsetup{date=D:20101212153723+01'00'}
+\date{2016/06/13}
 \bibliographystyle{alphadin}
 \title{\filename}%
 \Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
 \author{Josef Kleber}
-\Fileversion{v2.3b}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
+\Fileversion{v2.4}
+\Refline{\href{mailto:pdfcomment@jklatex.de}{\texttt{pdfcomment@jklatex.de}}\\\href{http://pdfcomment.jklatex.de}{\texttt{http://pdfcomment.jklatex.de}}}
 \maketitle
 \Headline{Zusammenfassung}%
 \begin{abstract}
 \texttt{pdflatex}\index{pdflatex} bietet seit jeher den Befehl \cmd\pdfannot{} für das Einfügen beliebiger PDF annotations. Allerdings in einer Form, in der zusätzliche Kenntnisse der PDF-Referenz unabdingbar sind. \substyle{\filename} ist eine Antwort auf die in Newsgroups -- von Zeit zu Zeit -- auftauchende Frage, wie man die Kommentarfunktion des \texttt{Adobe Reader} nutzen könnte. Zumindest aus dem \LaTeX{}-Code heraus, bietet \substyle{\filename} eine bequeme und nutzerfreundliche Möglichkeit PDF annotations in PDF-Dateien zu nutzen. Seit Version v1.1 unterstützt \texttt{\filename{}} auch:
 
 \medskip
-\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{nur mit der Styleoption \texttt{dvipdfmx}}, \XeLaTeX und \LuaLaTeX}.\hfill
+\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx}\footnote{nur mit der Styleoption \texttt{dvipdfmx}}, \XeLaTeX\ und \LuaLaTeX}.\hfill
 \medskip
 
 Leider ist die Unterstützung der PDF annotations durch die PDF-Viewer teilweise nur sehr eingeschränkt bzw. gar nicht vorhanden. Der Referenz-Viewer für die Entwicklung dieses Pakets ist \texttt{Adobe Reader}.
@@ -171,7 +172,7 @@ Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Komme
 \vfill
 \begin{center}
 \subsubsection*{Benötigte Pakete für die Nutzung von \substyle{\filename}}
-\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote}, \package{datetime}, \package{refcount}, \package{soulpos} und die von diesen Paketen aufgerufenen Dateien.}}
+\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{etoolbox}, \package{luatex85}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote}, \package{datetime2}, \package{refcount}, \package{soulpos} und die von diesen Paketen aufgerufenen Dateien.}}
 \end{center}
 \vfill
 \clearpage
@@ -211,7 +212,7 @@ Außerdem möchte ich folgenden Personen danken für bug reports, feature requests,
 \section{Optionen}
 \subsection{Globale Styleoptionen}
 \subsubsection[\texttt{final}]{\styleoption{final}}\label{sec:final}
-Mit der Option \texttt{final} versetzt man das Paket in den Final-Modus. Die PDF annotations werden nicht gesetzt und beeinflussen daher auch nicht den Zeilen\-umbruch. Benutzen Sie die lokale Option \styleoption{disable}, falls Sie nur einzelne PDF annotations abschalten möcten. (siehe: \ref{sec:disable})
+Mit der Option \texttt{final} versetzt man das Paket in den Final-Modus. Die PDF annotations werden nicht gesetzt und beeinflussen daher auch nicht den Zeilen\-umbruch. Benutzen Sie die lokale Option \styleoption{disable}, falls Sie nur einzelne PDF annotations abschalten möchten. (siehe: \ref{sec:disable})
 \subsubsection[\texttt{draft}]{\styleoption{draft}}\label{sec:draft}
 Mit der Option \texttt{draft} (default) versetzt man das Paket in den Draft-Modus. Die PDF annotations werden daher gesetzt.
 \subsubsection[\texttt{dvipdfmx}]{\styleoption{dvipdfmx}}\label{sec:dvipdfmx}
@@ -384,7 +385,7 @@ Die Option \styleoption{voffset} dient der Festlegung eines vertikalen Offsets,
 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} (\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.
+Die Option \styleoption{height} dient der Festlegung der Höhe der PDF annotations. Bei PDF text annotations wurde die Höhe auf \cmd\normalbaselineskip{} festgelegt.
 
 \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.
@@ -397,13 +398,13 @@ Mit der Option \styleoption{date} kann man den PDF annotations ein Datum zuordne
 
 \begin{center}
 \begin{tabular}{l}
-D:YYYYMMDDhhmmss+TZ\\
-D:20101224153657+01'00'
+\texttt{D:YYYYMMDDhhmmss+TZ}\\
+\texttt{D:20101224153657+01'00'}
 \end{tabular}
 \end{center}
 
 \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.
+Sie müssen die Option \styleoption{timezone} nur benutzen, falls Sie die automatische Datumssetzung und \XeLaTeX\ verwenden. Ansonsten wird die \texttt{pdflatex}-Primitive \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. 
@@ -517,7 +518,7 @@ Beachten Sie bitte auch \LinkExMath{} für eine genauere Beschreibung der neuen M
 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{} (\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!
+\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=6cm,voffset=-4.1cm,hoffset=-4cm,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}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index e4d8b972417..e12074162a8 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -13,14 +13,14 @@
 %% 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".
+%% This work has the LPPL maintenance status "maintained".
 %%
 %% The Current Maintainer of this work is Josef Kleber.
 %%
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2016/03/26 pdfcomment.sty v2.3b - Josef Kleber (C) 2008-2012, 2015-2016]%
+\ProvidesPackage{pdfcomment}[2016/06/13 pdfcomment.sty v2.4 - Josef Kleber (C) 2008-2012, 2015-2016]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -154,6 +154,7 @@
 \gdef\pc@lopt@co{}%
 %
 \newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
+\newif\ifpc@gopt@xelatex\pc@gopt@xelatexfalse%
 \newif\ifpc@gopt@final\pc@gopt@finalfalse%
 \newif\ifpc@lopt@disable\pc@lopt@disablefalse%
 \newif\ifpc@gopt@disable\pc@gopt@disablefalse%
@@ -1328,6 +1329,16 @@
 %
 \ProcessOptionsX\relax%
 %
+\RequirePackage{etoolbox}%
+% luatex v0.85+ ???
+\ifdef\pdffeedback
+{%
+  \RequirePackage{luatex85}%
+  \RequirePackage{datetime2}[2016/06/04]%
+}%
+{%
+  \RequirePackage{datetime2}%
+}%
 \RequirePackage{zref-savepos}[2007/04/22]%
 \zref@require@unique%
 \RequirePackage{refcount}%
@@ -1335,7 +1346,6 @@
 \RequirePackage{calc}%
 \RequirePackage{marginnote}%
 \RequirePackage{ifpdf}%
-\RequirePackage{datetime}%
 \RequirePackage{soulpos}%
 %
 %hyperref setup
@@ -1373,6 +1383,7 @@
     \fi%
   \else%
     \global\pc@gopt@dvipdfmxtrue%
+    \global\pc@gopt@xelatextrue%
     \@ifpackageloaded{hyperref}%
     {%
       \hypersetup{xetex}%
@@ -1473,7 +1484,6 @@
             \hsize=0pt%
             \noindent%
             \vspace{\pc@lopt@voffset}%
-            \vspace{\normalbaselineskip}%
             \hbox to 0pt%
             {%
               \vsize=0pt%
@@ -1580,7 +1590,6 @@
                 \hsize=0pt%
                 \noindent%
                 \vspace{\pc@lopt@voffset}%
-                \vspace{\normalbaselineskip}%
                 \hbox to 0pt%
                 {%
                   \vsize=0pt%
@@ -2994,16 +3003,26 @@
   \strip@pt\dimexpr .996264\dimexpr #1\relax\relax%
 }%
 %
-% thanks to Heiko Oberdiek (Msg-ID: <ich62p$80k$1@news.eternal-september.org>)
-\begingroup\expandafter\expandafter\expandafter\endgroup\expandafter\ifx\csname pdfcreationdate\endcsname\relax%
-  \edef\pc@pdfdate@edef{D:\pdfdate\pc@lopt@timezone}%
-\else%
-  \edef\pc@pdfdate@edef{\pdfcreationdate}%
-\fi%
-%
 \newcommand*{\pc@pdfdate@auto}%
 {%
-  \pc@pdfdate@edef%
+  \ifpc@gopt@xelatex
+    D:\@dtm@currentyear%
+    \DTMtwodigits{\@dtm@currentmonth}%
+    \DTMtwodigits{\@dtm@currentday}%
+    \DTMtwodigits{\@dtm@currenthour}%
+    \DTMtwodigits{\@dtm@currentminute}%
+    \DTMtwodigits{\@dtm@currentsecond}%
+    \pc@lopt@timezone%
+  \else%
+    D:\@dtm@currentyear%
+    \DTMtwodigits{\@dtm@currentmonth}%
+    \DTMtwodigits{\@dtm@currentday}%
+    \DTMtwodigits{\@dtm@currenthour}%
+    \DTMtwodigits{\@dtm@currentminute}%
+    \DTMtwodigits{\@dtm@currentsecond}%
+    \ifnum\@dtm@currenttimezonehour<0\else+\fi\DTMtwodigits{\@dtm@currenttimezonehour}%
+    \DTMtwodigits{\@dtm@currenttimezoneminute}%
+  \fi%
 }%
 %
 \newcommand{\pc@annot@calc@pos}%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index f64fc145568..2fc93dba674 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -803,7 +803,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'pdf-forms-tutorial-de', "die 'skipping, requires acrobat'", #"&MAKEpdf_forms_tutorial",
  'pdf-forms-tutorial-en', "die 'skipping, requires acrobat'", #"&MAKEpdf_forms_tutorial",
  'pdfbook',     "die 'skipping, requires compilation'",
- 'pdfcomment',	"&MAKEflatten",
  'pdfjam',      "&MAKEflatten",
  'pdfmarginpar',"&MAKEflatten",
  'pdfrack',     "die 'skipping, until someone asks for it'",