From 0a05c759165972d30c5dd9c0ca35718b191361a9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 May 2011 22:06:07 +0000 Subject: pdfcomment (23may11) git-svn-id: svn://tug.org/texlive/trunk@22590 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/pdfcomment/pdfcomment.sty | 574 +++++++++++++++------ 1 file changed, 404 insertions(+), 170 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty index 160ee501ce8..e1250d6b9c6 100644 --- a/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty +++ b/Master/texmf-dist/tex/latex/pdfcomment/pdfcomment.sty @@ -1,26 +1,26 @@ %% -%% Copyright (C) 2008-2010 by: +%% Copyright (C) 2008-2011 by: %% Josef Kleber %% -%% +%% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license %% or (at your option) any later version. The latest version of this %% license is in: -%% +%% %% http://www.latex-project.org/lppl.txt -%% +%% %% and version 1.3 or later is part of all distributions of LaTeX version %% 2003/12/01 or later. -%% +%% %% This work has the LPPL maintenance status "author-maintained". -%% +%% %% The Current Maintainer of this work is Josef Kleber. %% %% This work consists of all files listed in manifest.txt. %% % -\ProvidesPackage{pdfcomment}[2010/12/11 pdfcomment.sty v2.1 - Josef Kleber (C) 2008-2010]% +\ProvidesPackage{pdfcomment}[2011/05/21 pdfcomment.sty v2.2 - Josef Kleber (C) 2008-2011]% % \RequirePackage{xkeyval}% % @@ -62,6 +62,7 @@ \gdef\pc@goptd@date{}% \gdef\pc@goptd@timezone{+00'00'}% \gdef\pc@goptd@dvipdfmx{true}% +\gdef\pc@goptd@printSOfinal{true}% % % values for global package options \gdef\pc@gopt@subject{}% @@ -100,6 +101,7 @@ \gdef\pc@gopt@id{}% \gdef\pc@gopt@date{}% \gdef\pc@gopt@timezone{}% +\gdef\pc@gopt@printSOfinal{}% % % values for local command options \gdef\pc@lopt@subject{}% @@ -140,6 +142,7 @@ \gdef\pc@lopt@date{}% \gdef\pc@lopt@replyto{}% \gdef\pc@lopt@timezone{}% +\gdef\pc@lopt@printSOfinal{}% % \gdef\pc@lopt@c{}% \gdef\pc@lopt@ic{}% @@ -153,10 +156,12 @@ \newif\ifpc@gopt@dvipdfmx\pc@gopt@dvipdfmxfalse% \newif\ifpc@gopt@final\pc@gopt@finalfalse% \newif\ifpc@lopt@disable\pc@lopt@disablefalse% +\newif\ifpc@gopt@disable\pc@gopt@disablefalse% \newif\ifpc@opt@unskip\pc@opt@unskiptrue% \newif\ifpc@annot@samepage\pc@annot@samepagetrue% \newif\ifpc@annot@secondpage\pc@annot@secondpagefalse% \newif\ifpc@afterpage\pc@afterpagefalse% +\newif\ifpc@ignorespaces\pc@ignorespacesfalse% % \newcounter{pc@annot@lines}% % @@ -260,6 +265,7 @@ \pc@define@key@avatar{pdflinecomment}% \pc@define@key@avatar{pdfsidelinecomment}% \pc@define@key@avatar{pdfreply}% +\pc@define@key@avatar{pdftooltip}% % \define@key{pdfcomment.sty}{style}[]% {% @@ -301,6 +307,7 @@ \pc@define@key@style{pdflinecomment}% \pc@define@key@style{pdfsidelinecomment}% \pc@define@key@style{pdfreply}% +\pc@define@key@style{pdftooltip}% % \define@key{pdfcomment.sty}{subject}[\pc@goptd@subject]% {% @@ -324,6 +331,7 @@ \pc@define@key@subject{pdflinecomment}% \pc@define@key@subject{pdfsidelinecomment}% \pc@define@key@subject{pdfreply}% +\pc@define@key@subject{pdftooltip}% % \define@key{pdfcomment.sty}{color}[\pc@goptd@color]% {% @@ -347,6 +355,7 @@ \pc@define@key@color{pdflinecomment}% \pc@define@key@color{pdfsidelinecomment}% \pc@define@key@color{pdfreply}% +\pc@define@key@color{pdftooltip}% % \define@key{pdfcomment.sty}{author}[\pc@goptd@author]% {% @@ -370,6 +379,7 @@ \pc@define@key@author{pdflinecomment}% \pc@define@key@author{pdfsidelinecomment}% \pc@define@key@author{pdfreply}% +\pc@define@key@author{pdftooltip}% % \define@key{pdfcomment.sty}{deadline}[\pc@goptd@deadline]% {% @@ -393,6 +403,7 @@ \pc@define@key@deadline{pdflinecomment}% \pc@define@key@deadline{pdfsidelinecomment}% \pc@define@key@deadline{pdfreply}% +\pc@define@key@deadline{pdftooltip}% % \define@key{pdfcomment.sty}{icon}[\pc@goptd@icon]% {% @@ -416,6 +427,7 @@ \pc@define@key@icon{pdflinecomment}% \pc@define@key@icon{pdfsidelinecomment}% \pc@define@key@icon{pdfreply}% +\pc@define@key@icon{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{open}[\pc@gopt@open\nr]{true,false}[false]% {% @@ -447,6 +459,7 @@ \pc@define@key@open{pdflinecomment}% \pc@define@key@open{pdfsidelinecomment}% \pc@define@key@open{pdfreply}% +\pc@define@key@open{pdftooltip}% % \define@key{pdfcomment.sty}{hspace}[\pc@goptd@hspace]% {% @@ -470,6 +483,7 @@ \pc@define@key@hspace{pdflinecomment}% \pc@define@key@hspace{pdfsidelinecomment}% \pc@define@key@hspace{pdfreply}% +\pc@define@key@hspace{pdftooltip}% % \define@key{pdfcomment.sty}{voffset}[\pc@goptd@voffset]% {% @@ -493,6 +507,7 @@ \pc@define@key@voffset{pdflinecomment}% \pc@define@key@voffset{pdfsidelinecomment}% \pc@define@key@voffset{pdfreply}% +\pc@define@key@voffset{pdftooltip}% % \define@key{pdfcomment.sty}{hoffset}[\pc@goptd@hoffset]% {% @@ -516,6 +531,7 @@ \pc@define@key@hoffset{pdflinecomment}% \pc@define@key@hoffset{pdfsidelinecomment}% \pc@define@key@hoffset{pdfreply}% +\pc@define@key@hoffset{pdftooltip}% % \define@key{pdfcomment.sty}{width}[\pc@goptd@width]% {% @@ -539,6 +555,7 @@ \pc@define@key@width{pdflinecomment}% \pc@define@key@width{pdfsidelinecomment}% \pc@define@key@width{pdfreply}% +\pc@define@key@width{pdftooltip}% % \define@key{pdfcomment.sty}{height}[\pc@goptd@height]% {% @@ -562,6 +579,7 @@ \pc@define@key@height{pdflinecomment}% \pc@define@key@height{pdfsidelinecomment}% \pc@define@key@height{pdfreply}% +\pc@define@key@height{pdftooltip}% % \define@key{pdfcomment.sty}{depth}[\pc@goptd@depth]% {% @@ -585,6 +603,7 @@ \pc@define@key@depth{pdflinecomment}% \pc@define@key@depth{pdfsidelinecomment}% \pc@define@key@depth{pdfreply}% +\pc@define@key@depth{pdftooltip}% % \define@key{pdfcomment.sty}{opacity}[\pc@goptd@opacity]% {% @@ -608,6 +627,7 @@ \pc@define@key@opacity{pdflinecomment}% \pc@define@key@opacity{pdfsidelinecomment}% \pc@define@key@opacity{pdfreply}% +\pc@define@key@opacity{pdftooltip}% % \define@key{pdfcomment.sty}{markup}[\pc@goptd@markup]% {% @@ -631,6 +651,7 @@ \pc@define@key@markup{pdflinecomment}% \pc@define@key@markup{pdfsidelinecomment}% \pc@define@key@markup{pdfreply}% +\pc@define@key@markup{pdftooltip}% % \define@key{pdfcomment.sty}{font}[\pc@goptd@font]% {% @@ -654,6 +675,7 @@ \pc@define@key@font{pdflinecomment}% \pc@define@key@font{pdfsidelinecomment}% \pc@define@key@font{pdfreply}% +\pc@define@key@font{pdftooltip}% % \define@key{pdfcomment.sty}{fontsize}[\pc@goptd@fontsize]% {% @@ -677,6 +699,7 @@ \pc@define@key@fontsize{pdflinecomment}% \pc@define@key@fontsize{pdfsidelinecomment}% \pc@define@key@fontsize{pdfreply}% +\pc@define@key@fontsize{pdftooltip}% % \define@key{pdfcomment.sty}{fontcolor}[\pc@goptd@fontcolor]% {% @@ -700,6 +723,7 @@ \pc@define@key@fontcolor{pdflinecomment}% \pc@define@key@fontcolor{pdfsidelinecomment}% \pc@define@key@fontcolor{pdfreply}% +\pc@define@key@fontcolor{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{justification}[\pc@gopt@justification\nr]{left,center,right}[left]% {% @@ -735,6 +759,7 @@ \pc@define@key@justification{pdflinecomment}% \pc@define@key@justification{pdfsidelinecomment}% \pc@define@key@justification{pdfreply}% +\pc@define@key@justification{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{borderstyle}[\pc@gopt@borderstyle\nr]{solid,dashed}[solid]% {% @@ -766,6 +791,7 @@ \pc@define@key@borderstyle{pdflinecomment}% \pc@define@key@borderstyle{pdfsidelinecomment}% \pc@define@key@borderstyle{pdfreply}% +\pc@define@key@borderstyle{pdftooltip}% % \define@key{pdfcomment.sty}{dashstyle}[\pc@goptd@dashstyle]% {% @@ -789,6 +815,7 @@ \pc@define@key@dashstyle{pdflinecomment}% \pc@define@key@dashstyle{pdfsidelinecomment}% \pc@define@key@dashstyle{pdfreply}% +\pc@define@key@dashstyle{pdftooltip}% % \define@key{pdfcomment.sty}{linewidth}[\pc@goptd@linewidth]% {% @@ -812,6 +839,7 @@ \pc@define@key@linewidth{pdflinecomment}% \pc@define@key@linewidth{pdfsidelinecomment}% \pc@define@key@linewidth{pdfreply}% +\pc@define@key@linewidth{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{bse}[\pc@gopt@bse\nr]{none,cloudy}[none]% {% @@ -843,6 +871,7 @@ \pc@define@key@bse{pdflinecomment}% \pc@define@key@bse{pdfsidelinecomment}% \pc@define@key@bse{pdfreply}% +\pc@define@key@bse{pdftooltip}% % \define@key{pdfcomment.sty}{bsei}[\pc@goptd@bsei]% {% @@ -866,6 +895,7 @@ \pc@define@key@bsei{pdflinecomment}% \pc@define@key@bsei{pdfsidelinecomment}% \pc@define@key@bsei{pdfreply}% +\pc@define@key@bsei{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{type}[\pc@gopt@type\nr]{freetext,callout,typewriter,line,polyline,polygon}[freetext]% {% @@ -913,6 +943,7 @@ \pc@define@key@type{pdflinecomment}% \pc@define@key@type{pdfsidelinecomment}% \pc@define@key@type{pdfreply}% +\pc@define@key@type{pdftooltip}% % \define@key{pdfcomment.sty}{lineend}[\pc@goptd@lineend]% {% @@ -936,6 +967,7 @@ \pc@define@key@lineend{pdflinecomment}% \pc@define@key@lineend{pdfsidelinecomment}% \pc@define@key@lineend{pdfreply}% +\pc@define@key@lineend{pdftooltip}% % \define@key{pdfcomment.sty}{linebegin}[\pc@goptd@linebegin]% {% @@ -959,6 +991,7 @@ \pc@define@key@linebegin{pdflinecomment}% \pc@define@key@linebegin{pdfsidelinecomment}% \pc@define@key@linebegin{pdfreply}% +\pc@define@key@linebegin{pdftooltip}% % \define@key{pdfcomment.sty}{icolor}[\pc@goptd@icolor]% {% @@ -982,6 +1015,7 @@ \pc@define@key@icolor{pdflinecomment}% \pc@define@key@icolor{pdfsidelinecomment}% \pc@define@key@icolor{pdfreply}% +\pc@define@key@icolor{pdftooltip}% % \define@choicekey*{pdfcomment.sty}{caption}[\pc@gopt@caption\nr]{none,inline,top}[inline]% {% @@ -1017,6 +1051,7 @@ \pc@define@key@caption{pdflinecomment}% \pc@define@key@caption{pdfsidelinecomment}% \pc@define@key@caption{pdfreply}% +\pc@define@key@caption{pdftooltip}% % \define@key{pdfcomment.sty}{line}[\pc@goptd@line]% {% @@ -1040,6 +1075,7 @@ \pc@define@key@line{pdflinecomment}% \pc@define@key@line{pdfsidelinecomment}% \pc@define@key@line{pdfreply}% +\pc@define@key@line{pdftooltip}% % \define@key{pdfcomment.sty}{captionhoffset}[\pc@goptd@captionhoffset]% {% @@ -1063,6 +1099,7 @@ \pc@define@key@captionhoffset{pdflinecomment}% \pc@define@key@captionhoffset{pdfsidelinecomment}% \pc@define@key@captionhoffset{pdfreply}% +\pc@define@key@captionhoffset{pdftooltip}% % \define@key{pdfcomment.sty}{captionvoffset}[\pc@goptd@captionvoffset]% {% @@ -1086,6 +1123,7 @@ \pc@define@key@captionvoffset{pdflinecomment}% \pc@define@key@captionvoffset{pdfsidelinecomment}% \pc@define@key@captionvoffset{pdfreply}% +\pc@define@key@captionvoffset{pdftooltip}% % \define@key{pdfcomment.sty}{linesep}[\pc@goptd@linesep]% {% @@ -1109,6 +1147,16 @@ \pc@define@key@linesep{pdflinecomment}% \pc@define@key@linesep{pdfsidelinecomment}% \pc@define@key@linesep{pdfreply}% +\pc@define@key@linesep{pdftooltip}% +% +\define@choicekey*{pdfcomment.sty}{disable}[\pc@gopt@disable\nr]{true,false}[true]% +{% + \ifcase\nr\relax% + \global\pc@gopt@disabletrue% + \or% + \global\pc@gopt@disablefalse% + \fi% +}% % \newcommand\pc@define@key@disable[1]% {% @@ -1131,6 +1179,7 @@ \pc@define@key@disable{pdflinecomment}% \pc@define@key@disable{pdfsidelinecomment}% \pc@define@key@disable{pdfreply}% +\pc@define@key@disable{pdftooltip}% % \newcommand\pc@define@key@id[1]% {% @@ -1149,6 +1198,7 @@ \pc@define@key@id{pdflinecomment}% \pc@define@key@id{pdfsidelinecomment}% \pc@define@key@id{pdfreply}% +\pc@define@key@id{pdftooltip}% % \define@key{pdfcomment.sty}{date}[\pc@goptd@date]% {% @@ -1172,6 +1222,7 @@ \pc@define@key@date{pdflinecomment}% \pc@define@key@date{pdfsidelinecomment}% \pc@define@key@date{pdfreply}% +\pc@define@key@date{pdftooltip}% % \define@key{pdfcomment.sty}{timezone}[\pc@goptd@timezone]% {% @@ -1195,6 +1246,39 @@ \pc@define@key@timezone{pdflinecomment}% \pc@define@key@timezone{pdfsidelinecomment}% \pc@define@key@timezone{pdfreply}% +\pc@define@key@timezone{pdftooltip}% +% +\define@choicekey*{pdfcomment.sty}{printSOfinal}[\pc@gpSOf\nr]{true,false}[true]% +{% + \ifcase\nr\relax% + \gdef\pc@gopt@printSOfinal{true}% + \or% + \gdef\pc@gopt@printSOfinal{false}% + \fi% +}% +% +\newcommand\pc@define@key@printSOfinal[1]% +{% + \define@choicekey*{#1}{printSOfinal}[\pc@lpSOf\nr]{true,false}[true]% + {% + \ifcase\nr\relax% + \gdef\pc@lopt@printSOfinal{true}% + \or% + \gdef\pc@lopt@printSOfinal{false}% + \fi% + }% +}% +% +\pc@define@key@printSOfinal{pdfcomment}% +\pc@define@key@printSOfinal{pdfmargincomment}% +\pc@define@key@printSOfinal{pdffreetextcomment}% +\pc@define@key@printSOfinal{pdfmarkupcomment}% +\pc@define@key@printSOfinal{pdfsquarecomment}% +\pc@define@key@printSOfinal{pdfcirclecomment}% +\pc@define@key@printSOfinal{pdflinecomment}% +\pc@define@key@printSOfinal{pdfsidelinecomment}% +\pc@define@key@printSOfinal{pdfreply}% +\pc@define@key@printSOfinal{pdftooltip}% % \define@key{pdfcomment.sty}{dvipdfmx}[\pc@goptd@dvipdfmx]% {% @@ -1225,6 +1309,11 @@ \gdef\pc@lopt@mathstyle{#1}% }% % +\define@key{pdftooltip}{mathstyle}% +{% + \gdef\pc@lopt@mathstyle{#1}% +}% +% \define@key{pdfreply}{replyto}% {% \gdef\pc@lopt@replyto{#1}% @@ -1240,7 +1329,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,version,date,timezone}% +\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,date,timezone,printSOfinal}% % \ProcessOptionsX\relax% % @@ -1262,8 +1351,8 @@ \RequirePackage[pdftex]{hyperref}[2007/04/09]% }% \else% - % to avoid problems with different default page size in - % pdflatex (dvi mode) and dvipdfmx/dvips + % to avoid problems with different default page size in + % pdflatex (dvi mode) and dvipdfmx/dvips \pdfpageheight=\paperheight% \pdfpagewidth=\paperwidth% %auto-set dvipdfmx driver in case of xetex @@ -1298,7 +1387,7 @@ \fi% % % Using the options draft, final and dvipdfmx in \pdfcommentsetup makes absolutely no sense! -% Therefore, they are switched off at "\AtBeginDocument" +% Therefore, they are switched off at "\AtBeginDocument" % and a warning is issued by xkeyval.sty, if used. \AtBeginDocument% {% @@ -1351,12 +1440,12 @@ /Subtype /Text% \pc@annot@text% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% }% @@ -1457,12 +1546,12 @@ /Subtype /Text% \pc@annot@text% } - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% }% @@ -1567,12 +1656,12 @@ /Subtype /FreeText% \pc@annot@freetext% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% \vss% @@ -1625,7 +1714,7 @@ }% \fi% \fi% - \fi% + \fi% \fi% }% % @@ -1682,12 +1771,12 @@ /Subtype /Square\space% \pc@annot@square% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% \vss% @@ -1740,7 +1829,7 @@ }% \fi% \fi% - \fi% + \fi% \fi% }% % @@ -1798,12 +1887,12 @@ % circle and square annatations differ only in /Subtype, so ... \pc@annot@square% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% \vss% @@ -1856,7 +1945,7 @@ }% \fi% \fi% - \fi% + \fi% \fi% }% % @@ -1932,12 +2021,12 @@ /Subtype /\pc@lopt@type\space% \pc@annot@line% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% - \pc@save@PDFOBJID{\pc@lopt@id}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}% + \pc@save@PDFOBJID{\pc@lopt@id}% + }% \hss% }% \vss% @@ -1982,13 +2071,13 @@ }% \fi% \fi% - \fi% + \fi% \fi% }% % \newcommand{\pdfmarkupcomment}[3][]% {% - \hspace*{0pt}% + \leavevmode% % Copy all global options to local options \pc@copy@gopt@lopt% % Change local options if specified @@ -2009,7 +2098,7 @@ \setlength{\pc@Eposy}{\zposy{pdfcomment:\thezref@unique}sp}% \ifmmode% \ifpc@gopt@final\else% - \ifpc@lopt@disable\else% + \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}% @@ -2034,7 +2123,7 @@ \fi% \fi% }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% \wd\pc@mathannot@box\z@% @@ -2043,8 +2132,32 @@ \box\pc@mathannot@box% \nobreak% \fi% - \fi% - #2% + \fi% + \ifpc@gopt@final% + \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% + {% + \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}% + {#2\global\pc@ignorespacesfalse}% + {\global\pc@ignorespacestrue}% + }% + {% + #2\global\pc@ignorespacesfalse% + }% + \else% + \ifpc@lopt@disable% + \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% + {% + \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}% + {#2\global\pc@ignorespacesfalse}% + {\global\pc@ignorespacestrue}% + }% + {% + #2\global\pc@ignorespacesfalse% + }% + \else% + #2\global\pc@ignorespacesfalse% + \fi% + \fi% \else% \pc@encode@PDF{#3}% \settoheight{\pc@box@height}{#2}% @@ -2062,7 +2175,7 @@ \fi% \ifpc@annot@samepage\else% \ifpc@gopt@final\else% - \ifpc@lopt@disable\else% + \ifpc@lopt@disable\else% % 1st part of annotation on 1st page \pc@annot@calc@pos% \pc@copy@xy@to@anna% @@ -2075,26 +2188,50 @@ {% \addtolength\pc@dimc{-\the\baselineskip}% }% - % one too much - \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% \fi% \ifpc@gopt@final\else% - \ifpc@lopt@disable\else% + \ifpc@lopt@disable\else% \pc@create@lpc% - \fi% + \fi% + \fi% + \ifpc@gopt@final% + \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% + {% + \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}% + {#2\global\pc@ignorespacesfalse}% + {\global\pc@ignorespacestrue}% + }% + {% + #2\global\pc@ignorespacesfalse% + }% + \else% + \ifpc@lopt@disable% + \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% + {% + \ifthenelse{\equal{\pc@lopt@printSOfinal}{true}}% + {#2\global\pc@ignorespacesfalse}% + {\global\pc@ignorespacestrue}% + }% + {% + #2\global\pc@ignorespacesfalse% + }% + \else% + #2\global\pc@ignorespacesfalse% + \fi% \fi% - #2% \zsavepos{pdfcomment:\thezref@unique}% \zref@refused{pdfcomment:\thezref@unique}% \refstepcounter{zref@unique}% \ifpc@gopt@final\else% - \ifpc@lopt@disable\else% + \ifpc@lopt@disable\else% \ifpc@annot@samepage% % annot complete on one page \pc@annot@calc@pos% @@ -2103,11 +2240,11 @@ \pc@create@annot% \else% % 2nd part of annotation on 2nd page - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}% - }% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}% + }% \pc@annot@calc@pos% \pc@copy@xy@to@anna% \renewcommand{\pc@anna@x@one}{\pc@x@left@text}% @@ -2125,7 +2262,7 @@ \pc@annot@secondpagetrue% \pc@create@annot% \fi% - \fi% + \fi% \fi% \fi% %only local! @@ -2134,6 +2271,9 @@ \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\pc@save@PDFOBJID{\pc@lopt@id}}% + \ifpc@ignorespaces% + \ignorespaces% + \fi% }% % \newenvironment{pdfsidelinecomment}[2][]% @@ -2203,18 +2343,18 @@ \fi% \ifpc@annot@samepage\else% \ifpc@gopt@final\else% - \ifpc@lopt@disable\else% - \pc@annot@secondpagefalse% + \ifpc@lopt@disable\else% + \pc@annot@secondpagefalse% \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]}% + \gdef\pc@lopt@le{/LE [/None\space\pc@lopt@linebegin]}% \marginnote{\pc@create@annot@sideline}% \fi% - \fi% + \fi% \fi% }% {% @@ -2230,20 +2370,20 @@ \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]}% + \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space\pc@lopt@linebegin]}% \marginnote{\pc@create@annot@sideline}% \else% - \pc@annot@secondpagetrue% + \pc@annot@secondpagetrue% \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]}% + \gdef\pc@lopt@le{/LE [\pc@lopt@lineend\space/None]}% \marginnote{\pc@create@annot@sideline}% \fi% - \fi% + \fi% \fi% \ifthenelse{\equal{\pc@lopt@id}{}}% {}% @@ -2279,54 +2419,51 @@ \hspace*{0pt}% %\pc@create@lpc% % typeset text annotation (see: PDF Reference) - \xdef\pc@zref@PDFOBJID{\pc@get@PDFOBJID{\pc@lopt@replyto}}% - \pc@afterpagefalse% + \xdef\pc@zref@PDFOBJID{\pc@get@PDFOBJID{\pc@lopt@replyto}}% + \pc@afterpagefalse% \ifpdf% - \@for\pc@for@PDFOBJID:={\pc@zref@PDFOBJID}\do% + \@for\pc@for@PDFOBJID:={\pc@zref@PDFOBJID}\do% {% - \ifthenelse{\equal{\pc@for@PDFOBJID}{A}}% - {% - \pc@afterpagetrue% - \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}% - }% - {% - \ifthenelse{\equal{\pc@for@PDFOBJID}{S}}% - {}% - {% - %\ifpc@afterpage% - \edef\pc@irt{/IRT \pc@for@PDFOBJID\space 0 R\space}% - \vbox% + \ifthenelse{\equal{\pc@for@PDFOBJID}{A}}% + {% + \pc@afterpagetrue% + \xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,A}% + }% + {% + \ifthenelse{\equal{\pc@for@PDFOBJID}{S}}% + {}% + {% + \edef\pc@irt{/IRT \pc@for@PDFOBJID\space 0 R\space}% + \vbox% + {% + \hsize=0pt% + \noindent% + \vspace{\pc@lopt@voffset}% + \hbox to 0pt% {% - \hsize=0pt% - \noindent% - \vspace{\pc@lopt@voffset}% - \hbox to 0pt% + \vsize=0pt% + \hskip\pc@lopt@hoffset% + \pdfannot width 0pt height \normalbaselineskip depth 0pt% {% - \vsize=0pt% - \hskip\pc@lopt@hoffset% - \pdfannot width 0pt height \normalbaselineskip depth 0pt% - {% - /Subtype /Text% - \pc@lopt@c\space% - \pc@lopt@cdate\space% - /T (\pc@pdfenc@author)\space% - /Subj (\pc@pdfenc@subject)\space% - /Contents (\pc@pdfenc@contents)\space% - \pc@irt%% - /F 4\space% - }% - \ifthenelse{\equal{\pc@lopt@id}{}}% - {}% - {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot} - }% - \hss% + /Subtype /Text% + \pc@lopt@c\space% + \pc@lopt@cdate\space% + /T (\pc@pdfenc@author)\space% + /Subj (\pc@pdfenc@subject)\space% + /Contents (\pc@pdfenc@contents)\space% + \pc@irt%% + /F 4\space% }% + \ifthenelse{\equal{\pc@lopt@id}{}}% + {}% + {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% + \hss% }% - %\fi% - }% - }% - }% - \ifthenelse{\equal{\pc@lopt@id}{}}% + }% + }% + }% + }% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\pc@save@PDFOBJID{\pc@lopt@id}}% \else% @@ -2344,6 +2481,88 @@ \fi% }% % +\newcommand{\pdftooltip}[3][]% +{% + \leavevmode% + % Copy all global options to local options + \pc@copy@gopt@lopt% + % Change local options if specified + \setkeys{pdftooltip}{#1}% + \ifmmode% + \marginnote{\pc@encode@PDF@math{#3}}% + \ifpc@lopt@disable + #2% + \else% + \settowidth{\pc@box@width}{$\pc@lopt@mathstyle#2$}% + \settoheight{\pc@box@height}{$\pc@lopt@mathstyle#2$}% + \settodepth{\pc@box@depth}{$\pc@lopt@mathstyle#2$}% + \ifpdf% + \pdfannot width \the\pc@box@width height \the\pc@box@height depth \the\pc@box@depth% + {% + /Subtype /Widget\space% + \pc@annot@tooltip% + }% + #2% + \else% + \ifpc@gopt@dvipdfmx% + \special{pdf: ann width \the\pc@box@width\space height \the\pc@box@height\space depth \the\pc@box@depth% + <<% + /Subtype /Widget\space% + \pc@annot@tooltip% + >>% + }% + #2% + \else% + \pdfmark[\pc@lopt@mathstyle#2]% + {% + pdfmark=/ANN,% + Subtype=/Widget,% + Raw={\pc@annot@tooltip}% + }% + \fi% + \fi% + \fi% + \else% + \pc@encode@PDF{#3}% + \ifpc@lopt@disable% + #2% + \else% + \hspace*{0pt}% + \settowidth{\pc@box@width}{#2}% + \settoheight{\pc@box@height}{#2}% + \settodepth{\pc@box@depth}{#2}% + \ifpdf% + \pdfannot width \the\pc@box@width height \the\pc@box@height depth \the\pc@box@depth% + {% + /Subtype /Widget\space% + \pc@annot@tooltip% + }% + #2% + \else% + \ifpc@gopt@dvipdfmx% + \special{pdf: ann width \the\pc@box@width\space height \the\pc@box@height\space depth \the\pc@box@depth% + <<% + /Subtype /Widget\space% + \pc@annot@tooltip% + >>% + }% + #2% + \else% + \pdfmark[#2]% + {% + pdfmark=/ANN,% + Subtype=/Widget,% + Raw={\pc@annot@tooltip}% + }% + \fi% + \fi% + \fi% + \fi% + \refstepcounter{zref@unique}% + %only local! + \gdef\pc@lopt@mathstyle{}% +}% +% % reset global options \newcommand{\pdfcommentsetup}[1]% {% @@ -2488,6 +2707,12 @@ \gdef\pc@lopt@id{}% \gdef\pc@collect@PDFOBJID{S}% \pc@lopt@disablefalse% + \gdef\pc@lopt@printSOfinal{\pc@gopt@printSOfinal}% + \ifpc@gopt@disable% + \global\pc@lopt@disabletrue% + \else% + \global\pc@lopt@disablefalse% + \fi% }% % \newcommand{\pc@encode@PDF}[1]% @@ -2539,7 +2764,7 @@ }% % \newcommand{\pc@annot@freetext}% -{% +{% \pc@lopt@c\space% \pc@lopt@cdate\space% /DA (/\pc@lopt@font\space \pc@lopt@fontsize\space Tf\space \pc@hyenc@fontcolor\space rg)\space% @@ -2566,7 +2791,7 @@ }% % \newcommand{\pc@annot@square}% -{% +{% \pc@lopt@c\space% \pc@lopt@ic\space% \pc@lopt@cdate\space% @@ -2589,7 +2814,7 @@ }% % \newcommand{\pc@annot@line}% -{% +{% \pc@lopt@c\space% \pc@lopt@ic\space% \pc@lopt@cdate\space% @@ -2622,7 +2847,7 @@ {% /Subtype /\pc@lopt@markup\space% /C [\pc@hyenc@color]\space% - \pc@lopt@cdate\space% + \pc@lopt@cdate\space% /CA \pc@lopt@opacity\space% /T (\pc@pdfenc@author)\space% /Subj (\pc@pdfenc@subject)\space% @@ -2639,7 +2864,7 @@ <<\space% /Subtype /\pc@lopt@markup\space% /C [\pc@hyenc@color]\space% - \pc@lopt@cdate\space% + \pc@lopt@cdate\space% /CA \pc@lopt@opacity\space% /T (\pc@pdfenc@author)\space% /Subj (\pc@pdfenc@subject)\space% @@ -2659,7 +2884,7 @@ Subtype=/\pc@lopt@markup,% Raw={ /C [\pc@hyenc@color]\space% - \pc@lopt@cdate\space% + \pc@lopt@cdate\space% /CA \pc@lopt@opacity\space% /T (\pc@pdfenc@author)\space% /Subj (\pc@pdfenc@subject)\space% @@ -2671,6 +2896,15 @@ }% }% % +\newcommand{\pc@annot@tooltip}% +{% + /TU (\pc@pdfenc@contents)\space% + /T (tooltip \thezref@unique)\space% + /FT/Btn\space% + /Ff/65536\space% + /H/N\space% +}% +% \newcommand{\pc@create@pdfannotopt}% {% \gdef\pc@pdfannotopt{}% @@ -2781,18 +3015,18 @@ }% \vss% }% - \ifpc@annot@samepage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifpc@annot@samepage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \ifpc@annot@secondpage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \else% + \ifpc@annot@secondpage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \fi% - \fi% + \else% + \fi% + \fi% \else% \ifpc@gopt@dvipdfmx% \vbox to 0pt% @@ -2844,7 +3078,7 @@ \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% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% \else% @@ -2861,20 +3095,20 @@ \pc@calc@textblockpos% \pc@copy@anna@to@annb% \setlength{\pc@dimf}{\dimexpr \pc@annb@y@one bp\relax}% - \setlength{\pc@dimg}{\dimexpr \pc@y@top@text bp\relax}% - \setlength{\pc@dimh}{\pc@dimg-\pc@dimf}% - \setlength{\pc@dimi}{\pc@dimb-\pc@dimg+\the\baselineskip+\the\baselineskip}% - % set new right border only if more than 1 line on second page - \ifdim\pc@dimi<0pt% - \ifdim\pc@dimh<\the\baselineskip% + \setlength{\pc@dimg}{\dimexpr \pc@y@top@text bp\relax}% + \setlength{\pc@dimh}{\pc@dimg-\pc@dimf}% + \setlength{\pc@dimi}{\pc@dimb-\pc@dimg+\the\baselineskip+\the\baselineskip}% + % set new right border only if more than 1 line on second page + \ifdim\pc@dimi<0pt% + \ifdim\pc@dimh<\the\baselineskip% \renewcommand{\pc@annb@x@two}{\pc@x@right@text}% \renewcommand{\pc@annb@x@four}{\pc@x@right@text}% - \fi% - \fi% - \ifpc@annot@samepage% - \renewcommand{\pc@annb@x@two}{\pc@x@right@text}% + \fi% + \fi% + \ifpc@annot@samepage% + \renewcommand{\pc@annb@x@two}{\pc@x@right@text}% \renewcommand{\pc@annb@x@four}{\pc@x@right@text}% - \fi% + \fi% \renewcommand{\pc@annb@y@two}{\pc@anna@y@one}% \renewcommand{\pc@annb@y@four}{\pc@anna@y@three}% \ifthenelse{\equal{\pc@lopt@markup}{StrikeOut}}% @@ -2884,20 +3118,20 @@ }% {}% \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% + \ifpdf% \pc@annot@markup@pdf% - \ifpc@annot@samepage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifpc@annot@samepage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \ifpc@annot@secondpage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \else% + \ifpc@annot@secondpage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \fi% - \fi% + \else% + \fi% + \fi% \else% \ifpc@gopt@dvipdfmx% \pc@annot@markup@dvipdfmx% @@ -2916,26 +3150,26 @@ \edef\pc@annb@y@four{\pc@pttobp{\dimexpr \pc@annb@y@four bp + 1.5pt\relax}}% \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@three bp + 1.5pt \relax}}% }% - {}% + {}% \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}% \setlength{\pc@dimg}{\dimexpr \pc@annb@y@one bp\relax}% - \setlength{\pc@dimh}{\pc@dimg-\pc@dimf+3pt}% - % only 1 line on first page? => no annotation for last line - \ifdim\pc@dimh<0pt% - \ifpdf% + \setlength{\pc@dimh}{\pc@dimg-\pc@dimf+3pt}% + % only 1 line on first page? => no annotation for last line + \ifdim\pc@dimh<0pt% + \ifpdf% \pc@annot@markup@pdf% - \ifpc@annot@samepage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifpc@annot@samepage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \ifpc@annot@secondpage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \else% + \ifpc@annot@secondpage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \fi% - \fi% + \else% + \fi% + \fi% \else% \ifpc@gopt@dvipdfmx% \pc@annot@markup@dvipdfmx% @@ -2943,17 +3177,17 @@ \pc@annot@markup@dvips% \fi% \fi% - \fi% + \fi% %middle lines \pc@copy@anna@to@annb% \setlength{\pc@dimc}{\dimexpr \pc@annb@y@one bp + 0.1pt\relax}% - \ifpc@annot@samepage% + \ifpc@annot@samepage% \setlength{\pc@dimd}{\dimexpr \pc@annb@y@two bp\relax}% \fi% - \ifpc@annot@secondpage% + \ifpc@annot@secondpage% \setlength{\pc@dimd}{\dimexpr \pc@annb@y@two bp\relax}% \fi% - \setcounter{pc@annot@lines}{0}% + \setcounter{pc@annot@lines}{0}% \setlength{\pc@dime}{\pc@dimc}% \addtolength{\pc@dime}{-\pc@dimd}% % count lines @@ -2977,7 +3211,7 @@ {% \edef\pc@annb@y@one{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \the\baselineskip + 2pt\relax}}% \edef\pc@annb@y@three{\pc@pttobp{\dimexpr \pc@annb@y@one bp - \pc@box@depth - \pc@box@height -2pt \relax}}% - }% + }% \fi% \whiledo{\value{pc@annot@lines}>0}% {% @@ -2987,18 +3221,18 @@ \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% - \ifpc@annot@samepage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \ifpc@annot@samepage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \ifpc@annot@secondpage% - \ifthenelse{\equal{\pc@lopt@id}{}}% + \else% + \ifpc@annot@secondpage% + \ifthenelse{\equal{\pc@lopt@id}{}}% {}% {\xdef\pc@collect@PDFOBJID{\pc@collect@PDFOBJID,\the\pdflastannot}}% - \else% - \fi% - \fi% + \else% + \fi% + \fi% \else% \ifpc@gopt@dvipdfmx% \pc@annot@markup@dvipdfmx% @@ -3006,7 +3240,7 @@ \pc@annot@markup@dvips% \fi% \fi% - }% + }% }% \fi% }% @@ -3019,7 +3253,7 @@ \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}}% + \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}}% @@ -3037,7 +3271,7 @@ \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}% \else% \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}% - \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}% + \renewcommand{\pc@x@two}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \evensidemargin + \textwidth + \dimexpr \pc@lopt@linesep bp \relax\relax}}% \fi% \else% \renewcommand{\pc@x@one}{\pc@pttobp{\dimexpr \dimexpr 1in\relax + \hoffset + \oddsidemargin - \dimexpr \pc@lopt@linesep bp \relax\relax}}% -- cgit v1.2.3