pdfcomment (28mar16)

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

19 files changed, 104 insertions, 138 deletions

diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index b8b7bea3e53..edbb06e0a8f 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,8 +1,31 @@
-5a38dc437d0f
-
 === pdfcomment.sty ===
 
--- pdfcomment.sty (v2.3a) (<- v2.3 2012/09/28) (Commit: 5a38dc437d0f)
+-- pdfcomment.sty (v2.3b) (<- v2.3.1dev 2015/04/10) (Commit: 382b38b2e17e4853fbc537250aabc6c42160df2a)
+
+2012/09/30  added 'pdfencoding=auto' while loading hyperref [jk]
+            Needed for Unicode bookmarks in XeTeX and LuaTeX
+
+2015/04/10  Bugfix: incorrect vertical position of superscripts in \pdftooltip [jk]
+            
+            reported and patched by Ross Moore
+            
+2015/04/10  Bugfix: change zero width in \pdfcomment and \pdfmargincomment [jk]
+            to make the comments visible in both evince and the internal viewer of texstudio
+
+            reported by shaniaki (BitBucket #7)
+            
+2015/04/23  improve appearance of tooltips with Mac Preview (at least)
+
+            feature request by Ross Moore
+
+2015/09/08  expand comment argument in \pdftooltip before pushing it through \pdfstringdef
+
+            feature request by Robert Terwilliger (BitBucket #18)
+            
+2016/03/26  dropped support for \pdfreply
+
+
+-- pdfcomment.sty (v2.3a) (<- v2.3 2012/09/28) (Commit: 0752b119ceff2e866fb7a00331661bff57113bbd)
 
 2012/09/28  Bugfix: problem with boxes around tooltips [jk]
             spurious backslash in "/Ff/65536\space%" in line 2967, see:
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
deleted file mode 100644
index d6d53a885e3..00000000000
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ /dev/null
@@ -1,25 +0,0 @@
-For a long time pdflatex has offered the command \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 Adobe
-Reader. At least for the writer of LaTeX code, the package offers a
-convenient and user-friendly means of using \pdfannot to provide comments
-in PDF files. Since version v1.1, pdfcomment.sty also supports:
-
-       LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx and XeLaTeX.
-
-Unfortunately, support of PDF annotations by PDF viewers is sparse to
-nonexistent. The reference viewer for the development of this package is
-Adobe Reader.
-
-License: LPPL
-
-Changes in v2.3a:
-
-- Bugfix: problem with boxes around tooltips [jk]
-          spurious backslash in "/Ff/65536\space%" in line 2967, see:
-          https://bitbucket.org/kleberj/pdfcomment/issue/8/pdftooltip-tooltip-area-is-displayed-like
-          http://tex.stackexchange.com/questions/34698/strange-appearance-of-tooltips-produced-by-pdfcomment
-
-          reported by: diabonas
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README.md b/Master/texmf-dist/doc/latex/pdfcomment/README.md
new file mode 100644
index 00000000000..714bea61372
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README.md
@@ -0,0 +1,41 @@
+# README #
+
+For a long time pdflatex has offered the command `\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 Adobe
+Reader. At least for the writer of LaTeX code, the package offers a
+convenient and user-friendly means of using `\pdfannot` to provide comments
+in PDF files. Since version v1.1, pdfcomment.sty also supports:
+
+  LaTeX -> dvips -> ps2pdf, LaTeX -> dvipdfmx, XeLaTeX and LuaLaTeX
+
+Unfortunately, support of PDF annotations by PDF viewers may vary.
+The reference viewer for the development of this package is Adobe Reader.
+
+License: **LPPL**
+
+Changes in v2.3b:
+
+* Bugfix: incorrect vertical position of superscripts in `\pdftooltip`
+            
+reported and patched by Ross Moore
+
+* Bugfix: change zero width in `\pdfcomment` and `\pdfmargincomment`
+          to make the comments visible in both Evince and the internal viewer of TeXStudio
+
+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
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
index 09e8c5999a6..f87b3bfe807 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 2b8104e9e5c..388e1b4df9f 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -18,11 +18,7 @@
 \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.}
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply to a reply}
-\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+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}%
 \pdfcomment[avatar=CaptainJack,style=MyStar,subject={enough},deadline={2009/11/11 - Josef}]{It's enough now!}
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 9ec92e7d48b..e8526d772bd 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 a73fd8453e6..b4a96566595 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -6,8 +6,7 @@
 \usepackage{microtype}
 \usepackage{lipsum}
 \usepackage[absolute]{textpos}
-%dvipdfmx leads to an error with xcolor
-\usepackage[svgnames,dvipdfm,rgb]{xcolor}
+\usepackage[svgnames,dvipdfmx,rgb]{xcolor}
 % define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf
 \def\pgfsysdriver{pgfsys-dvipdfm.def}
 \usepackage{tikz}
@@ -20,12 +19,7 @@
 \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.}
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
- test the hspace!%
+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}%
 \pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}
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 bb776034f57..115533323e0 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 c9adc3a3e29..4bb4fc22e4a 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
@@ -17,12 +17,7 @@
 \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.}%
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+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}%
 \pdfcomment[avatar=CaptainJack,style=MyStar]{It's enough now!}%
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 a0badca0d8a..953446e1498 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 2e07080e3e8..8820c85b0a1 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
@@ -3,7 +3,6 @@
 \usepackage[latin1]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{lmodern}
-\usepackage[leading=1.08]{stonehand}
 \usepackage[svgnames,rgb]{xcolor}
 \usepackage{listings}
 \usepackage[author={Josef Kleber},subject={Math test},color=Khaki]{pdfcomment}
@@ -24,9 +23,6 @@
 PDF annotations work in inline formula ($\pdfmarkupcomment[style=mathpopup]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{comment}$), as well as in display mode:
 
 \[\pdfmarkupcomment[id=1,style=mathpopup,mathstyle=\displaystyle,open=true]{f(x)=\prod_{i=1}^{n}\left(i-\frac{1}{2i}\right)}{comment}\]
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply to a reply}
-\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
 
 \bigskip
 Of course, you can only comment parts of a formula:
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
index de9962c7966..e7a19c4c72a 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 3d8b84ca09e..5984ac39f9a 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -1,3 +1,4 @@
+% This file works with lualatex as well!
 % Make sure to write the page size into the dvi file!
 % That's possible with the pagesize option of KoMa-Script
 % Otherwise the positioning of the annotations will fail!
@@ -24,12 +25,7 @@
 \definecolor{myblue}{rgb}{0.045,0.278,0.643}
 \colorlet{myorange}{red!30!yellow}
 \pdfcommentsetup{date=D:20101211153723+01'00',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.}
-% works with pdflatex only!
-%\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101211161247+01'00']{This is a reply to a comment}
-%\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101212095321+01'00']{Of course, you can reply %to a reply}
-%\pdfreply[id=4,avatar=Bob,replyto=1,date=D:20101212095512+01'00']{Just another reply}
-test the hspace!%
+A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffset=8pt,opacity=0.5]{This is a comment.} little Test! \pdfcomment[color=myblue,icon=Note,open=true,hspace=100pt]{This is another comment.} test the hspace!%
 \defineavatar{CaptainJack}{color=myorange,author={Captain Jack}}%
 \definestyle{MyStar}{icon=Star,opacity=0.7,voffset=12pt}%
 \pdfcomment[avatar=CaptainJack,style=MyStar,date={}]{It's enough now!}
@@ -193,5 +189,5 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
 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ß}\]
+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 8428c712c7d..82e2c9bdb9e 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 6b21fb8cb3b..1179362565d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -9,6 +9,7 @@
 \usepackage{attachfile}%
 \usepackage{ltxdocext}%
 \usepackage{marginnote}%
+\usepackage{metalogo}%
 \usepackage[svgnames,rgb]{xcolor}%
 \usepackage{amsmath,array}%
 \usepackage{tikz}%
@@ -138,18 +139,18 @@
 \title{\filename}%
 \Subtitle{A user-friendly interface to PDF annotations}%
 \author{Josef Kleber}
-\Fileversion{v2.3a}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
+\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}}}
 \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}} and \XeLaTeX}.\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 is sparse to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.
+Unfortunately, support of PDF annotations by PDF viewers may vary. The reference viewer for the development of this package is \texttt{Adobe Reader}.
 
 If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test annotation},color=lime,hspace=20pt]{This is an annotation} you are definitely using the wrong PDF viewer!
 \end{abstract}
@@ -206,9 +207,6 @@ Version v2.0 of \texttt{pdfcomment.sty} introduced a bugfix that removes unwante
 \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. 
 
-\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}).
-
 \subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
 You can use the option \styleoption{subject} for defining the subject of the PDF popup annotations.
 
@@ -442,7 +440,7 @@ Possible \margcs{\cmd\pdfcomment\\\oarg{options}\marg{comment}}options: \styleop
 \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:
+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}. Furthermore there are some commands for formatting:
 
 \begin{center}
 \begin{tabular}{cl}
@@ -531,22 +529,6 @@ Possible \margcs{\cmd\pdfsidelinecomment\\\oarg{options}\marg{comment}}options:
 \cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \LinkEx).
 
 \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}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
-
-\bigskip
-\defineavatar{Joe}{author=Joe,color=yellow}
-\defineavatar{Bob}{author=Bob,color=green}
-With the command \cmd\pdfreply{} you can compose replys to comments. The option \texttt{replyto} provides a clear reference to the comment the reply refers to.\footnote{The replys must be typeset on the same page than the refering comments}. Due to technical reasons the command \string\pdfreply\  works only while using \texttt{pdflatex}.
-\pdfmargincomment[subject={Top2},author={Josef Kleber},icon=Note,id=1,color=blue]{This is a comment.}
-\pdfreply[id=2,avatar=Joe,replyto=1,date=D:20101212161247+01'00']{This is a reply to a comment}
-\pdfreply[id=3,avatar=Bob,replyto=2,date=D:20101213095321+01'00']{Of course, you can reply to a reply}
-\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}}
@@ -698,12 +680,4 @@ with a text editor and change the entry
 
 Please note that only opened popups will be printed!
 
-{
-\clearpage
-\raggedright
-\nocite{*}
-\bibliography{pdfcomment}
-\addcontentsline{toc}{section}{\refname}
-}
-
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index ec23fadfd65..bf9a8b5ddbd 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 67e5826c618..387674d1d5b 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -9,6 +9,7 @@
 \usepackage{attachfile}%
 \usepackage{ltxdocext}%
 \usepackage{marginnote}%
+\usepackage{metalogo}%
 \usepackage[svgnames,rgb]{xcolor}%
 \usepackage{amsmath,array}%
 \usepackage{tikz}%
@@ -152,15 +153,15 @@
 \title{\filename}%
 \Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
 \author{Josef Kleber}
-\Fileversion{v2.3a}
-\Refline{\href{mailto:josef.kleber@gmx.de}{\texttt{josef.kleber@gmx.de}}\\\href{https://bitbucket.org/kleberj/pdfcomment/}{\texttt{https://bitbucket.org/kleberj/pdfcomment/}}}
+\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}}}
 \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}} und \XeLaTeX}.\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}.
@@ -220,9 +221,6 @@ Mit der Version v2.0 von \texttt{pdfcomment.sty} wurde ein Bugfix hinzugefügt, d
 \subsection{Lokale Optionen}
 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}).
-
 \subsubsection[\texttt{subject}]{\styleoption{subject}}\label{sec:subject}
 Die Option \styleoption{subject} dient der Festlegung der Überschriften der PDF popup annotations.
 
@@ -454,7 +452,7 @@ Mögliche \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \sty
 \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:
+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}. Zusätzlich gibt es für die Formatierung die folgenden Befehle:
 
 \begin{center}
 \begin{tabular}{cl}
@@ -542,22 +540,6 @@ Mögliche \margcs{\cmd\pdfsidelinecomment\\\oarg{Optionen}\marg{Kommentar}}Option
 \bigskip
 \cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \LinkEx).
 
-\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}, \styleoption{disable}, \styleoption{date}, \styleoption{timezone}
-
-\bigskip
-\defineavatar{Anton}{author=Anton,color=yellow}
-\defineavatar{Berti}{author=Berti,color=green}
-Mit dem Befehl \cmd\pdfreply{} kann man Antworten zu Kommentaren verfassen. Dabei dient die Option \texttt{replyto} der eindeutigen Identifizierung des Kommentars auf den sich die Antwort bezieht\footnote{Die Antworten müssen auf derselben Seite wie die Kommentare gesetzt werden}. Wegen technischer Gründe funktioniert der Befehl \string\pdfreply\  ausschließlich bei der Verwendung von \texttt{pdflatex}.
-\pdfmargincomment[subject={Top2},author={Josef Kleber},icon=Note,id=1,color=blue]{Das ist ein Kommentar.}
-\pdfreply[id=2,avatar=Anton,replyto=1,date=D:20101212161247+01'00']{Das ist eine Antwort auf einen Kommentar}
-\pdfreply[id=3,avatar=Berti,replyto=2,date=D:20101213095321+01'00']{Natürlich kann man auch auf Antworten antworten}
-\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}}
@@ -708,14 +690,4 @@ mit einem Text-Editor und ändern Sie den Eintrag
 
 Bitte beachten Sie, daß nur geöffnete popup annotations gedruckt werden!
 
-{
-\clearpage
-\raggedright
-\nocite{*}
-\bibliography{pdfcomment}
-\addcontentsline{toc}{section}{\refname}
-}
-
-%for index
-\footnotesize
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index e3e4d507a37..e4d8b972417 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2008-2012 by:
+%% Copyright (C) 2008-2012, 2015-2016 by:
 %% Josef Kleber
 %% <josef.kleber@gmx.de>
 %%
@@ -20,7 +20,7 @@
 %% This work consists of all files listed in manifest.txt.
 %%
 %
-\ProvidesPackage{pdfcomment}[2012/09/28 pdfcomment.sty v2.3a - Josef Kleber (C) 2008-2012]%
+\ProvidesPackage{pdfcomment}[2016/03/26 pdfcomment.sty v2.3b - Josef Kleber (C) 2008-2012, 2015-2016]%
 %
 \RequirePackage{xkeyval}%
 %
@@ -173,6 +173,7 @@
 \newcounter{pc@count@iv}%
 %
 \newbox\pc@mathannot@box%
+\newbox\pc@nullbox%
 %
 \newlength{\pc@dima}%
 \newlength{\pc@dimb}%
@@ -1344,7 +1345,7 @@
     \hypersetup{pdftex}%
   }%
   {%
-    \RequirePackage[pdftex]{hyperref}[2007/04/09]%
+    \RequirePackage[pdftex,pdfencoding=auto]{hyperref}[2007/06/12]%
   }%
 \else%
   % to avoid problems with different default page size in
@@ -1359,7 +1360,7 @@
         \hypersetup{dvipdfmx}%
       }%
       {%
-        \RequirePackage[dvipdfmx]{hyperref}[2007/04/09]%
+        \RequirePackage[dvipdfmx,pdfencoding=auto]{hyperref}[2007/06/12]%
       }%
     \else%
       \@ifpackageloaded{hyperref}%
@@ -1367,7 +1368,7 @@
         \hypersetup{dvips}%
       }%
       {%
-        \RequirePackage[dvips]{hyperref}[2007/04/09]%
+        \RequirePackage[dvips,pdfencoding=auto]{hyperref}[2007/06/12]%
       }%
     \fi%
   \else%
@@ -1377,7 +1378,7 @@
       \hypersetup{xetex}%
     }%
     {%
-      \RequirePackage[xetex]{hyperref}[2007/04/09]%
+      \RequirePackage[xetex,pdfencoding=auto]{hyperref}[2007/06/12]%
     }%
   \fi%
 \fi%
@@ -1432,7 +1433,7 @@
           {%
             \vsize=0pt%
             \hskip\pc@lopt@hoffset%
-            \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+            \pdfannot width \normalbaselineskip height \normalbaselineskip depth 0pt%
             {%
               /Subtype /Text%
               \pc@annot@text%
@@ -1457,7 +1458,7 @@
             {%
               \vsize=0pt%
               \hskip\pc@lopt@hoffset%
-              \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+              \special{pdf: ann width \the\normalbaselineskip\space height \the\normalbaselineskip\space depth 0pt%
                 <<%
                   /Subtype /Text%
                   \pc@annot@text%
@@ -1477,7 +1478,7 @@
             {%
               \vsize=0pt%
               \hskip\pc@lopt@hoffset%
-              \pdfmark[\rule{0pt}{0pt}]%
+              \pdfmark[\rule{\normalbaselineskip}{0pt}\rule{0pt}{\normalbaselineskip}]%
               {%
                 pdfmark=/ANN,%
                 Subtype=/Text,%
@@ -1539,7 +1540,7 @@
               {%
                 \vsize=0pt%
                 \hskip\pc@lopt@hoffset%
-                \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+                \pdfannot width \normalbaselineskip height \normalbaselineskip depth 0pt%
                 {%
                   /Subtype /Text%
                   \pc@annot@text%
@@ -1564,7 +1565,7 @@
                 {%
                   \vsize=0pt%
                   \hskip\pc@lopt@hoffset%
-                  \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+                  \special{pdf: ann width \the\normalbaselineskip\space height \the\normalbaselineskip\space depth 0pt%
                     <<%
                       /Subtype /Text%
                       \pc@annot@text%
@@ -1584,7 +1585,7 @@
                 {%
                   \vsize=0pt%
                   \hskip\pc@lopt@hoffset%
-                  \pdfmark[\rule{0pt}{0pt}]%
+                  \pdfmark[\rule{\normalbaselineskip}{0pt}\rule{0pt}{\normalbaselineskip}]%
                   {%
                     pdfmark=/ANN,%
                     Subtype=/Text,%
@@ -2542,7 +2543,7 @@
   % Change local options if specified
   \setkeys{pdftooltip}{#1}%
   \ifmmode%
-    \marginnote{\pc@encode@PDF@math{#3}}%
+    \setbox\pc@nullbox=\hbox{\pc@encode@PDF@math{#3}}%
     \ifpc@lopt@disable%
       #2%
     \else%
@@ -2576,7 +2577,7 @@
       \fi%
     \fi%
   \else%
-    \pc@encode@PDF{#3}%
+    \expandafter\pc@encode@PDF{#3}%
     \ifpc@lopt@disable%
       #2%
     \else%
@@ -2962,10 +2963,12 @@
 {%
   /TU (\pc@pdfenc@contents)\space%
   /T (tooltip \thezref@unique)\space%
-  /C [0 0 0]\space%
+  /C [ ]\space%
   /FT/Btn\space%
+  /F 768\space%
   /Ff 65536\space%
   /H/N\space%
+  /BS << /W 0 >>\space%
 }%
 %
 \newcommand{\pc@create@pdfannotopt}%
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d7f4fc303a9..2cbbdb484d4 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -797,6 +797,7 @@ 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'",