From c9da1ed0b83a4552761131b261977efc39a5db4f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Aug 2006 18:14:48 +0000 Subject: latex required package graphics update from latex-tds (27aug06) git-svn-id: svn://tug.org/texlive/trunk@2041 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/graphics/color.sty | 9 ++- Master/texmf-dist/tex/latex/graphics/dvipdf.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvips.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvipsnam.def | 2 +- Master/texmf-dist/tex/latex/graphics/dvipsone.def | 2 +- Master/texmf-dist/tex/latex/graphics/dviwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/emtex.def | 2 +- Master/texmf-dist/tex/latex/graphics/epsfig.sty | 2 +- Master/texmf-dist/tex/latex/graphics/graphics.sty | 14 ++++- Master/texmf-dist/tex/latex/graphics/graphicx.sty | 2 +- Master/texmf-dist/tex/latex/graphics/keyval.sty | 2 +- Master/texmf-dist/tex/latex/graphics/lscape.sty | 2 +- Master/texmf-dist/tex/latex/graphics/pctex32.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexhp.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexps.def | 2 +- Master/texmf-dist/tex/latex/graphics/pctexwin.def | 2 +- Master/texmf-dist/tex/latex/graphics/pstcol.sty | 76 ----------------------- Master/texmf-dist/tex/latex/graphics/tcidvi.def | 2 +- Master/texmf-dist/tex/latex/graphics/trig.sty | 2 +- Master/texmf-dist/tex/latex/graphics/truetex.def | 2 +- 20 files changed, 36 insertions(+), 97 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/graphics/pstcol.sty (limited to 'Master/texmf-dist/tex/latex/graphics') diff --git a/Master/texmf-dist/tex/latex/graphics/color.sty b/Master/texmf-dist/tex/latex/graphics/color.sty index 4be81e28d0e..15826813e15 100644 --- a/Master/texmf-dist/tex/latex/graphics/color.sty +++ b/Master/texmf-dist/tex/latex/graphics/color.sty @@ -7,15 +7,18 @@ %% color.dtx (with options: `package') %% %% color.dtx Copyright (C) 1994--1999 David Carlisle +%% Copyright (C) 2005 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. +%% +%% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{color} - [1999/02/16 v1.0i Standard LaTeX Color (DPC)] + [2005/11/14 v1.0j Standard LaTeX Color (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -48,7 +51,9 @@ \DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}} \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}} \DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}} +\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}} \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}} +\DeclareOption{xetex}{\def\Gin@driver{xetex.def}} \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} \DeclareOption{emtex}{\def\Gin@driver{emtex.def}} diff --git a/Master/texmf-dist/tex/latex/graphics/dvipdf.def b/Master/texmf-dist/tex/latex/graphics/dvipdf.def index 6356b016a08..a7543dcc11d 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipdf.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipdf.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipdf.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/dvips.def b/Master/texmf-dist/tex/latex/graphics/dvips.def index 1ebdb9f7680..bbf384ffbc4 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvips.def +++ b/Master/texmf-dist/tex/latex/graphics/dvips.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvips.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def index 2c16d9af88c..a4620489911 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsnam.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsnam.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsnam.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/dvipsone.def b/Master/texmf-dist/tex/latex/graphics/dvipsone.def index 33c1197b04f..210f48eddb9 100644 --- a/Master/texmf-dist/tex/latex/graphics/dvipsone.def +++ b/Master/texmf-dist/tex/latex/graphics/dvipsone.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dvipsone.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/dviwin.def b/Master/texmf-dist/tex/latex/graphics/dviwin.def index ad87d602ca5..c8e89b3e3df 100644 --- a/Master/texmf-dist/tex/latex/graphics/dviwin.def +++ b/Master/texmf-dist/tex/latex/graphics/dviwin.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{dviwin.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/emtex.def b/Master/texmf-dist/tex/latex/graphics/emtex.def index 773f97b9f16..f4cfa864b92 100644 --- a/Master/texmf-dist/tex/latex/graphics/emtex.def +++ b/Master/texmf-dist/tex/latex/graphics/emtex.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{emtex.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/epsfig.sty b/Master/texmf-dist/tex/latex/graphics/epsfig.sty index 0391324238a..153903a5843 100644 --- a/Master/texmf-dist/tex/latex/graphics/epsfig.sty +++ b/Master/texmf-dist/tex/latex/graphics/epsfig.sty @@ -11,7 +11,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{epsfig} diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index b04d905638f..32f0bc6e6c3 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -8,15 +8,18 @@ %% %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995--1999 2001 David Carlisle +%% Copyright (C) 2005--2006 David Carlisle, LaTeX3 Project %% %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. +%% +%% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphics} - [2001/07/07 v1.0n Standard LaTeX Graphics (DPC,SPQR)] + [2006/02/20 v1.0o Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -41,11 +44,18 @@ \newif\ifGin@draft \DeclareOption{hiresbb}{% \edef\Gread@BBox{\@percentchar\@percentchar HiResBoundingBox}} +\DeclareOption{demo}{% + \AtBeginDocument{% + \def\Ginclude@graphics#1{% + \rule{\@ifundefined{Gin@@ewidth}{150pt}{\Gin@@ewidth}}% + {\@ifundefined{Gin@@eheight}{100pt}{\Gin@@eheight}}}}} \providecommand\Gin@driver{} \DeclareOption{dvips}{\def\Gin@driver{dvips.def}} \DeclareOption{xdvi}{\ExecuteOptions{dvips}} \DeclareOption{dvipdf}{\def\Gin@driver{dvipdf.def}} \DeclareOption{dvipdfm}{\def\Gin@driver{dvipdfm.def}} +\DeclareOption{dvipdfmx}{\def\Gin@driver{dvipdfmx.def}} +\DeclareOption{xetex}{\def\Gin@driver{xetex.def}} \DeclareOption{pdftex}{\def\Gin@driver{pdftex.def}} \DeclareOption{dvipsone}{\def\Gin@driver{dvipsone.def}} \DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}} diff --git a/Master/texmf-dist/tex/latex/graphics/graphicx.sty b/Master/texmf-dist/tex/latex/graphics/graphicx.sty index 0383717c8b6..cccb538c06f 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphicx.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphicx.sty @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{graphicx} diff --git a/Master/texmf-dist/tex/latex/graphics/keyval.sty b/Master/texmf-dist/tex/latex/graphics/keyval.sty index cb547cc7009..aa973f2e294 100644 --- a/Master/texmf-dist/tex/latex/graphics/keyval.sty +++ b/Master/texmf-dist/tex/latex/graphics/keyval.sty @@ -11,7 +11,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{keyval} diff --git a/Master/texmf-dist/tex/latex/graphics/lscape.sty b/Master/texmf-dist/tex/latex/graphics/lscape.sty index 0717fc85f2c..61248c37675 100644 --- a/Master/texmf-dist/tex/latex/graphics/lscape.sty +++ b/Master/texmf-dist/tex/latex/graphics/lscape.sty @@ -11,7 +11,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{lscape} diff --git a/Master/texmf-dist/tex/latex/graphics/pctex32.def b/Master/texmf-dist/tex/latex/graphics/pctex32.def index d9561bbe418..2ebd9acce4f 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctex32.def +++ b/Master/texmf-dist/tex/latex/graphics/pctex32.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctex32.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/pctexhp.def b/Master/texmf-dist/tex/latex/graphics/pctexhp.def index 8bf6cfdcb8d..a322aaedc3f 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexhp.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexhp.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexhp.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/pctexps.def b/Master/texmf-dist/tex/latex/graphics/pctexps.def index 08f992345a1..eeeb9519d5b 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexps.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexps.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexps.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/pctexwin.def b/Master/texmf-dist/tex/latex/graphics/pctexwin.def index 93cb570182c..bdc40f2f836 100644 --- a/Master/texmf-dist/tex/latex/graphics/pctexwin.def +++ b/Master/texmf-dist/tex/latex/graphics/pctexwin.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{pctexwin.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/pstcol.sty b/Master/texmf-dist/tex/latex/graphics/pstcol.sty deleted file mode 100644 index 9af84e428c6..00000000000 --- a/Master/texmf-dist/tex/latex/graphics/pstcol.sty +++ /dev/null @@ -1,76 +0,0 @@ -%% -%% This is file `pstcol.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% pstcol.dtx (with options: `package') -%% -%% pstcol.dtx Copyright (C) 1994--1996 1999 David Carlisle -%% -%% This file is part of the Standard LaTeX `Graphics Bundle'. -%% It may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pstcol} - [2001/06/20 v1.1 PSTricks color colompatibility (DPC)] -%%%%%%%%%%%%%%%%%% -\let\saved@gray\color@gray -\RequirePackage{pstricks} -\let\color@gray\saved@gray -%%%%%%%%%%%%%%%% -\DeclareOption*{\PassOptionsToPackage\CurrentOption{color}} -\ProcessOptions -\RequirePackage{color} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\pst@getcolor#1#2{% -\@ifundefined{\string\color@#1}% -{\@pstrickserr{Color `#1' not defined}\@eha}% - {\edef#2{\expandafter\expandafter\expandafter - \c@lor@to@ps\csname\string\color @#1\endcsname\@@}}} -\def\pst@usecolor#1{#1\space} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\definecolor{darkgray}{gray}{.25} -\definecolor{gray}{gray}{.5} -\definecolor{lightgray}{gray}{.75} -\definecolor{gradbegin}{rgb}{0,1,1} -\definecolor{gradend}{rgb}{0,.1,.95} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\psset@bordercolor{white} -\psset@doublecolor{white} -\psset@linecolor{black} -\psset@fillcolor{white} -\psset@hatchcolor{black} -\psset@gridcolor{black} -\psset@gridlabelcolor{black} -\psset@shadowcolor{darkgray} -\psset@subgridcolor{gray} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\newgray#1{% - \definecolor{#1}{gray}} -\def\newrgbcolor#1#2{% - \newrgbcolorx{#1}#2\@@} -\def\newrgbcolorx#1#2 #3 #4\@@{% - \definecolor{#1}{rgb}{#2,#3,#4}} -\def\newcmykcolor#1#2{% - \newcmykcolorx{#1}#2\@@} -\def\newcmykcolorx#1#2 #3 #4 #5\@@{% - \definecolor{#1}{cmyk}{#2,#3,#4,#5}} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\renewcommand\black {\color{black}} -\renewcommand\darkgray {\color{darkgray}} -\renewcommand\gray {\color{gray}} -\renewcommand\lightgray{\color{lightgray}} -\renewcommand\white {\color{white}} -\renewcommand\blue {\color{blue}} -\renewcommand\red {\color{red}} -\renewcommand\green {\color{green}} -\renewcommand\yellow {\color{yellow}} -\renewcommand\magenta {\color{magenta}} -\renewcommand\cyan {\color{cyan}} - -\endinput -%% -%% End of file `pstcol.sty'. diff --git a/Master/texmf-dist/tex/latex/graphics/tcidvi.def b/Master/texmf-dist/tex/latex/graphics/tcidvi.def index de7f33d3a95..4156e28ea10 100644 --- a/Master/texmf-dist/tex/latex/graphics/tcidvi.def +++ b/Master/texmf-dist/tex/latex/graphics/tcidvi.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{tcidvi.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] diff --git a/Master/texmf-dist/tex/latex/graphics/trig.sty b/Master/texmf-dist/tex/latex/graphics/trig.sty index ad856cdf070..08e76b162c6 100644 --- a/Master/texmf-dist/tex/latex/graphics/trig.sty +++ b/Master/texmf-dist/tex/latex/graphics/trig.sty @@ -11,7 +11,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3c or, at your option, any later version. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{trig} diff --git a/Master/texmf-dist/tex/latex/graphics/truetex.def b/Master/texmf-dist/tex/latex/graphics/truetex.def index 4bc590e38b7..e9cf0d3c7e9 100644 --- a/Master/texmf-dist/tex/latex/graphics/truetex.def +++ b/Master/texmf-dist/tex/latex/graphics/truetex.def @@ -12,7 +12,7 @@ %% This file is part of the Standard LaTeX `Graphics Bundle'. %% It may be distributed under the terms of the LaTeX Project Public %% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1.0 or, at your option, any later version. +%% Either version 1.3 or, at your option, any later version. %% \ProvidesFile{truetex.def} [1999/02/16 v3.0i Driver-dependant file (DPC,SPQR)] -- cgit v1.2.3