From b180f86879660a6bbae8a3778b7bc92aa650026d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 29 Aug 2017 21:04:31 +0000 Subject: powerdot (29aug17) git-svn-id: svn://tug.org/texlive/trunk@45165 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/powerdot/README | 2 +- Master/texmf-dist/doc/latex/powerdot/powerdot.pdf | Bin 543572 -> 543912 bytes .../texmf-dist/source/latex/powerdot/powerdot.dtx | 94 +++++++++------------ Master/texmf-dist/tex/latex/powerdot/powerdot.cls | 65 +++++++------- 4 files changed, 75 insertions(+), 86 deletions(-) diff --git a/Master/texmf-dist/doc/latex/powerdot/README b/Master/texmf-dist/doc/latex/powerdot/README index e0bce4f95e1..139e300a9bd 100644 --- a/Master/texmf-dist/doc/latex/powerdot/README +++ b/Master/texmf-dist/doc/latex/powerdot/README @@ -1,4 +1,4 @@ -powerdot v1.5b +powerdot v1.5c -------------- powerdot is a presentation class for LaTeX that allows for the quick diff --git a/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf b/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf index 69c0040cd05..0f2e98fccfd 100644 Binary files a/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf and b/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf differ diff --git a/Master/texmf-dist/source/latex/powerdot/powerdot.dtx b/Master/texmf-dist/source/latex/powerdot/powerdot.dtx index a0c8f90780f..4b3ef472462 100644 --- a/Master/texmf-dist/source/latex/powerdot/powerdot.dtx +++ b/Master/texmf-dist/source/latex/powerdot/powerdot.dtx @@ -87,8 +87,8 @@ \input{pdpream.ble} \OnlyDescription %\EnableCrossrefs -\def\fileversion{v1.5b} -\def\filedate{2017/07/22} +\def\fileversion{v1.5c} +\def\filedate{2017/08/28} \begin{document} \DocInput{powerdot.dtx} \let\Section\section\def\section*#1{\Section*{#1}\addcontentsline{toc}{section}{#1}} @@ -104,7 +104,7 @@ to this package in any other way.\\[1em] \hspace*{\stretch{1}} \begin{minipage}{.9\linewidth} Ramon van den Akker, David Carlisle, Pavel \v C\'i\v zek, Darren Dale, Hans Marius -Eikseth, Morten H\o gholm, Andr\'as Horv\'ath, Laurent Jacques, Akira +Eikseth, Alexander Grahn, Morten H\o gholm, Andr\'as Horv\'ath, Laurent Jacques, Akira Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. \end{minipage} @@ -163,6 +163,7 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. % \changes{v1.5a}{2015/11/29}{Added requirement for \texttt{pst-ovl} to get overlays working after \texttt{pstricks} moved the code there} % \changes{v1.5b}{2017/07/22}{Added requirement for latest \texttt{graphicx} to work with latest \texttt{dvips}} % \changes{v1.5b}{2017/07/22}{Updated documentation with respect to handout options} +% \changes{v1.5c}{2017/08/28}{Replaced clock code by the version by Alexander Grahn to achieve compatibility with the \pf{animate} package.} % % \CheckSum{3375} % @@ -2744,7 +2745,7 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{powerdot} - [2017/07/22 v1.5b powerdot presentation class (HA)] + [2017/08/28 v1.5c powerdot presentation class (HA)] % \end{macrocode} % Initializations. % \begin{macrocode} @@ -2808,39 +2809,19 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. nopsheader,hlentries,hlsections,nohandoutpagebreaks,nohandoutframes% }[true] % \end{macrocode} -% Clock definitions. +% Clock definitions. Contributed by Alexander Grahn. % \begin{macrocode} \define@boolkey[pd]{class}[pd@@]{clock}[true]{% \ifpd@@clock - \AtBeginDocument{% -% \end{macrocode} -% Start a \pf{hyperref} form. -% \begin{macrocode} - \@Form[]% -% \end{macrocode} -% Trick to insert rotation into text field if in landscape orientation. -% \begin{macrocode} - \ifnum\pd@orient=\z@ - \def\pd@clockrot{] /R 90\@gobble}% - \else - \let\pd@clockrot\@empty - \fi - }% -% \end{macrocode} -% \begin{macro}{\pd@startclock} -% Clock javascript. -% \changes{v1.4}{2005/12/10}{Added arguments for \texttt{clockformat} and \texttt{clockrefresh} values.} -% \begin{macrocode} + \newcount\pd@clockcnt \def\pd@startclock##1##2{% - function pdshowtime(){ - var pdtime=new Date(); - this.getField("pdclock.time").value= - util.printd("##1",pdtime); - } - pdshowtime(); - var tempa=app.setInterval("pdshowtime()",##2); - this.getField("pdstartclock").readonly=true; - this.getField("pdclock.time").readonly=true; + function pdshowtime(){% + var pdtime=new Date();% + this.getField("pdclock.\the\pd@clockcnt").value=util.printd("##1",pdtime);% + this.dirty=false;% + }% + pdshowtime();% + var pdclock_\the\pd@clockcnt=app.setInterval("pdshowtime()",##2);% }% \fi } @@ -3056,6 +3037,17 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. } \RequirePackage{verbatim} % \end{macrocode} +% This is needed for the implementation of the clock. +% \begin{macrocode} +\ifpd@@clock + \RequirePackage{pdfbase} + \ExplSyntaxOn + \let\pd@PdfAnnot\pbs_pdfannot:nnnn + \let\pd@PdfLastAnn\pbs_pdflastann: + \let\pd@AppendToFields\pbs_appendtofields:n + \ExplSyntaxOff +\fi +% \end{macrocode} % Here are some basic properties of the slides. % \begin{macrocode} \ifnum\pd@mode<2 @@ -3805,22 +3797,9 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. \fi \fi % \end{macrocode} -% Clock coding. +% Clock coding. Contributed by Alexander Grahn. % \begin{macrocode} \ifpd@@clock - \ifnum\c@slide=\@ne - \ifpd@overlay\else -% \end{macrocode} -% Insert invisible function to start the clock. -% \begin{macrocode} - \rput(0,-1){% - \TextField[% - format=\pd@startclock\pd@@clockformat\pd@@clockrefresh,% - name=pdstartclock,bordercolor={},backgroundcolor={},% - height=0bp,width=0bp]{}% - }% - \fi - \fi % \end{macrocode} % Extract the color specification, convert it to |rgb| and store it % to be used for the clock. This uses some \pf{xcolor} macros. @@ -3831,14 +3810,25 @@ Kakuto, Uwe Kern, Kyanh, Theo Stewart, and Don P. Story. \edef\pd@tempa{\expandafter\pd@tempa\pd@tempb\@nil}% % \end{macrocode} % Insert the clock. +% \changes{v1.4}{2005/12/10}{Added arguments for \texttt{clockformat} and \texttt{clockrefresh} values.} % \begin{macrocode} \ifx\pd@@clockpos\@empty\else + \@tempdima\pd@@clockcharsize \rput[\pd@@clockhook](\pd@@clockpos){% - \TextField[name=pdclock.time,bordercolor={},% - rotation={\ifnum\pd@orient=\z@ 90\else 0\fi},% - backgroundcolor={},align=\pd@@clockalign,color=\pd@tempa,% - charsize=\pd@@clockcharsize,width=\pd@@clockwidth,% - height=\pd@@clockheight]{}% + \makebox[\pd@@clockwidth][l]{\rule{0pt}{\pd@@clockheight}% + \pd@PdfAnnot{\pd@@clockwidth}{\pd@@clockheight}{0pt}{% + /Subtype/Widget/FT/Tx/T (pdclock.\the\pd@clockcnt) /Ff 1 + /DA (/Helv \strip@pt\@tempdima\space Tf \pd@tempa\space rg) + /MK<> + /Q \pd@@clockalign\space + /AA << + /PO << /S/JavaScript/JS(\pd@startclock\pd@@clockformat\pd@@clockrefresh) >> + /PC << /S/JavaScript/JS(app.clearInterval(pdclock_\the\pd@clockcnt);) >> + >> + }% + }% + \pd@AppendToFields{\pd@PdfLastAnn}% + \global\advance\pd@clockcnt\@ne }% \fi \fi diff --git a/Master/texmf-dist/tex/latex/powerdot/powerdot.cls b/Master/texmf-dist/tex/latex/powerdot/powerdot.cls index 083156287ca..58b2aa6f791 100644 --- a/Master/texmf-dist/tex/latex/powerdot/powerdot.cls +++ b/Master/texmf-dist/tex/latex/powerdot/powerdot.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{powerdot} - [2017/07/22 v1.5b powerdot presentation class (HA)] + [2017/08/28 v1.5c powerdot presentation class (HA)] \newif\ifpd@overlay \newif\ifpd@section \newif\ifpd@ifsetup @@ -67,24 +67,15 @@ }[true] \define@boolkey[pd]{class}[pd@@]{clock}[true]{% \ifpd@@clock - \AtBeginDocument{% - \@Form[]% - \ifnum\pd@orient=\z@ - \def\pd@clockrot{] /R 90\@gobble}% - \else - \let\pd@clockrot\@empty - \fi - }% + \newcount\pd@clockcnt \def\pd@startclock##1##2{% - function pdshowtime(){ - var pdtime=new Date(); - this.getField("pdclock.time").value= - util.printd("##1",pdtime); - } - pdshowtime(); - var tempa=app.setInterval("pdshowtime()",##2); - this.getField("pdstartclock").readonly=true; - this.getField("pdclock.time").readonly=true; + function pdshowtime(){% + var pdtime=new Date();% + this.getField("pdclock.\the\pd@clockcnt").value=util.printd("##1",pdtime);% + this.dirty=false;% + }% + pdshowtime();% + var pdclock_\the\pd@clockcnt=app.setInterval("pdshowtime()",##2);% }% \fi } @@ -214,6 +205,14 @@ \orig@description[#2]% } \RequirePackage{verbatim} +\ifpd@@clock + \RequirePackage{pdfbase} + \ExplSyntaxOn + \let\pd@PdfAnnot\pbs_pdfannot:nnnn + \let\pd@PdfLastAnn\pbs_pdflastann: + \let\pd@AppendToFields\pbs_appendtofields:n + \ExplSyntaxOff +\fi \ifnum\pd@mode<2 \pagestyle{empty} \fi @@ -640,27 +639,27 @@ \fi \fi \ifpd@@clock - \ifnum\c@slide=\@ne - \ifpd@overlay\else - \rput(0,-1){% - \TextField[% - format=\pd@startclock\pd@@clockformat\pd@@clockrefresh,% - name=pdstartclock,bordercolor={},backgroundcolor={},% - height=0bp,width=0bp]{}% - }% - \fi - \fi \def\pd@tempa##1,##2,##3\@nil{##1 ##2 ##3}% \extractcolorspec\pd@@clockcolor\pd@tempb \expandafter\convertcolorspec\pd@tempb{rgb}\pd@tempb \edef\pd@tempa{\expandafter\pd@tempa\pd@tempb\@nil}% \ifx\pd@@clockpos\@empty\else + \@tempdima\pd@@clockcharsize \rput[\pd@@clockhook](\pd@@clockpos){% - \TextField[name=pdclock.time,bordercolor={},% - rotation={\ifnum\pd@orient=\z@ 90\else 0\fi},% - backgroundcolor={},align=\pd@@clockalign,color=\pd@tempa,% - charsize=\pd@@clockcharsize,width=\pd@@clockwidth,% - height=\pd@@clockheight]{}% + \makebox[\pd@@clockwidth][l]{\rule{0pt}{\pd@@clockheight}% + \pd@PdfAnnot{\pd@@clockwidth}{\pd@@clockheight}{0pt}{% + /Subtype/Widget/FT/Tx/T (pdclock.\the\pd@clockcnt) /Ff 1 + /DA (/Helv \strip@pt\@tempdima\space Tf \pd@tempa\space rg) + /MK<> + /Q \pd@@clockalign\space + /AA << + /PO << /S/JavaScript/JS(\pd@startclock\pd@@clockformat\pd@@clockrefresh) >> + /PC << /S/JavaScript/JS(app.clearInterval(pdclock_\the\pd@clockcnt);) >> + >> + }% + }% + \pd@AppendToFields{\pd@PdfLastAnn}% + \global\advance\pd@clockcnt\@ne }% \fi \fi -- cgit v1.2.3