summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/CHANGES6
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/README10
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example.pdfbin127011 -> 146710 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example.tex20
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdfbin43751 -> 53654 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex20
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdfbin538596 -> 546833 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex20
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdfbin0 -> 156666 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex117
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdfbin46926 -> 54950 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex20
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/manifest.txt2
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdfbin206586 -> 224002 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex48
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdfbin210581 -> 230278 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex48
-rw-r--r--Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty204
18 files changed, 425 insertions, 90 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index dd937506040..a81a650ea45 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,11 @@
=== pdfcomment.sty ===
+-- pdfcomment.sty (v1.6) (<- v1.53dev 2010/08/07) -- (svn rev 51)
+
+2010/08/04 added support for using \pdfmarkupcomment in math mode [jk]
+
+ feature request by: Ross Moore (he also contributed ideas and code)
+
-- pdfcomment.sty (v1.5e) (<- v1.5d 2010/06/01) -- (svn rev 48)
2010/06/11 Bugfix: empty line, \pdfcomment, empty line produced two new [jk]
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 37255a82cfe..9f087f5a436 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,11 +15,9 @@ Adobe Reader.
License: LPPL
-Changes in v1.5e:
+Changes in v1.6:
-- Bugfix: empty line, \pdfcomment, empty line produced two new
- paragraphs even in final mode
+- added support for using \pdfmarkupcomment in math mode
+ (see: example_math_markup.pdf)
- reported by: Marc-André Michel
-
-- revision of option declaration (code clean up) \ No newline at end of file
+ feature request by: Ross Moore (he also contributed ideas and code) \ 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 2d10722e89d..62bc5627bd3 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.tex b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
index e09ed746063..c0fdbb09b06 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -9,6 +9,7 @@
\usepackage[svgnames,rgb]{xcolor}
\usepackage[absolute]{textpos}
\usepackage{tikz}
+\usepackage{amssymb,amsmath,array,bm}
\usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
@@ -97,4 +98,23 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={sideline},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
\lipsum[2-6]
\end{pdfsidelinecomment}
+
+\vspace{2cm}
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{Bernoulli Trials} &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
\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 d2745a53180..4ac1b0bee40 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf
Binary files differ
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 3599a64ac05..65e4ee085df 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}
+\usepackage{amssymb,amsmath,array,bm}
\usepackage[subject={Top1},author={\AA{}nsgar Lund},dvipdfmx]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
@@ -99,4 +100,23 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
\lipsum[2-6]
\end{pdfsidelinecomment}
+
+\vspace{2cm}
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{Bernoulli Trials} &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
\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 26eb9246b2a..37a31e0fdb8 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
Binary files differ
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 cabdba3a7ac..699f45f7786 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}
+\usepackage{amssymb,amsmath,array,bm}
\usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
@@ -96,4 +97,23 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
\lipsum[2-6]
\end{pdfsidelinecomment}
+
+\vspace{2cm}
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{Bernoulli Trials} &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
\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
new file mode 100644
index 00000000000..ee331c6ae79
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
new file mode 100644
index 00000000000..2c0315b1f51
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_math_markup.tex
@@ -0,0 +1,117 @@
+\documentclass[pagesize,11pt,leqno]{scrartcl}
+\usepackage[english]{babel}
+\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}
+\begin{document}
+\setlength{\parindent}{0pt}
+\addtokomafont{section}{\normalfont\normalcolor\bfseries}
+\setkomafont{title}{\normalfont\normalcolor\bfseries}
+\author{Josef Kleber}
+\title{Using \texttt{\string\pdfmarkupcomment}\ in math mode}
+\lstset{language=[LaTeX]TeX,numbers=left,numberstyle=\tiny,basicstyle=\ttfamily\small,frame=single,backgroundcolor=\color{LightGoldenrodYellow},keywordstyle=\color{Blue},emph={mathstyle,style}, emphstyle=\color{Tomato},emph={[2]mathpopup},emphstyle={[2]\color{SeaGreen}},morekeywords={pdfmarkupcomment,[,]}}
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+\hypersetup{pdfauthor={Josef Kleber},pdftitle={Using \textbackslash{}pdfmarkupcomment in math mode},pdfsubject={An example file for demonstrating the usage of \textbackslash{}pdfmarkupcomment in math mode},colorlinks=true,pdfborder={0 0 0},linkcolor=blue,citecolor=blue}%
+\maketitle
+\section{Simple formulas}
+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[style=mathpopup,mathstyle=\displaystyle]{f(x)=\prod_{i=1}^{n}\left(i-\frac{1}{2i}\right)}{comment}\]
+
+\bigskip
+Of course, you can only comment parts of a formula:
+
+\bigskip
+\begin{tabular}{cc}
+\begin{minipage}{0.26\linewidth}
+\[(a+b=c)^{\pdfmarkupcomment[style=mathpopup]{d+e}{comment}}\]
+\end{minipage} &
+\begin{minipage}{0.68\linewidth}
+\begin{lstlisting}
+\[(a+b=c)^{\pdfmarkupcomment[style=mathpopup]
+{d+e}{comment}}\]
+\end{lstlisting}
+\end{minipage}
+\end{tabular}
+
+\bigskip
+As you can see the size of the PDF annoation is too big! The math content is set into a box to measure the size. Unfortunately, the math context gets lost, which results in a wrong size, as the math snippets are set as inline formula into the box by default. You can correct this with the option \texttt{mathstyle} (\texttt{\string\textstyle, \string\displaystyle, \string\scriptstyle, \string\scriptscriptstyle})
+
+\bigskip
+\begin{tabular}{cc}
+\begin{minipage}{0.25\linewidth}
+\[(a+b=c)^{\pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{d+e}{comment}}\]
+\end{minipage} &
+\begin{minipage}{0.68\linewidth}
+\begin{lstlisting}
+\[(a+b=c)^{\pdfmarkupcomment[style=mathpopup,
+mathstyle=\scriptstyle]{d+e}{comment}}\]
+\end{lstlisting}
+\end{minipage}
+\end{tabular}
+
+\bigskip
+Of course, it also works with equations:
+
+\bigskip
+\begin{tabular}{cc}
+\begin{minipage}{0.41\linewidth}
+\begin{equation}
+\pdfmarkupcomment[style=mathpopup,mathstyle=\displaystyle]{\sum_{i=1}^{n}i=\frac{1}{2}n\cdot(n+1)}{comment}
+\end{equation}\label{eq:display}
+\end{minipage} &
+\begin{minipage}{0.52\linewidth}
+\begin{lstlisting}
+\begin{equation}
+\pdfmarkupcomment[style=mathpopup,
+mathstyle=\displaystyle]
+{\sum_{i=1}^{n}i=\frac{1}{2}n
+\cdot(n+1)}{comment}
+\end{equation}\label{eq:display}
+\end{lstlisting}
+\end{minipage}
+\end{tabular}
+
+\bigskip
+In formula \ref{eq:display} \texttt{mathsytle=\string\displaystyle} was used.
+
+\section{Complex formulas}
+If you use more complex environments like \texttt{eqnarry*}, you can no longer comment the complete formula, as this would break the internals of the environment. Remember that you can only comment, what you can put into a math box (\${}math stuff\${}). Therefore, you can only comment parts of the complex formula:
+
+\bigskip
+\begin{tabular}{cc}
+\begin{minipage}{0.4\linewidth}
+\begin{eqnarray*}
+\pdfmarkupcomment[style=mathpopup]{\mathrm{left}}{comment} &
+\pdfmarkupcomment[style=mathpopup]{\mathrm{middle}}{comment} & \pdfmarkupcomment[style=mathpopup]{\mathrm{right}}{comment}\\
+\pdfmarkupcomment[style=mathpopup,mathstyle=\displaystyle]{\frac{1}{\sqrt{n}}}{comment} = & \pdfmarkupcomment[style=mathpopup,mathstyle=\displaystyle]{\frac{\sqrt{n}}{n}}{comment} = & \pdfmarkupcomment[style=mathpopup,mathstyle=\displaystyle]{\frac{n}{n\sqrt{n}}}{comment}
+\end{eqnarray*}
+\end{minipage} &
+\begin{minipage}{0.53\linewidth}
+\begin{lstlisting}
+\begin{eqnarray*}
+\pdfmarkupcomment[style=mathpopup]
+{\mathrm{left}}{comment} &
+\pdfmarkupcomment[style=mathpopup]
+{\mathrm{middle}}{comment} &
+\pdfmarkupcomment[style=mathpopup]
+{\mathrm{right}}{comment}\\
+\pdfmarkupcomment[style=mathpopup,
+mathstyle=\displaystyle]
+{\frac{1}{\sqrt{n}}}{comment} = &
+\pdfmarkupcomment[style=mathpopup,
+mathstyle=\displaystyle]
+{\frac{\sqrt{n}}{n}}{comment} = &
+\pdfmarkupcomment[style=mathpopup,
+mathstyle=\displaystyle]
+{\frac{n}{n\sqrt{n}}}{comment}
+\end{eqnarray*}
+\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 d676b3bce9b..f647bcccc39 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
index 02b3bc3703f..07bd5ae9f6d 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}
+\usepackage{amssymb,amsmath,array,bm}
\usepackage[absolute]{textpos}
\usepackage[subject={Top1},author={Ã…nsgar Lund}]{pdfcomment}
\setmainfont[Mapping=tex-text]{Bergamo}
@@ -104,4 +105,23 @@ eleifend, sagittis quis, diam. Duis eget orci sit amet orci dignissim rutrum.}{T
\begin{pdfsidelinecomment}[avatar=CaptainJack,subject={Top2},opacity=1,color=red,icolor=yellow,caption=inline,linebegin={/Butt},lineend={/Square},linewidth=3bp,linesep=1cm]{ ! Delete ! }
\lipsum[2-6]
\end{pdfsidelinecomment}
+
+\vspace{2cm}
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{Bernoulli Trials} &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
\end{document}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
index ab45a5dd09f..698cf346280 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
+++ b/Master/texmf-dist/doc/latex/pdfcomment/manifest.txt
@@ -18,6 +18,8 @@ example_latex_dvips_ps2pdf.tex
example_latex_dvips_ps2pdf.pdf
example_latex_dvipdfmx.tex
example_latex_dvipdfmx.pdf
+example_math_markup.tex
+example_math_markup.pdf
example_xelatex.tex
example_xelatex.pdf
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index 178f9c79995..b41164f1180 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
index e576ec17a65..53835e405ba 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -10,9 +10,12 @@
\usepackage{ltxdocext}%
\usepackage{marginnote}%
\usepackage[svgnames,rgb]{xcolor}%
+\usepackage{amsmath,array}%
\usepackage{jkdoc}%
\usepackage{pdfcomment}%
%
+\def\LinkExMath{\href{http://mirror.ctan.org/macros/latex/contrib/pdfcomment/doc/example_math_markup.pdf}{\texttt{example\_math\_markup.pdf}}}
+\def\LinkEx{\href{http://mirror.ctan.org/macros/latex/contrib/pdfcomment/doc/example.pdf}{\texttt{example.pdf}}}
\def\filename{pdfcomment.sty}%
\def\XeLaTeX{Xe\LaTeX}%
%
@@ -48,7 +51,7 @@
\title{\filename}%
\Subtitle{A user-friendly interface to PDF annotations}%
\author{Josef Kleber}
-\Fileversion{v1.5e}
+\Fileversion{v1.6}
\Refline{\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}\\\href{http://pdfcomment.josef-kleber.de/en_index.htm}{\texttt{http://pdfcomment.josef-kleber.de/en\_index.htm}}}%
\maketitle
\Headline{Abstract}
@@ -92,6 +95,8 @@ I want to thank the following persons for contributions to the development of th
\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.
+\item \textbf{Ross Moore} for contributing ideas and code for his own feature request to support \texttt{\string\pdfmarkupcomment} in math mode.
+
\item \textbf{Heiko Oberdiek} also for answering my stupid questions on d.c.t.t., as well as for the development of dozens of very usefull packages, especially \file{hyperref.sty}, \file{hycolor.sty} and \file{zref.sty}, which made this package possible.
\item \textbf{Herbert Voß} also for answering my stupid questions on d.c.t.t.
@@ -215,7 +220,7 @@ callout line & $n = 3$ \\
\end{tabular}
\end{center}}
-In general, the points must be given from line begin to line end. For callout lines the points must be given from line end to line begin. Please note the example file \texttt{example.tex}!
+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.
@@ -223,7 +228,7 @@ To avoid the method 'trail and error' you can load the PDF file with the Ghostsc
You can use the option \styleoption{linewidth} for defining the line width of PDF annoations.
\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
-You can use the option \styleoption{linebegin} for defining the arrow type at the line begin. The example file \texttt{example.pdf} shows all possible types of arrows. \pdfcomment[icon=Help,color=blue,open=true,subject={arrow types}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)}
+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}
@@ -276,6 +281,9 @@ 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!
+
\section{Environments}\label{sec:umgebungen}
\subsection{Comment environments}\label{sec:kommentarumgebungen}
@@ -321,7 +329,7 @@ Possible \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}}options: \s
\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}
+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}
\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!}
@@ -337,19 +345,41 @@ Limitations:
\item While using \XeLaTeX{} you have to make sure that page dimensions are written to the xdvi file, e.\,g. with the option \styleoption{pagesize} of the KoMa-Script classes, or as option of the package \package{typearea.sty} respectively.
\end{itemize}
+Since version v1.6, \texttt{\string\pdfmarkupcomment} is also supported in math mode. So you can also comment formula like:
+
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{ Bernoulli Trials: } &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
+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}
\bigskip
-\cmd\pdffreetextcomment{} (type=freetext) will typeset a comment in form of a freely positioned box on the wished spot of the page.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-3.7cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} By using the option \styleoption{type} = \texttt{callout} the box will have an additional so called callout line, to bind the box to a certain element of the page. With the option \styleoption{type} = \texttt{typewriter} you can write a comment everywhere on the page with a virtual 'typewriter'. These PDF freetext annotation do have no frame and a transparent background for 'overwriting' arbitrary parts of the page. Please note the example file \texttt{example.pdf}!
+\cmd\pdffreetextcomment{} (type=freetext) will typeset a comment in form of a freely positioned box on the wished spot of the page.\pdffreetextcomment[subject={\textbackslash pdffreetextcomment Test},height=1.2cm,width=4cm,voffset=-3.7cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} By using the option \styleoption{type} = \texttt{callout} the box will have an additional so called callout line, to bind the box to a certain element of the page. With the option \styleoption{type} = \texttt{typewriter} you can write a comment everywhere on the page with a virtual 'typewriter'. These PDF freetext annotation do have no frame and a transparent background for 'overwriting' arbitrary parts of the page. Please note the example file \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}
\bigskip
-\cmd\pdfsquarecomment{} will typeset a rectangular box at the wished spot of a page (see: \texttt{example.pdf}).
+\cmd\pdfsquarecomment{} will typeset a rectangular box at the wished spot of a page (see: \LinkEx).
\subsubsection{\texorpdfstring{\cs{pdfcirclecomment}}{\textbackslash pdfcirclecomment}}
@@ -357,14 +387,14 @@ Possible \margcs{\cmd\pdfsquarecomment\\\oarg{options}\marg{comment}} options: \
Possible \margcs{\cmd\pdfcirclecomment\\\oarg{options}\marg{comment}} options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
\bigskip
-\cmd\pdfsquarecomment{} will typeset a comment in form of a circle or ellipse at the wished spot of the page (see: \texttt{example.pdf}).
+\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}
\bigskip
-\cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \texttt{example.pdf}).
+\cmd\pdflinecomment{} will typeset a comment in form of a line, polyline or polygon at the wished spot of the page (see: \LinkEx).
\subsection{Misc. commands}
@@ -414,7 +444,7 @@ With the command \cmd\defineavatar \margcs{\cmd\defineavatar\marg{name}\marg{opt
\subsubsection{\texorpdfstring{\cs{definestyle}}{\textbackslash definestyle}}
\label{sec:definestyle}
-With the command \cmd\definestyle \margcs{\cmd\definestyle\marg{name}\marg{options}} you can split up lists in personal and stylistic option lists (see \file{example.tex}). This option list can be loaded with the option \styleoption{style}.
+With the command \cmd\definestyle \margcs{\cmd\definestyle\marg{name}\marg{options}} you can split up lists in personal and stylistic option lists (see \LinkEx). This option list can be loaded with the option \styleoption{style}.
\section{Printing comments and popups}
\label{sec:print}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 370fee9febd..90b4018d7ca 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
index 8bab9f582ef..fb39903cafe 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -10,9 +10,12 @@
\usepackage{ltxdocext}%
\usepackage{marginnote}%
\usepackage[svgnames,rgb]{xcolor}%
+\usepackage{amsmath,array}%
\usepackage{jkdocde}%
\usepackage{pdfcomment}%
%
+\def\LinkExMath{\href{http://mirror.ctan.org/macros/latex/contrib/pdfcomment/doc/example_math_markup.pdf}{\texttt{example\_math\_markup.pdf}}}
+\def\LinkEx{\href{http://mirror.ctan.org/macros/latex/contrib/pdfcomment/doc/example.pdf}{\texttt{example.pdf}}}
\def\filename{pdfcomment.sty}%
\def\XeLaTeX{Xe\LaTeX}%
%
@@ -68,7 +71,7 @@
\title{\filename}%
\Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
\author{Josef Kleber}
-\Fileversion{v1.5e}
+\Fileversion{v1.6}
\Refline{\href{mailto:pdfcomment.sty@pdfcomment.josef-kleber.de}{\texttt{pdfcomment.sty@pdfcomment.josef-kleber.de}}\\\href{http://pdfcomment.josef-kleber.de}{\texttt{http://pdfcomment.josef-kleber.de}}}%
\maketitle
\Headline{Zusammenfassung}%
@@ -108,12 +111,12 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken:
\noindent\hfill\texttt{\LaTeX{} $\rightarrow$ \texttt{dvips} $\rightarrow$ \texttt{ps2pdf}, \LaTeX{} $\rightarrow$ \texttt{dvipdfmx} und \XeLaTeX}.\hfill
\medskip
-\item \textbf{Gabriel Cardona} für den Hinweis auf Probleme mit älteren Versionen von \texttt{hyperref} (v6.76a [2007/04/09])
-
\item \textbf{Ulrike Fischer} für das Beantworten meiner dummen Fragen in d.c.t.t. zur Verwirklichung des Avatar- und Style-Systems und vieles mehr.
\item \textbf{Christian Feuersänger} für das Einbringen neuer Ideen in Form von \package{pdfmarginpar.sty} und die Lösung des Druckproblems\footnote{siehe Abschnitt \ref{sec:print}} der PDF annotations und popups.
+\item \textbf{Ross Moore} für das Einbringen von Ideen und Code zur Umsetzung seines eigenen feature requests zur Unterstützung von \texttt{\string\pdfmarkupcomment} im math mode.
+
\item \textbf{Heiko Oberdiek} ebenfalls für das Beantworten meiner dummen Fragen in d.c.t.t., sowie die Entwicklung dutzender nützlicher Pakete, speziell \file{hyperref.sty}, \file{hycolor.sty} und \file{zref.sty}, die dieses Paket erst ermöglichten.
\item \textbf{Herbert Voß} ebenfalls für das Beantworten meiner dummen Fragen in d.c.t.t.
@@ -236,7 +239,7 @@ Callout Linie & $n = 3$ \\
\end{tabular}
\end{center}}
-Üblicherweise erfolgt die Angabe der Koordinaten vom Linienanfang zum Linienende. Bei der Callout Linie müssen die Koordinaten vom Linienende bis zum Linienanfang angegeben werden. Beachten Sie dazu bitte das Beispiel \texttt{example.tex}!
+Üblicherweise erfolgt die Angabe der Koordinaten vom Linienanfang zum Linienende. Bei der Callout Linie müssen die Koordinaten vom Linienende bis zum Linienanfang angegeben werden. Beachten Sie dazu bitte das Beispiel \LinkEx!
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.
@@ -244,7 +247,7 @@ Zur Vermeidung der Methode 'Versuch und Irrtum' kann man die PDF-Datei mit dem G
Die Option \styleoption{linewidth} dient der Festlegung der Liniendicke in PDF annoations.
\subsubsection[\texttt{linebegin}]{\styleoption{linebegin}}\label{sec:linebegin}
-Die Option \styleoption{linebegin} dient der Festlegung des Pfeiltyps am Linienanfang. Die Beispieldatei \texttt{example.pdf} zeigt alle möglichen Pfeiltypen. \pdfcomment[icon=Help,color=blue,open=true,subject={Pfeiltypen}]{/None, /Square, /Circle, /Diamond, /OpenArrow, /ClosedArrow, /Butt (PDF1.5), /ROpenArrow (PDF1.5), /RClosedArrow (PDF1.5), /Slash (PDF1.6)}
+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}
Die Option \styleoption{lineend} dient der Festlegung des Pfeiltyps am Linienende.
@@ -296,6 +299,9 @@ 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!
+
\section{Umgebungen}\label{sec:umgebungen}
\subsection{Kommentarumgebungen}\label{sec:kommentarumgebungen}
@@ -340,7 +346,7 @@ Mögliche \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}}Optionen
\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}
+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}
\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!}
@@ -356,33 +362,55 @@ Einschränkungen:
\item Bei der Verwendung von \XeLaTeX{} muß Sorge getragen werden, daß die korrekte Seitengröße in die xdvi-Datei geschrieben wird, z.\,B. über die Option \styleoption{pagesize} bei Verwendung der KoMa-Script-Klassen, bzw. als Option beim Paket \package{typearea.sty}.
\end{itemize}
+Seit Version v1.6 funktioniert \texttt{\string\pdfmarkupcomment} auch im math mode. Sie können jetzt also auch Formeln kommentieren, wie z.\,B.:
+
+\definestyle{mathpopup}{author={},subject={},color=NavajoWhite,markup=Highlight}
+
+\[
+\begin{array}{c>{\displaystyle}c}
+ \text{ Bernoulli Trials: } &
+ \pdfmarkupcomment[style=mathpopup]{P(E)}{Probability of event E: Get exactly k heads in n coin flips.}%
+ =
+ \pdfmarkupcomment[style=mathpopup]{\dbinom{n}{k}}{Number of ways to get exactly k heads in n coin flips}%
+ {\pdfmarkupcomment[style=mathpopup]{p}{Probability of getting heads in one flip}%
+}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{k}{Number of heads}
+ }%
+ \pdfmarkupcomment[style=mathpopup]{(1-p)}{Probability of getting tails in one flip}^{%
+ \pdfmarkupcomment[style=mathpopup,mathstyle=\scriptstyle]{n-k}{Number of tails}%
+ }%
+\end{array}
+\]
+
+Beachten Sie bitte auch \LinkExMath{} für eine genauere Beschreibung der neuen Möglichkeiten!
+
\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}
\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.3cm,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 \texttt{example.pdf}!
+\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.3cm,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}
Mögliche \margcs{\cmd\pdfsquarecomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{icolor}, \styleoption{opacity}, \styleoption{linewidth}, \styleoption{borderstyle}, \styleoption{dashstyle}, \styleoption{bse}, \styleoption{bsei}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset}
\bigskip
-\cmd\pdfsquarecomment{} setzt einen Kommentar in Form einer rechteckigen Box an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
+\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}
\bigskip
-\cmd\pdfsquarecomment{} setzt einen Kommentar in Form eines Kreises oder einer Ellipse an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
+\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}
\bigskip
-\cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \texttt{example.pdf}).
+\cmd\pdflinecomment{} setzt einen Kommentar in Form einer Linie. Polylinie oder Polygon an die gewünschte Stelle der Seite (siehe: \LinkEx).
\subsection{Allgemeine Befehle}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 3bc46e1d87b..072a3e6cb1c 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -20,7 +20,7 @@
%% This work consists of all files listed in manifest.txt.
%%
%
-\ProvidesPackage{pdfcomment}[2010/06/01 pdfcomment.sty v1.5e - Josef Kleber (C) 2008-2010]%
+\ProvidesPackage{pdfcomment}[2010/08/15 pdfcomment.sty v1.6 - Josef Kleber (C) 2008-2010]%
%
\RequirePackage{xkeyval}%
%
@@ -126,6 +126,7 @@
\gdef\pc@lopt@captionhoffset{}%
\gdef\pc@lopt@captionvoffset{}%
\gdef\pc@lopt@linesep{}%
+\gdef\pc@lopt@mathstyle{}%
%
\gdef\pc@lopt@c{}%
\gdef\pc@lopt@ic{}%
@@ -142,6 +143,8 @@
%
\newcounter{pc@annot@lines}%
%
+\newbox\pc@mathannot@box%
+%
\newlength{\pc@dima}%
\newlength{\pc@dimb}%
\newlength{\pc@dimc}%
@@ -152,6 +155,7 @@
\newlength{\pc@Sposy}%
\newlength{\pc@Eposx}%
\newlength{\pc@Eposy}%
+\newlength{\pc@box@width}%
\newlength{\pc@box@height}%
\newlength{\pc@box@depth}%
%
@@ -1045,6 +1049,11 @@
\expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
}%
%
+\define@key{pdfmarkupcomment}{mathstyle}%
+{%
+ \gdef\pc@lopt@mathstyle{#1}%
+}%
+%
\define@key{pdfcomment.sty}{final}[]%
{%
\pc@gopt@finaltrue%
@@ -1720,9 +1729,6 @@
\pc@copy@gopt@lopt%
% Change local options if specified
\setkeys{pdfmarkupcomment}{#1}%
- % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef
- % and transform color input to pdf color
- \pc@encode@PDF{#3}%
\zsavepos{pdfcomment:\thezref@unique}%
\zref@refused{pdfcomment:\thezref@unique}%
\setlength{\pc@Sposx}{\zposx{pdfcomment:\thezref@unique}sp}%
@@ -1730,75 +1736,113 @@
\refstepcounter{zref@unique}%
\setlength{\pc@Eposx}{\zposx{pdfcomment:\thezref@unique}sp}%
\setlength{\pc@Eposy}{\zposy{pdfcomment:\thezref@unique}sp}%
- \settoheight{\pc@box@height}{#2}%
- \ifthenelse{\equal{\pc@lopt@markup}{Underline}}%
- {%
- \settodepth{\pc@box@depth}{Tq}%
- }%
- {%
- \settodepth{\pc@box@depth}{#2}%
- }%
- \ifdim\pc@Sposy<\pc@Eposy%
- \pc@annot@samepagefalse%
- \else%
- \pc@annot@samepagetrue%
- \fi%
- \ifpc@annot@samepage\else%
+ \ifmmode%
\ifpc@gopt@final\else%
- % 1st part of annotation on 1st page
- \pc@annot@calc@pos%
- \pc@copy@xy@to@anna%
- \renewcommand{\pc@anna@x@two}{\pc@x@right@text}%
- \renewcommand{\pc@anna@x@four}{\pc@x@right@text}%
- %calculate baseline of last line (not necessarily bottom text block!)
- \setlength\pc@dimc{\dimexpr \dimexpr \pc@anna@y@three bp \relax\relax}%
- \setlength\pc@dimd{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep - \textheight\relax}%
- \whiledo{\lengthtest{\pc@dimc>\pc@dimd}}%
+ %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}%
+ \HyColor@XZeroOneThreeFour{\pc@lopt@fontcolor}{\pc@hyenc@fontcolor}{pdfcomment}{color}%
+ \HyColor@XZeroOneThreeFour{\pc@lopt@icolor}{\pc@hyenc@icolor}{pdfcomment}{color}%
+ \settowidth{\pc@box@width}{$\pc@lopt@mathstyle#2$}%
+ \settoheight{\pc@box@height}{$\pc@lopt@mathstyle#2$}%
+ \settodepth{\pc@box@depth}{$\pc@lopt@mathstyle#2$}%
+ \setbox\pc@mathannot@box=\hbox to\pc@box@width%
{%
- \addtolength\pc@dimc{-\the\baselineskip}%
+ \vrule height\pc@box@height depth\pc@box@depth width\z@%
+ \hfill%
+ \pc@annot@calc@pos@math%
+ \xdef\pc@annot@quadpoints{\pc@x@one\space\pc@y@one\space\pc@x@two\space\pc@y@two\space\pc@x@three\space\pc@y@three\space\pc@x@four\space\pc@y@four}%
+ \ifpdf%
+ \pc@annot@markup@pdf%
+ \else%
+ \ifpc@gopt@dvipdfmx%
+ \pc@annot@markup@dvipdfmx%
+ \else%
+ \pc@annot@markup@dvips%
+ \fi%
+ \fi%
}%
- % 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%
+ \wd\pc@mathannot@box\z@%
+ \ht\pc@mathannot@box\z@%
+ \dp\pc@mathannot@box\z@%
+ \box\pc@mathannot@box%
+ \nobreak%
\fi%
- \fi%
- \ifpc@gopt@final\else%
- \pc@create@lpc%
- \fi%
- #2%
- \zsavepos{pdfcomment:\thezref@unique}%
- \zref@refused{pdfcomment:\thezref@unique}%
- \refstepcounter{zref@unique}%
- \ifpc@gopt@final\else%
- \ifpc@annot@samepage%
- % annot complete on one page
- \pc@annot@calc@pos%
- \pc@copy@xy@to@anna%
- \pc@annot@secondpagefalse%
- \pc@create@annot%
+ #2%
+ \else%
+ \pc@encode@PDF{#3}%
+ \settoheight{\pc@box@height}{#2}%
+ \ifthenelse{\equal{\pc@lopt@markup}{Underline}}%
+ {%
+ \settodepth{\pc@box@depth}{Tq}%
+ }%
+ {%
+ \settodepth{\pc@box@depth}{#2}%
+ }%
+ \ifdim\pc@Sposy<\pc@Eposy%
+ \pc@annot@samepagefalse%
\else%
- % 2nd part of annotation on 2nd page
- \pc@annot@calc@pos%
- \pc@copy@xy@to@anna%
- \renewcommand{\pc@anna@x@one}{\pc@x@left@text}%
- \renewcommand{\pc@anna@x@three}{\pc@x@left@text}%
- \setlength\pc@dimc{\dimexpr \dimexpr \pc@anna@y@four bp \relax\relax}%
- \setlength\pc@dimd{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep\relax}%
- \whiledo{\lengthtest{\pc@dimc<\pc@dimd}}%
- {%
+ \pc@annot@samepagetrue%
+ \fi%
+ \ifpc@annot@samepage\else%
+ \ifpc@gopt@final\else%
+ % 1st part of annotation on 1st page
+ \pc@annot@calc@pos%
+ \pc@copy@xy@to@anna%
+ \renewcommand{\pc@anna@x@two}{\pc@x@right@text}%
+ \renewcommand{\pc@anna@x@four}{\pc@x@right@text}%
+ %calculate baseline of last line (not necessarily bottom text block!)
+ \setlength\pc@dimc{\dimexpr \dimexpr \pc@anna@y@three bp \relax\relax}%
+ \setlength\pc@dimd{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep - \textheight\relax}%
+ \whiledo{\lengthtest{\pc@dimc>\pc@dimd}}%
+ {%
+ \addtolength\pc@dimc{-\the\baselineskip}%
+ }%
+ % one too much
\addtolength\pc@dimc{\the\baselineskip}%
- }%
- % two too much
- \addtolength\pc@dimc{-\the\baselineskip}\addtolength\pc@dimc{-\the\baselineskip}%
- \renewcommand{\pc@anna@y@three}{\pc@pttobp{\pc@dimc}}%
- \renewcommand{\pc@anna@y@one}{\pc@pttobp{\pc@dimc + \pc@box@depth + \pc@box@height +2pt}}%
- \pc@annot@secondpagetrue%
- \pc@create@annot%
+ \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%
+ \ifpc@gopt@final\else%
+ \pc@create@lpc%
+ \fi%
+ #2%
+ \zsavepos{pdfcomment:\thezref@unique}%
+ \zref@refused{pdfcomment:\thezref@unique}%
+ \refstepcounter{zref@unique}%
+ \ifpc@gopt@final\else%
+ \ifpc@annot@samepage%
+ % annot complete on one page
+ \pc@annot@calc@pos%
+ \pc@copy@xy@to@anna%
+ \pc@annot@secondpagefalse%
+ \pc@create@annot%
+ \else%
+ % 2nd part of annotation on 2nd page
+ \pc@annot@calc@pos%
+ \pc@copy@xy@to@anna%
+ \renewcommand{\pc@anna@x@one}{\pc@x@left@text}%
+ \renewcommand{\pc@anna@x@three}{\pc@x@left@text}%
+ \setlength\pc@dimc{\dimexpr \dimexpr \pc@anna@y@four bp \relax\relax}%
+ \setlength\pc@dimd{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep\relax}%
+ \whiledo{\lengthtest{\pc@dimc<\pc@dimd}}%
+ {%
+ \addtolength\pc@dimc{\the\baselineskip}%
+ }%
+ % two too much
+ \addtolength\pc@dimc{-\the\baselineskip}\addtolength\pc@dimc{-\the\baselineskip}%
+ \renewcommand{\pc@anna@y@three}{\pc@pttobp{\pc@dimc}}%
+ \renewcommand{\pc@anna@y@one}{\pc@pttobp{\pc@dimc + \pc@box@depth + \pc@box@height +2pt}}%
+ \pc@annot@secondpagetrue%
+ \pc@create@annot%
+ \fi%
\fi%
\fi%
+ %only local!
+ \gdef\pc@lopt@mathstyle{}%
}%
%
\newenvironment{pdfsidelinecomment}[2][]%
@@ -2045,6 +2089,22 @@
\HyColor@XZeroOneThreeFour{\pc@lopt@icolor}{\pc@hyenc@icolor}{pdfcomment}{color}%
}%
%
+\newcommand{\pc@encode@PDF@math}[1]%
+{%
+ \gdef\pc@lopt@comment{#1}%
+ \ifthenelse{\equal{\pc@lopt@deadline}{}}%
+ {%
+ \gdef\pc@comment@deadline{\pc@lopt@comment}%
+ \pdfstringdef\pc@pdfenc@contents{\pc@comment@deadline}%
+ }%
+ {%
+ \gdef\pc@comment@deadline{\pc@lopt@comment\textCR(\pc@lopt@deadline)}%
+ \pdfstringdef\pc@pdfenc@contents{\pc@comment@deadline}%
+ }%
+ \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}%
+ \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}%
+}%
+%
\newcommand{\pc@annot@text}%
{%
\pc@lopt@c\space%
@@ -2245,6 +2305,20 @@
\setlength{\pc@dimb}{\dimexpr \pc@Eposy - \pc@box@depth - 1pt\relax}%
}%
%
+\newcommand{\pc@annot@calc@pos@math}%
+{%
+ \renewcommand{\pc@x@one}{\pc@pttobp{\pc@Sposx}}%
+ \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \pc@Sposx + \pc@box@width\relax}}%
+ \renewcommand{\pc@x@three}{\pc@pttobp{\pc@Sposx}}%
+ \renewcommand{\pc@x@four}{\pc@pttobp{\dimexpr \pc@Sposx + \pc@box@width\relax}}%
+ \renewcommand{\pc@y@one}{\pc@pttobp{\dimexpr \pc@Sposy + \pc@box@height + 1pt\relax}}%
+ \renewcommand{\pc@y@two}{\pc@pttobp{\dimexpr \pc@Sposy + \pc@box@height + 1pt\relax}}%
+ \renewcommand{\pc@y@three}{\pc@pttobp{\dimexpr \pc@Sposy - \pc@box@depth - 1pt\relax}}%
+ \renewcommand{\pc@y@four}{\pc@pttobp{\dimexpr \pc@Sposy - \pc@box@depth - 1pt\relax}}%
+ \setlength{\pc@dima}{\dimexpr \pc@Sposy - \pc@box@depth - 1pt\relax}%
+ \setlength{\pc@dimb}{\dimexpr \pc@Eposy - \pc@box@depth - 1pt\relax}%
+}%
+%
\newcommand{\pc@create@annot@sideline}%
{%
%create options for \pdfannot