summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-10 00:34:00 +0000
committerKarl Berry <karl@freefriends.org>2010-11-10 00:34:00 +0000
commit3b2f26271608630ca56a88b528a1004f51535ea3 (patch)
tree28e000ad2d66a09a7123c86cbaaf10cac7dd42ed /Master/texmf-dist
parent6a43749c68fb713c7747927e2dbce5fecebeef41 (diff)
pdfcomment (9nov10)
git-svn-id: svn://tug.org/texlive/trunk@20389 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/CHANGES22
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/README23
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example.pdfbin146710 -> 146723 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex2
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdfbin224002 -> 225677 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex100
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdfbin230278 -> 231007 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex98
-rw-r--r--Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty882
12 files changed, 711 insertions, 422 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
index a81a650ea45..fb3eba2193d 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
+++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES
@@ -1,5 +1,27 @@
=== pdfcomment.sty ===
+-- pdfcomment.sty (v2.0) (<- v1.63dev 2010/11/08) -- (svn rev 56)
+
+2010/11/08 Bugfix: unwanted whitespace before comment commands [jk]
+ -> added \unskip
+ This removes whitespace before comment commands
+ and may change the reference point for hoffset
+ -> added global option version (1|2(default))
+ version=1 will preserve the old behavior
+ for old documents
+
+ reported by: Stefan Pinnow
+
+2010/11/05 added local option disable to all comment commands [jk]
+ to "switch off" single comments
+
+ feature request by: Stefan Pinnow
+
+2010/11/05 changed definitions of options open and disable [jk]
+ to choicekey* to check valid option values (true|false)
+
+ feature request by: Jannis von Buttlar
+
-- pdfcomment.sty (v1.6) (<- v1.53dev 2010/08/07) -- (svn rev 51)
2010/08/04 added support for using \pdfmarkupcomment in math mode [jk]
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README
index 9f087f5a436..812481c3006 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/README
+++ b/Master/texmf-dist/doc/latex/pdfcomment/README
@@ -15,9 +15,24 @@ Adobe Reader.
License: LPPL
-Changes in v1.6:
+Changes in v2.0:
-- added support for using \pdfmarkupcomment in math mode
- (see: example_math_markup.pdf)
+- Bugfix: unwanted whitespace before comment commands [jk]
+ -> added \unskip
+ This removes whitespace before comment commands
+ and may change the reference point for hoffset
+ -> added global option version (1|2(default))
+ version=1 will preserve the old behavior
+ for old documents
- feature request by: Ross Moore (he also contributed ideas and code) \ No newline at end of file
+ reported by: Stefan Pinnow
+
+- added local option disable to all comment commands [jk]
+ to "switch off" single comments
+
+ feature request by: Stefan Pinnow
+
+- changed definitions of options open and disable [jk]
+ to choicekey* to check valid option values (true|false)
+
+ feature request by: Jannis von Buttlar \ 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 62bc5627bd3..03c6163f4a0 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 c0fdbb09b06..f4eb3dc37df 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex
@@ -10,7 +10,7 @@
\usepackage[absolute]{textpos}
\usepackage{tikz}
\usepackage{amssymb,amsmath,array,bm}
-\usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment}
+\usepackage[subject={Top1},author={\AA{}nsgar Lund},version=1]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
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 65e4ee085df..f67ded2ff58 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex
@@ -12,7 +12,7 @@
\def\pgfsysdriver{pgfsys-dvipdfm.def}
\usepackage{tikz}
\usepackage{amssymb,amsmath,array,bm}
-\usepackage[subject={Top1},author={\AA{}nsgar Lund},dvipdfmx]{pdfcomment}
+\usepackage[subject={Top1},author={\AA{}nsgar Lund},dvipdfmx,version=1]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
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 699f45f7786..4862d6e54a3 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
@@ -9,7 +9,7 @@
\usepackage[absolute]{textpos}
\usepackage{tikz}
\usepackage{amssymb,amsmath,array,bm}
-\usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment}
+\usepackage[subject={Top1},author={\AA{}nsgar Lund},version=1]{pdfcomment}
\begin{document}
\definecolor{myblue}{rgb}{0.045,0.278,0.643}
\colorlet{myorange}{red!30!yellow}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
index 07bd5ae9f6d..2fbb729d9f2 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex
@@ -15,7 +15,7 @@
\usepackage{tikz}
\usepackage{amssymb,amsmath,array,bm}
\usepackage[absolute]{textpos}
-\usepackage[subject={Top1},author={Ånsgar Lund}]{pdfcomment}
+\usepackage[subject={Top1},author={Ånsgar Lund},version=1]{pdfcomment}
\setmainfont[Mapping=tex-text]{Bergamo}
\begin{document}
\fontspec[SmallCapsFont={BergamoSmc},]{Bergamo}
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf
index b41164f1180..fdf2d9f92fc 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 53835e405ba..fd7c2f68853 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex
@@ -11,9 +11,94 @@
\usepackage{marginnote}%
\usepackage[svgnames,rgb]{xcolor}%
\usepackage{amsmath,array}%
-\usepackage{jkdoc}%
+\usepackage{tikz}%
+\usepackage{ragged2e}%
+\usepackage{url}%
+\usepackage[automark,nouppercase]{scrpage2}
\usepackage{pdfcomment}%
%
+\makeatletter
+\setlength{\headheight}{1.1\baselineskip}%
+%
+\hypersetup{colorlinks=true,urlcolor=NavyBlue,linkcolor=NavyBlue,citecolor=CornflowerBlue,naturalnames=true,hypertexnames=false}%
+\renewcommand{\maketitle}%
+{%
+ \thispagestyle{empty}%
+ \pagecolor{Ivory}%
+ \begin{titlepage}%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle%
+ (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=-4cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\Huge\sffamily\textbf{\@title}}};%
+ \draw[anchor=west,yshift=-6cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@fileversion}}};%
+ \draw[anchor=west,yshift=-9cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\huge\sffamily\textbf{\@subtitle}}};%
+ \draw[anchor=west,yshift=-14cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@date}}};%
+ \draw[anchor=west,yshift=-20cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\Large\sffamily{\@authorline\\\textbf{\@author}}}};%
+ \end{tikzpicture}%
+ };%
+ \node[yshift=0cm] at (current page.south west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=NavyBlue,color=NavyBlue,yshift=6cm,xshift=2cm] (0,0) rectangle (0.2cm,19cm);%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\large\sffamily{\@refline}}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+ \end{titlepage}%
+ \pagecolor{white}%
+}%
+%
+\newcommand*{\@tikzhead}[1]%
+{%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=1.5cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\LARGE\sffamily\textbf{\@title}}};%
+ \node[anchor=east,xshift=.9\paperwidth,rectangle,%
+ rounded corners=15pt,inner sep=11pt,fill=NavyBlue]%
+ {\color{white}\textsc{#1}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+}%
+\clearscrheadings%
+\ihead{\@tikzhead{\headmark}}%
+\cfoot{\upshape\thepage}%
+\pagestyle{scrheadings}%
+%
+%\newcommand*{\headline}[1]{\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}%
+\newcommand*{\Headline}[1]{\@mkboth{#1}{#1}}%
+%
+\renewcommand{\headfont}{\normalfont\mdseries\scshape}
+%
+\gdef\@subtitle{}%
+\providecommand*{\Subtitle}[1]{\gdef\@subtitle{#1}}%
+\gdef\@fileversion{}%
+\providecommand*{\Fileversion}[1]{\gdef\@fileversion{#1}}%
+\gdef\@author{}%
+\providecommand*{\Author}[1]{\gdef\@author{#1}}%
+\gdef\@authorline{Package author:}%
+\providecommand*{\Authorline}[1]{\gdef\@authorline{#1}}%
+\gdef\@refline{}%
+\providecommand*{\Refline}[1]{\gdef\@refline{#1}}%
+\gdef\and{\unskip{}, }%
+\newcommand\doubledash{-\kern0.5pt-}
+\def\enoteformat{\rightskip\z@ \leftskip\z@ \parindent=1em\leavevmode\llap{\makeenmark}}
+\makeatother
+%
\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}%
@@ -51,8 +136,8 @@
\title{\filename}%
\Subtitle{A user-friendly interface to PDF annotations}%
\author{Josef Kleber}
-\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}}}%
+\Fileversion{v2.0}
+\Refline{\href{mailto:kleberj@users.berlios.de}{\texttt{kleberj@users.berlios.de}}\\\href{http://pdfcomment.berlios.de}{\texttt{http://pdfcomment.berlios.de}}}
\maketitle
\Headline{Abstract}
\begin{abstract}
@@ -104,16 +189,18 @@ I want to thank the following persons for contributions to the development of th
I also want to thank the following persons for bug reports, feature requests, ...:
-Gabriel Cardona, Jin-Hwan Cho, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair
+Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
\clearpage
\section{Options}
\subsection{Global options}
\subsubsection[\texttt{final}]{\styleoption{final}}\label{sec:final}
-The option \styleoption{final} will set the package to final mode. The PDF annotations will not be typeset and will not influence line breaking.
+The option \styleoption{final} will set the package to final mode. The PDF annotations will not be typeset and will not influence line breaking. Use the local option \styleoption{disable} if you want to disable single PDF annotations. (see: \ref{sec:disable})
\subsubsection[\texttt{draft}]{\styleoption{draft}}\label{sec:draft}
The option \styleoption{draft} (default) will set the package to draft mode. Therefore, the PDF annotations will be typeset.
\subsubsection[\texttt{dvipdfmx}]{\styleoption{dvipdfmx}}\label{sec:dvipdfmx}
If you want to use the driver \texttt{dvipdfmx} for creating your documents, you have to use the option \styleoption{dvipdfmx}. The other drivers are recognized automatically.
+\subsubsection[\texttt{version}]{\styleoption{version}}\label{sec:version}
+Version v2.0 of \texttt{pdfcomment.sty} introduced a bugfix that removes unwanted whitespace before the comment commands. This may also change the reference point for options like \styleoption{hoffset}. If you want to preserve the old behavior for older documents simply use \texttt{version=1}. Otherwise \texttt{version=2} is used by default!
\subsection{Local options}
The following options are useable as options for the commands presented in sections \ref{sec:kommentarumgebungen} and \ref{sec:kommentarbefehle}, as well as style options. As style options they have global effect, whereas they have only local effect when used in commands. Furthermore global options are not overwritten.
@@ -275,6 +362,9 @@ You can use the option \styleoption{height} for definig the height of PDF annota
\subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
You can use the option \styleoption{markup} for defining the type of the PDF text markup annotation. Possible values are: Highlight, Underline, Squiggly und StrikeOut.
+\subsubsection[\texttt{disable}]{\styleoption{disable}}\label{sec:disable}
+You can use the option \styleoption{disable} for switching off single PDF annotation. For switching off all PDF annotations use the global option \styleoption{final}.
+
\subsubsection[\texttt{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.
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf
index 90b4018d7ca..6e5ed9daa06 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 fb39903cafe..ad48eeffae8 100644
--- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
+++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex
@@ -11,7 +11,10 @@
\usepackage{marginnote}%
\usepackage[svgnames,rgb]{xcolor}%
\usepackage{amsmath,array}%
-\usepackage{jkdocde}%
+\usepackage{tikz}%
+\usepackage{ragged2e}%
+\usepackage{url}%
+\usepackage[automark,nouppercase]{scrpage2}
\usepackage{pdfcomment}%
%
\def\LinkExMath{\href{http://mirror.ctan.org/macros/latex/contrib/pdfcomment/doc/example_math_markup.pdf}{\texttt{example\_math\_markup.pdf}}}
@@ -20,6 +23,82 @@
\def\XeLaTeX{Xe\LaTeX}%
%
\makeatletter%
+\hypersetup{colorlinks=true,urlcolor=NavyBlue,linkcolor=NavyBlue,citecolor=CornflowerBlue,naturalnames=true,hypertexnames=false}%
+\setlength{\headheight}{1.1\baselineskip}%
+%
+\renewcommand{\maketitle}%
+{%
+ \thispagestyle{empty}%
+ \pagecolor{Ivory}%
+ \begin{titlepage}%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle%
+ (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=-4cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\Huge\sffamily\textbf{\@title}}};%
+ \draw[anchor=west,yshift=-6cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@fileversion}}};%
+ \draw[anchor=west,yshift=-9cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\RaggedRight\huge\sffamily\textbf{\@subtitle}}};%
+ \draw[anchor=west,yshift=-14cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\huge\sffamily\textbf{\@date}}};%
+ \draw[anchor=west,yshift=-20cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\Large\sffamily{\@authorline\\\textbf{\@author}}}};%
+ \end{tikzpicture}%
+ };%
+ \node[yshift=0cm] at (current page.south west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=NavyBlue,color=NavyBlue,yshift=6cm,xshift=2cm] (0,0) rectangle (0.2cm,19cm);%
+ \draw[fill=CornflowerBlue,color=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=3cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\large\sffamily{\@refline}}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+ \end{titlepage}%
+ \pagecolor{white}%
+}%
+%
+\newcommand*{\@tikzhead}[1]%
+{%
+ \begin{tikzpicture}[remember picture,overlay]%
+ \node[yshift=-2cm] at (current page.north west)%
+ {%
+ \begin{tikzpicture}[remember picture, overlay]%
+ \draw[fill=CornflowerBlue] (0,0) rectangle (\paperwidth,2cm);%
+ \draw[anchor=west,yshift=1cm,xshift=1.5cm,color=NavyBlue] (0,0) node%
+ {\parbox{15cm}{\LARGE\sffamily\textbf{\@title}}};%
+ \node[anchor=east,xshift=.9\paperwidth,rectangle,%
+ rounded corners=15pt,inner sep=11pt,fill=NavyBlue]%
+ {\color{white}\textsc{#1}};%
+ \end{tikzpicture}%
+ };%
+ \end{tikzpicture}%
+}%
+\clearscrheadings%
+\ihead{\@tikzhead{\headmark}}%
+\cfoot{\thepage}%
+\pagestyle{scrheadings}%
+%
+\renewcommand{\headfont}{\normalfont\mdseries\scshape}
+%
+%\newcommand*{\Headline}[1]{\@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}}%
+\newcommand*{\Headline}[1]{\@mkboth{#1}{#1}}%
+%
+\gdef\@subtitle{}%
+\providecommand*{\Subtitle}[1]{\gdef\@subtitle{#1}}%
+\gdef\@fileversion{}%
+\providecommand*{\Fileversion}[1]{\gdef\@fileversion{#1}}%
+\gdef\@authorline{Package Autor:}%
+\providecommand*{\Authorline}[1]{\gdef\@authorline{#1}}%
+\gdef\@refline{}%
+\providecommand*{\Refline}[1]{\gdef\@refline{#1}}%
+\gdef\and{\unskip{}, }%
+%
\renewcommand\tableofcontents%
{%
%\section*{\contentsname}%
@@ -71,8 +150,8 @@
\title{\filename}%
\Subtitle{Ein benutzerfreundliches Interface zu PDF-Kommentaren}%
\author{Josef Kleber}
-\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}}}%
+\Fileversion{v2.0}
+\Refline{\href{mailto:kleberj@users.berlios.de}{\texttt{kleberj@users.berlios.de}}\\\href{http://pdfcomment.berlios.de}{\texttt{http://pdfcomment.berlios.de}}}
\maketitle
\Headline{Zusammenfassung}%
\begin{abstract}
@@ -124,16 +203,18 @@ F�r Beitr�ge zur Entwicklung dieses Pakets m�chte ich folgenden Personen danken:
Au�erdem m�chte ich folgenden Personen danken f�r bug reports, feature requests, ...:
-Gabriel Cardona, Jin-Hwan Cho, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair
+Jannis von Buttlar, Gabriel Cardona, Jin-Hwan Cho, Thomas K�nig, Marc-Andr� Michel, Guillaume Millet, Fritz Moore, Michael Niedermair, Stefan Pinnow
\clearpage
\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.
+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})
\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}
Falls Sie f�r die Erstellung Ihrer Dokumente den Treiber \texttt{dvipdfmx} einsetzen m�chten, m�ssen Sie die Option \texttt{dvipdfmx} benutzen. Die anderen bereits erw�hnten Treiber werden automatisch erkannt.
+\subsubsection[\texttt{version}]{\styleoption{version}}\label{sec:version}
+Mit der Version v2.0 von \texttt{pdfcomment.sty} wurde ein Bugfix hinzugef�gt, der ungewollten Whitespace vor den Kommentarbefehlen entfernt. Das �ndert u.\,U. auch den Referenzpunkt f�r Optionen wie \styleoption{hoffset}. M�chten Sie das urspr�ngliche Verhalten erhalten - etwa f�r alte Dokumente - verwenden Sie die Option \texttt{version=1}. Ansonsten wird die Option \texttt{version=2} als Default verwendet!
\subsection{Lokale Optionen}
Die anschlie�end vorgestellten Optionen sind f�r die in den Abschnitten \ref{sec:kommentarumgebungen} und \ref{sec:kommentarbefehle} vorgestellten Befehle anwendbar, allerdings k�nnen sie auch als Styleoptionen benutzt werden. Als Styleoptionen besitzen sie globale Wirkung, w�hrend sie in Befehlen nur eine lokale Wirkung besitzen und die globalen Optionen nicht �berschreiben.
@@ -293,6 +374,9 @@ Die Option \styleoption{height} dient der Festlegung der H�he der PDF annotation
\subsubsection[\texttt{markup}]{\styleoption{markup}}\label{sec:markup}
Die Option \styleoption{markup} dient der Festlegung des Typs der text markup annotations. M�gliche Werte sind dabei: Highlight, Underline, Squiggly und StrikeOut.
+\subsubsection[\texttt{disable}]{\styleoption{disable}}\label{sec:disable}
+Mit der Option \styleoption{disable} kann man einzelne PDF annotationa abschalten. M�chten Sie alle PDF annotations abschalten, benuzten Sie die globale Option \styleoption{final}.
+
\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.
@@ -313,7 +397,7 @@ M�gliche \marginnote{\raggedleft\scriptsize\envb{pdfsidelinecomment}\\\oarg{Opti
\bigskip
Mit der Umgebung \env{pdfsidelinecomment} kann man ganze Seitenbereiche in Form zweier Linien in den Randspalten mit einem Kommentar kennzeichnen.
-\hspace*{0pt}\newline
+\clearpage
\begin{pdfsidelinecomment}[color=red,icolor=yellow,linebegin=/Circle,lineend=/Circle,linewidth=3bp,linesep=1cm]{ ! Beachten ! }
Einschr�nkungen:
@@ -389,7 +473,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}
\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 \LinkEx!
+\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=-5.3cm,hoffset=-2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation}. Bei Verwendung der Option \styleoption{type} = \texttt{callout} verf�gt die Box zus�tzlich �ber eine sogenannte Callout Linie, um die Box an ein bestimmtes Element der Seite zu binden. Mit der Option \styleoption{type} = \texttt{typewriter} kann man einen Kommentar an einer beliebigen Stelle mit einer virtuellen 'Schreibmaschine' schreiben. Diese PDF freetext annotation haben keinen Rand und einen transparenten Hintergrund. Dadurch kann man beliebige Stellen '�berschreiben'. Bitte beachten Sie dazu die Beispieldatei \LinkEx!
\subsubsection{\texorpdfstring{\cs{pdfsquarecomment}}{\textbackslash pdfsquarecomment}}
\label{sec:pdfsquarecomment}
diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
index 072a3e6cb1c..73fadc2184d 100644
--- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
+++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty
@@ -15,12 +15,12 @@
%%
%% This work has the LPPL maintenance status "author-maintained".
%%
-%% This Current Maintainer of this work is Josef Kleber.
+%% The Current Maintainer of this work is Josef Kleber.
%%
%% This work consists of all files listed in manifest.txt.
%%
%
-\ProvidesPackage{pdfcomment}[2010/08/15 pdfcomment.sty v1.6 - Josef Kleber (C) 2008-2010]%
+\ProvidesPackage{pdfcomment}[2010/11/08 pdfcomment.sty v2.0 - Josef Kleber (C) 2008-2010]%
%
\RequirePackage{xkeyval}%
%
@@ -57,6 +57,7 @@
\gdef\pc@goptd@captionhoffset{0pt}%
\gdef\pc@goptd@captionvoffset{0pt}%
\gdef\pc@goptd@linesep{0.5cm}%
+\gdef\pc@goptd@disable{false}%
\gdef\pc@goptd@dvipdfmx{true}%
%
% values for global package options
@@ -92,6 +93,7 @@
\gdef\pc@gopt@captionhoffset{}%
\gdef\pc@gopt@captionvoffset{}%
\gdef\pc@gopt@linesep{}%
+\gdef\pc@gopt@disable{}%
%
% values for local command options
\gdef\pc@lopt@subject{}%
@@ -127,6 +129,7 @@
\gdef\pc@lopt@captionvoffset{}%
\gdef\pc@lopt@linesep{}%
\gdef\pc@lopt@mathstyle{}%
+\gdef\pc@lopt@disable{}%
%
\gdef\pc@lopt@c{}%
\gdef\pc@lopt@ic{}%
@@ -138,6 +141,8 @@
%
\newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse%
\newif\ifpc@gopt@final\pc@gopt@finalfalse%
+\newif\ifpc@lopt@disable\pc@lopt@disablefalse%
+\newif\ifpc@opt@unskip\pc@opt@unskiptrue%
\newif\ifpc@annot@samepage\pc@annot@samepagetrue%
\newif\ifpc@annot@secondpage\pc@annot@secondpagefalse%
%
@@ -189,6 +194,8 @@
\newcommand{\pc@y@top@text}{}%
\newcommand{\pc@y@bottom@text}{}%
%
+\gdef\pc@version{}%
+%
\newcommand{\pc@raggedleftmarginnote}{\centering}%
\newcommand{\pc@raggedrightmarginnote}{\centering}%
%
@@ -386,16 +393,24 @@
\pc@define@key@icon{pdflinecomment}%
\pc@define@key@icon{pdfsidelinecomment}%
%
-\define@key{pdfcomment.sty}{open}[\pc@goptd@open]%
+\define@choicekey*{pdfcomment.sty}{open}[\pc@gopt@open\nr]{true,false}[false]%
{%
- \gdef\pc@gopt@open{#1}%
+ \ifcase\nr\relax%
+ \gdef\pc@gopt@open{true}%
+ \or%
+ \gdef\pc@gopt@open{false}%
+ \fi%
}%
%
\newcommand\pc@define@key@open[1]%
{%
- \define@key{#1}{open}[\pc@gopt@open]%
+ \define@choicekey*{#1}{open}[\pc@lopt@open\nr]{true,false}[true]%
{%
- \gdef\pc@lopt@open{##1}%
+ \ifcase\nr\relax%
+ \gdef\pc@lopt@open{true}%
+ \or%
+ \gdef\pc@lopt@open{false}%
+ \fi%
}%
}%
%
@@ -1044,14 +1059,30 @@
\pc@define@key@linesep{pdflinecomment}%
\pc@define@key@linesep{pdfsidelinecomment}%
%
-\define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
+\newcommand\pc@define@key@disable[1]%
{%
- \expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
+ \define@choicekey*{#1}{disable}[\pc@lopt@disable\nr]{true,false}[true]%
+ {%
+ \ifcase\nr\relax%
+ \global\pc@lopt@disabletrue%
+ \or%
+ \global\pc@lopt@disablefalse%
+ \fi%
+ }%
}%
%
-\define@key{pdfmarkupcomment}{mathstyle}%
+\pc@define@key@disable{pdfcomment}%
+\pc@define@key@disable{pdfmargincomment}%
+\pc@define@key@disable{pdffreetextcomment}%
+\pc@define@key@disable{pdfmarkupcomment}%
+\pc@define@key@disable{pdfsquarecomment}%
+\pc@define@key@disable{pdfcirclecomment}%
+\pc@define@key@disable{pdflinecomment}%
+\pc@define@key@disable{pdfsidelinecomment}%
+%
+\define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]%
{%
- \gdef\pc@lopt@mathstyle{#1}%
+ \expandafter\global\csname pc@gopt@dvipdfmx#1\endcsname%
}%
%
\define@key{pdfcomment.sty}{final}[]%
@@ -1064,6 +1095,20 @@
\pc@gopt@finalfalse%
}%
%
+\define@choicekey{pdfcomment.sty}{version}[\pc@version\nr]{1,2}[2]%
+{%
+ \ifcase\nr\relax%
+ \pc@opt@unskipfalse%
+ \or%
+ \pc@opt@unskiptrue%
+ \fi%
+}%
+%
+\define@key{pdfmarkupcomment}{mathstyle}%
+{%
+ \gdef\pc@lopt@mathstyle{#1}%
+}%
+%
\define@key{listofpdfcomments}{liststyle}[AuthorSubject]%
{%
\gdef\pc@lopt@liststyle{#1}%
@@ -1074,7 +1119,7 @@
\renewcommand{\lpcname}{#1}%
}%
%
-\ExecuteOptionsX{subject,color,author,deadline,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup,font,fontsize,fontcolor,justification,borderstyle,linewidth,dashstyle,bse,bsei,type,lineend,linebegin,icolor,line,caption,captionhoffset,captionvoffset,linesep}%
+\ExecuteOptionsX{subject,color,author,deadline,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup,font,fontsize,fontcolor,justification,borderstyle,linewidth,dashstyle,bse,bsei,type,lineend,linebegin,icolor,line,caption,captionhoffset,captionvoffset,linesep,version}%
%
\ProcessOptionsX\relax%
%
@@ -1138,9 +1183,11 @@
\disable@keys{pdfcomment.sty}{draft}%
\disable@keys{pdfcomment.sty}{final}%
\disable@keys{pdfcomment.sty}{dvipdfmx}%
+ \disable@keys{pdfcomment.sty}{version}%
}%
\newcommand{\pdfcomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1156,29 +1203,11 @@
\gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
}%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- \pc@create@lpc%
- % typeset text annotation (see: PDF Reference)
- \ifpdf%
- \vbox%
- {%
- \hsize=0pt%
- \noindent%
- \vspace{\pc@lopt@voffset}%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pdfannot width 0pt height \normalbaselineskip depth 0pt%
- {%
- /Subtype /Text%
- \pc@annot@text%
- }%
- \hss%
- }%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ \pc@create@lpc%
+ % typeset text annotation (see: PDF Reference)
+ \ifpdf%
\vbox%
{%
\hsize=0pt%
@@ -1188,43 +1217,64 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
- <<%
- /Subtype /Text%
- \pc@annot@text%
- >>%
+ \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+ {%
+ /Subtype /Text%
+ \pc@annot@text%
}%
\hss%
}%
}%
\else%
- \vbox%
- {%
- \hsize=0pt%
- \noindent%
- \vspace{\pc@lopt@voffset}%
- \vspace{\normalbaselineskip}%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox%
{%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pdfmark[\rule{0pt}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \vspace{\pc@lopt@voffset}%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/Text,%
- Raw={\pc@annot@text}%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+ <<%
+ /Subtype /Text%
+ \pc@annot@text%
+ >>%
+ }%
+ \hss%
}%
- \hss%
}%
- }%
+ \else%
+ \vbox%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \vspace{\pc@lopt@voffset}%
+ \vspace{\normalbaselineskip}%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pdfmark[\rule{0pt}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/Text,%
+ Raw={\pc@annot@text}%
+ }%
+ \hss%
+ }%
+ }%
+ \fi%
\fi%
+ \hspace{\pc@lopt@hspace}%
\fi%
- \hspace{\pc@lopt@hspace}%
\fi%
}%
%
\newcommand{\pdfmargincomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1240,35 +1290,17 @@
\gdef\pc@lopt@c{/C [\pc@hyenc@color]}%
}%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- \pc@create@lpc%
- \begingroup%
- % center marginnotes!
- \renewcommand{\raggedleftmarginnote}{\pc@raggedleftmarginnote}%
- \renewcommand{\raggedrightmarginnote}{\pc@raggedrightmarginnote}%
- % typeset text annotation (see: PDF Reference)
- \marginnote%
- {%
- \ifpdf%
- \vbox%
- {%
- \hsize=0pt%
- \noindent%
- \vspace{\pc@lopt@voffset}%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pdfannot width 0pt height \normalbaselineskip depth 0pt%
- {%
- /Subtype /Text%
- \pc@annot@text%
- }
- \hss%
- }%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ \pc@create@lpc%
+ \begingroup%
+ % center marginnotes!
+ \renewcommand{\raggedleftmarginnote}{\pc@raggedleftmarginnote}%
+ \renewcommand{\raggedrightmarginnote}{\pc@raggedrightmarginnote}%
+ % typeset text annotation (see: PDF Reference)
+ \marginnote%
+ {%
+ \ifpdf%
\vbox%
{%
\hsize=0pt%
@@ -1278,45 +1310,66 @@
{%
\vsize=0pt%
\hskip\pc@lopt@hoffset%
- \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
- <<%
- /Subtype /Text%
- \pc@annot@text%
- >>%
- }%
+ \pdfannot width 0pt height \normalbaselineskip depth 0pt%
+ {%
+ /Subtype /Text%
+ \pc@annot@text%
+ }
\hss%
}%
}%
\else%
- \vbox%
- {%
- \hsize=0pt%
- \noindent%
- \vspace{\pc@lopt@voffset}%
- \vspace{\normalbaselineskip}%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox%
{%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pdfmark[\rule{0pt}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \vspace{\pc@lopt@voffset}%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/Text,%
- Raw={\pc@annot@text}%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \special{pdf: ann width 0pt\space height \the\normalbaselineskip\space depth 0pt%
+ <<%
+ /Subtype /Text%
+ \pc@annot@text%
+ >>%
+ }%
+ \hss%
}%
- \hss%
}%
- }%
+ \else%
+ \vbox%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \vspace{\pc@lopt@voffset}%
+ \vspace{\normalbaselineskip}%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pdfmark[\rule{0pt}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/Text,%
+ Raw={\pc@annot@text}%
+ }%
+ \hss%
+ }%
+ }%
+ \fi%
\fi%
- \fi%
- \hspace{\pc@lopt@hspace}%
- }%
- \endgroup%
+ \hspace{\pc@lopt@hspace}%
+ }%
+ \endgroup%
+ \fi%
\fi%
}%
%
\newcommand{\pdffreetextcomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1340,30 +1393,10 @@
%create options for \pdfannot
\pc@create@pdfannotopt%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- % typeset freetext annotation (see: PDF Reference)
- \ifpdf%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- \expandafter\pdfannot \pc@pdfannotopt%
- {%
- /Subtype /FreeText%
- \pc@annot@freetext%
- }%
- \hss%
- }%
- \vss%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ % typeset freetext annotation (see: PDF Reference)
+ \ifpdf%
\vbox to 0pt%
{%
\hsize=0pt%
@@ -1374,47 +1407,70 @@
\vsize=0pt%
\hskip\pc@lopt@hoffset%
\pc@create@lpc%
- \special{pdf: ann \pc@pdfannotopt%
- <<%
- /Subtype /FreeText%
- \pc@annot@freetext%
- >>%
+ \expandafter\pdfannot \pc@pdfannotopt%
+ {%
+ /Subtype /FreeText%
+ \pc@annot@freetext%
}%
- \hss%
+ \hss%
}%
- \vss%
+ \vss%
}%
\else%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- % add extra \vskip box height because of different reference point
- \vskip-\pc@lopt@height%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox to 0pt%
{%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- %create dimensions of annotation
- \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/FreeText,%
- Raw={\pc@annot@freetext}%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ \special{pdf: ann \pc@pdfannotopt%
+ <<%
+ /Subtype /FreeText%
+ \pc@annot@freetext%
+ >>%
+ }%
+ \hss%
}%
- \hss%
+ \vss%
}%
- \vss%
- }%
+ \else%
+ \vbox to 0pt%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ % add extra \vskip box height because of different reference point
+ \vskip-\pc@lopt@height%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ %create dimensions of annotation
+ \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/FreeText,%
+ Raw={\pc@annot@freetext}%
+ }%
+ \hss%
+ }%
+ \vss%
+ }%
+ \fi%
\fi%
- \fi%
+ \fi%
\fi%
}%
%
\newcommand{\pdfsquarecomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1439,30 +1495,10 @@
%create options for \pdfannot
\pc@create@pdfannotopt%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- % typeset square annotation (see: PDF Reference)
- \ifpdf%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- \expandafter\pdfannot \pc@pdfannotopt%
- {%
- /Subtype /Square\space%
- \pc@annot@square%
- }%
- \hss%
- }%
- \vss%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ % typeset square annotation (see: PDF Reference)
+ \ifpdf%
\vbox to 0pt%
{%
\hsize=0pt%
@@ -1473,47 +1509,70 @@
\vsize=0pt%
\hskip\pc@lopt@hoffset%
\pc@create@lpc%
- \special{pdf: ann \pc@pdfannotopt%
- <<%
- /Subtype /Square\space%
- \pc@annot@square%
- >>%
+ \expandafter\pdfannot \pc@pdfannotopt%
+ {%
+ /Subtype /Square\space%
+ \pc@annot@square%
}%
\hss%
}%
\vss%
}%
\else%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- % add extra \vskip box height because of different reference point
- \vskip-\pc@lopt@height%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox to 0pt%
{%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- %create dimensions of annotation
- \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/Square,%
- Raw={\pc@annot@square}%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ \special{pdf: ann \pc@pdfannotopt%
+ <<%
+ /Subtype /Square\space%
+ \pc@annot@square%
+ >>%
+ }%
+ \hss%
}%
- \hss%
+ \vss%
}%
- \vss%
- }%
+ \else%
+ \vbox to 0pt%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ % add extra \vskip box height because of different reference point
+ \vskip-\pc@lopt@height%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ %create dimensions of annotation
+ \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/Square,%
+ Raw={\pc@annot@square}%
+ }%
+ \hss%
+ }%
+ \vss%
+ }%
+ \fi%
\fi%
- \fi%
+ \fi%
\fi%
}%
%
\newcommand{\pdfcirclecomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1538,31 +1597,10 @@
%create options for \pdfannot
\pc@create@pdfannotopt%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- % typeset circle annotation (see: PDF Reference)
- \ifpdf%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- \expandafter\pdfannot \pc@pdfannotopt%
- {%
- /Subtype /Circle\space%
- % circle and square annatations differ only in /Subtype, so ...
- \pc@annot@square%
- }%
- \hss%
- }%
- \vss%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ % typeset circle annotation (see: PDF Reference)
+ \ifpdf%
\vbox to 0pt%
{%
\hsize=0pt%
@@ -1573,47 +1611,71 @@
\vsize=0pt%
\hskip\pc@lopt@hoffset%
\pc@create@lpc%
- \special{pdf: ann \pc@pdfannotopt%
- <<%
- /Subtype /Circle\space%
- \pc@annot@square%
- >>%
+ \expandafter\pdfannot \pc@pdfannotopt%
+ {%
+ /Subtype /Circle\space%
+ % circle and square annatations differ only in /Subtype, so ...
+ \pc@annot@square%
}%
\hss%
}%
\vss%
}%
\else%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \vskip-\pc@lopt@voffset%
- % add extra \vskip box height because of different reference point
- \vskip-\pc@lopt@height%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox to 0pt%
{%
- \vsize=0pt%
- \hskip\pc@lopt@hoffset%
- \pc@create@lpc%
- %create dimensions of annotation
- \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/Circle,%
- Raw={\pc@annot@square}%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ \special{pdf: ann \pc@pdfannotopt%
+ <<%
+ /Subtype /Circle\space%
+ \pc@annot@square%
+ >>%
+ }%
+ \hss%
}%
- \hss%
+ \vss%
}%
- \vss%
- }%
+ \else%
+ \vbox to 0pt%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \vskip-\pc@lopt@voffset%
+ % add extra \vskip box height because of different reference point
+ \vskip-\pc@lopt@height%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ \hskip\pc@lopt@hoffset%
+ \pc@create@lpc%
+ %create dimensions of annotation
+ \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/Circle,%
+ Raw={\pc@annot@square}%
+ }%
+ \hss%
+ }%
+ \vss%
+ }%
+ \fi%
\fi%
- \fi%
+ \fi%
\fi%
}%
%
\newcommand{\pdflinecomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1659,28 +1721,11 @@
%create options for \pdfannot
\pc@create@pdfannotopt%
\ifpc@gopt@final\else%
- \hspace*{0pt}%
- \pc@create@lpc%
- % typeset line annotation (see: PDF Reference)
- \ifpdf%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \hbox to 0pt%
- {%
- \vsize=0pt%
- \expandafter\pdfannot \pc@pdfannotopt%
- {%
- /Subtype /\pc@lopt@type\space%
- \pc@annot@line%
- }%
- \hss%
- }%
- \vss%
- }%
- \else%
- \ifpc@gopt@dvipdfmx%
+ \ifpc@lopt@disable\else%
+ \hspace*{0pt}%
+ \pc@create@lpc%
+ % typeset line annotation (see: PDF Reference)
+ \ifpdf%
\vbox to 0pt%
{%
\hsize=0pt%
@@ -1688,37 +1733,56 @@
\hbox to 0pt%
{%
\vsize=0pt%
- \special{pdf: ann \pc@pdfannotopt%
- <<%
- /Subtype /\pc@lopt@type\space%
- \pc@annot@line%
- >>%
+ \expandafter\pdfannot \pc@pdfannotopt%
+ {%
+ /Subtype /\pc@lopt@type\space%
+ \pc@annot@line%
}%
\hss%
}%
\vss%
}%
\else%
- \vbox to 0pt%
- {%
- \hsize=0pt%
- \noindent%
- \hbox to 0pt%
+ \ifpc@gopt@dvipdfmx%
+ \vbox to 0pt%
{%
- \vsize=0pt%
- %create dimensions of annotation
- \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ \hsize=0pt%
+ \noindent%
+ \hbox to 0pt%
{%
- pdfmark=/ANN,%
- Subtype=/\pc@lopt@type,%
- Raw={\pc@annot@line}%
+ \vsize=0pt%
+ \special{pdf: ann \pc@pdfannotopt%
+ <<%
+ /Subtype /\pc@lopt@type\space%
+ \pc@annot@line%
+ >>%
+ }%
+ \hss%
}%
- \hss%
+ \vss%
}%
- \vss%
- }%
+ \else%
+ \vbox to 0pt%
+ {%
+ \hsize=0pt%
+ \noindent%
+ \hbox to 0pt%
+ {%
+ \vsize=0pt%
+ %create dimensions of annotation
+ \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]%
+ {%
+ pdfmark=/ANN,%
+ Subtype=/\pc@lopt@type,%
+ Raw={\pc@annot@line}%
+ }%
+ \hss%
+ }%
+ \vss%
+ }%
+ \fi%
\fi%
- \fi%
+ \fi%
\fi%
}%
%
@@ -1738,36 +1802,38 @@
\setlength{\pc@Eposy}{\zposy{pdfcomment:\thezref@unique}sp}%
\ifmmode%
\ifpc@gopt@final\else%
- %changed \pc@encode@PDF, \pdfstringdef does not work in math mode
- \marginnote{\pc@encode@PDF@math{#3}}%
- \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
- \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%
- {%
- \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%
+ \ifpc@lopt@disable\else%
+ %changed \pc@encode@PDF, \pdfstringdef does not work in math mode
+ \marginnote{\pc@encode@PDF@math{#3}}%
+ \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}%
+ \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%
+ {%
+ \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%
- \pc@annot@markup@dvips%
+ \ifpc@gopt@dvipdfmx%
+ \pc@annot@markup@dvipdfmx%
+ \else%
+ \pc@annot@markup@dvips%
+ \fi%
\fi%
- \fi%
- }%
- \wd\pc@mathannot@box\z@%
- \ht\pc@mathannot@box\z@%
- \dp\pc@mathannot@box\z@%
- \box\pc@mathannot@box%
- \nobreak%
- \fi%
+ }%
+ \wd\pc@mathannot@box\z@%
+ \ht\pc@mathannot@box\z@%
+ \dp\pc@mathannot@box\z@%
+ \box\pc@mathannot@box%
+ \nobreak%
+ \fi%
+ \fi%
#2%
\else%
\pc@encode@PDF{#3}%
@@ -1786,59 +1852,65 @@
\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}%
- \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%
+ \ifpc@lopt@disable\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}%
+ \renewcommand{\pc@anna@y@four}{\pc@pttobp{\pc@dimc}}%
+ \renewcommand{\pc@anna@y@two}{\pc@pttobp{\pc@dimc + \pc@box@depth + \pc@box@height +2pt}}%
+ \pc@annot@secondpagefalse%
+ \pc@create@annot%
+ \fi%
+ \fi%
\fi%
\ifpc@gopt@final\else%
- \pc@create@lpc%
+ \ifpc@lopt@disable\else%
+ \pc@create@lpc%
+ \fi%
\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%
+ \ifpc@lopt@disable\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%
\fi%
%only local!
@@ -1847,6 +1919,7 @@
%
\newenvironment{pdfsidelinecomment}[2][]%
{%
+ \ifpc@opt@unskip\unskip\fi%
% Copy all global options to local options
\pc@copy@gopt@lopt%
% Change local options if specified
@@ -1904,15 +1977,17 @@
\fi%
\ifpc@annot@samepage\else%
\ifpc@gopt@final\else%
- \pc@calc@sidelinepos%
- \renewcommand{\pc@y@two}{\pc@y@bottom@text}
- \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
- \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space/None]}%
- \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
- \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
- \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}%
- \marginnote{\pc@create@annot@sideline}%
- \fi%
+ \ifpc@lopt@disable\else%
+ \pc@calc@sidelinepos%
+ \renewcommand{\pc@y@two}{\pc@y@bottom@text}
+ \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+ \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space/None]}%
+ \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
+ \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+ \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}%
+ \marginnote{\pc@create@annot@sideline}%
+ \fi%
+ \fi%
\fi%
}%
{%
@@ -1920,25 +1995,27 @@
\zref@refused{pdfcomment:\thezref@unique}%
\refstepcounter{zref@unique}%
\ifpc@gopt@final\else%
- \ifpc@annot@samepage%
- % annot complete on one page
- \pc@calc@sidelinepos%
- \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
- \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
- \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
- \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
- \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}%
- \marginnote{\pc@create@annot@sideline}%
- \else%
- \pc@calc@sidelinepos%
- \renewcommand{\pc@y@one}{\pc@y@top@text}
- \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
- \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@lineend]}%
- \marginnote{\pc@create@annot@sideline}%
- \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
- \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}%
- \marginnote{\pc@create@annot@sideline}%
- \fi%
+ \ifpc@lopt@disable\else%
+ \ifpc@annot@samepage%
+ % annot complete on one page
+ \pc@calc@sidelinepos%
+ \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+ \gdef\pc@lopt@le{/LE [\pc@lopt@linebegin\space\pc@lopt@lineend]}%
+ \marginnote{\pc@create@lpc\pc@create@annot@sideline}%
+ \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+ \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}%
+ \marginnote{\pc@create@annot@sideline}%
+ \else%
+ \pc@calc@sidelinepos%
+ \renewcommand{\pc@y@one}{\pc@y@top@text}
+ \gdef\pc@lopt@line{\pc@x@two\space\pc@y@one\space\pc@x@two\space\pc@y@two}%
+ \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@lineend]}%
+ \marginnote{\pc@create@annot@sideline}%
+ \gdef\pc@lopt@line{\pc@x@one\space\pc@y@two\space\pc@x@one\space\pc@y@one}%
+ \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}%
+ \marginnote{\pc@create@annot@sideline}%
+ \fi%
+ \fi%
\fi%
}%
%
@@ -2068,6 +2145,7 @@
\gdef\pc@lopt@captionhoffset{\pc@gopt@captionhoffset}%
\gdef\pc@lopt@captionvoffset{\pc@gopt@captionvoffset}%
\gdef\pc@lopt@linesep{\pc@gopt@linesep}%
+ \pc@lopt@disablefalse%
}%
%
\newcommand{\pc@encode@PDF}[1]%