summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-08 00:45:56 +0000
committerKarl Berry <karl@freefriends.org>2011-01-08 00:45:56 +0000
commitabd5bdf3fcf83a33374db38d5d1851e59eab3796 (patch)
tree6e115938b4e06d98b73f6f29c86d6053d85480ae /Master
parent0c064f70cbb4e75660441c4d0da7b0374beb4537 (diff)
powerdot (6jan11)
git-svn-id: svn://tug.org/texlive/trunk@20970 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/powerdot/README4
-rwxr-xr-xMaster/texmf-dist/doc/latex/powerdot/RunSlideDoc25
-rw-r--r--Master/texmf-dist/doc/latex/powerdot/powerdot.bib9
-rw-r--r--Master/texmf-dist/doc/latex/powerdot/powerdot.pdfbin533164 -> 544353 bytes
-rw-r--r--Master/texmf-dist/doc/latex/powerdot/powerdot.tex97
-rw-r--r--Master/texmf-dist/tex/latex/powerdot/powerdot.cls223
6 files changed, 222 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/powerdot/README b/Master/texmf-dist/doc/latex/powerdot/README
index ef1214af8d1..aba6aa31a17 100644
--- a/Master/texmf-dist/doc/latex/powerdot/README
+++ b/Master/texmf-dist/doc/latex/powerdot/README
@@ -1,4 +1,4 @@
-powerdot v1.4d
+powerdot v1.4e
--------------
powerdot is a presentation class for LaTeX that allows for the quick
@@ -33,7 +33,7 @@ powerdot into your LaTeX distribution
License
-------
-Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
+Copyright (C) 2005-2011 Hendri Adriaens and Christopher Ellison
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/powerdot/RunSlideDoc b/Master/texmf-dist/doc/latex/powerdot/RunSlideDoc
new file mode 100755
index 00000000000..c7bfd8db135
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/powerdot/RunSlideDoc
@@ -0,0 +1,25 @@
+#!/bin/bash
+# To generate style examples, do
+# (after extracting powerdot-styleexample.tex):
+# Do this for all available styles (replace `default' by any
+# other style name) to generate .001 and .002 files which
+# will be included by the documentation.
+
+latex powerdotSlide.tex
+latex powerdotSlide.tex
+#bibtex powerdot
+#makeindex -s gglo.ist -o powerdot.gls powerdot.glo
+#makeindex -s gind.ist -o powerdot.ind powerdot.idx
+#latex powerdot.tex
+#latex powerdot.tex
+dvips powerdotSlide.dvi
+ps2pdf powerdotSlide.ps
+
+rm *.aux *.log *.i?? *.g?? *.toc *.dvi *.blg *.ps *.bm *.bbl
+rm powerdot-styleexample-*
+
+
+# If you also want to generate the source code documentation,
+# remove \OnlyDescription from the preamble of powerdot.dtx
+# prior to compiling the source.
+#
diff --git a/Master/texmf-dist/doc/latex/powerdot/powerdot.bib b/Master/texmf-dist/doc/latex/powerdot/powerdot.bib
index c62cec7a975..c32474f8672 100644
--- a/Master/texmf-dist/doc/latex/powerdot/powerdot.bib
+++ b/Master/texmf-dist/doc/latex/powerdot/powerdot.bib
@@ -50,7 +50,7 @@
@MISC{PSTricksWeb,
author = {Herbert Vo\ss},
title = {\pf{PSTricks} website},
- howpublished = {\url{http://pstricks.tug.org}}
+ howpublished = {\url{http://tug.org/pstricks/}}
}
@MISC{xkeyval,
@@ -130,6 +130,13 @@
title = {{\LyX\ website}},
howpublished = {\url{http://www.lyx.org}}
}
+
+@MISC{javascript,
+ author = {Adobe Solutions Network},
+ title = {{Acrobat JavaScript Scripting Reference}},
+ howpublished = {\url{http://partners.adobe.com/public/developer/en/acrobat/sdk/pdf/javascript/AcroJS.pdf}}
+}
+
\endinput
%%
%% End of file `powerdot.bib'.
diff --git a/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf b/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf
index 8ddfc20bbf4..a7de4d5ca11 100644
--- a/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf
+++ b/Master/texmf-dist/doc/latex/powerdot/powerdot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/powerdot/powerdot.tex b/Master/texmf-dist/doc/latex/powerdot/powerdot.tex
index 7b1a02bee08..ac398e67f0c 100644
--- a/Master/texmf-dist/doc/latex/powerdot/powerdot.tex
+++ b/Master/texmf-dist/doc/latex/powerdot/powerdot.tex
@@ -2,7 +2,8 @@
%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
%% ---------------------------------------------------------------
%%
-%% Version 1.4d prepared by Herbert Voss
+%% Version 1.4e prepared by Herbert Voss
+%% Additional work for the documentation by Patrice Mégret
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +22,7 @@
\usepackage{xcolor}
\usepackage{enumitem}
\usepackage{graphicx}
-\usepackage{pst-char}
+\usepackage{pst-text}
\usepackage{listings}
\usepackage{array}
\usepackage{xkeyval}
@@ -164,8 +165,8 @@
}{\textbf{No example files found for style \pf{#1}.}}%
}
-\def\fileversion{v1.4b}
-\def\filedate{2010/10/07}
+\def\fileversion{v1.4e}
+\def\filedate{2010/12/18}
\changes{v1.0}{2005/09/04}{Initial release}
\changes{v1.1}{2005/09/19}{Fixed some small bugs}
@@ -203,16 +204,27 @@
\changes{v1.3}{2005/12/06}{Added logo feature}
\changes{v1.3}{2005/12/06}{Added examples and example file}
\changes{v1.3}{2005/12/06}{Added two slide processing methods to do verbatim on slides easily}
- \changes{v1.4}{2005/12/10}{Moved \texttt{lf} and \texttt{rf} keys from
- \texttt{global} to \texttt{glslide} family}
- \changes{v1.4}{2005/12/10}{Added \texttt{cf} option}
- \changes{v1.4}{2005/12/10}{Updated styles}
- \changes{v1.4}{2005/12/10}{Solved some small bugs}
- \changes{v1.4}{2005/12/10}{Moved footers out of slide box in handout mode}
+
+ \changes{v1.4 }{2005/12/10}{Moved \texttt{lf} and \texttt{rf} keys from \texttt{global} to \texttt{glslide} family}
+ \changes{v1.4 }{2005/12/10}{Added \texttt{cf} option}
+ \changes{v1.4 }{2005/12/10}{Updated styles}
+ \changes{v1.4 }{2005/12/10}{Solved some small bugs}
+ \changes{v1.4 }{2005/12/10}{Moved footers out of slide box in handout mode}
+ \changes{v1.4 }{2008/08/24}{Added \texttt{clockformat} and \texttt{clockrefresh} keys to \texttt{global} family}
+ \changes{v1.4 }{2008/08/24}{\texttt{blackslide} replaced by the more general \texttt{pauseslide}}
+ \changes{v1.4 }{2008/08/24}{\texttt{pauseslide} does not get randomdots anymore}
+ \changes{v1.4 }{2008/08/24}{Renames \texttt{nopagebreaks} option to \texttt{nohandoutpagebreaks}}
+ \changes{v1.4 }{2008/08/24}{Added option for no frames in handout mode}
+
\changes{v1.4a}{2010/10/07}{fixed bug with geometry 5.x (hv)}
\changes{v1.4b}{2010/11/16}{fixed bug with centered footnote (hv)}
\changes{v1.4c}{2010/11/16}{fixed bug with missing macros for centered footer (hv)}
- \changes{v1.4d}{2012/12/03}{fixed missleading comment header of powerdot.cls (hv)}
+ \changes{v1.4d}{2010/12/03}{fixed misleading comment header of powerdot.cls (hv)}
+ \changes{v1.4e}{2010/12/18}{fixed bugs with enumitem (hv)}
+
+
+
+
\begin{document}
@@ -344,12 +356,14 @@ This mode will produce a black and white overview of your slides that
can be used to make personal notes on, for distribution to students,
a personal guide during your talk, etcetera.
\begin{description}
-\item\option{nopagebreaks}\\
+\item\DescribeOption{nohandoutpagebreaks}\option{nohandoutpagebreaks}\\
By default, the handout mode produces a document with two slides per
page. If you want to fit more slides on a page, specify this option
in the |\documentclass| command and \pf{powerdot} will let \LaTeX\
decide on the places to insert a page break, namely when a page is
full.
+\item\DescribeOption{nohandoutframes}\option{nohandoutframes}\\
+In handout mode, each slide is contained in a frame by default. This option turns the frames off.
\end{description}
\end{description}
@@ -435,15 +449,16 @@ with the current section in the presentation and is preset to |false|.
See also section~\ref{sec:structure}. Specifying this
option turns highlighting of sections on. This could be useful when
you are using a style that implements a split table of contents.
-\item\DescribeOption{blackslide}\option{blackslide}\\
-This option inserts a black slide in the presentation on page 1 and
+\item\DescribeOption{pauseslide}\option{pauseslide}\\
+This option inserts an empty slide (black by default) in the presentation on page 1 and
will automatically advance to page 2 when opening the presentation
in a PDF viewer like Acrobat (Reader). The option also inserts a
link behind every slide or section title that brings you to the
-black slide when clicked. When you click anywhere in the black
+pause slide when clicked. When you click anywhere in the pause
slide, you will go back to the originating slide. This option can be
used to temporarily pause a presentation, for instance, to do a
-proof on the black board.
+proof on the black board. You can use a different color than black
+by specifying it after the option, for instance, |pauseslide=white|.
\item\DescribeOptions{clock}\option{clock}\\
This displays a small digital clock on slides which you can use to
check the time left for your presentation.
@@ -457,8 +472,8 @@ Here is an example of a |\documentclass| command.
mode=present,
display=slidesnotes,
style=tycja,
- nopagebreaks,
- blackslide,
+ nohandoutpagebreaks,
+ pauseslide,
fleqn
]{powerdot}
\end{example}
@@ -471,13 +486,13 @@ slide, normal size 12 points and flushed left equations.
mode=handout,
display=slidesnotes,
style=tycja,
- nopagebreaks,
- blackslide,
+ nohandoutpagebreaks,
+ pauseslide,
fleqn
]{powerdot}
\end{example}
Changing the |paper| and |mode| options, now produces a handout with
-possibly more than two slides per page due to the |nopagebreaks|
+possibly more than two slides per page due to the |nohandoutpagebreaks|
option.
\subsection{Setup options}\label{sec:pdsetup}
@@ -540,6 +555,27 @@ See for more information on controlling the layout of lists the
\item\DescribeOptions{enumerate,itemize}\option{enumerate,itemize}\\
As the |list| option, but only control |enumerate| and |itemize|
environments respectively.
+\item\DescribeOption{clockformat}\option{clockformat}\\
+This option specifies the format of the clock. The format is set using
+Acrobat's |util.printd| function.\footnote{For a complete listing of
+allowable formats, consult the \textit{Acrobat JavaScript Scripting
+Reference}\cite{javascript}.} The default value is |HH:MM:ss|, which
+shows a 00-23 hour, 00-59 minute, 00-59 second clock. Example:
+\begin{example}
+clockformat=h:MM tt
+\end{example}
+The above setting will display a 1-12 hour, 00-59 minute, am/pm clock.
+That is, the clock might show |5:53 pm|.
+\item\DescribeOption{clockrefresh}\option{clockrefresh}\\
+This option should be a number which specifies how often
+the clock is refreshed in milliseconds. The default behavior is to refresh
+the clock every second. Thus, the default value is 1000. Notice, if the
+|clockformat| is such that seconds are not shown, then it makes no sense
+to update that clock every second. A corresponding example:
+\begin{example}
+clockrefresh=60000
+\end{example}
+The interpretation of this is that the clock will be updated every minute.
\end{description}
\subsubsection{Global and local options}\label{sec:glopts}
@@ -651,7 +687,7 @@ black. If the number is positive, the color will be adjusted towards
white, with 100 giving white. With a light background, you may want
to choose |bright| to be positive. With a dark background, you may
want to set it negative. The preset value is |60|, meaning a mixture
-of 40\ of the original color and 60\ white.
+of 40\% of the original color and 60\% white.
\item\DescribeOption{dprop}\option{dprop}\\
This option is used for passing extra parameters to the |\psdot|
command, which creates the random dots. You could, for instance,
@@ -668,7 +704,7 @@ Here are two examples for the use of random dots.
randomdots,dminwidth=.2\slidewidth
}
\end{example}
-This turns on random dots and doesn't use the left 20\ of the slide
+This turns on random dots and doesn't use the left 20\% of the slide
for placing random dots.
\begin{example}
\pdsetup{
@@ -1265,7 +1301,7 @@ using BiB\TeX\ or not):\\
\begin{slide}{Slide}
\cite{someone}
\end{slide}
- \begin{slide}{References}
+\begin{slide}{References}
\begin{thebibliography}{1}
\bibitem{someone} Article of someone.
\end{thebibliography}
@@ -1826,7 +1862,7 @@ template.
Make sure you choose a \emph{proper} name for the template, and
avoid redefining existing templates or environments. \pf{powerdot}
-defines |blackslide|, |note| and |emptyslide| internally, so you
+defines |pauseslide|, |note| and |emptyslide| internally, so you
shouldn't use these names unless you know what you're doing.
Furthermore, each style needs to define at least the templates
|slide| and |titleslide|. The |titleslide| environment will be used
@@ -1964,7 +2000,7 @@ documentation for more information.
This defines the position of the |hook| on the paper. The lower left
corner of the paper is given by the point |{0,0}| and the upper right
corner by the point |{\slidewidth,\slideheight}|. So if you want to
-position the main text box at 20\ from the left edge and 30\ from
+position the main text box at 20\% from the left edge and 30\% from
the top edge of the paper, you have to do the following.
\begin{example}
textpos={.2\slidewidth,.7\slideheight}
@@ -2644,16 +2680,15 @@ want to have a look at the source code description, locate
|powerdot.dtx|, search in the file for |\OnlyDescription| and remove
that and do
\begin{example}
- latex powerdot.dtx
- latex powerdot.dtx
+ latex powerdot.tex
+ latex powerdot.tex
bibtex powerdot
makeindex -s gglo.ist -o powerdot.gls powerdot.glo
makeindex -s gind.ist -o powerdot.ind powerdot.idx
- latex powerdot.dtx
- latex powerdot.dtx
+ latex powerdot.tex
+ latex powerdot.tex
\end{example}
-\StopEventually{}
\section{Implementation}\label{sec:imple}
\subsection{General construction}
diff --git a/Master/texmf-dist/tex/latex/powerdot/powerdot.cls b/Master/texmf-dist/tex/latex/powerdot/powerdot.cls
index 8b7f17378e1..f46d533bd3d 100644
--- a/Master/texmf-dist/tex/latex/powerdot/powerdot.cls
+++ b/Master/texmf-dist/tex/latex/powerdot/powerdot.cls
@@ -5,7 +5,7 @@
%% Copyright (C) 2005-2010 Hendri Adriaens and Christopher Ellison
%% ---------------------------------------------------------------
%%
-%% Version 1.4d prepared by Herbert Voss
+%% Version 1.4e prepared by Herbert Voss
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,11 +18,12 @@
%% This work has the LPPL maintenance status "unmaintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{powerdot}[2010/12/03 v1.4d powerdot presentation class (HA,CE)]
+\ProvidesClass{powerdot}[2010/12/18 v1.4e powerdot presentation class (HA,CE)]
\newif\ifpd@overlay
\newif\ifpd@section
\newif\ifpd@ifsetup
\newif\ifpd@display
+\newif\ifpd@pauseslide
\newcounter{note}
\newcounter{slide}
\newcounter{pd@pause}
@@ -49,8 +50,12 @@
slides,notes,slidesnotes}{\XKV@addtolist@x\pd@cursetup\pd@tempa}
\define@choicekey*[pd]{class}{mode}[\pd@tempa\pd@mode]{%
present,print,handout}{\XKV@addtolist@x\pd@cursetup\pd@tempa}
+\define@key[pd]{class}{pauseslide}[black]{%
+ \pd@pauseslidetrue
+ \def\pd@pauseslidecolor{#1}%
+}
\define@boolkeys[pd]{class}[pd@@]{%
- nopsheader,hlentries,hlsections,blackslide,nopagebreaks%
+ nopsheader,hlentries,hlsections,nohandoutpagebreaks,nohandoutframes%
}[true]
\define@boolkey[pd]{class}[pd@@]{clock}[true]{%
\ifpd@@clock
@@ -62,15 +67,16 @@
\let\pd@clockrot\@empty
\fi
}%
- \def\pd@startclock{%
+ \def\pd@startclock##1##2{%
function pdshowtime(){
var pdtime=new Date();
this.getField("pdclock.time").value=
- util.printd("H:MM:ss",pdtime);
+ util.printd("##1",pdtime);
}
- var tempa=app.setInterval("pdshowtime()",1000);
+ pdshowtime();
+ var tempa=app.setInterval("pdshowtime()",##2);
this.getField("pdstartclock").readonly=true;
- this.getField("pdclock").readonly=true;
+ this.getField("pdclock.time").readonly=true;
}%
\fi
}
@@ -150,7 +156,7 @@
\pagestyle{empty}
\fi
\ifnum\pd@mode>0
- \pd@@blackslidefalse
+ \pd@pauseslidefalse
\fi
\setlength\parindent{0pt}
\setlength\slidewidth{.5\paperwidth}
@@ -179,13 +185,6 @@
\fi
\ifcase\pd@paper\def\@pdfpagescrop{0 0 594 842}\fi
\def\@pdfcreator{LaTeX with powerdot class}
-\ifpd@@blackslide\def\@pdfstartpage{2}\fi
-\AtBeginDocument{%
- \ifpd@@blackslide
- \begin{blackslide}[toc=,bm=,trans=Replace]{}%
- \end{blackslide}%
- \fi
-}
\AtEndDocument{%
\immediate\write\@auxout{\string\newlabel{lastslide}%
{{}{\the\c@slide}{\relax}{}{}}}%
@@ -193,30 +192,31 @@
\define@key[pd]{global}{theslide}{\def\theslide{#1}}
\define@key[pd]{global}{thenote}{\def\thenote{#1}}
\define@key[pd]{global}{enumerate}{%
- \ifx\enit@enum\@undefined
- \def\enit@enum{#1}%
+ \ifx\enit@@enum\@undefined
+ \def\enit@@enum{#1}%
\else
- \XKV@addtolist@n\enit@enum{#1}%
+ \XKV@addtolist@n\enit@@enum{#1}%
\fi
}
\define@key[pd]{global}{itemize}{%
- \ifx\enit@item\@undefined
- \def\enit@item{#1}%
+ \ifx\enit@@item\@undefined
+ \def\enit@@item{#1}%
\else
- \XKV@addtolist@n\enit@item{#1}%
+ \XKV@addtolist@n\enit@@item{#1}%
\fi
}
\define@key[pd]{global}{list}{%
- \ifx\enit@list\@undefined
- \def\enit@list{#1}%
+ \ifx\enit@@list\@undefined
+ \def\enit@@list{#1}%
\else
- \XKV@addtolist@n\enit@list{#1}%
+ \XKV@addtolist@n\enit@@list{#1}%
\fi
}
\define@key[pd]{global}{counters}{%
\XKV@addtolist@n\pd@@counters{#1}%
}
\def\pd@@counters{table,figure,equation,footnote,mpfootnote}
+\define@cmdkeys[pd]{global}[pd@@]{clockformat,clockrefresh}
\define@cmdkeys[pd]{glslide}[pd@@]{lf,cf,rf,trans}
\define@cmdkey[pd]{glslide}[pd@@]{palette}{%
\ifnum\pd@mode<2
@@ -260,7 +260,8 @@
trans=Replace,dminsize=5pt,dmaxsize=40pt,dminwidth=0pt,%
dmaxwidth=\slidewidth,dminheight=0pt,dbright=60,%
dmaxheight=\slideheight,dmindots=5,dmaxdots=40,dprop=,%
- logohook=tl,logopos=,logocmd=,method=normal%
+ logohook=tl,logopos=,logocmd=,method=normal,%
+ clockformat=HH:MM:ss,clockrefresh=1000%
}
\def\pdsetup{\setkeys[pd]{global,glslide}}
\AtBeginDocument{%
@@ -321,12 +322,9 @@
\pd@pdifsetup\pd@@ifsetup{present,print,handout}%
\pd@pdifs@tup\pd@@ifsetup\pd@ifsetuptrue\pd@ifsetupfalse
}
-\define@choicekey*[pd]{template}{tocorient}[\pd@tempa\pd@tocorient]{%
- v,h}{}
-\define@choicekey*[pd]{template}{stocorient}[\pd@tempa\pd@stocorient]{%
- v,h}{}
-\define@choicekey*[pd]{template}{ntocorient}[\pd@tempa\pd@ntocorient]{%
- v,h}{}
+\define@choicekey*[pd]{template}{tocorient}[\pd@tempa\pd@tocorient]{v,h}{}
+\define@choicekey*[pd]{template}{stocorient}[\pd@tempa\pd@stocorient]{v,h}{}
+\define@choicekey*[pd]{template}{ntocorient}[\pd@tempa\pd@ntocorient]{v,h}{}
\setkeys[pd]{template}{%
ifsetup,%
titlehook=Bl,titlepos=,titlewidth=\slidewidth,%
@@ -344,7 +342,7 @@
tocsecm=,toctcolor=black,tochlcolor=black,tochltcolor=white,%
tocsecindent=0pt,tocslideindent=0pt,%
lfhook=Bl,lfpos=,lffont=\scriptsize,lftemp=\pd@@lf,%
- cfhook=Bc,cfpos=,cffont=\scriptsize,cftemp=\pd@@cf,%
+ cfhook=B,cfpos=,cffont=\scriptsize,cftemp=\pd@@cf,%
rfhook=Br,rfpos=,rffont=\scriptsize,rftemp=\pd@@rf\ifx\pd@@rf
\@empty\else\ifx\theslide\@empty\else\ -- \fi\fi\theslide,%
iacolor=lightgray,%
@@ -374,6 +372,7 @@
}{\advance\@tempcnta\@ne}%
}%
}
+\ifpd@pauseslide\def\@pdfstartpage{2}\fi
\AtBeginDocument{%
\ifx\pd@nopalettes\@undefined\else\ifx\pd@@palette\@undefined
\@nameuse{pd@pe@\@nameuse{pd@pe@1@name}@colors}%
@@ -387,6 +386,10 @@
\let\default@color\current@color
\let\pd@color\XC@current@color
\else\pd@countcolors\fi
+ \ifpd@pauseslide
+ \begin{pauseslide}[toc=,bm=,trans=Replace,randomdots=false]{}%
+ \end{pauseslide}%
+ \fi
}
\def\pddefinetemplate{\@testopt\pd@pddefinetemplate{}}
\def\pd@pddefinetemplate[#1]#2#3#4{%
@@ -493,7 +496,7 @@
\@whilenum\c@pd@overlay<\pd@nooverlays\do{%
\pd@overlaytrue
\XKV@for@o\pd@@counters\pd@tempa{%
- \setcounter{\pd@tempa}{\csname pd@counter@\pd@tempa\endcsname}%
+ \setcounter\pd@tempa{\csname pd@counter@\pd@tempa\endcsname}%
}%
\stepcounter{pd@overlay}%
\ifpd@@randomdots
@@ -506,6 +509,7 @@
}
\def\pd@sl@de{%
\stepcounter{slide}\newpage
+ \ifpd@overlay\addtocounter{slide}\m@ne\fi
\edef\@currentlabel{\the\c@slide}%
\pst@Verb{InitOL /TheOL (0) def}%
\pst@Verb{(0) BOL}%
@@ -554,25 +558,34 @@
(\pd@tempb,\pd@tempc)}%
}%
\fi
+ \def\pd@tempa{pauseslide}%
+ \def\pd@tempb{emptyslide}%
\ifx\pd@@logopos\@empty\else
\ifx\pd@logobox\@undefined\else
- \rput[\pd@@logohook](\pd@@logopos){\usebox\pd@logobox}%
+ \ifx\@currenvir\pd@tempa\else
+ \ifx\@currenvir\pd@tempb\else
+ \rput[\pd@@logohook](\pd@@logopos){\usebox\pd@logobox}%
+ \fi
+ \fi
\fi
\fi
\ifpd@@clock
- \ifnum\c@slide=\@ne
+ \ifnum\c@slide=\@ne\ifpd@overlay\else
\rput(0,-1){%
- \TextField[format=\pd@startclock,name=pdstartclock,%
- bordercolor={},backgroundcolor={},height=0bp,width=0bp]{}%
+ \TextField[%
+ format=\pd@startclock\pd@@clockformat\pd@@clockrefresh,%
+ name=pdstartclock,bordercolor={},backgroundcolor={},%
+ height=0bp,width=0bp]{}%
}%
- \fi
+ \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
\rput[\pd@@clockhook](\pd@@clockpos){%
- \TextField[name=pdclock.time,bordercolor=\pd@clockrot,%
+ \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]{}%
@@ -580,9 +593,7 @@
\fi
\fi
\pd@pdftrans
- \ifpd@overlay
- \addtocounter{slide}\m@ne
- \else
+ \ifpd@overlay\else
\def\pd@tempa{note}%
\ifx\@currenvir\pd@tempa\else
\pd@maketocbm0%
@@ -608,8 +619,8 @@
\end{minipage}%
}%
\rput[\pd@@titlehook](\pd@@titlepos){%
- \ifpd@@blackslide
- \hyperlink{blackslide}{\pd@tempa}%
+ \ifpd@pauseslide
+ \hyperlink{pauseslide}{\pd@tempa}%
\else
\pd@tempa
\fi
@@ -674,6 +685,7 @@
\pd@@textfont
\let\color\pd@tempa
}
+%
\def\pd@notet{0}
\pddefinetemplate{note}{%
titlepos={.04\slidewidth,.92\slideheight},%
@@ -701,11 +713,11 @@
\psline[linewidth=.5pt](0,.08\slideheight)%
(\slidewidth,.08\slideheight)%
}
-\pddefinetemplate{blackslide}{}{%
+\pddefinetemplate{pauseslide}{}{%
\addtocounter{slide}\m@ne
- \hyper@anchorstart{blackslide}\hyper@anchorend
- \psframe*[linecolor=black](0,0)(\slidewidth,\slideheight)%
- {\color{black}%
+ \hyper@anchorstart{pauseslide}\hyper@anchorend
+ \psframe*[linecolor=\pd@pauseslidecolor](0,0)(\slidewidth,\slideheight)%
+ {\color{\pd@pauseslidecolor}%
\rput[cm](.5\slidewidth,.5\slideheight){%
\Acrobatmenu{GoBack}{\setlength\fboxsep{10cm}\fbox{GoBack}}}}%
}
@@ -713,7 +725,7 @@
\let\pd@orig@maketitle\maketitle
\def\maketitle{\@testopt\pd@maketitle{}}
\def\pd@maketitle[#1]{%
- \begin{titleslide}[#1,toc=,bm=,trans=Replace]{}%
+ \begin{titleslide}[#1,toc=,bm=,trans=Replace,method=normal]{}%
\let\footnote\thanks
\def\thefootnote{\@fnsymbol\c@footnote}%
{\pd@title{\pd@@titlefont\@title}\par}{%
@@ -1114,14 +1126,12 @@
\ifx\@empty#2\@empty\else
\def\pd@closeitem{\gdef\pd@currentstate{0}}%
\fi
- \pd@orig@item[#1]%\relax\leavevmode\ignorespaces
- %% without \relax a trailing space is introduced in a trivlist environment
- %% but we do not know what the then missing \leavevmode\ignorespaces may introduce
- \leavevmode\ignorespaces%
+ \pd@orig@item[#1]\leavevmode\ignorespaces
}
\let\pd@orig@@trivlist\@trivlist
\def\@trivlist{%
- \global\expandafter\let\csname pd@currentstate\the\c@pd@trivlist\endcsname\pd@currentstate
+ \global\expandafter\let\csname pd@currentstate\the\c@pd@trivlist
+ \endcsname\pd@currentstate
\ifnum\pd@@type=\z@\let\pd@closeitem\relax\fi
\stepcounter{pd@trivlist}%
\pd@orig@@trivlist
@@ -1182,38 +1192,35 @@
}%
}
\define@cmdkeys[pd]{twocolumn}[pd@@]{%
- lineheight,lfrheight,cfrheight,rfrheight,lcolwidth,rcolwidth,%
- topsep,bottomsep,indent,lineprop,lfrprop,rfrprop,cfrprop%
+ lineheight,lfrheight,rfrheight,lcolwidth,rcolwidth,%
+ topsep,bottomsep,indent,lineprop,lfrprop,rfrprop%
}
\define@key[pd]{twocolumn}{colsep}{\setlength\pd@colsep{#1}}
\define@key[pd]{twocolumn}{frsep}{\setlength\pd@frsep{#1}}
\presetkeys[pd]{twocolumn}{frsep=1.5mm,colsep=.06\linewidth,%
lcolwidth=.47\linewidth,rcolwidth=.47\linewidth,topsep=0cm,%
- bottomsep=0cm,indent=0cm,lineprop=,lfrprop=,rfrprop=,cfrprop=,%
- lineheight=,lfrheight=,rfrheight=,cfrheight=%
+ bottomsep=0cm,indent=0cm,lineprop=,lfrprop=,rfrprop=,%
+ lineheight=,lfrheight=,rfrheight=%
}{}
\def\twocolumn{\@testopt\pd@twocolumn{}}
\long\def\pd@twocolumn[#1]#2#3{%
\setkeys[pd]{twocolumn}{#1}%
- \sbox\pd@tba{\begin{minipage}\pd@@lcolwidth#2\end{minipage}}%
+ \sbox\pd@tba{\begin{minipage}\pd@@lcolwidth\pd@@textfont#2\end{minipage}}%
\setlength\@tempdima{\the\ht\pd@tba}%
\addtolength\@tempdima{\the\dp\pd@tba}%
- \sbox\pd@tbb{\begin{minipage}\pd@@rcolwidth#3\end{minipage}}%
+ \sbox\pd@tbb{\begin{minipage}\pd@@rcolwidth\pd@@textfont#3\end{minipage}}%
\setlength\@tempdimb{\the\ht\pd@tbb}%
\addtolength\@tempdimb{\the\dp\pd@tbb}%
\setlength\@tempdimc{\pd@maxdim\@tempdima\@tempdimb}%
\ifx\pd@@lfrheight\@empty\else
\setlength\@tempdimc{\pd@maxdim\pd@@lfrheight\@tempdimc}%
\fi
- \ifx\pd@@cfrheight\@empty\else
- \setlength\@tempdimc{\pd@maxdim\pd@@cfrheight\@tempdimc}%
+ \ifx\pd@@lineheight\@empty\else
+ \setlength\@tempdimc{\pd@maxdim\pd@@lineheight\@tempdimc}%
\fi
\ifx\pd@@rfrheight\@empty\else
\setlength\@tempdimc{\pd@maxdim\pd@@rfrheight\@tempdimc}%
\fi
- \ifx\pd@@lineheight\@empty\else
- \setlength\@tempdimc{\pd@maxdim\pd@@lineheight\@tempdimc}%
- \fi
\begin{pspicture}(-\pd@@indent,\pd@@topsep)(\linewidth,-\@tempdimc)%
\psset{linewidth=.25pt,linecolor=\pd@color}%
\setlength\@tempdima\pd@@lcolwidth
@@ -1250,26 +1257,6 @@
\def\@captype{table}%
\par\begin{center}%
}{\par\end{center}}
-\renewenvironment{thebibliography}[1]{%
- \list{\@biblabel{\@arabic\c@enumiv}}{%
- \settowidth\labelwidth{\@biblabel{#1}}%
- \leftmargin\labelwidth
- \advance\leftmargin\labelsep
- \@openbib@code
- \usecounter{enumiv}%
- \let\p@enumiv\@empty
- \renewcommand\theenumiv{\@arabic\c@enumiv}%
- }%
- \sloppy
- \clubpenalty4000
- \@clubpenalty \clubpenalty
- \widowpenalty4000%
- \sfcode`\.\@m
-}{%
- \def\@noitemerr
- {\@latex@warning{Empty `thebibliography' environment}}%
- \endlist
-}
\def\pddefinelyxtemplate#1#2{\def#1{\pd@lyxgetargsandbody{#2}}}
\def\pd@lyxgetargsandbody#1{\@testopt{\pd@lyxget@rgsandbody{#1}}{}}
\def\pd@lyxget@rgsandbody#1[#2]#3{%
@@ -1345,6 +1332,36 @@
\let\bbl@frenchitemize\relax
\let\bbl@frenchlistspacing\relax
\fi
+ \renewenvironment{thebibliography}[1]{%
+ \list{\@biblabel{\@arabic\c@enumiv}}{%
+ \settowidth\labelwidth{\@biblabel{#1}}%
+ \leftmargin\labelwidth
+ \advance\leftmargin\labelsep
+ \@openbib@code
+ \usecounter{enumiv}%
+ \let\p@enumiv\@empty
+ \renewcommand\theenumiv{\@arabic\c@enumiv}%
+ }%
+ \sloppy
+ \clubpenalty4000
+ \@clubpenalty \clubpenalty
+ \widowpenalty4000%
+ \sfcode`\.\@m
+ }{%
+ \def\@noitemerr
+ {\@latex@warning{Empty `thebibliography' environment}}%
+ \endlist
+ }%
+ \@ifpackageloaded{CJK}{%
+ \count@=127
+ \@whilenum\count@<255\do{%
+ \advance\count@\@ne
+ \lccode`\~=\count@
+ \catcode\count@=\active
+ \lowercase{\def~{\kern1ex}}%
+ }%
+ \hypersetup{CJKbookmarks=true}%
+ }{}%
}
\ifnum\pd@mode=\z@
\AtBeginDocument{%
@@ -1390,7 +1407,9 @@
\gdef\lyxend{\gdef\lyxend{}\pd@slide}%
\begin{lrbox}\pd@textbox
\@tempdima\linewidth
- \advance\@tempdima-16pt
+ \ifpd@@nohandoutframes\else
+ \advance\@tempdima-16pt
+ \fi
\begin{minipage}\@tempdima
\subsection*\pd@t@tle
\pd@displaytrue\raggedright
@@ -1399,9 +1418,14 @@
\def\pd@slide{%
\end{minipage}\end{lrbox}%
\ifpd@display
- \psframebox[framesep=7pt,linewidth=1pt]{\usebox\pd@textbox}%
+ \ifpd@@nohandoutframes
+ \usebox\pd@textbox
+ \else
+ \fboxrule1pt\fboxsep7pt
+ \fbox{\usebox\pd@textbox}%
+ \fi
\par\smallskip
- \pd@@lf\hfill\pd@@cf\hfill\ifx\pd@@rf\@empty\else\pd@@rf\ -- \fi
+ \pd@@lf\hfill\ifx\pd@@rf\@empty\else\pd@@rf\ -- \fi
\def\pd@tempa{note}%
\ifx\pd@resa\pd@tempa
\ifnum\c@slide=\pd@notet
@@ -1413,7 +1437,7 @@
\thenote
\else\theslide\fi
\par\bigskip
- \ifpd@@nopagebreaks\else\vfill\pd@newpage\fi
+ \ifpd@@nohandoutpagebreaks\else\vfill\pd@newpage\fi
\fi
}
\def\pd@maketitle[#1]{%
@@ -1460,9 +1484,8 @@
}
\fi
\def\@nameedef#1{\expandafter\edef\csname#1\endcsname}
-\def\pd@namelet#1#2{%
- \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname
-}
+\def\pd@namelet#1#2{\expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname}
+%
\def\pd@pop#1#2{%
\@expandtwoargs\in@{,}{#1}%
\ifin@\expandafter\pd@p@p#1\@nil#2#1\else\let#2#1\let#1\@empty\fi
@@ -1508,18 +1531,14 @@
r r moveto r r neg L r neg r neg L r neg r L
closepath stroke }%
}
-\IfFileExists{powerdot-\pd@@style.sty}{
- \RequirePackage{powerdot-\pd@@style}
-}{
- \pd@error{unknown style `\pd@@style'}
-}
+\IfFileExists{powerdot-\pd@@style.sty}
+ {\RequirePackage{powerdot-\pd@@style}}
+ {\pd@error{unknown style `\pd@@style'}}
\ifx\titleslide\@undefined
- \pd@error{`titleslide' environment
- not defined by style `\pd@@style'}
+ \pd@error{`titleslide' environment not defined by style `\pd@@style'}
\fi
\ifx\slide\@undefined
- \pd@error{`slide' environment not
- defined by style `\pd@@style'}
+ \pd@error{`slide' environment not defined by style `\pd@@style'}
\fi
\ifx\pd@title\@undefined\let\pd@title\@firstofone\fi
\ifx\pd@slidetitle\@undefined\let\pd@slidetitle\@firstofone\fi
@@ -1539,7 +1558,7 @@
\hskip\@tempdima
\begin{minipage}[b]\@tempdimb
\pd@usedtocfont\color\pd@@tochltcolor#1%
- \end{minipage}%
+ \end{minipage}%3
}%
}
\fi