diff options
author | Norbert Preining <preining@logic.at> | 2006-11-09 13:18:02 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2006-11-09 13:18:02 +0000 |
commit | 3696c8f2a98b5e48514a3608e0156c676b63470a (patch) | |
tree | 99006293861d5004c6de0938b605f6ef0e4b554a /Master/texmf-dist/tex/latex | |
parent | aa10b19a7c6ffac34c3b21c9ac9afb7dc827cec4 (diff) |
The Krakow-Vienna train ride update
package updates:
ccaption cdpbundl chem-journal clefval coordsys dingbat dramatist
egplot filecontents lcd maybemath metaobj metaplot mwcls pdfscreen
pst-bar rsc dpfloat footbib jurabib
added to ctan-tpm-check (and re-indented the long list)
no changes between CTAN and depot, only added to the WorkingTPM list
acmtrans bibunits bitfield blindtext bophook cherokee citeref
cmdtrack colorinfo compactbib courier-scaled courseoutline coursepaper
crop custom-bib cvsty dancers dashbox dcpic decimal digiconfigs
dinat directory eCards eemeir ellipsis engrec envbig epiolmec epsf
eqparbox eskd ethiop-t1 euro eurosans exam examplep expressg
extarrows extsizes fp fribrief functan gatech-thesis ginpenc greenpoint
hands hitec hvfloat hyperxmp inlinebib invoice isorot isotope jpsj
kalender kerkis keystroke labels layouts lcg leaflet leawood lgreek
limap lipsum listliketab logpap ltablex ltxindex mailing makebox
makecirc makeglos maple mceinleger menu metatex mftinc mhs multicap
mwrite nath nature ntgclass numline ofs ogham oldstyle papercdcase
paresse parrun permute phaistos pittetd plates preprint prettyref
program pseudocode pspicture pst-fr3d pst-math qcm rccol rcsinfo
resume robustindex sae sauerj
updates with changed files, but no added/removed files:
ccaption cdpbundl chem-journal clefval coordsys dingbat dramatist
egplot filecontents lcd maybemath metaobj metaplot mwcls pdfscreen
pst-bar rsc
updates with changes and added/removed files:
dpfloat footbib jurabib
git-svn-id: svn://tug.org/texlive/trunk@2411 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
23 files changed, 324 insertions, 239 deletions
diff --git a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty index f816c75102f..ba1087b2cda 100644 --- a/Master/texmf-dist/tex/latex/ccaption/ccaption.sty +++ b/Master/texmf-dist/tex/latex/ccaption/ccaption.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ccaption}[2005/03/21 v3.2 Extended captioning and new floats] +\ProvidesPackage{ccaption}[2005/03/29 v3.2a Extended captioning and new floats] \newif\if@contsubfigxx \@contsubfigxxfalse @@ -207,7 +207,7 @@ \newcommand{\bitwonumcaption}[6][\@empty]{% \begingroup \@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}} - \ifx #1\@empty\else + \ifx\@empty#1\else \label{#1} \fi \setlength{\abovecaptionskip}{0pt} @@ -222,7 +222,7 @@ \newcommand{\bionenumcaption}[6][\@empty]{% \begingroup \@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}} - \ifx #1\@empty\else + \ifx\@empty#1\else \label{#1} \fi \setlength{\abovecaptionskip}{0pt} @@ -241,7 +241,7 @@ \newcommand{\bicaption}[5][\@empty]{% \begingroup \@if@contemptyarg{#2}{\caption{#3}}{\caption[#2]{#3}} - \ifx #1\@empty\else + \ifx\@empty#1\else \label{#1} \fi \setlength{\abovecaptionskip}{0pt} diff --git a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty b/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty index 0429bd51229..a78c119a25c 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty +++ b/Master/texmf-dist/tex/latex/cdpbundl/adiseal.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -48,13 +48,13 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesPackage{adiseal} - [2005/01/01 v0.33 (development)] + [2006/01/01 v0.34 (development)] \@ifdefinable\@adiseal{\def\@adiseal{adiseal}} \newcommand*\ADIWWW{% http://www.math.unipd.it/\string~favero/adipd/% } \@ifdefinable\@seal@graph@file{\def\@seal@graph@file{% - adiseal.eps% must be an Encapsulated PostScript file + adiseal% must be an EPS or a PDF file }} \@ifdefinable\if@use@pixmap@{\newif\if@use@pixmap@} \@ifdefinable\@temp@adiseal{} @@ -71,7 +71,7 @@ }% } \if@use@pixmap@ - \IfFileExists{\@seal@graph@file}{% + \IfFileExists{\@seal@graph@file.eps}{% \IfFileExists{epsfig.sty}{% \RequirePackage{epsfig}% }{% diff --git a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls index e4b14d03b97..25b17bbf96a 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/articoletteracdp.cls @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -48,8 +48,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1996/06/01] % LaTeX2e is required! \ProvidesClass{articoletteracdp} - [2005/01/01 v0.33 (development)] -%% \typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI, + [2006/01/01 v0.34 (development)] +%% \typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI, %% all rights reserved.} \@ifdefinable\@out@table@list{} \@ifdefinable\@in@table@list{} @@ -58,6 +58,7 @@ \def\do#1{\@ifdefinable#1{\newif#1}} \do\if@toc@in@toc@ \do\if@loX@in@toc@ +\@ifdefinable\@letter@bookmark{\let\@letter@bookmark\@gobbletwo} \newlength\abovecaptionskip \newlength\belowcaptionskip \DeclareOption{titlepage}{% @@ -79,16 +80,35 @@ \@toc@in@toc@false \@loX@in@toc@false } +\DeclareOption{letterbookmarks}{% + \def\@letter@bookmark{\pdfbookmark[0]}% + \PassOptionsToPackage{bookmarksopen=false}{hyperref}% +} +\DeclareOption{noletterbookmarks}{% + \let\@letter@bookmark\@gobbletwo +} +\DeclareOption{openletterbookmarks}{% + \def\@letter@bookmark{\pdfbookmark[0]}% + \PassOptionsToPackage{bookmarksopen,bookmarksopenlevel=1}{hyperref}% +} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}} -\ExecuteOptions{plaintoc} +\ExecuteOptions{plaintoc,openletterbookmarks} \ProcessOptions\relax -\LoadClass{letteracdp}[2005/01/01] +\LoadClass{letteracdp}[2006/01/01] \newcounter{section}[letter] \newcounter{paragraph}[section] \newcounter{figure}[letter] \newcounter{table}[letter] -\newcounter{subsection} -\newcounter{subsubsection} +\AtBeginDocument{% + \def\theHletter{\arabic{letter}}% + \@ifpackageloaded{hyperref}{% + \def\theHparagraph{\theHsection.\arabic{paragraph}}% + \def\theHsection{\theHletter.\arabic{section}}% + \def\toclevel@paragraph{2}% + }{% + \let\@letter@bookmark\@gobbletwo + }% +} \@ifdefinable\hyper@last{\let\hyper@last\relax} %% Command \title and \author redefined to make changes local. \def\title#1{\def\@title{#1}} @@ -111,6 +131,11 @@ \endgroup } \g@addto@macro\@begin@letter@hook{% + \edef\@cdp@reserved{% + \noexpand\@letter@bookmark + {\lettername\space\theletter}{letter.\theHletter}% + }% + \@cdp@reserved \if@filesw {\escapechar\m@ne \immediate\write\@out@table@list{\string\}^^J\string\{}% @@ -176,7 +201,7 @@ \@ifdefinable\@temp@table@list{\let\@temp@table@list\@empty} \@ifdefinable\@addfullstop{\long\def\@addfullstop#1{% {\nonfrenchspacing\ignorespaces#1\unskip - \ifnum\spacefactor>\@m \else.\fi \/}% + \ifnum \spacefactor>\@m \else.\fi \/}% }} \newcommand*\nopunct{\spacefactor 1001\relax} \setcounter{topnumber}{\tw@} @@ -195,11 +220,11 @@ \setlength \dblfloatsep {\bigskipamount} \@msetlength\dbltextfloatsep {2}{\bigskipamount} \setlength \@fptop {\z@ plus 1 fil} -\setlength \@fpsep {\bigskipamount} +\setlength \@fpsep {1\bigskipamount plus 2 fil} \setlength \@fpbot {\z@ plus 1 fil} -\setlength \@dblfptop {\z@ plus 1 fil} -\setlength \@dblfpsep {\bigskipamount} -\setlength \@dblfpbot {\z@ plus 1 fil} +\setlength \@dblfptop {\@fptop} +\setlength \@dblfpsep {\@fpsep} +\setlength \@dblfpbot {\@fpbot} \setlength\abovecaptionskip{\medskipamount} \setlength\belowcaptionskip{\z@skip} \newcommand*\maketitle{% diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty index c9e0a36d4df..44c9edd9999 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpaddon.sty @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -48,7 +48,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesPackage{cdpaddon} - [2005/01/01 v0.33 (development)] + [2006/01/01 v0.34 (development)] \@ifdefinable\@cdpaddon{\def\@cdpaddon{cdpaddon}} \def\do#1{\@ifdefinable#1{\newif#1}} \do\if@using@cdp@ @@ -75,7 +75,7 @@ }{% \@temp@cdpaddon@a } -\def\@temp@cdpaddon@a#1printer:#2,#3@@@{% +\def\@temp@cdpaddon@a#1printer:#2,#3\@@@{% \def\@temp@cdpaddon@b{#1}% \ifx\@temp@cdpaddon@b\@empty \def\@cdpaddon@printer{#2}% @@ -88,7 +88,7 @@ \DeclareOption{hypertext}{\@use@hyper@true} \DeclareOption{plaintext}{\@use@hyper@false} \DeclareOption*{% - \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,@@@% + \expandafter\@temp@cdpaddon@a\CurrentOption,printer:,\@@@% } \ExecuteOptions{color,plaintext} \ProcessOptions\relax @@ -287,7 +287,6 @@ }% \let\@temp@cdpaddon@a\@undefined } - \def\toclevel@paragraph{2} \else \let\@temp@cdpaddon@a\@undefined \fi @@ -306,8 +305,8 @@ \let\@back@folding@tag\@undefined \let\@cdpaddon@printer\@undefined \let\@temp@cdpaddon@b\@undefined -\DeclareRobustCommand*{\facesmile}{\@face\smile} -\DeclareRobustCommand*{\facefrown}{\@face\frown} +\DeclareRobustCommand*\facesmile{\@face\smile} +\DeclareRobustCommand*\facefrown{\@face\frown} \@ifdefinable\@face{\def\@face#1{% \leavevmode \count@\spacefactor diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def index 631e6de7f9f..01a14f34de3 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues-example.def @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -59,7 +59,7 @@ %%% the name and the release date, respectively, of your file. %%% Note that the extension ".def" must be included in the file name, %%% and that the date is in the format YYYY/MM/DD. -\ProvidesFile{cdpshues-example.def}[2005/01/01 Printer-dependent file] +\ProvidesFile{cdpshues-example.def}[2006/01/01 Printer-dependent file] %%% %%% Define here the colors to use to draw the C.D.P. seal; %%% "slight@col" is the color used to paint the inner of the D and diff --git a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg index a2eee85af1c..f65f2ccba85 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg +++ b/Master/texmf-dist/tex/latex/cdpbundl/cdpshues.cfg @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle 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/tex/latex/cdpbundl/epson-stylus-740.def b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def index 98df00cb29a..96e5d7a64a6 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/epson-stylus-740.def @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -46,7 +46,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{epson-stylus-740.def}[2005/01/01 Printer-dependent file] +\ProvidesFile{epson-stylus-740.def}[2006/01/01 Printer-dependent file] \definecolor{slight@col}{rgb}{.8,1,.8} \definecolor{strong@col}{rgb}{0,.266667,0} \endinput diff --git a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def index 3a84a5d2125..780ed1786c4 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def +++ b/Master/texmf-dist/tex/latex/cdpbundl/hp-laserjet-4500.def @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -46,7 +46,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesFile{hp-laserjet-4500.def}[2005/01/01 Printer-dependent file] +\ProvidesFile{hp-laserjet-4500.def}[2006/01/01 Printer-dependent file] \definecolor{slight@col}{cmyk}{.1,0,.1,0} \definecolor{strong@col}{cmyk}{.5,0,.5,.5} \endinput diff --git a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls b/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls index 6989683ca08..a63114dd94d 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/lettcdpadi.cls @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -48,13 +48,13 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1998/06/01] % LaTeX2e is required! \ProvidesClass{lettcdpadi} - [2005/01/01 v0.33 (development)] + [2006/01/01 v0.34 (development)] \DeclareOption{nopixmap} {\PassOptionsToPackage{nopixmap} {adiseal}} \DeclareOption{usepixmap}{\PassOptionsToPackage{usepixmap}{adiseal}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{letteracdp}} \ProcessOptions\relax -\LoadClass{letteracdp}[2005/01/01] -\RequirePackage{adiseal}[2005/01/01] +\LoadClass{letteracdp}[2006/01/01] +\RequirePackage{adiseal}[2006/01/01] \endinput %% %% End of file `lettcdpadi.cls'. diff --git a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls index a4a6536873d..ec49dbdb124 100644 --- a/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls +++ b/Master/texmf-dist/tex/latex/cdpbundl/letteracdp.cls @@ -9,7 +9,7 @@ %% This is a generated file. %% It is part of a work named "C.D.P. Bundle". %% -%% Copyright (C) 1999-2005 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. +%% Copyright (C) 1999-2006 by Gustavo MEZZETTI <mezzetti@math.unipd.it>. %% %% The C.D.P. Bundle may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -48,8 +48,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e}[1997/06/01] % LaTeX2e is required! \ProvidesClass{letteracdp} - [2005/01/01 v0.33 (**incomplete**)] -\typeout{Copyright (C) 1999-2005 by Gustavo MEZZETTI, + [2006/01/01 v0.34 (**incomplete**)] +\typeout{Copyright (C) 1999-2006 by Gustavo MEZZETTI, all rights reserved.} \@ifdefinable\@letteracdp{\def\@letteracdp{letteracdp}} \newcommand*\Coordinamento{% @@ -144,6 +144,7 @@ \do\thesubject \do\@subject@style \do\@signature@style +\do\@place \do\@begin@letter@hook \do\@end@letter@hook \def\do#1{\@ifdefinable#1{\let#1\@undefined}} @@ -292,6 +293,13 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \fi %% Command \date redefined to make changes to date local. \def\date#1{\def\@date{#1}} +\newcommand*\place[1]{% + \ifx \@empty #1\@empty % if #1 is empty + \let\@place\@empty + \else + \def\@place{#1,}% + \fi +} \input{size1\@ptsize.clo} \setlength\lineskip{\p@} \setlength\normallineskip{\p@} @@ -715,7 +723,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \cleardoubleemptypage \c@page\@ne \refstepcounter{letter}% - \typeout{Letter \number\c@letter}% + \typeout{\lettername \space \number\c@letter}% \interlinepenalty 200 % smaller than the TeXbook value \parskip\medskipamount \ifx\@indent@pref L\else @@ -765,7 +773,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@baseletter }} \@ifdefinable\y@baseletter{\long\def\y@baseletter#1{% - \@cut@andcc #1\andcc @@@% + \@cut@andcc #1\andcc\@@@ \def\theaddresseeaddress{#1}% \@baseletter }} @@ -789,16 +797,16 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \the\@lett@decl \@begin@letter@hook } -\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2@@@{% - \@cut@and #1\and @@@% +\@ifdefinable\@cut@andcc{\long\def\@cut@andcc#1\andcc#2\@@@{% + \@cut@and #1\and\@@@% }} -\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2@@@{% - \@cut@nl #1\\@@@% +\@ifdefinable\@cut@and{\long\def\@cut@and#1\and#2\@@@{% + \@cut@nl #1\\\@@@% }} -\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2@@@{% - \@cut@par #1\par @@@% +\@ifdefinable\@cut@nl{\long\def\@cut@nl#1\\#2\@@@{% + \@cut@par #1\par\@@@% }} -\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2@@@{% +\@ifdefinable\@cut@par{\long\def\@cut@par#1\par#2\@@@{% \def\theaddresseename{#1}% }} \newcommand*\stopbreaks{% @@ -1135,7 +1143,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \cleardoublepage \@setup@pres }{% - \par + \@@par \addpenalty\@e@prespenalty \addvspace\belowpresentationvspace } @@ -1153,9 +1161,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \cleardoublepage \setbox\z@\vbox\bgroup \@setup@pres + \boxmaxdepth\maxdepth \color@begingroup \penalty-\@M - \prevdepth\z@ \else \@nofoldwarning \normalpresentation @@ -1248,8 +1256,8 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@esphack \fi } -\newcommand*\foldingfilbreak[2][\z@]{% - \@foldingfilbreak{\@fold@getpen{#1}}{#2}% +\newcommand*\foldingfilbreak[1][\z@]{% + \@foldingfilbreak{\@fold@getpen{#1}}% } \newcommand*\makefoldedpresentation{% \if@do@fold@ @@ -1281,9 +1289,9 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \nobreak\medskip \fi }} -\newcommand*\makedate [1][]{\@make@date{#1}NN} -\newcommand*\maketopdate [1][]{\@make@date{#1}NY} -\newcommand*\makebottomdate[1][]{\@make@date{#1}YN} +\newcommand*\makedate [1][\@place]{\@make@date{#1}NN} +\newcommand*\maketopdate [1][\@place]{\@make@date{#1}NY} +\newcommand*\makebottomdate[1][\@place]{\@make@date{#1}YN} \@ifdefinable\@empty@signature{\def\@empty@signature{% \ClassWarning{\@letteracdp}{% Empty signature% @@ -1381,7 +1389,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \@opening }% } -\newcommand*\@opening[1][]{% +\newcommand*\@opening[1][\@place]{% \makepresentation \maketopdate[#1]% \@cdp@reserved @@ -1713,6 +1721,7 @@ mediumsubject,uprightsignature,noPS,indent,105x37labels} \newcommand*\enclname {Allegati:} \newcommand*\PSname {P.S.:} \newcommand*\headtoname {A:} +\newcommand*\lettername {Lettera} \newcommand*\today{\number\day~\ifcase\month\or gennaio\or febbraio\or marzo\or aprile\or maggio\or giugno\or luglio\or agosto\or settembre\or ottobre\or novembre\or dicembre\fi diff --git a/Master/texmf-dist/tex/latex/clefval/clefval.sty b/Master/texmf-dist/tex/latex/clefval/clefval.sty index 374e8c2e1ca..f65e8c3a2e8 100644 --- a/Master/texmf-dist/tex/latex/clefval/clefval.sty +++ b/Master/texmf-dist/tex/latex/clefval/clefval.sty @@ -31,7 +31,7 @@ \newcommand*{\@setTheValue}[2]{% \ifx#1\relax \protect\G@refundefinedtrue - \nfss@text{\reset@font\bfseries^^a0????}% + \nfss@text{\reset@font\bfseries ????}% \@latex@warning{Valeur de #2 en page \thepage\space non d\'efinie}% \else #1\null \fi} \newcommand*{\TheValue}[1]{\expandafter\@setTheValue\csname diff --git a/Master/texmf-dist/tex/latex/coordsys/coordsys.sty b/Master/texmf-dist/tex/latex/coordsys/coordsys.sty index 82f4fbaefc6..f4490f483e3 100644 --- a/Master/texmf-dist/tex/latex/coordsys/coordsys.sty +++ b/Master/texmf-dist/tex/latex/coordsys/coordsys.sty @@ -8,7 +8,7 @@ %% %% %% This is the coordsys and logsys packages -%% Copyright 2000-04 by Mogens Lemvig Hansen, +%% Copyright 2000-06 by Mogens Lemvig Hansen, %% mlhansen@uniserve.com %% %% This program may be distributed and/or modified under the @@ -22,7 +22,7 @@ %% This program consists of the files coordsys.dtx and coordsys.ins %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{coordsys}[2004/11/15 version 1.3] +\ProvidesPackage{coordsys}[2006/02/03 version 1.4] \newcommand{\ticklength}{\relax} \newcommand{\vtickmark}{\relax} \newcommand{\htickmark}{\relax} @@ -75,11 +75,11 @@ \newcommand{\vlabel}[1]{#1}% \newcommand{\rescaleby}[4][]{\renewcommand{#4}[1]{{% \count@=##1\relax - \ifnum\count@<0\count@=-\count@\fi \ifnum\count@=0\relax \@tempcntb=1\relax \else \multiply\count@ #2\relax + \ifnum\count@<0\count@=-\count@\fi \@EuclidGCD{\count@}{#3}% \count@=##1\relax \multiply\count@ #2\relax diff --git a/Master/texmf-dist/tex/latex/coordsys/logsys.sty b/Master/texmf-dist/tex/latex/coordsys/logsys.sty index 0bdd97daa09..ac8a978bba7 100644 --- a/Master/texmf-dist/tex/latex/coordsys/logsys.sty +++ b/Master/texmf-dist/tex/latex/coordsys/logsys.sty @@ -8,7 +8,7 @@ %% %% %% This is the coordsys and logsys packages -%% Copyright 2000-04 by Mogens Lemvig Hansen, +%% Copyright 2000-06 by Mogens Lemvig Hansen, %% mlhansen@uniserve.com %% %% This program may be distributed and/or modified under the @@ -22,12 +22,12 @@ %% This program consists of the files coordsys.dtx and coordsys.ins %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{logsys}[2004/11/15 version 1.3] +\ProvidesPackage{logsys}[2006/02/03 version 1.4] \DeclareOption{centred}{\PassOptionsToPackage{centred}{coordsys}} \DeclareOption{outside}{\PassOptionsToPackage{outside}{coordsys}} \DeclareOption{inside}{\PassOptionsToPackage{inside}{coordsys}} \ProcessOptions -\RequirePackage{coordsys}[2004/11/15] +\RequirePackage{coordsys}[2006/02/03] \newcommand{\loglabel}[1]{% \ifnum #1=-2\relax \frac{1}{100}% \else\ifnum #1=-1\relax \frac{1}{10}% diff --git a/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty b/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty index 8865453fc04..15eea00940d 100644 --- a/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty +++ b/Master/texmf-dist/tex/latex/dpfloat/dpfloat.sty @@ -1,13 +1,37 @@ -% double-page float package +% ======================================================================== +% +% Copyright (c) 2006 The University of Washington % -% Copyright University of Washington +% This work 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 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Jim Fox, fox@washington.edu +% +% ======================================================================== +% +% +% double-page float package % % Jim Fox -% fox@u.washington.edu -% http://weber.u.washington.edu/~fox/ +% fox@washington.edu +% http://staff.washington.edu/fox/ +% + % +% Version history +% +% 2006/10/05: fix footer placement (suggestion by Mark Henning (mh@homolog.de) +% 1997/09/21: original + -\ProvidesPackage{dpfloat}[1997/09/21] +\ProvidesPackage{dpfloat}[2006/10/05] \NeedsTeXFormat{LaTeX2e} % This package allows you to format a double-page figure or table @@ -71,8 +95,8 @@ \let\old@xtryfc\@xtryfc \def\@xtryfc #1{% \expandafter\if\csname LP:\string#1\endcsname L% - \ifodd\count0\global\@colht\z@ - \typeout{I moved a leftpage float from page \the\count0.}% + \ifodd\count0\global\@fpmin\maxdimen + \typeout{dpfloat moved a leftpage float from page \the\count0.}% \fi\fi \old@xtryfc #1} @@ -83,4 +107,8 @@ \fi +% assure that any remaining floats are printed +\def\@dpf@mtlist{} +\AtEndDocument{\ifx\@deferlist\@dpf@mtlist\else\ifodd\count0\else\typeout{dpfloat added a blank page}\clearpage\ \clearpage\fi\fi} + % end of dpfloat diff --git a/Master/texmf-dist/tex/latex/dramatist/dramatist.sty b/Master/texmf-dist/tex/latex/dramatist/dramatist.sty index 74d814fc64d..eee9a2f05cb 100644 --- a/Master/texmf-dist/tex/latex/dramatist/dramatist.sty +++ b/Master/texmf-dist/tex/latex/dramatist/dramatist.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %% dramatist.dtx -%% Copyright (C) 2003-2004 Massimiliano Dominici +%% Copyright (C) 2003-2005 Massimiliano Dominici %% \CharacterTable%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z %% Digits \0\1\2\3\4\5\6\7\8\9 @@ -37,8 +37,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\ProvidesPackage{dramatist}[2004/05/10 v1.2 Package for typesetting drama -- Author: Massimiliano Dominici] +\ProvidesPackage{dramatist}[2005/12/01 v1.2d Package for typesetting drama -- Author: Massimiliano Dominici] \NeedsTeXFormat{LaTeX2e} +\RequirePackage{xspace} \@ifundefined{if@openright}{\newif\if@openright}{} \newif\if@drverse \newif\if@poemscol @@ -81,7 +82,7 @@ \@drversetrue \if@poemscol \begin{poem} - \setcounter{linenumber}{\value{storelineno}} + \setcounter{verselinenumber}{\value{storelineno}} \setcounter{printlineindex}{\value{storeprintlineindex}} \else \begin{verse} @@ -95,7 +96,7 @@ \fi \if@poemscol \end{poem} - \setcounter{storelineno}{\value{linenumber}} + \setcounter{storelineno}{\value{verselinenumber}} \setcounter{storeprintlineindex}{\value{printlineindex}} \else \end{verse} @@ -213,10 +214,10 @@ \def\@xcharacter[#1]#2#3{% \stepcounter{character} \@character{#2}{#3} - \n@me@ppend@nddef{persona}{\roman{character}}{\castfont #1} + \n@me@ppend@nddef{persona}{@\Roman{character}}{\castfont #1} } \def\@character#1#2{% - \@namedef{#2}{{\namefont #1}\intsp@ce{#1}\check@spr} + \@namedef{#2}{{\namefont #1}\xspace} \n@me@ppend@nddef{#2}{\@ppendname}{% \if@drverse {\speakstab\speaksfont{#1}\speaksdel\par\nobreak\addvspace{-\parskip}} @@ -229,14 +230,14 @@ \newcommand{\@ppendname}{speaks} \newenvironment{CharacterGroup}[1]{% \stepcounter{character} - \newcounter{g\roman{character}} + \newcounter{g\Roman{character}} \grouplist{#1} }{} \newsavebox{\tbox} \newcommand\grouplist[1]{% - \global\n@me@ppend@nddef{persona}{\roman{character}}{% + \global\n@me@ppend@nddef{persona}{@\Roman{character}}{% \begin{lrbox}{\tbox} - \begin{minipage}[c]{.65\textwidth}\raggedright + \begin{minipage}[c]{\CharWidth}\raggedright \leftmargini=0pt \begin{list}{}{\itemsep=0pt} \dogrouplist @@ -245,27 +246,27 @@ \end{lrbox} \parbox{\CharWidth}{\usebox{\tbox}}% \parbox{\ParenWidth}{$\left.\rule{0pt}{\ht\tbox}\right\}$} - \parbox{\CastWidth}{\castfont #1}} + \parbox{\CastWidth}{\castfont #1\strut}} } \newcommand{\dogrouplist}{% - \ifnum\value{g\roman{temp}}>\value{gtemp} + \ifnum\value{g\Roman{temp}}>\value{gtemp} \stepcounter{gtemp} - \item\@nameuse{gpersona\Roman{temp}\roman{gtemp}} + \item\@nameuse{gpersona@\Roman{temp}@\Roman{gtemp}}\strut \dogrouplist \fi \setcounter{gtemp}{0} } \newcommand\GCharacter[3]{ - \stepcounter{g\roman{character}} - \global\@namedef{#3}{{\namefont #2}\intsp@ce{#2}\check@spr} + \stepcounter{g\Roman{character}} + \global\@namedef{#3}{{\namefont #2}\xspace} \global\n@me@ppend@nddef{#3}{\@ppendname}{% \if@drverse - {\speakstab\speaksfont #2\par\nobreak\addvspace{-\parskip}} + {\speakstab\speaksfont #2\speaksdel\par\nobreak\addvspace{-\parskip}} \else - \item[#2] + \item[#2\speaksdel] \fi} - \global\n@me@ppend@nddef{gpersona\Roman{character}}{% - \roman{g\roman{character}}}{\castfont #1} + \global\n@me@ppend@nddef{gpersona@\Roman{character}}{% + @\Roman{g\Roman{character}}}{\castfont #1} } \newcommand\speaker[1]{% \if@drverse @@ -273,53 +274,6 @@ \else \item[#1\speaksdel] \fi} -\let \nospace \relax -\let \check@spr \@empty -\def \intsp@ce #1{% - \def \reserved@a {#1}% - \ifx \reserved@a \@empty - \let \check@spr \@empty - \else - \ifx \reserved@a \space - \let \check@spr \@empty - \else - \check@nospace@ #1\nospace\@nil - \fi - \fi -} -\def \check@nospace@ #1#2\nospace#3\@nil {% - \let \check@spr \maybe@sp - \def \reserved@a {\nospace}% - \def \reserved@b {#1}% - \def \reserved@c {#3}% - \ifx \reserved@a \reserved@b - \ifx \reserved@c \@empty - \else - \let \check@spr \@empty - \fi - \else - \ifx \reserved@c \@empty - \else - \let \check@spr \@empty - \fi - \fi -} -\def \maybe@sp {\futurelet\@let@token\maybe@sp@} -\def \maybe@sp@ {% - \@tempswatrue - \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=% - \nospacelist - \do \t@st@sp - \if@tempswa \space \fi -} -\def \t@st@sp {% - \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax - \ifx\reserved@b\@let@token - \@tempswafalse - \@break@tfor - \fi -} -\def \nospacelist {,.;:?!)} \newcommand{\DramPer}{% \@ifundefined{if@openright}{\clearpage}{% \if@openright\cleardoublepage\else\clearpage\fi} @@ -342,7 +296,7 @@ \newcommand{\dodramperlist}{% \ifnum\value{character}>\value{temp} \stepcounter{temp} - \item\@nameuse{persona\roman{temp}} + \item\@nameuse{persona@\Roman{temp}}\strut \dodramperlist \fi } @@ -351,15 +305,15 @@ \newcommand{\@direct}[1]{% \if@drverse \vskip2\normallineskip - \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\@centercr + \parbox[b]{\dirwidth}{\dirdelimiter{{\itshape #1}}}\@centercr \else - \dirdelimiter{\emph{#1}}\unskip + \dirdelimiter{{\itshape #1}}\unskip \fi } \newcommand{\@sdirect}[1]{% \if@drverse \vskip2\normallineskip - \parbox[b]{\dirwidth}{\dirdelimiter{\emph{#1}}}\\! + \parbox[b]{\dirwidth}{\dirdelimiter{\itshape #1}}\\! \else \starrederror \fi diff --git a/Master/texmf-dist/tex/latex/egplot/egplot.sty b/Master/texmf-dist/tex/latex/egplot/egplot.sty index 2989278caa1..169d4279745 100644 --- a/Master/texmf-dist/tex/latex/egplot/egplot.sty +++ b/Master/texmf-dist/tex/latex/egplot/egplot.sty @@ -32,7 +32,7 @@ %% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% \CheckSum{376} +%% \CheckSum{449} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -50,22 +50,28 @@ %% Right brace \} Tilde \~} %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\fileversion{v1.01} +\def\fileversion{v1.02a} \NeedsTeXFormat{LaTeX2e} \gdef\filename{egplot.sty}% -\gdef\filedate{1998/06/20}% +\gdef\filedate{1998/07/08}% \gdef\filemaintainer{Axel Probst}% \ProvidesPackage{egplot}[\filedate\space\fileversion\space Encapsulated gnuplot LaTeX Package (\filemaintainer)] -\RequirePackage{graphicx}[1994/12/15] \RequirePackage{verbatim} \RequirePackage{ifthen} \newboolean{egp@german} \setboolean{egp@german}{false} \DeclareOption{german}{% \setboolean{egp@german}{true}} +\newboolean{egp@oldgp} +\setboolean{egp@oldgp}{true} +\DeclareOption{gnuplot35}{% + \setboolean{egp@oldgp}{true}} +\DeclareOption{gnuplot36beta}{% + \setboolean{egp@oldgp}{false}} \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{graphicx}} \ProcessOptions +\RequirePackage{graphicx}[1994/12/15] {\catcode`\#=11\gdef\egpcomment{#}} \def\egpwrite#1{% \if@egpio @@ -75,11 +81,17 @@ \newif\if@egpio \@egpiotrue \newwrite\@outegp -\newcommand{\egpfile}[1][\jobname]{% +\newcounter{egpfilenum} % 1998-03-07 +\setcounter{egpfilenum}{0} % 1998-03-07 +\newcommand{\egpfile}[1][\jobname\theegpfilenum_]{% \def\theegpfile{#1}% + \ifthenelse{\equal{\theegpfile}{\jobname\theegpfilenum_}}{% + \stepcounter{egpfilenum}% + \def\theegpfilename{\jobname\theegpfilenum.gp}}{% + \def\theegpfilename{\theegpfile.gp}} \if@egpio - \immediate\openout\@outegp=\theegpfile.gp\relax - \egpwrite{\egpcomment\space \theegpfile.gp -- % + \immediate\openout\@outegp=\theegpfilename\relax + \egpwrite{\egpcomment\space \theegpfilename -- % do not edit, generated automatically by \jobname.tex^^J} \expandafter\ifx\expandafter*\the\egp@prelude*\else \egpwrite{\the\egp@prelude;}% @@ -116,20 +128,26 @@ \egp@def} \def\egp@{% \egp@start% - \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J% - set output '\theegpfile\theegpfig.eps'^^J} + \ifthenelse{\boolean{egp@oldgp}} + {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}} + {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}} + \egpwrite{set output '\theegpfile\theegpfig.eps'} \egp@includegraphics{\theegpfile}{\theegpfig}% \egpcmds} \def\egp@x#1{% - \egp@start% - \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J% - set output '\theegpfile\theegpfig.eps'^^J} - \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}% - \egpcmds} + \egp@start% + \ifthenelse{\boolean{egp@oldgp}} + {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}} + {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}} + \egpwrite{set output '\theegpfile\theegpfig.eps'} + \egp@includegraphicx[#1]{\theegpfile}{\theegpfig}% + \egpcmds} \def\egp@def{% \egp@start% - \egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'^^J% - set output '\theegpfile\theegpfig.eps'^^J} + \ifthenelse{\boolean{egp@oldgp}} + {\egpwrite{\egpcomment\space --- \theegpfile\theegpfig.eps ---}} + {\egpwrite{print 'generating picture ---- \theegpfile\theegpfig.eps'}} + \egpwrite{set output '\theegpfile\theegpfig.eps'} \egpcmds} \def\egp@start{% \egp@checkfile @@ -141,7 +159,7 @@ \def\egp@checkfile{% \ifx\theegpfile\relax \errhelp={Outside an egpfile environment, I have no clue as to where^^J% - the GNUPlot commands should go. I will use egpdefault.gp^^J% + the gnuplot commands should go. I will use egpdefault.gp^^J% for this graph, but you'd better fix your code!}% \errmessage{I detected a egp environment outside of egpfile}% \egpfile[egpdefault] @@ -152,7 +170,7 @@ {\includegraphics{#1#2.eps}}% {\typeout{% egp: File #1#2.eps\space not found:^^J% - egp: Process #1.gp with GNUPlot and then % + egp: Process \theegpfilename\space with gnuplot and then % reprocess this file.}}} \newcommand{\egp@includegraphicx}[3][scale=1]{% \leavevmode @@ -160,7 +178,7 @@ {\includegraphics[#1]{#2#3.eps}}% {\typeout{% egp: File #2#3.eps\space not found:^^J% - egp: Process #2.gp with GNUPlot and then % + egp: Process \theegpfilename\space with gnuplot and then % reprocess this file.}}} \def\egpcmds{% \begingroup @@ -175,13 +193,15 @@ \def\endegp{% \endegpcmds \ifthenelse{\boolean{egp@german}}{% - \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp^^J} + \egpwrite{!sed -e '/[0-9]*[.][0-9]*)\ .show/s/[.]/,/' % + \theegpfile\theegpfig.eps >\theegpfile\theegpfig.tmp} \egpwrite{!cp \theegpfile\theegpfig.tmp \theegpfile\theegpfig.eps} \egpwrite{!rm -f \theegpfile\theegpfig.tmp}} {} \expandafter\ifx\expandafter*\the\egp@figepilog*\else \egpwrite{\the\egp@figepilog}% - \fi} + \fi + \egpwrite{}} \def\endegpx{\endegp} \def\endegpdef{\endegp} \def\egp@@def#1{% @@ -200,16 +220,21 @@ \egp@checkfile \global\expandafter\advance\csname c@egpcalc\endcsname \@ne \egpc@@def{\egp@@name}% - \egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'^^J% - set term table; set output '\theegpfile\theegpcalc.tmp'^^J% + \ifthenelse{\boolean{egp@oldgp}} + {\egpwrite{\egpcomment\space --- \theegpfile\theegpcalc.val ---}} + {\egpwrite{print 'calculating value ----- \theegpfile\theegpcalc.val'}} + \egpwrite{set term table; set output '\theegpfile\theegpcalc.tmp'^^J% set samples 2^^J% set zero 0^^J% - plot [0:0] \egp@expression^^J} + plot [0:0] \egp@expression} \ifthenelse{\boolean{egp@german}}{% - \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' | sed -e 's/[.]/{,}/' >\theegpfile\theegpcalc.val^^J}} - {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 | cut -f 2 -d' ' >\theegpfile\theegpcalc.val^^J}} - \egpwrite{!rm -f \theegpfile\theegpcalc.tmp^^J% - reset^^J}} + \egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |% + cut -f 2 -d' ' | sed -e 's/[.]/{,}/' % + >\theegpfile\theegpcalc.val}} + {\egpwrite{!tail -3 \theegpfile\theegpcalc.tmp | head -1 |% + cut -f 2 -d' ' >\theegpfile\theegpcalc.val}} + \egpwrite{!rm -f \theegpfile\theegpcalc.tmp} + \egpwrite{}} \def\egpc@@def#1{% \global\e@namedef{egp@k:f:#1}{\theegpfile}% \global\e@namedef{egp@k:v:#1}{\theegpcalc}} @@ -218,12 +243,12 @@ {\input{#1#2.val}}% {\typeout{% egp: File #1#2.val\space not found:^^J% - egp: Process #1#2.gp with GNUPlot and then % + egp: Process \theegpfilename\space with gnuplot and then % reprocess this file.}}} \newcommand{\egpshowval}[2][*]{% \def\egp@@name{#1}% - \def\egp@expression{#2} - \egp@calc + \def\egp@expression{#2}% + \egp@calc% \egp@includevalue{\theegpfile}{\theegpcalc}} \newcommand{\egpuseval}[1]{% \@ifundefined{egp@k:f:#1}% @@ -231,8 +256,13 @@ {\egp@includevalue{\@nameuse{egp@k:f:#1}}{\@nameuse{egp@k:v:#1}}}} \newcommand{\egpassign}[2]{% \egpwrite{#1=#2}\egpshowval{#1}} +\ifthenelse{\boolean{egp@oldgp}} + {\egpprelude{save "reset.gp"}} + {\relax} \egpfigprelude{set terminal postscript eps monochrome dashed "Helvetica" 17} -\egpfigepilog{reset} +\ifthenelse{\boolean{egp@oldgp}}{% + \egpfigepilog{load "reset.gp"}}{% + \egpfigepilog{reset}} \InputIfFileExists{egplot.cfg} {\typeout{egp: Using configuration file 'egplot.cfg'}} {} diff --git a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty index 01a4b5be38d..8936cc18ebc 100644 --- a/Master/texmf-dist/tex/latex/filecontents/filecontents.sty +++ b/Master/texmf-dist/tex/latex/filecontents/filecontents.sty @@ -8,20 +8,22 @@ %% %% This is a generated file. %% -%% Copyright (C) 2004 Scott Pakin <scott+fc@pakin.org> +%% Copyright (C) 2006 Scott Pakin <scott+fc@pakin.org> %% ------------------------------------------------------- %% -%% This package may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.2 -%% of this license or (at your option) any later version. -%% The latest version of this license is in +%% This package may be distributed and/or modified under the conditions +%% of the LaTeX Project Public License, either version 1.3b 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.2 or later is part of all distributions of LaTeX -%% version 1999/12/01 or later. +%% +%% and version 1.3b or later is part of all distributions of LaTeX +%% version 2006/01/07 or later. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{filecontents} - [2004/08/16 v1.1 Create an external file from within a LaTeX document] + [2006/03/11 v1.1a Create an external file from within a LaTeX document] \begingroup% \catcode`\*=11 % \catcode`\^^M\active% diff --git a/Master/texmf-dist/tex/latex/footbib/footbib.sty b/Master/texmf-dist/tex/latex/footbib/footbib.sty index 8a1210399a9..739f984a06e 100644 --- a/Master/texmf-dist/tex/latex/footbib/footbib.sty +++ b/Master/texmf-dist/tex/latex/footbib/footbib.sty @@ -20,14 +20,16 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% File: footbib.dtx Copyright (C) 1997 Eric Domenjoud +%% +%% File: footbib.dtx Copyright (C) 1997-2005 Eric Domenjoud %% %% Eric Domenjoud, %% CRIN/CNRS & INRIA Lorraine %% E-mail: Eric.Domenjoud@loria.fr %% -\def\fileversion{2.0.1} -\def\filedate{1999/05/06} + +\def\fileversion{2.0.4} +\def\filedate{2004/06/04} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{footbib}[\filedate\space v\fileversion\space(E.Domenjoud)] \@makeother\` @@ -56,7 +58,8 @@ \@addtocurcol\else\@reinserts\@addmarginpar\fi}\@latexbug\ifnum \outputpenalty<\z@\if@nobreak\nobreak\else\addpenalty\interlinepenalty \fi\fi\fi\fi} -\@tempa\@doclearpage{\ifvoid\footins\setbox\@tempboxa\vsplit\@cclv to\z@ +\@tempa\@doclearpage{\ifvoid\footins\ifvbox\@kludgeins{\setbox\@tempboxa + \box\@kludgeins}\fi\setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa\setbox\@tempboxa\box\@cclv\xdef\@deferlist{\@toplist \@botlist\@deferlist}\global\let\@toplist\@empty\global\let\@botlist \@empty\global\@colroom\@colht\ifx\@currlist\@empty\else\@latexerr @@ -70,14 +73,14 @@ \@opcol\clearpage\fi} \@tempa\@makecol{\ifvoid\footins\setbox\@outputbox\box\@cclv\else\setbox \@outputbox\vbox{\boxmaxdepth\@maxdepth\@tempdima\dp\@cclv\unvbox\@cclv - \vskip-\@tempdima\vskip\skip\footins\color@begingroup\normalcolor - \footnoterule\unvbox\footins\color@endgroup}\fi\xdef\@freelist{\@freelist + \vskip\skip\footins\color@begingroup\normalcolor\footnoterule\unvbox + \footins\color@endgroup}\fi\let\@elt\relax\xdef\@freelist{\@freelist \@midlist}\global\let\@midlist\@empty\@combinefloats\ifvbox\@kludgeins \@makespecialcolbox\else\setbox\@outputbox\vbox to\@colht{\@texttop\dimen@ \dp\@outputbox\unvbox\@outputbox\vskip-\dimen@\@textbottom}\fi\global - \maxdepth\@maxdepth}\@tempa\@reinserts{\ifvoid\footins\else\insert\footins - {\unvbox\footins}\fi\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins - }\fi} + \maxdepth\@maxdepth} +\@tempa\@reinserts{\ifvoid\footins\else\insert\footins{\unvbox\footins}\fi + \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi} \fi \if@tempswa \PackageError{footbib}{the output routine of LaTeX changed} @@ -639,6 +642,9 @@ \ifvoid\footins\else\@tempswafalse\fi \ifvoid\fb@ins\else\@tempswafalse\fi \if@tempswa + \ifvbox\@kludgeins + {\setbox \@tempboxa \box \@kludgeins}% + \fi \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa \setbox\@tempboxa\box\@cclv \xdef\@deferlist{\@toplist\@botlist\@deferlist}% @@ -701,6 +707,7 @@ \fi }% \fi + \let\@elt\relax \xdef\@freelist{\@freelist\@midlist}% \global \let \@midlist \@empty \@combinefloats diff --git a/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf b/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf index 59d490eb047..b2c0c20324c 100644 --- a/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf +++ b/Master/texmf-dist/tex/latex/jurabib/frjbbib.ldf @@ -115,7 +115,7 @@ \def\transby{par}% \def\fromgerman{de l'allemand}% \def\fromenglish{de l'anglais}% - \def\fromfrench{du fran^^e7ais}% + \def\fromfrench{du français}% \def\fromdutch{du n\'eerlandais}% \def\fromspanish{de l'espagnol}% \def\fromitalian{de l'italien}% diff --git a/Master/texmf-dist/tex/latex/lcd/lcd.sty b/Master/texmf-dist/tex/latex/lcd/lcd.sty index f80140d1a9c..68d40c6696b 100644 --- a/Master/texmf-dist/tex/latex/lcd/lcd.sty +++ b/Master/texmf-dist/tex/latex/lcd/lcd.sty @@ -133,19 +133,19 @@ \DefineLCDchar{rb}{01000001000010000010001000010001000} \DefineLCDchar{alpha}{00000000000100110101100101001001101} \begingroup -\catcode`\~=11 \catcode`\$=11 \catcode`\^^b5=11 \catcode`\^^b0=11 -\catcode`\^^b7=11 \catcode`\^^e4=11 \catcode`\^^f6=11 \catcode`\^^fc=11 -\catcode`\^^df=11 \catcode`\"=11 \catcode`\#=11 \catcode`\&=11 +\catcode`\~=11 \catcode`\$=11 \catcode`\µ=11 \catcode`\°=11 +\catcode`\·=11 \catcode`\ä=11 \catcode`\ö=11 \catcode`\ü=11 +\catcode`\ß=11 \catcode`\"=11 \catcode`\#=11 \catcode`\&=11 \catcode`\^=11 \catcode`\_=11 \DefineLCDchar{$}{00100011111010001110001011111000100}%$ \DefineLCDchar{#}{01010010101111101010111110101001010} -\DefineLCDchar{^^b5}{00000100011000110001100111110110000} -\DefineLCDchar{^^b0}{11100101001110000000000000000000000} -\DefineLCDchar{^^b7}{00000000000000001100011000000000000} -\DefineLCDchar{^^e4}{01010000000111000001011111000101111} -\DefineLCDchar{^^f6}{01010000000111010001100011000101110} -\DefineLCDchar{^^fc}{01010000001000110001100011001101101} -\DefineLCDchar{^^df}{00000011101000111110100011111010000} +\DefineLCDchar{µ}{00000100011000110001100111110110000} +\DefineLCDchar{°}{11100101001110000000000000000000000} +\DefineLCDchar{·}{00000000000000001100011000000000000} +\DefineLCDchar{ä}{01010000000111000001011111000101111} +\DefineLCDchar{ö}{01010000000111010001100011000101110} +\DefineLCDchar{ü}{01010000001000110001100011001101101} +\DefineLCDchar{ß}{00000011101000111110100011111010000} \DefineLCDchar{"}{01010010100101000000000000000000000} \DefineLCDchar{&}{01100100101010001000101011001011101} \DefineLCDchar{^}{00100010101000100000000000000000000} @@ -205,9 +205,9 @@ \linethickness{0.7\unitlength}} \newcommand*\@LCDend{\end{picture}} \newcommand*\do@LCDspecials{% - \catcode`\~=11 \catcode`\$=11 \catcode`\^^b5=11 \catcode`\^^b0=11 - \catcode`\^^b7=11 \catcode`\^^e4=11 \catcode`\^^f6=11 \catcode`\^^fc=11 - \catcode`\^^df=11 \catcode`\"=11 \catcode`\&=11 \catcode`\#=11 + \catcode`\~=11 \catcode`\$=11 \catcode`\µ=11 \catcode`\°=11 + \catcode`\·=11 \catcode`\ä=11 \catcode`\ö=11 \catcode`\ü=11 + \catcode`\ß=11 \catcode`\"=11 \catcode`\&=11 \catcode`\#=11 \catcode`\^=11 \catcode`\_=11 \catcode`\%=11 \obeyspaces} \newcommand*\calc@LCDsize[2]{\@tempcnta#1\multiply\@tempcnta10\relax \@tempcntb#2\multiply\@tempcntb6\advance\@tempcntb2\relax} diff --git a/Master/texmf-dist/tex/latex/maybemath/maybemath.sty b/Master/texmf-dist/tex/latex/maybemath/maybemath.sty index 0b88a0c127f..0cbe49e8550 100644 --- a/Master/texmf-dist/tex/latex/maybemath/maybemath.sty +++ b/Master/texmf-dist/tex/latex/maybemath/maybemath.sty @@ -1,9 +1,11 @@ -\ProvidesPackage{maybemath}[2004/11/29] +\ProvidesPackage{maybemath}[2005/2/22] +\RequirePackage{amsmath} \RequirePackage{bm} +%\RequirePackage{xspace} -%% A few commands for making math fonts bold or italic -%% according to the context of surrounding text. It is -%% particularly useful for avoiding problems with math +%% A few commands for making math fonts bold, upright, italic +%% or sans-serif according to the context of surrounding text. +%% It is particularly useful for avoiding problems with math %% boldness in section titles causing unwanted boldness %% in e.g. the table of contents. %% @@ -17,35 +19,74 @@ %% Author: Andy Buckley <andy@insectnation.org> +%% Mode names for bold, ext-bold, italic and sans-serif contexts +\def\@boldname{b}% +\def\@boldexname{bx}% +\def\@italname{it}% +\def\@sfname{cmss}% + + %% Use the bold symbol if reqd for math fonts -\DeclareRobustCommand{\maybebm}[1]{% - \def\boldname{b}% - \def\boldexname{bx}% - \ifx\f@series\boldname% - \boldsymbol{#1}% - \else\ifx\f@series\boldexname% - \boldsymbol{#1}% +\DeclareRobustCommand{\maybebm}[1]{\ensuremath{% + \ifx\f@series\@boldname% + {{\bm{#1}}}% + \else\ifx\f@series\@boldexname% + {{\bm{#1}}}% \else% - #1% + {{#1}}% \fi\fi% -} +}} %% Use \mathrm if not in italic context -%% (``backward logic'' for a reason) -\def\italname{it}% -\DeclareRobustCommand{\maybeit}[1]{% - \ifx\f@shape\italname% +\DeclareRobustCommand{\mayberm}[1]{\ensuremath{% + \ifx\f@shape\@italname% {#1}% \else% {\mathrm{#1}}% \fi% -} +}} + +%% Use \mathit if in italic context +\DeclareRobustCommand{\maybeit}[1]{\ensuremath{% + \ifx\f@shape\@italname% + {\mathit{#1}}% + \else% + {#1}% + \fi% +}} + +%% Use \mathrm if not in italic context +%% and \mathit if in italic context +\DeclareRobustCommand{\maybeitrm}[1]{\ensuremath{% + \ifx\f@shape\@italname% + {\mathit{#1}}% + \else% + {\mathrm{#1}}% + \fi% +}} %% Maybe-italic subscript shifting -\DeclareRobustCommand{\maybeitsubscript}[1]{% - \ifx\f@shape\italname% - {\!\!#1}% +\DeclareRobustCommand{\maybeitsubscript}[1]{\ensuremath{% + \ifx\f@shape\@italname% + {\!\mspace{1mu}#1}% + \else% + {#1}% + \fi% +}} + +%% Maybe-sans font change +\DeclareRobustCommand{\maybesf}[1]{\ensuremath{% + \ifx\f@family\@sfname% + {\mathsf{#1}}% \else% {#1}% \fi% -}
\ No newline at end of file +}} + +%% Convenience command for following bold and sans-serif contexts +\DeclareRobustCommand{\maybebmsf}[1]{% + {\maybebm{\maybesf{#1}}}% +} + +%% For reference purposes :-) +%\DeclareRobustCommand{\maybemath}{\texttt{maybemath}\xspace} diff --git a/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty b/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty index 6a16d6e5190..f2c93522cb1 100644 --- a/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty +++ b/Master/texmf-dist/tex/latex/pdfscreen/pdfscreen.sty @@ -990,7 +990,6 @@ \newcounter{slide} \newcounter{slideoverlay} \newenvironment{slide}{% - \clearpage\begingroup\parindent0pt% \stepcounter{slide}% \stepcounter{slideoverlay}% \ifnum\theslideoverlay=11\setcounter{slideoverlay}{1} @@ -998,7 +997,7 @@ \PDFSCR@Warning{Overly counter reset to zero}\fi\fi \ifx\@overlay\@empty\else \PDFSCR@Warning{Overly file is \@overlay.pdf}\fi - %\noindent\begin{minipage}[c][\textheight][c]{\textwidth} + \noindent\begin{minipage}[c][\textheight][c]{\textwidth} \newcommand\realnormalsize{% \@setfontsize\realnormalsize\@xiipt{14.5}% \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ @@ -1053,8 +1052,7 @@ \renewcommand\huge{\@setfontsize\huge{40}{48}} \let\Huge=\huge } -{\endgroup%\end{minipage} -} +{\end{minipage}} % \long\def\buttonbox#1{% \leavevmode @@ -1256,15 +1254,6 @@ \setcounter{secnumdepth}{4} \fi %% - -\def\includesrc#1{\begingroup\pdfcompresslevel=0 - \immediate\pdfobj - stream attr {/Type /SourceFile /SourceName (#1)} - file{#1} - \pdfcatalog{/SourceObject \the\pdflastobj\space 0 R} - \endgroup - \pdfcompresslevel=9} - \endinput %% %% End of file pdfscreen.sty diff --git a/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty b/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty index ed014a1471c..09377686fff 100644 --- a/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty +++ b/Master/texmf-dist/tex/latex/pst-bar/pst-bar.sty @@ -3,4 +3,5 @@ \input{pst-bar.tex} \ProvidesFile{pst-bar.tex} [\filedate\space v\fileversion\space `pst-bar' (ahr)] +\IfFileExists{pst-bar.pro}{\@addtofilelist{pst-bar.pro}}{}% hv 2006-01-20 \endinput |