diff options
Diffstat (limited to 'Master/texmf-dist/tex')
10 files changed, 266 insertions, 214 deletions
diff --git a/Master/texmf-dist/tex/latex/texpower/automata.sty b/Master/texmf-dist/tex/latex/texpower/automata.sty index dc5f856a3fc..c598f736337 100644 --- a/Master/texmf-dist/tex/latex/texpower/automata.sty +++ b/Master/texmf-dist/tex/latex/texpower/automata.sty @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/fixseminar.sty b/Master/texmf-dist/tex/latex/texpower/fixseminar.sty index 3bf8b99c50e..1c07844ed93 100644 --- a/Master/texmf-dist/tex/latex/texpower/fixseminar.sty +++ b/Master/texmf-dist/tex/latex/texpower/fixseminar.sty @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/powersem.cls b/Master/texmf-dist/tex/latex/texpower/powersem.cls index fb6eff35232..90bc02ab2d9 100644 --- a/Master/texmf-dist/tex/latex/texpower/powersem.cls +++ b/Master/texmf-dist/tex/latex/texpower/powersem.cls @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/texpower.sty b/Master/texmf-dist/tex/latex/texpower/texpower.sty index a46f177abb7..fa31659c3a0 100644 --- a/Master/texmf-dist/tex/latex/texpower/texpower.sty +++ b/Master/texmf-dist/tex/latex/texpower/texpower.sty @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License @@ -26,7 +27,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{texpower} - [2004/07/27 v0.1b Create Dynamic Presentations with LaTeX.] + [2005/04/08 v0.2 Create Dynamic Presentations with LaTeX.] \RequirePackage{ifthen} \RequirePackage{calc} @@ -38,6 +39,10 @@ \DeclareOption{printout}{\setboolean{display}{false}} \newboolean{fixcolorstack@TP} \DeclareOption{fixcolorstack}{\setboolean{fixcolorstack@TP}{true}} +\newboolean{oldfiltering@TP} +\DeclareOption{oldfiltering}{\setboolean{oldfiltering@TP}{true}} +\newcommand{\oldfilteringon}{\setboolean{oldfiltering@TP}{true}} +\newcommand{\oldfilteringoff}{\setboolean{oldfiltering@TP}{false}} \newboolean{nineminutes@TP} \DeclareOption{nineminutes}{\setboolean{nineminutes@TP}{true}} \newboolean{TPcolor} @@ -72,26 +77,22 @@ \ifthenelse{\boolean{verbose@TP}}{\setcounter{errorcontextlines}{10000}}{} \newboolean{psspecialsallowed} \setboolean{psspecialsallowed}{true} % optimistic default -\IfFileExists{ifpdf.sty} -{% - \RequirePackage{ifpdf}% - } -{% - \@ifundefined{pdftrue} - {% - \expandafter\newif\csname ifpdf\endcsname - \ifx\pdfoutput\undefined - \else - \ifx\pdfoutput\relax - \else - \ifcase\pdfoutput - \else - \pdftrue - \fi - \fi - \fi - }{}% - } +\@ifundefined{pdftrue}{ +\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}}{% + \expandafter\newif\csname ifpdf\endcsname + \ifx\pdfoutput\undefined + \else + \ifx\pdfoutput\relax + \else + \ifcase\pdfoutput + \else + \pdftrue + \fi + \fi + \fi + } +}{% \ifpdf is defined - nothing to do +} \ifpdf\setboolean{psspecialsallowed}{false}\fi \@ifclassloaded{slides}% @@ -1461,7 +1462,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndtoppanelheight@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\toppanelheight=\bgndtoppanelheight@TP% Overwrite panel settings - use user-supplied value. + } \ifthenelse{\equal{\bgndbottompanelheight@TP}{}}% Has the bottom panel height been set? {% No. Guess default. \ifx\bottompanelcontents@TP\empty% Is the bottom panel defined? @@ -1480,7 +1483,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndbottompanelheight@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\bottompanelheight=\bgndbottompanelheight@TP% Overwrite panel settings - use user-supplied value. + } \mklength@TP{\bgndleftpanelheight@TP}% Calculate remaining space in the center. {\TPpageheight-\bgndtoppanelheight@TP-\bgndbottompanelheight@TP}% \let\bgndrightpanelheight@TP=\bgndleftpanelheight@TP% Height of left and right panels is equal. @@ -1502,7 +1507,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndleftpanelwidth@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\leftpanelwidth=\bgndleftpanelwidth@TP% Overwrite panel settings - use user-supplied value. + } \ifthenelse{\equal{\bgndrightpanelwidth@TP}{}}% Has the right panel width been set? {% No. Guess default. \ifx\rightpanelcontents@TP\empty% Is the panel defined? @@ -1521,7 +1528,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndrightpanelwidth@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\rightpanelwidth=\bgndrightpanelwidth@TP% Overwrite panel settings - use user-supplied value. + } }% matches \ifthenelse{\boolean{hpanels@TP}} {% No. Vertical panels are `outer', horizontal panels are `inner'. \let\bgndleftpanelheight@TP=\TPpageheight% Full height for vertical panels. @@ -1544,7 +1553,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndleftpanelwidth@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\leftpanelwidth=\bgndleftpanelwidth@TP% Overwrite panel settings - use user-supplied value. + } \ifthenelse{\equal{\bgndrightpanelwidth@TP}{}}% Has the right panel width been set? {% No. Guess default. \ifx\rightpanelcontents@TP\empty% Is the panel defined? @@ -1563,7 +1574,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndrightpanelwidth@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\rightpanelwidth=\bgndrightpanelwidth@TP% Overwrite panel settings - use user-supplied value. + } \mklength@TP{\bgndtoppanelwidth@TP}% Calculate remaining space in the center. {\TPpagewidth-\bgndleftpanelwidth@TP-\bgndrightpanelwidth@TP}% \let\bgndbottompanelwidth@TP=\bgndtoppanelwidth@TP% Width of top and bottom panels is equal. @@ -1585,7 +1598,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndtoppanelheight@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\toppanelheight=\bgndtoppanelheight@TP% Overwrite panel settings - use user-supplied value. + } \ifthenelse{\equal{\bgndbottompanelheight@TP}{}}% Has the bottom panel height been set? {% No. Guess default. \ifx\bottompanelcontents@TP\empty% Is the panel defined? @@ -1604,7 +1619,9 @@ }% \fi }% matches \ifthenelse{\equal{\bgndbottompanelheight@TP}{}} - {}% Yes. Nothing to do. + {% Yes. + \let\bottompanelheight=\bgndbottompanelheight@TP% Overwrite panel settings - use user-supplied value. + } }% matches second argument of \ifthenelse{\boolean{hpanels@TP}} }% matches \newcommand{\initpanels@TP}[1]{ \newcommand{\phantomrule@TP}[2]{\rule{0pt}{#2}\rule{#1}{0pt}} @@ -2324,6 +2341,42 @@ \newcommand{\pausesafecounter}[1]% {\expandafter\def\expandafter\cl@@ckptpause@TP\expandafter{\cl@@ckptpause@TP\@elt{#1}}} \@ifclassloaded{seminar}{\pausesafecounter{slide}}{} +\ifthenelse{\boolean{display}}{% + \AtBeginDocument{\@ifpackageloaded{hyperref}{% + \let\hyper@anchor@TP=\hyper@anchor + \long\def\hyper@@anchor#1#2{% + %%% \ifthenelse{\boolean{instepwise@TP}}% + \ifthenelse{\boolean{instepwise@TP} \AND \NOT \boolean{oldfiltering@TP}}% + {\ifthenelse{\NOT \boolean{instep@TP}}% + {\ifthenelse{\value{step}=\value{firststep}}{\@hyper@@anchor#1\relax#2\relax}{}}% + {\ifthenelse{\boolean{active} \AND \boolean{firstactivation}}% + {\@hyper@@anchor#1\relax#2\relax}{}}% End \ifthenelse{\boolean{active} ... + }% End \ifthenelse{\NOT \boolean{instep@TP}} + {\@hyper@@anchor#1\relax#2\relax}% End \ifthenelse{\boolean{instepwise@TP}} + } + \let\hyper@anchorstart@TP=\hyper@anchorstart + \def\hyper@anchorstart#1{% + \ifthenelse{\boolean{instepwise@TP} \AND \NOT \boolean{oldfiltering@TP}}% + {\ifthenelse{\NOT \boolean{instep@TP}}% + {\ifthenelse{\value{step}=\value{firststep}}{\hyper@anchorstart@TP{#1}}{}}% + {\ifthenelse{\boolean{active} \AND \boolean{firstactivation}}% + {\hyper@anchorstart@TP{#1}}{}}% End \ifthenelse{\boolean{active} ... + }% End \ifthenelse{\NOT \boolean{instep@TP}} + {\hyper@anchorstart@TP{#1}}% End \ifthenelse{\boolean{instepwise@TP}} + } + }{}}% End \AtBeginDocument{\@ifpackageloaded{hyperref}{ + % Changing \protected@write to avoid duplicates in aux-file + \let\protected@write@TP=\protected@write + \long\def\protected@write#1#2#3{% + \ifthenelse{\boolean{instepwise@TP} \AND \NOT \boolean{oldfiltering@TP}}% + {\ifthenelse{\NOT \boolean{instep@TP}}% + {\ifthenelse{\value{step}=\value{firststep}}{\protected@write@TP{#1}{#2}{#3}}{}}% + {\ifthenelse{\boolean{active} \AND \boolean{firstactivation}}% + {\protected@write@TP{#1}{#2}{#3}}{}}% End \ifthenelse{\boolean{active} ... + }% End \ifthenelse{\NOT \boolean{instep@TP}} + {\protected@write@TP{#1}{#2}{#3}}% End \ifthenelse{\boolean{instepwise@TP}} + }% +}{}% End \ifthenelse{\boolean{display}} \def\save@TP {% \par% Always end current paragraph. @@ -2339,7 +2392,14 @@ \output=\memoutput@TP% Restore output routine. } \let\filterpage@TP\relax -\newcommand{\filterwhatsits@TP}{\global\setbox\@cclv=\hbox{\leaders\copy\@cclv\hskip\wd\@cclv}} +\newcommand{\filterwhatsits@TP}{% + \ifthenelse{\boolean{oldfiltering@TP}}% + {\global\setbox\@cclv=\hbox{\leaders\copy\@cclv\hskip\wd\@cclv}}% Old aggressive/robust filtering + {}% No filtering - handled by \insertfilterwhatsits@TP and stepwise aware commands. +} +\newcommand{\insertfilterwhatsits@TP}{% + \global\setbox\tempbox@TP=\hbox{\leaders\copy\tempbox@TP\hskip\wd\tempbox@TP}% +} \newcommand{\insertfirstduplicate@TP} {\unvcopy\mempageconts@TP}% Just output the vbox's contents. \newcommand{\do@colorcorrections@TP} @@ -2356,7 +2416,12 @@ \global\skip\footins=\skip\memfootins@TP \global\count\footins=\count\memfootins@TP \global\dimen\footins=\dimen\memfootins@TP - \unvcopy\mempageconts@TP% Output the vbox's contents. + \ifthenelse{\boolean{oldfiltering@TP}}% + {\unvcopy\mempageconts@TP}% + {\setbox\tempbox@TP=\vbox{\unvcopy\mempageconts@TP}% + \insertfilterwhatsits@TP + \copy\tempbox@TP% + } } \newcommand{\outputduplicate@TP} {% @@ -2422,64 +2487,55 @@ \newcommand{\hidesmartignore}[1]{\setbox\tempbox@TP=\vbox{#1}} \AtBeginDocument% {% - \@ifpackageloaded{soul}% Can we use the soul package? - {% - \@ifpackagelater{soul}{2002/05/28}% Correct version? - {% Yes. Let's define the necessary macros. - \DeclareRobustCommand*\hidetext - {% - \leavevmode% To prevent \phantom from inserting an hbox into the vertical list. + \@ifpackageloaded{soul}{% + \@ifpackagelater{soul}{2002/05/28}{ + \DeclareRobustCommand*\hidetext{% + \leavevmode \SOUL@setup - \def\SOUL@everytoken{\phantom{\the\SOUL@token\SOUL@setkern\SOUL@charkern}}% Make current token `invisible'. + \def\SOUL@everytoken{\phantom{\the\SOUL@token\SOUL@setkern\SOUL@charkern}} \def\SOUL@everyhyphen {% \discretionary {% \unkern - \phantom{\SOUL@setkern\SOUL@hyphkern\char\hyphenchar\font}% Output an `invisible' hyphen if needed. + \phantom{\SOUL@setkern\SOUL@hyphkern\char\hyphenchar\font}% }{}{}% }% \SOUL@% }% - }% - {% No. Encourage people to update. + }{ \PackageInfo{texpower} {Package soul too old.\MessageBreak Command \string\hidetext\space disabled}% - \let\hidetext=\hidephantom% \hidephantom is a sorry excuse for \hidetext... + \let\hidetext=\hidephantom }% - }% - {% No. In this case, there is no useful definition for \hidetext. + }{ \PackageInfo{texpower} {Package soul not loaded.\MessageBreak Command \string\hidetext\space disabled}% - \let\hidetext=\hidephantom% \hidephantom is a sorry excuse for \hidetext... + \let\hidetext=\hidephantom }% } -\ifthenelse{\boolean{colormath@TP}}% Should we color math? -{% Yes. +\ifthenelse{\boolean{colormath@TP}}{% \newcommand{\commitcolor@TP} {\textcolor{\ifmmode mathcolor\else textcolor\fi}} - } -{% No. - \newcommand{\commitcolor@TP}{\textcolor{textcolor}}% Switch to textcolor. +}{ + \newcommand{\commitcolor@TP}{\textcolor{textcolor}} } -\ifthenelse{\boolean{TPcolor}}% Can we use colors at all? -{% Yes. - \newcommand{\hidedimmed}[1]% Make argument appear in `dimmed' colors. - {% - {% A group makes the color changes local. - \ifthenelse{\boolean{instepwise@TP}}{\usecolorset{stwcolors}}{}% Just in case we currently are in dimmed mode... - \dimcolors% Dim colors. - \commitcolor@TP{#1}% Switch on dimmed color. - }% - }% - } -{\let\hidedimmed=\displayidentical}% No. Disable this command. -\ifthenelse{\boolean{TPcolor}}% Can we use colors at all? -{% Yes. - \newcommand{\hidevanish}[1]% Make argument `vanish' by changing colors. - {\textcolor{\vanishcolor}{\vanishcolors#1}} +\ifthenelse{\boolean{TPcolor}}{ + \newcommand{\hidedimmed}[1]{% + { + \ifthenelse{\boolean{instepwise@TP}}{\usecolorset{stwcolors}}{}% + \dimcolors + \commitcolor@TP{#1} + } } -{\let\hidevanish=\hidephantom}% No. Use \hidephantom instead. +}{ + \let\hidedimmed=\displayidentical +} +\ifthenelse{\boolean{TPcolor}}{ + \newcommand{\hidevanish}[1]{\textcolor{\vanishcolor}{\vanishcolors#1}} +}{ + \let\hidevanish=\hidephantom +} \newcommand{\boxedsteps} % Use boxed versions. {\let\displaystepcontents=\displayboxed\let\hidestepcontents=\hidephantom} @@ -2710,6 +2766,7 @@ \newcommand{\@switch@TP}[2] {% \global\advance\c@stepcommand by 1\relax% This execution of \switch is counted. + \setboolean{instep@TP}{true}% Set indicator. % % If the verbose option is set, type out some accounting information which can be used for debugging. \ifthenelse{\boolean{verbose@TP}} @@ -2753,6 +2810,7 @@ }% End of \s@step@TPcheck % \let\afterstep=\o@afterstep@TP% Restore the definition of \afterstep. + \setboolean{instep@TP}{false}% Set indicator. }% End of the definition of \@switch@TP. \@onlyinstepwise@TP\restep @@ -2949,13 +3007,14 @@ \def\paren@overlays@TP(#1){\def\optarg@ov@TP{(#1)}\@@overlays@TP} \newcommand{\@@overlays@TP}[2] {% - \setcounter{substep}{0}% Initialize substep counter. + \setcounter{substep}{1}% Initialize substep counter. \leavevmode% Make sure that \rlap doesn't insert anything in the vertical list. - \whiledo{\value{substep}<#1}% Iterate <n> times. + \whiledo{\value{substep}<#1}% Iterate <n-1> times (since we start at 1). {% - \stepcounter{substep}% \expandafter\switch\optarg@ov@TP{}{\ifthenelse{\boolean{firstactivation}}{\mbox{#2}}{\rlap{#2}}}% + \stepcounter{substep}% }% + \expandafter\switch\optarg@ov@TP{}{\mbox{#2}}% Always using \mbox for last overlay. } \newenvironment{stepcapsule}{}{} \newcommand{\afterstep}[1] @@ -3048,6 +3107,7 @@ \renewcommand{\@@@@dblhgradrule@TP}[3][0pt]{}% } \newboolean{instepwise@TP} +\newboolean{instep@TP} \newcommand{\@stepwise@TP}[2][] {% \save@TP% Save the current contents of the page. @@ -3143,7 +3203,62 @@ \repeat \endgroup \global\c@firststep=\c@o@fs@TP\relax% Restore default value of counter firststep. -}% End of the definition of \@stepwise@TP +} +\newenvironment{fragilesteps}{% + \def\texpower@verbatimfilename{\jobname-texpower.vrb}% + \immediate\openout\texpower@verbatimfileout=\texpower@verbatimfilename% + \texpower@verbatimreadframe% +} +{% + \immediate\closeout\texpower@verbatimfileout% + \stepwise{\input{\texpower@verbatimfilename}}% +} +\newwrite\texpower@verbatimfileout + +\def\texpower@verbatimreadframe{% + \begingroup% + \let\do\@makeother\dospecials% + \count@=127% + \@whilenum\count@<255 \do{% + \advance\count@ by 1% + \catcode\count@=11% + }% + \@makeother\^^L% and whatever other special cases + \endlinechar`\^^M \catcode`\^^M=12 \texpower@processframefirstline} + +{\catcode`\^^M=12\endlinechar=-1% + \long\gdef\texpower@processframefirstline#1^^M{% + \def\texpower@test{#1}% + \ifx\texpower@test\texpower@stopframefirst% + \let\next=\texpower@endfragilesteps% + \else + \ifx\texpower@test\@empty% + \else% + \@temptokena={#1}% + \immediate\write\texpower@verbatimfileout{\the\@temptokena}% + \fi% + \let\next=\texpower@processframeline% + \fi% + \next% + } + \long\gdef\texpower@processframeline#1^^M{% + \def\texpower@test{#1}% + \ifx\texpower@test\texpower@stopframe% + \let\next=\texpower@endfragilesteps% + \else + \immediate\write\texpower@verbatimfileout{#1}% + \fi% + \next% + } +} + +{ + \escapechar=-1\relax% + \xdef\texpower@stopframe{\string\\end\string\{fragilesteps\string\}} + \xdef\texpower@stopframefirst{\noexpand\end\string\{fragilesteps\string\}} +} + +\def\texpower@endfragilesteps{\endgroup\end{fragilesteps}} \InputIfFileExists{tpsettings.cfg}{}{} \endinput %% diff --git a/Master/texmf-dist/tex/latex/texpower/tpcolors.cfg b/Master/texmf-dist/tex/latex/texpower/tpcolors.cfg index cd28d055d03..b31297c86a1 100644 --- a/Master/texmf-dist/tex/latex/texpower/tpcolors.cfg +++ b/Master/texmf-dist/tex/latex/texpower/tpcolors.cfg @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/tplists.sty b/Master/texmf-dist/tex/latex/texpower/tplists.sty index 8b9212b7102..b27c575d933 100644 --- a/Master/texmf-dist/tex/latex/texpower/tplists.sty +++ b/Master/texmf-dist/tex/latex/texpower/tplists.sty @@ -4,11 +4,12 @@ %% %% The original source files were: %% -%% texpower-addons.dtx (with options: `tplists') +%% tplists.dtx (with options: `tplists') %% %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License @@ -24,111 +25,38 @@ %% The list of all files belonging to the TeXPower bundle is %% given in the file `00readme.txt'. %% -% =============================================================================== -% File: tplists.sty -% -% Function: The package provides dynamic lists. The following -% environments/lists are available -% 1) 'stepenum', 'stepitem', 'stepeqlist', 'stepcompactenum' -% 'stepcompactitem' and 'stepcompacteqlist'. -% 2) 'flipenum', 'flipitem', 'flipeqlist', 'flipcompactenum', -% 'flipcompactitem', and 'flipcompacteqlist' -% 3) 'dimenum', 'dimitem', 'dimeqlist', 'dimcompactenum', -% 'dimcompactitem', and 'dimcompacteqlist' -% where 'step' is short for stepped, 'flip' for flipped and -% 'dim' for dimmed. The packages 'paralist' and 'eqlist' -% must be loaded before this package to use the *eqlist and -% *compact* lists. -% -% Usage: The package is loaded in the normal fashion, eg: -% \usepackage{tplists} -% The following options exist: -% pausestep - makes step* lists use \pause -% The package works better (the lists look better) if TeXPower -% uses colors. -% -% All lists (except *eqlist) takes an optional parameter -% adding to the indent of the list. Note that dim* and -% flip* lists do not nest, and that step* lists inside -% dim*/flip* will behave as a dim*/flip* list respectively. -% -% Example: -% -% \documentclass[a4paper]{article} -% \usepackage[darkbackground,display]{texpower} -% \usepackage{tplists} -% \begin{document} -% \begin{flipitem}[2cm] -% \item Before -% \begin{enumerate}[1cm] -% \item An item -% \item Another item -% \end{enumerate} -% \item After -% \end{flipitem} -% \end{document} -% -% (The normal 'itemize' and 'enumerate' lists are modified -% so they accept the optional parameter and work nested -% with the new lists.) -% -% Issues: The step* lists use \vstep (as default) which give weird results with -% structured backgrounds. Using the pausestep option fixes this, but then -% you can't nest step* lists inside dim* or flip* lists. -% There are also some unresolved problems when using french babel. -% -% History: 2003/10/03 v0.1: -% * first public release -% 2003/10/04 v0.1a: -% * removed redefinition of eqlist (since it doesn't work) -% 2003/10/07 v0.1b: -% * corrected some typos in this documentation -% * added option pausestep -% * made dim* (and all variants of flip*) lists work without -% colors by using boldface for active items. -% - +%% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tplists}% - [2003/10/07 v0.1b Dynamic Lists using TeXPower] - -%% Packages +\ProvidesPackage{tplists} + [2005/04/07 v0.2 Easy Dynamic Lists using TeXPower] \RequirePackage{texpower} -% Compact enum/item. \newboolean{tpl@paralist} \@ifpackageloaded{paralist}{\setboolean{tpl@paralist}{true}}{} -% Lists with equal indentation. \newboolean{tpl@eqlist} \@ifpackageloaded{eqlist}{\setboolean{tpl@eqlist}{true}}{} - -%% Options -% Use \pause for steplists (too avoid problems with structured backgrounds). \newboolean{tpl@pausestep} \DeclareOption{pausestep}{\setboolean{tpl@pausestep}{true}} +\newboolean{tpl@noflipendstep} +\DeclareOption{noflipendstep}{\setboolean{tpl@noflipendstep}{true}} \ProcessOptions - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% Flipped/dimmed/stepped itemize/enumerate/eqlist environment. % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% '\iftpl@instepenv' indicates if we are in some kind of stepped list -% environment. '\iftpl@indimenv' / '\tpl@inflipenv' indicates that we are -% using one of the stepwise environments from texpower (that doesn't -% nest). '\iftpl@inpausestepenv' indicates that we are in a stepped -% list that uses \pause. - -% using 'tpl@' as prefix for internals. +\define@key{tpl}{pausestep}[true]{% + \setboolean{tpl@pausestep}{#1} +} +\define@key{tpl}{noflipendstep}[true]{% + \setboolean{tpl@noflipendstep}{#1} +} +\newcommand*{\tplsetup}{\setkeys{tpl}} \newif\iftpl@instepenv \tpl@instepenvfalse \newif\iftpl@inpausestepenv \tpl@inpausestepenvfalse \newif\iftpl@indimenv \tpl@indimenvfalse \newif\iftpl@inflipenv \tpl@inflipenvfalse \let\oldenumerate=\enumerate \let\olditemize=\itemize +\let\olddescription=\description \let\endoldenumerate=\endenumerate \let\endolditemize=\enditemize +\let\endolddescription=\enddescription \ifthenelse{\boolean{tpl@eqlist}}{% \let\oldeqlist=\eqlist \let\endoldeqlist=\endeqlist @@ -139,10 +67,6 @@ \let\endoldcompactenum=\endcompactenum \let\endoldcompactitem=\endcompactitem }{} - -%%% Defining \tpl@collect@body - command used to scan the list -%%% environments. Definition borrowed from 'amsmath.sty' - slightly -%%% modified to allow for 'long' arguments \let\tpl@nx\noexpand \let\tpl@xp\expandafter \newtoks\tpl@emptytoks @@ -171,56 +95,57 @@ \fi \tpl@process@envbody } - -%%% Defining command '\tpl@addmargin' used to add a length to -%%% the leftmargin of the current level in a list. \def\tpl@addmargin#1{% \advance\@listdepth 1 \addtolength{\csname leftmargin\romannumeral\@listdepth\endcsname}{#1} \advance\@listdepth -1 } -%%% Defining a flipped step command. +\ifthenelse{\boolean{display}}{% \ifthenelse{\boolean{TPcolor}}% Can we use colors? {% Yes. In this case highlighting is implemented by switching color. - \def\tpl@flipstep% Note that \tpl@flipstep takes no argument. - {% + \def\tpl@flipstep{% \step{\ifthenelse{\boolean{firstactivation}}% {\color{textcolor}}% {\color{inactivecolor}}% }% - }% + }% } {% No. In this case highlighting is implemented by putting the item in boldface. - \def\tpl@flipstep - {% - \step{\ifthenelse{\boolean{firstactivation}}% - {\bfseries}{\mdseries}} - }% - } - -%%% Defining a dimmed step command. + \def\tpl@flipstep{% + \step{\ifthenelse{\boolean{firstactivation}}{\bfseries}{\mdseries}} + }% +} \ifthenelse{\boolean{TPcolor}}% Can we use colors? {% Yes. In this case highlighting is implemented by using \dstep - \def\tpl@dimstep% Note that \tpl@flipstep takes no argument. - {% - \dstep - }% + \def\tpl@dimstep{\dstep}% } {% No. In this case highlighting is implemented by putting the item in boldface. - \def\tpl@dimstep - {% - \step{\bfseries} + \def\tpl@dimstep{% + \step{\bfseries}% \ifthenelse{\boolean{active}}{}{\mdseries}% - }% - } - -%%% Defining flipped stepped - itemize / enumerate / eqlist -%%% compact itemize / compact enumerate / compact eqlist - environments. + }% +} +\ifthenelse{\boolean{TPcolor}}% Can we use colors? +{% Yes. In this case stepping is implemented by using \vstep + \def\tpl@step{\vstep}% +} +{% No. In this case stepping is implemented using \pause + \def\tpl@step{\pause}% +} +}{% \boolean{display} is false +\def\tpl@flipstep{\relax}% +\def\tpl@dimstep{\relax}% +\def\tpl@step{\relax}% +} \newenvironment{flipitem}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@flipitem}% {\global\@ignoretrue} +\newenvironment{flipdesc}[1][0cm]{% + \tpl@addmargin{#1} + \tpl@collect@body\@flipdesc}% + {\global\@ignoretrue} \newenvironment{flipenum}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@flipenum}% @@ -267,13 +192,15 @@ \tpl@inflipenvtrue \renewcommand{\item}{\tpl@flipstep\tpl@origitem}% #2 - \step{} + \ifthenelse{\boolean{tpl@noflipendstep}}{}{\step{}}% \end{#1}} \fi\fi } \newcommand\@flipitem[1]{% \@fliplist{olditemize}{#1}} +\newcommand\@flipdesc[1]{% + \@fliplist{olddescription}{#1}} \newcommand\@flipenum[1]{% \@fliplist{oldenumerate}{#1}} \ifthenelse{\boolean{tpl@eqlist}}{% @@ -288,13 +215,14 @@ \newcommand\@flipcompactenum[1]{% \@fliplist{oldcompactenum}{#1}} }{} - -%%% Defining dimmed stepped - itemize / enumerate / eqlist / -%%% compact itemize / compact enumerate / compact eqlist - environments. \newenvironment{dimitem}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@dimitem}% {\global\@ignoretrue} +\newenvironment{dimdesc}[1][0cm]{% + \tpl@addmargin{#1} + \tpl@collect@body\@dimdesc}% + {\global\@ignoretrue} \newenvironment{dimenum}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@dimenum}% @@ -346,6 +274,8 @@ \newcommand\@dimitem[1]{% \@dimlist{olditemize}{#1}} +\newcommand\@dimdesc[1]{% + \@dimlist{olddescription}{#1}} \newcommand\@dimenum[1]{% \@dimlist{oldenumerate}{#1}} \ifthenelse{\boolean{tpl@eqlist}}{% @@ -360,13 +290,14 @@ \newcommand\@dimcompactenum[1]{% \@dimlist{oldcompactenum}{#1}} }{} - -%%% Defining stepped - itemize / enumerate / eqlist / -%%% compact itemize / compact enumerate / compact eqlist - environments. \newenvironment{stepitem}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@stepitem}% {\global\@ignoretrue} +\newenvironment{stepdesc}[1][0cm]{% + \tpl@addmargin{#1} + \tpl@collect@body\@stepdesc}% + {\global\@ignoretrue} \newenvironment{stepenum}[1][0cm]{% \tpl@addmargin{#1} \tpl@collect@body\@stepenum}% @@ -389,10 +320,8 @@ \tpl@collect@body\@stepcompactenum}% {\global\@ignoretrue} }{} - -\ifthenelse{\boolean{tpl@pausestep}}{% -% Using \pause for step* lists \newcommand\@steplist[2]{% +\ifthenelse{\boolean{tpl@pausestep}}{% \iftpl@inflipenv \PackageError{tplists}{% flip* followed by step* environment does NOT work \MessageBreak @@ -413,10 +342,7 @@ #2 \end{#1} \fi\fi -} }{ -% Using \liststepwise for step* lists -\newcommand\@steplist[2]{% \iftpl@inflipenv \begin{#1} \renewcommand{\item}{\tpl@flipstep\tpl@origitem} @@ -429,7 +355,7 @@ \end{#1}% \else\iftpl@instepenv \begin{#1} - \renewcommand{\item}{\vstep\tpl@origitem}% + \renewcommand{\item}{\tpl@step\tpl@origitem}% #2 \end{#1}% \else @@ -437,7 +363,7 @@ \begin{#1} \iftpl@instepenv\else\let\tpl@origitem=\item\fi \tpl@instepenvtrue - \renewcommand{\item}{\vstep\tpl@origitem}% + \renewcommand{\item}{\tpl@step\tpl@origitem}% #2 \end{#1}} \fi\fi\fi @@ -446,6 +372,8 @@ \newcommand\@stepitem[1]{% \@steplist{olditemize}{#1}} +\newcommand\@stepdesc[1]{% + \@steplist{olddescription}{#1}} \newcommand\@stepenum[1]{% \@steplist{oldenumerate}{#1}} \ifthenelse{\boolean{tpl@eqlist}}{% @@ -460,16 +388,10 @@ \newcommand\@stepcompactenum[1]{% \@steplist{oldcompactenum}{#1}} }{} - -%%% Defining compact eqlist \newenvironment{compacteqlist}[1][0cm]{% % \tpl@addmargin{#1} \begin{eqlist}[\parsep0pt\itemsep0pt]}% {\end{eqlist}} - - -%%% Redefining enumerate and itemize to handle changes made by -%%% introducing steps and leftmargini-option. \renewenvironment{enumerate}[1][0cm]{% \tpl@addmargin{#1} \begin{oldenumerate} @@ -488,8 +410,14 @@ }% {\end{olditemize}} -%%% Redefining compactenum and compactitem to handle changes made by -%%% introducing steps and leftmargini-option. +\renewenvironment{description}[1][0cm]{% + % \tpl@addmargin{#1} % Has no effect - FIXME + \begin{olddescription} + \iftpl@instepenv + \renewcommand{\item}{\tpl@origitem}% + \fi + }% + {\end{olddescription}} \ifthenelse{\boolean{tpl@paralist}}{% \renewenvironment{compactenum}[1][0cm]{% \tpl@addmargin{#1} @@ -509,6 +437,7 @@ }% {\end{oldcompactitem}} }{} + \endinput %% %% End of file `tplists.sty'. diff --git a/Master/texmf-dist/tex/latex/texpower/tpoptions.cfg b/Master/texmf-dist/tex/latex/texpower/tpoptions.cfg index 96560a0998b..ed57865997f 100644 --- a/Master/texmf-dist/tex/latex/texpower/tpoptions.cfg +++ b/Master/texmf-dist/tex/latex/texpower/tpoptions.cfg @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/tppstcol.sty b/Master/texmf-dist/tex/latex/texpower/tppstcol.sty index 02da81b8ab3..1682926f0b4 100644 --- a/Master/texmf-dist/tex/latex/texpower/tppstcol.sty +++ b/Master/texmf-dist/tex/latex/texpower/tppstcol.sty @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/tpsem-a4.sty b/Master/texmf-dist/tex/latex/texpower/tpsem-a4.sty index 4753d98ad98..11080e7a7d6 100644 --- a/Master/texmf-dist/tex/latex/texpower/tpsem-a4.sty +++ b/Master/texmf-dist/tex/latex/texpower/tpsem-a4.sty @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License diff --git a/Master/texmf-dist/tex/latex/texpower/tpsettings.cfg b/Master/texmf-dist/tex/latex/texpower/tpsettings.cfg index 7beab25003c..e6f1e0b74e8 100644 --- a/Master/texmf-dist/tex/latex/texpower/tpsettings.cfg +++ b/Master/texmf-dist/tex/latex/texpower/tpsettings.cfg @@ -9,6 +9,7 @@ %% -------------------------------------------------------------- %% TeXPower bundle - dynamic online presentations with LaTeX %% Copyright (C) 1999-2004 Stephan Lehmke +%% Copyright (C) 2003-2005 Hans Fredrik Nordhaug %% %% This program is free software; you can redistribute it and/or %% modify it under the terms of the GNU General Public License |