diff options
author | Karl Berry <karl@freefriends.org> | 2014-01-20 23:17:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-01-20 23:17:26 +0000 |
commit | a5bbf3d2582890eb3376a46ab8e7dad19baf4e53 (patch) | |
tree | e6234c0512e8e8f13cda590c0119bedb3498dbc9 /Master/texmf-dist/tex/latex/seminar | |
parent | b172732c296db880f27bfba6ea750c2f4bffb860 (diff) |
seminar (20jan14)
git-svn-id: svn://tug.org/texlive/trunk@32736 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/seminar')
-rw-r--r-- | Master/texmf-dist/tex/latex/seminar/sem-dem.sty | 1 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/seminar/semcolor.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/seminar/seminar.bg2 | 136 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/seminar/seminar.cls | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/seminar/semlayer.sty | 1 |
5 files changed, 45 insertions, 130 deletions
diff --git a/Master/texmf-dist/tex/latex/seminar/sem-dem.sty b/Master/texmf-dist/tex/latex/seminar/sem-dem.sty index 81af6413ce6..e671c22498d 100644 --- a/Master/texmf-dist/tex/latex/seminar/sem-dem.sty +++ b/Master/texmf-dist/tex/latex/seminar/sem-dem.sty @@ -13,6 +13,7 @@ \def\FileName{\jobname} % Write identification in the PDF file (if one will be generated) +\RequirePackage{hyperref} \newcommand{\HyperSetUp}{% \hypersetup{pdftitle={\FileInfoA{} - \FileInfoB}, pdfsubject={\FileName{} diff --git a/Master/texmf-dist/tex/latex/seminar/semcolor.sty b/Master/texmf-dist/tex/latex/seminar/semcolor.sty index 1aa142e8373..84fc61986c4 100644 --- a/Master/texmf-dist/tex/latex/seminar/semcolor.sty +++ b/Master/texmf-dist/tex/latex/seminar/semcolor.sty @@ -9,8 +9,8 @@ %% Public License, as described in lppl.txt in the base LaTeX distribution. %% Either version 1.0 or, at your option, any later version. %% -\def\fileversion{1.01} -\def\filedate{2004/05/18} +\def\fileversion{1.02} +\def\filedate{2014/01/17} %% %% LaTeX style option `semcolor.sty'. %% For use with LaTeX v2.09 and the `seminar' document style. @@ -66,9 +66,9 @@ \def\make@overlay#1{% \setbox\@slidebox=\hbox{% \pst@initoverlay{#1}% - \pst@Verb{(0) \tx@BOL}% + \pst@Verb{ 0 \tx@BOL }% \copy\@@slidebox - \pst@Verb{(all) \tx@BOL}}} + \pst@Verb{ -1 \tx@BOL }}} \def\@overlay{\pst@overlay} \addto@hook\before@newslide{\def\curr@overlay{0}} \@ifundefined{overlaystrue}{}{\ifarticle\else\overlaystrue\layerstrue\fi} diff --git a/Master/texmf-dist/tex/latex/seminar/seminar.bg2 b/Master/texmf-dist/tex/latex/seminar/seminar.bg2 index 53e545682eb..c9598ab651e 100644 --- a/Master/texmf-dist/tex/latex/seminar/seminar.bg2 +++ b/Master/texmf-dist/tex/latex/seminar/seminar.bg2 @@ -26,12 +26,13 @@ %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\FileVersion{2.1} -\def\FileDate{May 31, 2002} +\def\FileVersion{2.2} +\def\FileDate{Jan 16, 2014} \typeout{seminar.bg2: various corrections for the Seminar document class^^J% added since seminar.bug and few add-ons for overlays^^J% - (Version \FileVersion\space of <\FileDate> (D.G.))} + (Version \FileVersion\space of <\FileDate> (DG, hv))} +\RequirePackage{pst-ovl} \edef\TheAtCode{\the\catcode`\@} \catcode`\@=11 @@ -54,54 +55,35 @@ % Used by the \slide@subheading macro but undefined \def\theslidesubsection{\theslidesection.\arabic{slidesubsection}} +%% Requires main pst-ovl +\ifx\PSTovlloaded\endinput\else\input pst-ovl \fi + + \def\slide@heading[#1]#2{% -% D.G. modification begin - Oct. 15, 1997 -% \stepcounter{slidesection}% \refstepcounter{slidesection}% \@addtoreset{slidesubsection}{slidesection} -% D.G. modification end \addtocontents{los}{\protect\l@slide {\the\c@slidesection}{\ignorespaces#1}{\@SCTR}}% -% D.G. modification begin - May 30, 1997 -% \gdef\theslideheading{#1}% -% D.G. modification end \def\@tempa{#2}% \ifx\@tempa\@empty\else {\edef\@currentlabel{\csname p@slidesection\endcsname\theslidesection}% \makeslideheading{#2}}% \fi -% D.G. modification begin - May 30, 1997 \gdef\theslideheading{#1}% -% D.G. modification end -% D.G. modification begin - Aug. 1, 1997 \gdef\theslidesubheading{}% -% D.G. modification end } \def\slide@subheading[#1]#2{% -% D.G. modification begin - Oct. 15, 1997 -% \stepcounter{slidesection}% \refstepcounter{slidesubsection}% -% D.G. modification end \addtocontents{los}{\protect\l@subslide {\the\c@slidesubsection}{\ignorespaces#1}{\@SCTR}}% -% D.G. modification begin - May 30, 1997 -% \gdef\theslidesubheading{#1}% -% D.G. modification end \def\@tempa{#2}% \ifx\@tempa\@empty\else {\edef\@currentlabel{\csname p@slidesubsection\endcsname -% D.G. modification begin - Jul. 18, 1995 -% \theslidesubsection}\makeslideheading{#2}}% \theslidesubsection}\makeslidesubheading{#2}}% -% D.G. modification end \fi -% D.G. modification begin - May 30, 1997 \gdef\theslidesubheading{#1}% -% D.G. modification end } - - % 3 - To correct a bug in the \slidecontents macro % (reported by Denis Roegel (LORIA) <Denis.Roegel@loria.fr> - Sep. 22, 1996) @@ -109,15 +91,10 @@ \def\slide@contents{% \def\l@slide##1##2##3{% -% Modification Denis Roegel begin - Sep. 22, 1996 -% \slide@cline{\slidenumberline{$\bullet$}{##2}}{##3}}% -% \let\l@subslide\@gobbletwo -% Modification Denis Roegel end \slide@cline{\slidenumberline{##1}{##2}}{##3}}% \let\l@subslide\@gobblethree \@startlos} - % 4 - To solve incompatibility between the `graphicx' package and Seminar. % The \espfslidesize Seminar macro work only with the old version of % the `epsfig' package, so with \includegraphics the PostScript files are @@ -135,18 +112,11 @@ \else % Graphicx package detected \def\Gin@i{% \def\Gin@req@sizes{% -% D.G. modification begin - May 16, 1997 \Gin@nat@height=\inverseslidesmag\Gin@nat@height \Gin@nat@width=\inverseslidesmag\Gin@nat@width -% D.G. modification end \Gin@req@height\Gin@nat@height \Gin@req@width\Gin@nat@width}% \@ifnextchar[\Gin@ii{\Gin@ii[]}} -% D.G. modification begin - Feb. 19, 1997 -%\define@key{Gin}{width}{\def\Gin@ewidth{#1}} -%\define@key{Gin}{height}{\def\Gin@eheight{#1}} -%\define@key{Gin}{totalheight}{% -%\def\Gin@eresize{\totalheight}\def\Gin@eheight{#1}} \define@key{Gin}{width}{% \@tempdima=##1\@tempdima=\inverseslidesmag\@tempdima\def\Gin@ewidth{\@tempdima}} \define@key{Gin}{height}{% @@ -154,15 +124,11 @@ \define@key{Gin}{totalheight}{% \def\Gin@eresize{\totalheight}% \@tempdima=##1\@tempdima=\inverseslidesmag\@tempdima\def\Gin@eheight{\@tempdima}} -% D.G. modification end \fi} \def\epsfslidesize{% \let\epsfsize\slide@epsfsize -% D.G. modification begin - Feb. 19, 1997 \GraphicsNotScaled} -% D.G. modification end - % 5 - To solve incompatibily between the LongTable package and Seminar % (reported by Bhaskar Manda (UIUC) <bhaskar@or4.me.uiuc.edu> - May 7, 1997) @@ -182,10 +148,7 @@ \fi \if@test \reset@slideoutput -% D.G. modification begin - May 13, 1997 -% \@@makeslide \@@makeslideLT -% D.G. modification end \process@slide \fi \refstepcounter{slide}} @@ -194,9 +157,7 @@ \setbox\@slidebox\hbox{% \vfuzz=\slidefuzz\relax \vbox to\slide@vsize{% -% D.G. modification begin - May 13, 1997 \box\@outputbox -% D.G. modification end \ifcenterslides\vskip\z@ plus .0001fil \fi \unvbox\@slidebox \vskip\z@ plus .0001fil}% @@ -216,10 +177,7 @@ \ifdim\dimen@<\ht\z@ \setbox\@cclv\vbox{\unvbox\z@\copy\LT@foot\vss}% \@makecol -% D.G. modification begin - May 13, 1997 -% \@outputpage \slide@outputLT -% D.G. modification end \setbox\z@\vbox{\box\LT@head}% \fi \fi @@ -231,11 +189,7 @@ \else \setbox\@cclv\vbox{\unvbox\@cclv\copy\LT@foot\vss}% \@makecol -% D.G. modification begin - May 13, 1997 -% \@outputpage -% \global\vsize\@colroom % Work for slides, but not for notes... \slide@outputLT -% D.G. modification end \copy\LT@head \fi} @@ -249,7 +203,6 @@ % 6 - To allow automatic changes of language dependent labels, % for instance by loading the `french' package after Seminar % (suggested by Bernard Gaulle (IDRIS) <gaulle@idris.fr> - Nov. 20, 1997) -% D.G. modification begin - Nov. 20, 1997 % From seminar.cls \def\slidename{Slide} \def\slidelabel{\bf\slidename{} \theslide} @@ -262,7 +215,6 @@ \slide@undottedcline{\slidenumberline{##3}{##2}}{}}% \let\l@subslide\l@slide \@startlos} -% D.G. modification end % 7 - There were several problems when doing a global change of color @@ -306,19 +258,11 @@ \ifvoid\saved@specials\else \setbox\@slidebox\hbox{\box\saved@specials\box\@slidebox}% \fi -% D.G. modification begin - Mar. 28, 2002 -% \global\let\insert@specials\relax} \global\let\save@slidespecials@i\save@slidespecials@ii} -% D.G. modification end \fi \addto@hook{\before@newslide}{\save@slidespecials@i} - -% D.G. modification begin - 1999 -% \addto@hook\after@slidepage{\pstVerb{0 setgray}} \after@slidepage={} -% D.G. modification end - % 7 - To vertically correctly center the footer, if defined % (this is mainly visible when using the `fancyhdr' package, and specially @@ -334,9 +278,7 @@ % designed on the model of the \newslideframe and \slideframe ones. % (added by Denis Girou (CNRS/IDRIS) <Denis.Girou@idris.fr> - Jun. 30, 1999) -% D.G. modification begin - Jun. 30, 1999 \newbox\Seminar@SlideBoxBackground -% D.G. modification end \ifarticle \else @@ -372,9 +314,7 @@ \advance\textwidth-\evensidemargin \fi \setbox\@slidebox=\hbox to \@tempdima{% -% D.G. modification begin - Jun. 30, 1999 \box\Seminar@SlideBoxBackground -% D.G. modification end \kern\oddsidemargin \vbox to\@tempdimb{% \ifnum\fancyput@flag>-1 @@ -393,9 +333,7 @@ \hbox to\textwidth{\hss\box\@slidebox\hss}% \vfill \vbox to\footheight{% -% D.G. modification begin - May 15, 1998 \vfill -% D.G. modification end \hbox{% \slidefootfont\relax\strut \hbox to\textwidth{\@oddfoot}}% @@ -403,9 +341,7 @@ \hss}% \ifrotateheaders\@ifrotateslide\rotate@slide\fi \insert@specials -% D.G. modification begin - Jun. 24, 1999 \let\protect\noexpand -% D.G. modification end \shipout\box\@slidebox \endgroup \let\firstmark\botmark} @@ -413,14 +349,10 @@ \fi \def\finish@slide{% -% D.G. modification begin - Jun. 30, 1999 \theSlideFrameBackground -% D.G. modification end \theslideframe \add@slidelabel\slidelabel} -% D.G. modification begin - Jun. 30, 1999 -% Built according \newslideframe, \slideframe, etc. \def\SeminarNewSlideFrameBackground#1{% \@ifnextchar[{\@SeminarNewSlideFrameBackground{#1}}% @@ -475,15 +407,11 @@ % (added by Denis Girou (CNRS/IDRIS) <Denis.Girou@idris.fr> - Dec. 5, 2001) \def\overlay#1{% -% D.G. modification end \ifoverlays\ifx\@overlay\relax\nooverlays@err\fi\fi \ifslide \@tempcnta=#1 \@testfalse -% D.G. modification begin - Dec. 5, 2001 -% \ifnum\@tempcnta>-1 \ifnum\@tempcnta<10 \@testtrue\fi\fi \ifnum\@tempcnta>-2 \ifnum\@tempcnta<677 \@testtrue\fi\fi -% D.G. modification end \if@test \c@overlay=\@tempcnta \ifnum\c@overlay=0 @@ -500,12 +428,8 @@ \@overlay{\the\c@overlay}% \fi \else -% D.G. modification begin - Dec. 5, 2001 -% \@seminarerr{\string\overlay\space argument must be -% an integer between 0 and 9}\@eha \@seminarerr{\string\overlay\space argument must be an integer between 0 and 676}\@eha -% D.G. modification end \fi \else \@seminarerr{\string\overlay\space can only be used @@ -517,10 +441,7 @@ \begingroup \overlay@prep \c@overlay=1 -% D.G. modification begin - Dec. 5, 2001 -% \@whilenum\c@overlay<10 \@whilenum\c@overlay<677 -% D.G. modification end \do{% \test@member{\the\c@overlay}{\overlay@list}% \if@test @@ -532,8 +453,6 @@ \advance\c@overlay by 1}% \endgroup} -% D.G. modification begin - Dec. 5, 2001 -% \def\theoverlay{\theslide-\alph{overlay}} \def\theoverlay{{% \ifnum\c@overlay>26 \@tempcnta=\c@overlay @@ -549,7 +468,6 @@ \else \theslide-\alph{overlay}% \fi}} -% D.G. modification end % 10 - Addition for management of cumulative and progressive overlays. @@ -563,17 +481,10 @@ \def\make@overlay#1{% \setbox\@slidebox=\hbox{% \pst@initoverlay{#1}% -% D.G. modification begin - Dec. 5, 2001 -% \pst@Verb{(0) BOL}% - \pst@Verb{0 \tx@BOL}% -% D.G. modification end + \pst@Verb{0 \tx@BOL }% \copy\@@slidebox -% D.G. modification begin - Dec. 5, 2001 -% \pst@Verb{(all) BOL}}} - \pst@Verb{-1 \tx@BOL}}} -% D.G. modification end + \pst@Verb{-1 \tx@BOL }}} -% D.G. modification begin - Feb. 15, 2002 % We must redefine too the /BeginOL macro form pstricks.pro, as "all" is now -1 % \def\pst@initoverlay#1{\pst@Verb{\tx@InitOL /TheOL (#1) def}} \def\pst@initoverlay#1{% @@ -587,22 +498,15 @@ {Invisible /IfVisible false def} if} ifelse} def -\tx@InitOL +\tx@InitOL end /TheOL #1 def}} -% D.G. modification end \def\pst@overlay#1{% \edef\curr@overlay{#1}% -% D.G. modification begin - Dec. 5, 2001 -% \pst@Verb{(#1) BOL}% -\pst@Verb{#1 \tx@BOL}% -% D.G. modification end +\pst@Verb{#1 \tx@BOL }% \aftergroup\pst@endoverlay} \def\pst@endoverlay{% -% D.G. modification begin - Dec. 5, 2001 -% \pst@Verb{(\curr@overlay) BOL}} \pst@Verb{\curr@overlay\space \tx@BOL }} -% D.G. modification end % Cumulative overlays % =================== @@ -620,7 +524,7 @@ {Invisible /IfVisible false def} if} ifelse} def -\tx@InitOL +\tx@InitOL end /TheOL ##1 def}}} % Alternative method for same goal (needed when PSTricks nodes are used) @@ -636,13 +540,13 @@ {Invisible /IfVisible false def} if} ifelse} def -\tx@InitOL +\tx@InitOL end /Visible {initclip} def /Invisible {CP newpath OLUnit itransform moveto clip newpath moveto} def /TheOL ##1 def}}} % Progressive overlays -% °°°°°°°°°°°°°°°°°°°° +% =================== % Progressive overlays (at step i, only overlays 0 and i are shown) \def\SeminarProgressiveOverlays{% @@ -658,7 +562,7 @@ {Invisible /IfVisible false def} if} ifelse} def -\tx@InitOL +\tx@InitOL end /TheOL ##1 def}}} % Alternative method for the same goal (needed when PSTricks nodes are used) @@ -674,8 +578,8 @@ {IfVisible {Invisible /IfVisible false def} if} - ifelse} def -\tx@InitOL + ifelse} def +\tx@InitOL end /Visible {initclip} def /Invisible {CP newpath OLUnit itransform moveto clip newpath moveto} def /TheOL ##1 def}}} @@ -698,10 +602,6 @@ \overlay{\the\c@overlay}% \itemORIG}} -%\PassOptionsToPackage{setpagesize=false}{hyperref} - - - \catcode`\@=\TheAtCode\relax \endinput %% END seminar.bg2 diff --git a/Master/texmf-dist/tex/latex/seminar/seminar.cls b/Master/texmf-dist/tex/latex/seminar/seminar.cls index 327c49fe933..1f2378a1f67 100644 --- a/Master/texmf-dist/tex/latex/seminar/seminar.cls +++ b/Master/texmf-dist/tex/latex/seminar/seminar.cls @@ -5,8 +5,8 @@ %% Fixes from David Carlisle, Denis Girou, %% and Frank Küster/Günter Milde (a4paper option fix) %% -\def\fileversion{1.6} -\def\filedate{2012/12/27} +\def\fileversion{1.61} +\def\filedate{2014/01/17} %% %% This is a style for typesetting notes and slides. %% @@ -26,7 +26,10 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{seminar}[\filedate, \fileversion] \typeout{% - Document Style: `seminar' v\fileversion \space <\filedate> (tvz)} + Documentclass: `seminar' v\fileversion \space <\filedate> (tvz,hv)} +%%%%%%%%%%%%%%%% fix hv +\def\tx@BOL{} +%%%%%%%%%%%%%%% \def\test@member#1#2{% \edef\@tempg{,#2,#1,}% \edef\@temph{####1,#1,}% @@ -43,10 +46,15 @@ \errmessage{#1^^J}} \def\notslide@err#1{\message{Cannot use \string#1 in slide environments}} \def\new@slidebox{\alloc@4\box\chardef\insc@unt} +\RequirePackage{pst-ovl} +%% +%\RequirePackage{geometry} +%\geometry{dvips,paperwidth=8.5in,paperheight=11in} \newdimen\slidewidth \slidewidth 8.5in \newdimen\slideheight \slideheight 6.3in -\paperwidth 8.5in -\paperheight 11in +\paperwidth=8.5in +\paperheight=11in +%% \def\addto@preamblecmds#1{% \begingroup \def\do{\noexpand\do\noexpand}% @@ -73,6 +81,7 @@ \DeclareOption{a4}{% \paperwidth 210mm \paperheight 297mm +% \geometry{paperwidth=210mm,paperheight=297mm} \slidewidth 222mm \slideheight 152mm\relax} \DeclareOption{a4paper}{\csname ds@a4\endcsname}% @@ -92,6 +101,9 @@ \let\paperheight\footheight \let\paperwidth\footheight \LoadClass{article} + +\RequirePackage{pst-ovl}% hv 20131224 + \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ @@ -101,7 +113,6 @@ \let\@listi\@slide@listi} \let\paperheight\sem@paperheight \let\paperwidth\sem@paperwidth -\RequirePackage{pst-ovl}% hv 20131224 \RequirePackage{sem-page} \newtoks\before@document \newtoks\after@document @@ -1196,8 +1207,10 @@ \def\@semtwoupmagerr#1{% \@seminarerr{\string#1 must come before \string\twoup}\@eha} \addto@preamblecmds{\twoup\do\@twoup} -\openin1 seminar.con -\ifeof1\else\closein1 \relax\@@input seminar.con\fi +% +\InputIfFileExists{seminar.con}{} +%\ifeof1\else\closein1 \relax\@@input seminar.con\fi +% \endinput %% %% END `seminar.cls'. diff --git a/Master/texmf-dist/tex/latex/seminar/semlayer.sty b/Master/texmf-dist/tex/latex/seminar/semlayer.sty index e59f175f582..de15ca1d9ed 100644 --- a/Master/texmf-dist/tex/latex/seminar/semlayer.sty +++ b/Master/texmf-dist/tex/latex/seminar/semlayer.sty @@ -152,6 +152,7 @@ \def\layerpagestyle#1{\@ifgoodps{#1}{\edef\layer@pagestyle{#1}}} \overlaypagestyle{} \layerpagestyle{} + \endinput %% %% End of file `semlayer.sty'. |