diff options
Diffstat (limited to 'Master/texmf-dist')
15 files changed, 751 insertions, 227 deletions
diff --git a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES index e8f4ab8afe0..7e336df909a 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/CHANGES +++ b/Master/texmf-dist/doc/latex/pdfcomment/CHANGES @@ -1,5 +1,17 @@ === pdfcomment.sty === +-- pdfcomment.sty (v1.3) (<- v1.25dev 2009/03/09) -- (svn rev 27) + +2009/03/05 new annotation type: text markup annotation [jk] (svn rev 24) + -> \pdfmarkupcomment, new option markup + +2009/02/24 Bugfix: avatar and style system [jk] (svn rev 13) + wrong key families (copy and paste) + +2009/02/21 code clean up [jk] (svn rev 13) + moved repeated code into commands + + -- pdfcomment.sty (v1.2) (<- v1.13dev 2009/02/19) -- (svn rev 12) 2009/02/15 new annotation type FreeText [jk] (svn rev 11) @@ -31,13 +43,6 @@ makes absolutely no sense! Therefore, they are switched off at "\AtBeginDocument" and a warning is issued by xkeyval.sty, if used. -2008/12/10 added code for the support of other drivers than pdflatex [jk] (svn rev 2) - various changes for the support of - latex->dvips->ps2pdf, latex->dvipdfmx, xelatex - new option dvipdfmx - - contributed by Alexander Grahn - 2008/12/10 problems with too old versions of hyperref [jk] (svn rev 4) no \HyColor@XZeroOneThreeFour (hycolor.sty) Change: \RequirePackage{hyperref}[2007/04/09] (v6.76a) @@ -48,7 +53,14 @@ draft: pdf annotations are typeset (default) final: pdf annotations are not typeset +2008/12/10 added code for the support of other drivers than pdflatex [jk] (svn rev 2) + various changes for the support of + latex->dvips->ps2pdf, latex->dvipdfmx, xelatex + new option dvipdfmx + contributed by Alexander Grahn + + === pdfcomment bundle === -- pdfcomment bundle -- diff --git a/Master/texmf-dist/doc/latex/pdfcomment/README b/Master/texmf-dist/doc/latex/pdfcomment/README index 05060a23469..0194201832c 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/README +++ b/Master/texmf-dist/doc/latex/pdfcomment/README @@ -15,11 +15,11 @@ Adobe Reader. License: LPPL -New in v1.2: +New in v1.3: - - new options: voffset, hoffset, width, height, opacity, avatar, style - - new annotation type: FreeText annotation - -> \pdffreetextcomment - - introduction of an avatar and style system - -> \defineavatar, \definestyle, options avatar and style - - printing the PDF annotations and popups is possible now!
\ No newline at end of file + - new annotation type: PDF text markup annotation + (known from the comment function of Adobe Reader) + -> \pdfmarkupcomment + - new option: markup (Highlight,Underline,Squiggly,StrikeOut) + - Bugfix: avatar and style system + wrong key families (copy and paste)
\ 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 Binary files differindex 46bae70ef90..1e04f66564d 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/example.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example.tex b/Master/texmf-dist/doc/latex/pdfcomment/example.tex index 27a1b77cdff..a4561d3a468 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example.tex +++ b/Master/texmf-dist/doc/latex/pdfcomment/example.tex @@ -1,9 +1,9 @@ % example for pdflatex \documentclass{scrartcl} -\usepackage[german]{babel} +\usepackage[english]{babel} \usepackage[latin1]{inputenc} \usepackage[T1]{fontenc} -\usepackage[svgnames]{xcolor} +\usepackage[svgnames,rgb]{xcolor} \usepackage[absolute]{textpos} \usepackage{tikz} \usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment} @@ -20,7 +20,7 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse \pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)} \end{textblock*}} -A little Test! +\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} \colorlet{KernFarbe}{red} \colorlet{HuelleFarbe}{blue} @@ -56,11 +56,14 @@ A little Test! \defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}} \pdfcommentsetup{avatar=Newton} \pdfcomment{Wow, that's nice!} -\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}} +\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}} \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!} \vspace{2cm} -For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} +\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} -Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}. +\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation} + +\vspace{5cm} +\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Highlight markup annotations with page break} \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 Binary files differindex 3ddf4b96329..779a998e8e4 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex index 10c0a5958be..d65686ddb89 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex +++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvipdfmx.tex @@ -1,10 +1,10 @@ -\documentclass{scrartcl} -\usepackage[german]{babel} +\documentclass[pagesize]{scrartcl} +\usepackage[english]{babel} \usepackage[latin1]{inputenc} \usepackage[T1]{fontenc} \usepackage[absolute]{textpos} %dvipdfmx leads to an error with xcolor -\usepackage[svgnames,dvipdfm]{xcolor} +\usepackage[svgnames,dvipdfm,rgb]{xcolor} % define \pgfsysdriver for dvipdfm(x) mode in tikz/pgf \def\pgfsysdriver{pgfsys-dvipdfm.def} \usepackage{tikz} @@ -22,7 +22,7 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse \pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)} \end{textblock*}} -A little Test! +\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} \colorlet{KernFarbe}{red} \colorlet{HuelleFarbe}{blue} @@ -58,11 +58,14 @@ A little Test! \defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}} \pdfcommentsetup{avatar=Newton} \pdfcomment{Wow, that's nice!} -\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}} +\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}} \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!} \vspace{2cm} -For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} +\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} -Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}. +\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation} + +\vspace{5cm} +\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Highlight markup annotations with page break} \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 Binary files differindex edeef49a28f..6bfda539b48 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_latex_dvips_ps2pdf.tex index 1e482725efd..63d9061ebcb 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 @@ -1,8 +1,8 @@ \documentclass{scrartcl} -\usepackage[german]{babel} +\usepackage[english]{babel} \usepackage[latin1]{inputenc} \usepackage[T1]{fontenc} -\usepackage[svgnames]{xcolor} +\usepackage[svgnames,rgb]{xcolor} \usepackage[absolute]{textpos} \usepackage{tikz} \usepackage[subject={Top1},author={\AA{}nsgar Lund}]{pdfcomment} @@ -19,7 +19,7 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse \pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)} \end{textblock*}} -A little Test! +\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} \colorlet{KernFarbe}{red} \colorlet{HuelleFarbe}{blue} @@ -55,11 +55,14 @@ A little Test! \defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}} \pdfcommentsetup{avatar=Newton} \pdfcomment{Wow, that's nice!} -\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}} +\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}} \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!} \vspace{2cm} -For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} +\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} -Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}. +\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation} + +\vspace{5cm} +\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the -- from time to time -- emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Highlight markup annotations with page break} \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 Binary files differindex c9c31d29e7f..acde2f6c227 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex index 9491e783b2d..afae2313e77 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex +++ b/Master/texmf-dist/doc/latex/pdfcomment/example_xelatex.tex @@ -1,11 +1,18 @@ -\documentclass{scrartcl} +% Make sure to write the page size into the dvi file! +% That's possible with the pagesize option of KoMa-Script +% Otherwise the positioning of the annotations will fail! +\documentclass[pagesize]{scrartcl} +% for other classes use, e.g. the pagesize option +% of package typearea +%\documentclass{article} +%\usepackage[pagesize]{typearea} +% \usepackage[no-math]{fontspec} \usepackage{xunicode} \usepackage{xltxtra} -\usepackage[svgnames]{xcolor} +\usepackage[svgnames,rgb]{xcolor} \usepackage{tikz} \usepackage[absolute]{textpos} -%\usepackage[unicode]{hyperref} \usepackage[subject={Top1},author={Ã…nsgar Lund}]{pdfcomment} \setmainfont[Mapping=tex-text]{Bergamo} \begin{document} @@ -22,7 +29,7 @@ A\pdfcomment[subject={Top2},author={Daisy Duck},color={0.234 0.867 0.211},voffse \pdffreetextcomment[avatar=CaptainJack,height=1.6cm,width=5cm,opacity=0.5,voffset=0pt,hoffset=0pt]{This one was placed with absolute coordinates (textpos.sty)} \end{textblock*}} -A little Test! +\pdfmarkupcomment[author={Donald Duck},color=red,markup=StrikeOut]{A little Test!}{Why is this repeated? This is a StrikeOut markup annotation} \colorlet{KernFarbe}{red} \colorlet{HuelleFarbe}{blue} @@ -58,11 +65,14 @@ A little Test! \defineavatar{Newton}{color=lime,subject={Top2},icon=Check,author={Dr. Albertus Newton}} \pdfcommentsetup{avatar=Newton} \pdfcomment{Wow, that's nice!} -\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=true,subject={Top1},icon=Circle,author={Prof. Dolittle}} +\defineavatar{Dolittle}{color=NavyBlue,opacity=0.3,open=false,subject={Top1},icon=Circle,author={Prof. Dolittle}} \pdfcommentsetup{avatar=Dolittle}\pdfmargincomment{Yeah nice, but stolen from the pgf-Users mailing list!} \vspace{2cm} -For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the - from time to time - emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} +\pdfmarkupcomment[author={Donald Duck},color=Khaki,opacity=1.0,markup=Underline]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the - from time to time - emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files}{It's better to use dark colors for annotations with lines, as you see! This is a Underline markup annotations}. \pdfmargincomment{Holy moly! Can anybody transfer that to real english!} -Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}. +\pdfmarkupcomment[author={Donald Duck},color=Teal,opacity=1.0,markup=Squiggly]{Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Squiggly markup annotation} + +\vspace{5cm} +\pdfmarkupcomment[author={Donald Duck},color=yellow,opacity=1.0,markup=Highlight]{For a long time \texttt{pdflatex} offers the command \texttt{\textbackslash pdfannot} for inserting arbitrary pdf annotations. However, in a form where additional knowledge of the pdf reference is indispensable. \texttt{pdfcomment.sty} is an answer to the - from time to time - emerging questions in newsgroups, how one could use the comment function of \texttt{Adobe Reader}. At least out of the \LaTeX{} code \texttt{pdfcomment.sty} offers a convenient and user-friendly possibility to use pdf annotations in pdf files. Unfortunately the support of pdf annotations by pdf viewers is only partly available to nonexistent. The reference viewer for the development of this package is \texttt{Adobe Reader}.}{This is a Highlight markup annotations with page break} \end{document} diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf Binary files differindex 55f0626bec0..7232ffa6da5 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex index c93383bc41d..1f4011f8db7 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex +++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment.tex @@ -9,11 +9,11 @@ \usepackage{url}% \usepackage{attachfile}% \usepackage{marginnote}% -\usepackage[svgnames]{xcolor} +\usepackage[svgnames,rgb]{xcolor} \usepackage{ltxdocext}% \usepackage{hyperref} \usepackage{pdfcomment} -\def\fileversion{v1.2} +\def\fileversion{v1.3} \def\filename{pdfcomment.sty} \def\XeLaTeX{Xe\LaTeX} %\usepackage{acrofont}% @@ -74,7 +74,7 @@ If you can't see this annotation \pdfcomment[author={Josef Kleber},subject={Test \vfill \begin{center} \subsubsection*{Required packages for using \substyle{\filename}} -\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{xkeyval}, \package{ifpdf}, \package{marginnote} and the packages loaded by them.}} +\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote} and the packages loaded by them.}} \end{center} \vfill \clearpage @@ -101,6 +101,8 @@ I want to thank the following persons for contributions to the development of th \item \textbf{Ulrike Fischer} for answering my stupid questions on d.c.t.t. for making possible the avatar and style system. \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{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. \end{itemize} \clearpage \section{Options} @@ -129,7 +131,7 @@ You can use the option \styleoption{color} for defining the color of PDF annotat By definition the PDF specification allows four different color spaces with different numbers of color values: \begin{center} -\begin{tabular}{rl} +\begin{tabular}{cl} \# & color space\\ \hline 0 & transparent \\ @@ -186,6 +188,9 @@ You can use the option \styleoption{height} for definig the height of PDF annota \subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace} You can use the option \styleoption{hspace} for defining the horizontal space after the PDF text annotations, otherwise the PDF text annoations will overlay the text. +\subsubsection[\texttt{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{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. @@ -200,15 +205,41 @@ You can use the following commands for commenting your documents. \subsubsection{\texorpdfstring{\cs{pdfcomment}}{\textbackslash pdfcomment}} \label{sec:pdfcomment} -\cmd\pdfcomment \margcs{\cmd\pdfcomment\\\oarg{options}\marg{comment}} will typeset an annotation into the text at the current \pdfcommentsetup{subject={\textbackslash pdfcomment test},hspace=18pt}\pdfcomment[icon=Star,color=YellowGreen]{This is a comment in the text} position. +Possible \margcs{\cmd\pdfcomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdfcomment{} will typeset an annotation into the text at the current \pdfcommentsetup{subject={\textbackslash pdfcomment test},hspace=18pt}\pdfcomment[icon=Star,color=YellowGreen]{This is a comment in the text} position. \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}} \label{sec:pdfmargincomment} -\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}} will typeset an annotation into the margin. Please note the positioning of the annotation in this example. This documentation was written with the \LaTeX{} class \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{This is a comment in the margin}. Therefore the annotation is typeset into the left margin. +Possible \margcs{\cmd\pdfmargincomment\\\oarg{options}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdfmargincomment{} will typeset an annotation into the margin. Please note the positioning of the annotation in this example. This documentation was written with the \LaTeX{} class \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{This is a comment in the margin}. Therefore the annotation is typeset into the left margin. + +\subsubsection{\texorpdfstring{\cs{pdfmarkupcomment}}{\textbackslash pdfmarkupcomment}} +\label{sec:pdfmarkupcomment} +Possible \margcs{\cmd\pdfmarkupcomment\oarg{options}\\\marg{markup text}\marg{comment}}options: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup} + +\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: \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!} + +\hspace*{0pt}\newline +Limitations: + +\begin{itemize} +\item As the name PDF text markup annotation might lead to suggest, this form of comment is suitable for text only. +\item The specified text with the argument \marg{markup text} must not be longer than one paragraph. +\item The PDF text markup annotation must not be longer than one page, otherwise the recognition of the page break will fail. +\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} \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}} \label{sec:pdffreetextcomment} -\cmd\pdffreetextcomment \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}} will typset 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=1cm,hoffset=1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} +Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{options}\marg{comment}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdffreetextcomment{} will typset 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=-1.3cm,hoffset=1.2cm,opacity=0.5,color=yellow]{This is a FreeText annotation} \subsection{Misc. commands} diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf Binary files differindex 9189a4f63ce..2d905d52c7a 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf +++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.pdf diff --git a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex index 026b15adf48..d0fc66a8a8b 100644 --- a/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex +++ b/Master/texmf-dist/doc/latex/pdfcomment/pdfcomment_de.tex @@ -8,11 +8,11 @@ \usepackage{url}% \usepackage{attachfile}% \usepackage{marginnote}% -\usepackage[svgnames]{xcolor} +\usepackage[svgnames,rgb]{xcolor} \usepackage{ltxdocext}% \usepackage{hyperref} \usepackage{pdfcomment} -\def\fileversion{v1.2} +\def\fileversion{v1.3} \def\filename{pdfcomment.sty} \def\XeLaTeX{Xe\LaTeX} %\usepackage{acrofont}% @@ -73,7 +73,7 @@ Falls Sie diesen Kommentar \pdfcomment[author={Josef Kleber},subject={Test Komme \vfill \begin{center} \subsubsection*{Benötigte Pakete für die Nutzung von \substyle{\filename}} -\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{xkeyval}, \package{ifpdf}, \package{marginnote} und die von diesen Paketen aufgerufenen Dateien.}} +\fbox{\parbox[t]{.8\linewidth}{\small \package{hyperref} (v6.76a [2007/04/09]), \package{zref} (v1.8 [2007/04/22]), \package{xkeyval}, \package{ifpdf}, \package{ifthen}, \package{calc}, \package{marginnote} und die von diesen Paketen aufgerufenen Dateien.}} \end{center} \vfill \clearpage @@ -100,6 +100,8 @@ Für Beiträge zur Entwicklung dieses Pakets möchte ich folgenden Personen danken: \item \textbf{Ulrike Fischer} für das Beantworten meiner dummen Fragen in d.c.t.t. zur Verwirklichung des Avatar- und Style-Systems. \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{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. \end{itemize} \clearpage \section{Optionen} @@ -128,7 +130,7 @@ Die Option \styleoption{color} dient der Festlegung der Farbe der PDF annotation Grundsätzlich erlaubt die PDF Spezifikation vier unterschiedliche Farbräume, die sich in der Anzahl der Farbwertangaben unterscheiden: \begin{center} -\begin{tabular}{rl} +\begin{tabular}{cl} \# & Farbraum\\ \hline 0 & transparent \\ @@ -180,11 +182,14 @@ Die Option \styleoption{hoffset} dient der Festlegung eines horizontalen Offsets Die Option \styleoption{width} dient der Festlegung der Breite der PDF annotations, speziell der Breite der FreeText annotations. PDF text annatations haben grundsätzlich eine Breite von 0pt. \subsubsection[\texttt{height}]{\styleoption{height}}\label{sec:height} -Die Option \styleoption{height} dient der Festlegung der Höhe der PDF annotations. Wegen der PDF text annotations wurde der Defaultwert auf \cmd\baselineskip{} festgelegt. +Die Option \styleoption{height} dient der Festlegung der Höhe der PDF annotations. Bei PDF text annotations wurde die Höhe auf \cmd\baselineskip{} festgelegt. \subsubsection[\texttt{hspace}]{\styleoption{hspace}}\label{sec:hspace} Die Option \styleoption{hspace} dient der Anpassung des horizontalen Abstands hinter den PDF text annotations, falls der Text nicht durch die PDF text annotations überschrieben werden sollen. +\subsubsection[\texttt{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{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. @@ -199,15 +204,41 @@ Die folgenden Befehlen können Sie zur Kommentierung Ihres Dokuments einsetzen. \subsubsection{\texorpdfstring{\cs{pdfcomment}}{\textbackslash pdfcomment}} \label{sec:pdfcomment} -\cmd\pdfcomment \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=20pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext. +Mögliche \margcs{\cmd\pdfcomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdfcomment{} setzt den Kommentar an der aktuellen Position \pdfcommentsetup{subject={\textbackslash pdfcomment Test},hspace=20pt}\pdfcomment[icon=Star,color=YellowGreen]{Das ist ein Kommentar im Fließtext} in den Fließtext. \subsubsection{\texorpdfstring{\cs{pdfmargincomment}}{\textbackslash pdfmargincomment}} \label{sec:pdfmargincomment} -\cmd\pdfmargincomment \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}} setzt den Kommentar in Höhe der aktuellen Zeile in die Randspalte. Bitte beachten Sie in diesem Beispiel die Positionierung des Kommentars. Diese Dokumentation wurde mit der \LaTeX{}-Klasse \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment Test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{Das ist ein Kommentar in der Randspalte} erstellt. Daher erscheint der Kommentar in der linken Randspalte. +Mögliche \margcs{\cmd\pdfmargincomment\\\oarg{Optionen}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{icon}, \styleoption{color}, \styleoption{opacity}, \styleoption{open}, \styleoption{hspace}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdfmargincomment{} setzt den Kommentar in Höhe der aktuellen Zeile in die Randspalte. Bitte beachten Sie in diesem Beispiel die Positionierung des Kommentars. Diese Dokumentation wurde mit der \LaTeX{}-Klasse \texttt{ltxdoc}\pdfcommentsetup{subject={\textbackslash pdfmargincomment Test}}\pdfmargincomment[icon=Help,color=DeepPink,hspace=-30pt]{Das ist ein Kommentar in der Randspalte} erstellt. Daher erscheint der Kommentar in der linken Randspalte. + +\subsubsection{\texorpdfstring{\cs{pdfmarkupcomment}}{\textbackslash pdfmarkupcomment}} +\label{sec:pdfmarkupcomment} +Mögliche \margcs{\cmd\pdfmarkupcomment\oarg{Optionen}\\\marg{Markup Text}\marg{Kommentar}}Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{markup} + +\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: \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!} + +\hspace*{0pt}\newline +Einschränkungen: + +\begin{itemize} +\item Wie die Bezeichnung PDF text markup annotation vermuten läßt, eignet sich diese Form der Kommentierung ausschließlich für reinen Text. +\item Der mit dem Argument \marg{Markup Text} festgelegte Text darf nicht länger sein als ein Absatz. +\item Die PDF text markup annotation darf nicht länger sein als eine Seite, da sonst die Erkennung des Seitenumbruchs fehlschlägt. +\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} \subsubsection{\texorpdfstring{\cs{pdffreetextcomment}}{\textbackslash pdffreetextcomment}} \label{sec:pdffreetextcomment} -\cmd\pdffreetextcomment \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} 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=-1.8cm,hoffset=-1.2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation} +Mögliche \margcs{\cmd\pdffreetextcomment\\\oarg{Optionen}\marg{Kommentar}} Optionen: \styleoption{avatar}, \styleoption{style}, \styleoption{subject}, \styleoption{author}, \styleoption{color}, \styleoption{opacity}, \styleoption{height}, \styleoption{width}, \styleoption{voffset}, \styleoption{hoffset} + +\bigskip +\cmd\pdffreetextcomment{} 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=-1.8cm,hoffset=0.2cm,opacity=0.5,color=yellow]{Das ist eine FreeText annotation} \subsection{Allgemeine Befehle} diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty index ec605e03752..bd17961f093 100644 --- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty +++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty @@ -20,8 +20,7 @@ %% This work consists of all files listed in manifest.txt. %% % -\ProvidesPackage{pdfcomment}[2009/02/19 pdfcomment.sty v1.2 - Josef Kleber (C) 2008-2009]% -% dvips, dvipdfmx, XeLaTeX drivers by Alexander Grahn +\ProvidesPackage{pdfcomment}[2009/03/09 pdfcomment.sty v1.3 - Josef Kleber (C) 2008-2009]% % \RequirePackage{xkeyval}% % @@ -38,6 +37,7 @@ \gdef\pc@goptd@height{0pt}% \gdef\pc@goptd@depth{0pt}% \gdef\pc@goptd@opacity{1.0}% +\gdef\pc@goptd@markup{Highlight}% \gdef\pc@goptd@dvipdfmx{true}% % % values for global package options @@ -53,8 +53,7 @@ \gdef\pc@gopt@height{}% \gdef\pc@gopt@depth{}% \gdef\pc@gopt@opacity{}% -\newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse% -\newif\ifpc@gopt@final\pc@gopt@finalfalse% +\gdef\pc@gopt@markup{}% % % values for local command options \gdef\pc@lopt@subject{}% @@ -69,6 +68,60 @@ \gdef\pc@lopt@height{}% \gdef\pc@lopt@depth{}% \gdef\pc@lopt@opacity{}% +\gdef\pc@lopt@markup{}% +% +\newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse% +\newif\ifpc@gopt@final\pc@gopt@finalfalse% +\newif\ifpc@annot@samepage\pc@annot@samepagetrue% +\newif\ifpc@annot@secondpage\pc@annot@secondpagefalse% +% +\newcounter{pc@annot@lines}% +% +\newlength{\pc@dima}% +\newlength{\pc@dimb}% +\newlength{\pc@dimc}% +\newlength{\pc@dimd}% +\newlength{\pc@dime}% +% +\newlength{\pc@Sposx}% +\newlength{\pc@Sposy}% +\newlength{\pc@Eposx}% +\newlength{\pc@Eposy}% +\newlength{\pc@box@height}% +\newlength{\pc@box@depth}% +% +\newcommand{\pc@x@one}{}% +\newcommand{\pc@x@two}{}% +\newcommand{\pc@x@three}{}% +\newcommand{\pc@x@four}{}% +\newcommand{\pc@y@one}{}% +\newcommand{\pc@y@two}{}% +\newcommand{\pc@y@three}{}% +\newcommand{\pc@y@four}{}% +\newcommand{\pc@anna@x@one}{}% +\newcommand{\pc@anna@x@two}{}% +\newcommand{\pc@anna@x@three}{}% +\newcommand{\pc@anna@x@four}{}% +\newcommand{\pc@anna@y@one}{}% +\newcommand{\pc@anna@y@two}{}% +\newcommand{\pc@anna@y@three}{}% +\newcommand{\pc@anna@y@four}{}% +\newcommand{\pc@annb@x@one}{}% +\newcommand{\pc@annb@x@two}{}% +\newcommand{\pc@annb@x@three}{}% +\newcommand{\pc@annb@x@four}{}% +\newcommand{\pc@annb@y@one}{}% +\newcommand{\pc@annb@y@two}{}% +\newcommand{\pc@annb@y@three}{}% +\newcommand{\pc@annb@y@four}{}% +% +\newcommand{\pc@x@left@text}{}% +\newcommand{\pc@x@right@text}{}% +\newcommand{\pc@y@top@text}{}% +\newcommand{\pc@y@bottom@text}{}% +% +\newcommand{\pc@raggedleftmarginnote}{\centering}% +\newcommand{\pc@raggedrightmarginnote}{\centering}% % % define global style option avatar for setting a predefined set of options (Avatar) \define@key{pdfcomment.sty}{avatar}[]% @@ -156,6 +209,12 @@ \gdef\pc@gopt@opacity{#1}% }% % +% define global style option markup for setting the markup type of the pdf markup annotations +\define@key{pdfcomment.sty}{markup}[\pc@goptd@markup]% +{% + \gdef\pc@gopt@markup{#1}% +}% +% % define global style option dvipdfmx for setting the output driver in DVI mode \define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]% {% @@ -184,7 +243,7 @@ % define local style option style for setting a predefined set of options (Style) \define@key{pdfcomment}{style}[]% {% - \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}% + \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment}{\csname pc@style@#1\endcsname}}% \pc@lopt@loadstyle% }% % @@ -240,18 +299,21 @@ \define@key{pdfcomment}{width}[\pc@gopt@width]% {% \gdef\pc@lopt@width{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfcomment ignored!}% }% % % define local style option height for setting the height of the pdf annotations \define@key{pdfcomment}{height}[\pc@gopt@height]% {% \gdef\pc@lopt@height{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfcomment ignored!}% }% % % define local style option depth for setting the depth of the pdf annotations \define@key{pdfcomment}{depth}[\pc@gopt@depth]% {% \gdef\pc@lopt@depth{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfcomment ignored!}% }% % % define local style option opacity for setting the opacity of the pdf annotations @@ -260,17 +322,24 @@ \gdef\pc@lopt@opacity{#1}% }% % +% define local style option markup for setting the markup type of the pdf markup annotations +\define@key{pdfcomment}{markup}[\pc@gopt@markup]% +{% + \gdef\pc@lopt@markup{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option markup in command \pdfcomment ignored!}% +}% +% % define local style option avatar for setting a predefined set of options (Avatar) \define@key{pdfmargincomment}{avatar}[]% {% - \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}% + \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfmargincomment}{\csname pc@avatar@#1\endcsname}}% \pc@lopt@loadavatar% }% % % define local style option style for setting a predefined set of options (Style) \define@key{pdfmargincomment}{style}[]% {% - \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}% + \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfmargincomment}{\csname pc@style@#1\endcsname}}% \pc@lopt@loadstyle% }% % @@ -326,18 +395,21 @@ \define@key{pdfmargincomment}{width}[\pc@gopt@width]% {% \gdef\pc@lopt@width{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfmargincomment ignored!}% }% % % define local style option height for setting the height of the pdf annotations \define@key{pdfmargincomment}{height}[\pc@gopt@height]% {% \gdef\pc@lopt@height{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfmargincomment ignored!}% }% % % define local style option depth for setting the depth of the pdf annotations \define@key{pdfmargincomment}{depth}[\pc@gopt@depth]% {% \gdef\pc@lopt@depth{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfmargincomment ignored!}% }% % % define local style option opacity for setting the opacity of the pdf annotations @@ -346,17 +418,24 @@ \gdef\pc@lopt@opacity{#1}% }% % +% define local style option markup for setting the markup type of the pdf markup annotations +\define@key{pdfmargincomment}{markup}[\pc@gopt@markup]% +{% + \gdef\pc@lopt@markup{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option margin in command \pdfmargincomment ignored!}% +}% +% % define local style option avatar for setting a predefined set of options (Avatar) \define@key{pdffreetextcomment}{avatar}[]% {% - \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfcomment}{\csname pc@avatar@#1\endcsname}}% + \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdffreetextcomment}{\csname pc@avatar@#1\endcsname}}% \pc@lopt@loadavatar% }% % % define local style option style for setting a predefined set of options (Style) \define@key{pdffreetextcomment}{style}[]% {% - \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfcomment.sty}{\csname pc@style@#1\endcsname}}% + \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdffreetextcomment}{\csname pc@style@#1\endcsname}}% \pc@lopt@loadstyle% }% % @@ -382,6 +461,7 @@ \define@key{pdffreetextcomment}{icon}[\pc@gopt@icon]% {% \gdef\pc@lopt@icon{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}% }% % % define local command option open for setting the open status (true,false) of pdf annotations @@ -394,6 +474,7 @@ \define@key{pdffreetextcomment}{hspace}[\pc@gopt@hspace]% {% \gdef\pc@lopt@hspace{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdffreetextcomment ignored!}% }% % % define local style option voffset for setting the vertical offset of the pdf annotations @@ -424,6 +505,7 @@ \define@key{pdffreetextcomment}{depth}[\pc@gopt@depth]% {% \gdef\pc@lopt@depth{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}% }% % % define local style option opacity for setting the opacity of the pdf annotations @@ -432,10 +514,124 @@ \gdef\pc@lopt@opacity{#1}% }% % -\ExecuteOptionsX{subject,color,author,icon,open,hspace,voffset,hoffset,width,height,depth,opacity}% +% define local style option markup for setting the markup type of the pdf markup annotations +\define@key{pdffreetextcomment}{markup}[\pc@gopt@markup]% +{% + \gdef\pc@lopt@markup{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdffreetextcomment ignored!}% +}% +% +% define local style option avatar for setting a predefined set of options (Avatar) +\define@key{pdfmarkupcomment}{avatar}[]% +{% + \edef\pc@lopt@loadavatar{\noexpand\setkeys{pdfmarkupcomment}{\csname pc@avatar@#1\endcsname}}% + \pc@lopt@loadavatar% +}% +% +% define local style option style for setting a predefined set of options (Style) +\define@key{pdfmarkupcomment}{style}[]% +{% + \edef\pc@lopt@loadstyle{\noexpand\setkeys{pdfmarkupcomment}{\csname pc@style@#1\endcsname}}% + \pc@lopt@loadstyle% +}% +% +% define local command option subject for setting the subject of pdf annotations +\define@key{pdfmarkupcomment}{subject}[\pc@gopt@subject]% +{% + \gdef\pc@lopt@subject{#1}% +}% +% +% define local command option color for setting the color of pdf annotations +\define@key{pdfmarkupcomment}{color}[\pc@gopt@color]% +{% + \gdef\pc@lopt@color{#1}% +}% +% +% define local command option author for setting the author of pdf annotations +\define@key{pdfmarkupcomment}{author}[\pc@gopt@author]% +{% + \gdef\pc@lopt@author{#1}% +}% +% +% define local command option icon for setting the icon of pdf annotations +\define@key{pdfmarkupcomment}{icon}[\pc@gopt@icon]% +{% + \gdef\pc@lopt@icon{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfmarkupcomment ignored!}% +}% +% +% define local command option open for setting the open status (true,false) of pdf annotations +\define@key{pdfmarkupcomment}{open}[\pc@gopt@open]% +{% + \gdef\pc@lopt@open{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option open in command \pdfmarkupcomment ignored!}% +}% +% +% define local command option hspace for setting the space after the pdf annotations +\define@key{pdfmarkupcomment}{hspace}[\pc@gopt@hspace]% +{% + \gdef\pc@lopt@hspace{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option icon in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option voffset for setting the vertical offset of the pdf annotations +\define@key{pdfmarkupcomment}{voffset}[\pc@gopt@voffset]% +{% + \gdef\pc@lopt@voffset{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option voffset in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option hoffset for setting the horizontal offset of the pdf annotations +\define@key{pdfmarkupcomment}{hoffset}[\pc@gopt@hoffset]% +{% + \gdef\pc@lopt@hoffset{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option hoffset in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option width for setting the width of the pdf annotations +\define@key{pdfmarkupcomment}{width}[\pc@gopt@width]% +{% + \gdef\pc@lopt@width{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option width in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option height for setting the height of the pdf annotations +\define@key{pdfmarkupcomment}{height}[\pc@gopt@height]% +{% + \gdef\pc@lopt@height{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option height in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option depth for setting the depth of the pdf annotations +\define@key{pdfmarkupcomment}{depth}[\pc@gopt@depth]% +{% + \gdef\pc@lopt@depth{#1}% + \PackageInfo{pdfcomment.sty}{Setting of option depth in command \pdfmarkupcomment ignored!}% +}% +% +% define local style option opacity for setting the opacity of the pdf annotations +\define@key{pdfmarkupcomment}{opacity}[\pc@gopt@opacity]% +{% + \gdef\pc@lopt@opacity{#1}% +}% +% +% define local style option markup for setting the markup type of the pdf markup annotations +\define@key{pdfmarkupcomment}{markup}[\pc@gopt@markup]% +{% + \gdef\pc@lopt@markup{#1}% +}% +% +\ExecuteOptionsX{subject,color,author,icon,open,hspace,voffset,hoffset,width,height,depth,opacity,markup}% % \ProcessOptionsX\relax% % +% problems with older versions of hyperref than v6.76a [2007/04/09] +% reported by Gabriel Cardona +\RequirePackage{hyperref}[2007/04/09]% +\RequirePackage{zref-savepos}[2007/04/22]% +\zref@require@unique% +\RequirePackage{ifthen}% +\RequirePackage{calc}% \RequirePackage{marginnote}% \RequirePackage{ifpdf}% % @@ -461,10 +657,6 @@ \fi% \fi% % -% problems with older versions of hyperref than v6.76a [2007/04/09] -% reported by Gabriel Cardona -\RequirePackage{hyperref}[2007/04/09]% -% % Using the options draft, final and dvipdfmx in \pdfcommentsetup makes absolutely no sense! % Therefore, they are switched off at "\AtBeginDocument" % and a warning is issued by xkeyval.sty, if used. @@ -474,32 +666,15 @@ \disable@keys{pdfcomment.sty}{final}% \disable@keys{pdfcomment.sty}{dvipdfmx}% }% -\newcommand{\pdfcomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]% +\newcommand{\pdfcomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]% {% % Copy all global options to local options - \gdef\pc@lopt@subject{\pc@gopt@subject}% - \gdef\pc@lopt@color{\pc@gopt@color}% - \gdef\pc@lopt@author{\pc@gopt@author}% - \gdef\pc@lopt@icon{\pc@gopt@icon}% - \gdef\pc@lopt@open{\pc@gopt@open}% - \gdef\pc@lopt@hspace{\pc@gopt@hspace}% - \gdef\pc@lopt@voffset{\pc@gopt@voffset}% - \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}% - \gdef\pc@lopt@width{\pc@gopt@width}% - \gdef\pc@lopt@height{\pc@gopt@height}% - \gdef\pc@lopt@depth{\pc@gopt@depth}% - \gdef\pc@lopt@opacity{\pc@gopt@opacity}% + \pc@copy@gopt@lopt% % Change local options if specified \setkeys{pdfcomment}{#1}% % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef - \def\pc@pdfenc@contents{}% - \pdfstringdef\pc@pdfenc@contents{#2}% - \def\pc@pdfenc@author{}% - \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}% - \def\pc@pdfenc@subject{}% - \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}% - % transform color input to pdf color - \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}% + % and transform color input to pdf color + \pc@encode@PDF{#2}% \ifpc@gopt@final\else% % typeset text annotation (see: PDF Reference) \ifpdf% @@ -514,15 +689,8 @@ \hskip\pc@lopt@hoffset% \pdfannot width 0pt height \baselineskip depth 0pt% {% - /Subtype /Text% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% + /Subtype /Text% + \pc@annot@text% }% \hss% }% @@ -542,14 +710,7 @@ \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt% <<% /Subtype /Text% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% + \pc@annot@text% >>% }% \hss% @@ -571,16 +732,7 @@ {% pdfmark=/ANN,% Subtype=/Text,% - Raw={% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% - }% + Raw={\pc@annot@text}% }% \hss% }% @@ -592,37 +744,20 @@ \fi% }% % -\newcommand{\pdfmargincomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]% +\newcommand{\pdfmargincomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]% {% % Copy all global options to local options - \gdef\pc@lopt@subject{\pc@gopt@subject}% - \gdef\pc@lopt@color{\pc@gopt@color}% - \gdef\pc@lopt@author{\pc@gopt@author}% - \gdef\pc@lopt@icon{\pc@gopt@icon}% - \gdef\pc@lopt@open{\pc@gopt@open}% - \gdef\pc@lopt@hspace{\pc@gopt@hspace}% - \gdef\pc@lopt@voffset{\pc@gopt@voffset}% - \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}% - \gdef\pc@lopt@width{\pc@gopt@width}% - \gdef\pc@lopt@height{\pc@gopt@height}% - \gdef\pc@lopt@depth{\pc@gopt@depth}% - \gdef\pc@lopt@opacity{\pc@gopt@opacity}% + \pc@copy@gopt@lopt% % Change local options if specified \setkeys{pdfmargincomment}{#1}% % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef - \def\pc@pdfenc@contents{}% - \pdfstringdef\pc@pdfenc@contents{#2}% - \def\pc@pdfenc@author{}% - \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}% - \def\pc@pdfenc@subject{}% - \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}% - % transform color input to pdf color - \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}% + % and transform color input to pdf color + \pc@encode@PDF{#2}% \ifpc@gopt@final\else% - \begingroup + \begingroup% % center marginnotes! - \renewcommand*{\raggedleftmarginnote}{\centering}% - \renewcommand*{\raggedrightmarginnote}{\centering}% + \renewcommand{\raggedleftmarginnote}{\pc@raggedleftmarginnote}% + \renewcommand{\raggedrightmarginnote}{\pc@raggedrightmarginnote}% % typeset text annotation (see: PDF Reference) \marginnote% {% @@ -639,14 +774,7 @@ \pdfannot width 0pt height \baselineskip depth 0pt% {% /Subtype /Text% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% + \pc@annot@text% } \hss% }% @@ -666,14 +794,7 @@ \special{pdf: ann width 0pt\space height \the\baselineskip\space depth 0pt% <<% /Subtype /Text% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% + \pc@annot@text% >>% }% \hss% @@ -695,16 +816,7 @@ {% pdfmark=/ANN,% Subtype=/Text,% - Raw={% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Name /\pc@lopt@icon% - /Contents (\pc@pdfenc@contents)% - /Open \pc@lopt@open% - /F 4% - }% + Raw={\pc@annot@text}% }% \hss% }% @@ -714,52 +826,23 @@ \fi% \hspace{\pc@lopt@hspace}% }% - \endgroup - \fi + \endgroup% + \fi% }% % -\newcommand{\pdffreetextcomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity}]% +\newcommand{\pdffreetextcomment}[2][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]% {% % Copy all global options to local options - \gdef\pc@lopt@subject{\pc@gopt@subject}% - \gdef\pc@lopt@color{\pc@gopt@color}% - \gdef\pc@lopt@author{\pc@gopt@author}% - \gdef\pc@lopt@icon{\pc@gopt@icon}% - \gdef\pc@lopt@open{\pc@gopt@open}% - \gdef\pc@lopt@hspace{\pc@gopt@hspace}% - \gdef\pc@lopt@voffset{\pc@gopt@voffset}% - \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}% - \gdef\pc@lopt@width{\pc@gopt@width}% - \gdef\pc@lopt@height{\pc@gopt@height}% - \gdef\pc@lopt@depth{\pc@gopt@depth}% - \gdef\pc@lopt@opacity{\pc@gopt@opacity}% + \pc@copy@gopt@lopt% % Change local options if specified \setkeys{pdffreetextcomment}{#1}% % Encode Contents, Author and Subject to pdf encodings (PD or PU) with hyperref's \pdfstringdef - \def\pc@pdfenc@contents{}% - \pdfstringdef\pc@pdfenc@contents{#2}% - \def\pc@pdfenc@author{}% - \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}% - \def\pc@pdfenc@subject{}% - \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}% - % transform color input to pdf color - \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}% - %define options for \pdfannot - \def\pc@pdfannotopt{}% - \ifx\pc@lopt@width\@empty% - \else% - \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt width \pc@lopt@width\space}% - \fi% - \ifx\pc@lopt@height\@empty% - \else% - \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt height \pc@lopt@height\space}% - \fi% - \ifx\pc@lopt@depth\@empty% - \else% - \expandafter\def\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt depth \pc@lopt@depth\space}% - \fi% + % and transform color input to pdf color + \pc@encode@PDF{#2}% + %create options for \pdfannot + \pc@create@pdfannotopt% \ifpc@gopt@final\else% - % typeset text annotation (see: PDF Reference) + % typeset freetext annotation (see: PDF Reference) \ifpdf% \vbox to 0pt% {% @@ -773,12 +856,7 @@ \expandafter\pdfannot \pc@pdfannotopt% {% /Subtype /FreeText% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Contents (\pc@pdfenc@contents)% - /F 4% + \pc@annot@freetext% }% \hss% }% @@ -798,12 +876,7 @@ \special{pdf: ann \pc@pdfannotopt% <<% /Subtype /FreeText% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Contents (\pc@pdfenc@contents)% - /F 4% + \pc@annot@freetext% >>% }% \hss% @@ -822,19 +895,12 @@ {% \vsize=0pt% \hskip\pc@lopt@hoffset% - %create dimensions of annoation + %create dimensions of annotation \pdfmark[\rule{0pt}{\pc@lopt@height}\rule{\pc@lopt@width}{0pt}]% {% pdfmark=/ANN,% Subtype=/FreeText,% - Raw={% - /C [\pc@hyenc@color]% - /CA \pc@lopt@opacity% - /T (\pc@pdfenc@author)% - /Subj (\pc@pdfenc@subject)% - /Contents (\pc@pdfenc@contents)% - /F 4% - }% + Raw={\pc@annot@freetext}% }% \hss% }% @@ -842,7 +908,91 @@ }% \fi% \fi% - \hspace{\pc@lopt@hspace}% + \fi% +}% +% +\newcommand{\pdfmarkupcomment}[3][subject={\pc@gopt@subject},color={\pc@gopt@color},author={\pc@gopt@author},icon={\pc@gopt@icon},open={\pc@gopt@open},hspace={\pc@gopt@hspace},voffset={\pc@gopt@voffset},hoffset={\pc@gopt@hoffset},width={\pc@gopt@width},height={\pc@gopt@height},depth={\pc@gopt@depth},opacity={\pc@gopt@opacity},markup={\pc@gopt@markup}]% +{% + \hspace*{0pt}% + % Copy all global options to local options + \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}% + \setlength{\pc@Sposy}{\zposy{pdfcomment:\thezref@unique}sp}% + \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% + \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% + \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% }% % @@ -866,4 +1016,285 @@ }% % % +\newcommand{\pc@copy@gopt@lopt}% +{% + \gdef\pc@lopt@subject{\pc@gopt@subject}% + \gdef\pc@lopt@color{\pc@gopt@color}% + \gdef\pc@lopt@author{\pc@gopt@author}% + \gdef\pc@lopt@icon{\pc@gopt@icon}% + \gdef\pc@lopt@open{\pc@gopt@open}% + \gdef\pc@lopt@hspace{\pc@gopt@hspace}% + \gdef\pc@lopt@voffset{\pc@gopt@voffset}% + \gdef\pc@lopt@hoffset{\pc@gopt@hoffset}% + \gdef\pc@lopt@width{\pc@gopt@width}% + \gdef\pc@lopt@height{\pc@gopt@height}% + \gdef\pc@lopt@depth{\pc@gopt@depth}% + \gdef\pc@lopt@opacity{\pc@gopt@opacity}% + \gdef\pc@lopt@markup{\pc@gopt@markup}% +}% +% +\newcommand{\pc@encode@PDF}[1]% +{% + \pdfstringdef\pc@pdfenc@contents{#1}% + \pdfstringdef\pc@pdfenc@author{\pc@lopt@author}% + \pdfstringdef\pc@pdfenc@subject{\pc@lopt@subject}% + \HyColor@XZeroOneThreeFour{\pc@lopt@color}{\pc@hyenc@color}{pdfcomment}{color}% +}% +% +\newcommand{\pc@annot@text}% +{% + /C [\pc@hyenc@color]% + /CA \pc@lopt@opacity% + /T (\pc@pdfenc@author)% + /Subj (\pc@pdfenc@subject)% + /Name /\pc@lopt@icon% + /Contents (\pc@pdfenc@contents)% + /Open \pc@lopt@open% + /F 4% +}% +% +\newcommand{\pc@annot@freetext}% +{% + /C [\pc@hyenc@color]% + /CA \pc@lopt@opacity% + /T (\pc@pdfenc@author)% + /Subj (\pc@pdfenc@subject)% + /Contents (\pc@pdfenc@contents)% + /F 4% +}% +% +\newcommand{\pc@annot@markup@pdf}% +{% + \pdfannot width 0pt height 0pt depth 0pt% + {% + /Subtype /\pc@lopt@markup% + /C [\pc@hyenc@color]% + /CA \pc@lopt@opacity% + /T (\pc@pdfenc@author)% + /Subj (\pc@pdfenc@subject)% + /Contents (\pc@pdfenc@contents)% + /Open \pc@lopt@open% + /QuadPoints [\pc@annot@quadpoints]% + /F 4% + }% +}% +% +\newcommand{\pc@annot@markup@dvipdfmx}% +{% + \special{pdf: ann width 0pt height 0pt depth 0pt% + <<% + /Subtype /\pc@lopt@markup% + /C [\pc@hyenc@color]% + /CA \pc@lopt@opacity% + /T (\pc@pdfenc@author)% + /Subj (\pc@pdfenc@subject)% + /Contents (\pc@pdfenc@contents)% + /Open \pc@lopt@open% + /QuadPoints [\pc@annot@quadpoints]% + /F 4% + >>% + }% +}% +% +\newcommand{\pc@annot@markup@dvips}% +{% + \pdfmark[\rule{0pt}{0pt}]% + {% + pdfmark=/ANN,% + Subtype=/\pc@lopt@markup,% + Raw={ + /Subtype /\pc@lopt@markup% + /C [\pc@hyenc@color]% + /CA \pc@lopt@opacity% + /T (\pc@pdfenc@author)% + /Subj (\pc@pdfenc@subject)% + /Contents (\pc@pdfenc@contents)% + /Open \pc@lopt@open% + /QuadPoints [\pc@annot@quadpoints]% + /F 4% + }% + }% +}% +% +\newcommand{\pc@create@pdfannotopt}% +{% + \gdef\pc@pdfannotopt{}% + \ifx\pc@lopt@width\@empty% + \else% + \expandafter\gdef\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt width \pc@lopt@width\space}% + \fi% + \ifx\pc@lopt@height\@empty% + \else% + \expandafter\gdef\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt height \pc@lopt@height\space}% + \fi% + \ifx\pc@lopt@depth\@empty% + \else% + \expandafter\gdef\expandafter\pc@pdfannotopt\expandafter{\pc@pdfannotopt depth \pc@lopt@depth\space}% + \fi% +}% +% +% thanks to Heiko Oberdiek Msg-Id: <go1hi9$g1s$1@news.belwue.de> +\newcommand{\pc@pttobp}[1]% +{% + \strip@pt\dimexpr .996264\dimexpr #1\relax\relax% +}% +% +\newcommand{\pc@copy@xy@to@anna}% +{% + \renewcommand{\pc@anna@x@one}{\pc@x@one}% + \renewcommand{\pc@anna@x@two}{\pc@x@two}% + \renewcommand{\pc@anna@x@three}{\pc@x@three}% + \renewcommand{\pc@anna@x@four}{\pc@x@four}% + \renewcommand{\pc@anna@y@one}{\pc@y@one}% + \renewcommand{\pc@anna@y@two}{\pc@y@two}% + \renewcommand{\pc@anna@y@three}{\pc@y@three}% + \renewcommand{\pc@anna@y@four}{\pc@y@four}% +}% +% +\newcommand{\pc@copy@anna@to@annb}% +{% + \renewcommand{\pc@annb@x@one}{\pc@anna@x@one}% + \renewcommand{\pc@annb@x@two}{\pc@anna@x@two}% + \renewcommand{\pc@annb@x@three}{\pc@anna@x@three}% + \renewcommand{\pc@annb@x@four}{\pc@anna@x@four}% + \renewcommand{\pc@annb@y@one}{\pc@anna@y@one}% + \renewcommand{\pc@annb@y@two}{\pc@anna@y@two}% + \renewcommand{\pc@annb@y@three}{\pc@anna@y@three}% + \renewcommand{\pc@annb@y@four}{\pc@anna@y@four}% +}% +% +\newcommand{\pc@annot@calc@pos}% +{% + \renewcommand{\pc@x@one}{\pc@pttobp{\pc@Sposx}}% + \renewcommand{\pc@x@two}{\pc@pttobp{\pc@Eposx}}% + \renewcommand{\pc@x@three}{\pc@pttobp{\pc@Sposx}}% + \renewcommand{\pc@x@four}{\pc@pttobp{\pc@Eposx}}% + \renewcommand{\pc@y@one}{\pc@pttobp{\dimexpr \pc@Sposy + \pc@box@height + 1pt\relax}}% + \renewcommand{\pc@y@two}{\pc@pttobp{\dimexpr \pc@Eposy + \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@Eposy - \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}% +{% + \ifdim\pc@dima=\pc@dimb% + {% one line + \pc@copy@anna@to@annb% + \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}% + \ifpdf% + \pc@annot@markup@pdf% + \else% + \ifpc@gopt@dvipdfmx% + \pc@annot@markup@dvipdfmx% + \else% + \pc@annot@markup@dvips% + \fi% + \fi% + }% + \else% + {% more lines + %first line + \pc@calc@textblockpos% + \pc@copy@anna@to@annb% + \renewcommand{\pc@annb@x@two}{\pc@x@right@text}% + \renewcommand{\pc@annb@x@four}{\pc@x@right@text}% + \renewcommand{\pc@annb@y@two}{\pc@anna@y@one}% + \renewcommand{\pc@annb@y@four}{\pc@anna@y@three}% + \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}% + \ifpdf% + \pc@annot@markup@pdf% + \else% + \ifpc@gopt@dvipdfmx% + \pc@annot@markup@dvipdfmx% + \else% + \pc@annot@markup@dvips% + \fi% + \fi% + %last line + \pc@copy@anna@to@annb% + \renewcommand{\pc@annb@x@one}{\pc@x@left@text}% + \renewcommand{\pc@annb@x@three}{\pc@x@left@text}% + \renewcommand{\pc@annb@y@one}{\pc@anna@y@two}% + \renewcommand{\pc@annb@y@three}{\pc@anna@y@four}% + \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@two\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@four}% + \ifpdf% + \pc@annot@markup@pdf% + \else% + \ifpc@gopt@dvipdfmx% + \pc@annot@markup@dvipdfmx% + \else% + \pc@annot@markup@dvips% + \fi% + \fi% + %middle lines + \pc@copy@anna@to@annb% + \setlength{\pc@dimc}{\dimexpr \pc@annb@y@one bp + 0.1pt\relax}% + \setlength{\pc@dimd}{\dimexpr \pc@annb@y@two bp\relax}% + \setcounter{pc@annot@lines}{0}% + \setlength{\pc@dime}{\pc@dimc}% + \addtolength{\pc@dime}{-\pc@dimd}% + % count lines + \whiledo{\lengthtest{\pc@dime>0pt}}% + {% + \stepcounter{pc@annot@lines}% + \addtolength{\pc@dime}{-\the\baselineskip}% + }% + % subtract first and last line + \addtocounter{pc@annot@lines}{-2}% + \renewcommand{\pc@annb@x@one}{\pc@x@left@text}% + \renewcommand{\pc@annb@x@three}{\pc@x@left@text}% + \renewcommand{\pc@annb@x@two}{\pc@x@right@text}% + \renewcommand{\pc@annb@x@four}{\pc@x@right@text}% + \ifpc@annot@secondpage% + \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% + {% + \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 1.5pt\relax}}% + \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -0.5pt \relax}}% + }% + {% + \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 1pt\relax}}% + \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -1pt \relax}}% + }% + \fi% + \whiledo{\value{pc@annot@lines}>0}% + {% + \addtocounter{pc@annot@lines}{-1}% + \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip \relax}}% + \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@three bp - \the\baselineskip \relax}}% + \xdef\pc@annot@quadpoints{\pc@annb@x@one\space\pc@annb@y@one\space\pc@annb@x@two\space\pc@annb@y@one\space\pc@annb@x@three\space\pc@annb@y@three\space\pc@annb@x@four\space\pc@annb@y@three}% + \ifpdf% + \pc@annot@markup@pdf% + \else% + \ifpc@gopt@dvipdfmx% + \pc@annot@markup@dvipdfmx% + \else% + \pc@annot@markup@dvips% + \fi% + \fi% + }% + }% + \fi% +}% +% +\newcommand{\pc@calc@textblockpos}% +{% + \if@twoside% + \ifodd\thepage% + \renewcommand{\pc@x@left@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin\relax}}% + \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth\relax}}% + \else% + \renewcommand{\pc@x@left@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin \relax}}% + \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth\relax}}% + \fi% + \else% + \renewcommand{\pc@x@left@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin \relax}}% + \renewcommand{\pc@x@right@text}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth\relax}}% + \fi% + \renewcommand{\pc@y@top@text}{\pc@pttobp{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep\relax}}% + \renewcommand{\pc@y@bottom@text}{\pc@pttobp{\dimexpr \paperheight - \dimexpr 1in\relax - \voffset - \topmargin - \headheight - \headsep - \textheight\relax}}% +}% +% +% \endinput%
\ No newline at end of file |