From 70aaae3b3c98fb6357c846ad54ce2367e9682f50 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 4 Oct 2019 20:57:14 +0000 Subject: latex2e (4oct19) git-svn-id: svn://tug.org/texlive/trunk@52286 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/graphics/color.dtx | 2 +- .../texmf-dist/source/latex/graphics/drivers.dtx | 2 +- Master/texmf-dist/source/latex/graphics/epsfig.dtx | 2 +- .../texmf-dist/source/latex/graphics/graphics.dtx | 48 ++++++++++++++++++---- .../texmf-dist/source/latex/graphics/graphicx.dtx | 2 +- Master/texmf-dist/source/latex/graphics/keyval.dtx | 2 +- Master/texmf-dist/source/latex/graphics/lscape.dtx | 2 +- .../texmf-dist/source/latex/graphics/rotating.dtx | 6 +-- Master/texmf-dist/source/latex/graphics/trig.dtx | 2 +- 9 files changed, 49 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/source/latex/graphics') diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx index d85b78349d8..8de7d013a37 100644 --- a/Master/texmf-dist/source/latex/graphics/color.dtx +++ b/Master/texmf-dist/source/latex/graphics/color.dtx @@ -2,7 +2,7 @@ % \iffalse % %% color.dtx Copyright (C) 1994--1999 David Carlisle -%% Copyright (C) 2005--2016 David Carlisle, LaTeX3 Project +%% Copyright (C) 2005-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/drivers.dtx b/Master/texmf-dist/source/latex/graphics/drivers.dtx index 07c201cf873..d693ebd27b0 100644 --- a/Master/texmf-dist/source/latex/graphics/drivers.dtx +++ b/Master/texmf-dist/source/latex/graphics/drivers.dtx @@ -3,7 +3,7 @@ % %% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz %% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/epsfig.dtx b/Master/texmf-dist/source/latex/graphics/epsfig.dtx index ba37d771cc2..f9197c7b1c9 100644 --- a/Master/texmf-dist/source/latex/graphics/epsfig.dtx +++ b/Master/texmf-dist/source/latex/graphics/epsfig.dtx @@ -2,7 +2,7 @@ % \iffalse % %% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz -%% Copyright (C) 2000--2015,2017 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx index 028f0658527..f2471e94bbb 100644 --- a/Master/texmf-dist/source/latex/graphics/graphics.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx @@ -2,7 +2,7 @@ % \iffalse % %% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2019 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 @@ -14,12 +14,18 @@ %<*dtx> \ProvidesFile{graphics.dtx} % -%\NeedsTeXFormat{LaTeX2e}[1995/12/01] -%\ProvidesPackage{graphics} +%<+package>\NeedsTeXFormat{LaTeX2e}[1995/12/01] +%<+package>\providecommand\DeclareRelease[3]{} +%<+package>\providecommand\DeclareCurrentRelease[2]{} +%<+package> +%<+package>\DeclareRelease{}{2017-06-25}{graphics-2017-06-25.sty} +%<+package>\DeclareCurrentRelease{}{2019-10-01} +%<+package> +%<+package>\ProvidesPackage{graphics} % \ProvidesFile{graphics.drv} % \fi % \ProvidesFile{graphics.dtx} - [2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)] + [2019/07/20 v1.3b Standard LaTeX Graphics (DPC,SPQR)] % % \iffalse %<*driver> @@ -1000,8 +1006,9 @@ % \end{macro} % % \begin{macro}{\Gin@getbase} -% \changes{v0.6a}{1994/11/29} -% {remove \cs{Gin@sep}} +% \changes{v0.6a}{1994/11/29} {remove \cs{Gin@sep}} +% \changes{v1.3a}{2019/07/01} {Support UTF-8 and spaces} +% \changes{v1.3b}{2019/07/20} {Delay adding quotes to filename} % Given a possible extension, |#1|, check whether the file exists. If % it does set |\Gin@base| and |\Gin@ext| to the filename stripped of % the extension, and the extension, respectively. @@ -1012,7 +1019,9 @@ \def\noexpand\Gin@base{####1}}}% \IfFileExists{\filename@area\filename@base#1}% {\Gin@tempa - \expandafter\@tempa\@filef@und + \edef\uq@filef@und{\expandafter\unquote@name + \expandafter{\@filef@und}}% + \expandafter\@tempa\uq@filef@und \edef\Gin@ext{#1}}{}}% % \end{macrocode} % \end{macro} @@ -1043,11 +1052,29 @@ % {Add default (*) rule possibility} % \changes{v0.6a}{1994/11/29} % {remove \cs{Gin@sepdefault}} +% \changes{v1.3a}{2019/07/01} {Support UTF-8 and spaces} +% The quoting business for graphic files needs further sorting +% out. This should be handled differently, right now we quote and +% unquote all over the place as we still use the old code base. +% +% This also makes the file name displays weird! +% +% Guard |\detokenize| use for plain classic tex. % \begin{macrocode} \def\Ginclude@graphics#1{% + \ifx\detokenize\@undefined\else + \edef\Gin@extensions{\detokenize\expandafter{\Gin@extensions}}% + \fi \begingroup \let\input@path\Ginput@path - \filename@parse{#1}% +% \end{macrocode} +% A lot of quote juggling going on here (room for improvements). +% \begin{macrocode} + \set@curr@file{#1}% + \edef\uq@curr@file{\expandafter\unquote@name\expandafter{\@curr@file}}% + \expandafter\filename@parse\expandafter{\uq@curr@file}% + \edef\filename@area{\expandafter\quote@name\expandafter{\filename@area}}% + \edef\filename@base{\expandafter\quote@name\expandafter{\filename@base}}% \ifx\filename@ext\relax \@for\Gin@temp:=\Gin@extensions\do{% \ifx\Gin@ext\relax @@ -1381,8 +1408,11 @@ % {Improve the error message if the info file is not there.} % \changes{v1.2a}{2017/06/01} % {Allow for spaces in name of a file} +% Due to the space handling code file names are now already quoted +% so we should not add any quotes around \verb=#1= any more. +% \changes{v1.3b}{2019/07/20} {add quotes here again} % \begin{macrocode} - \immediate\openin\@inputcheck"#1" % + \immediate\openin\@inputcheck\quote@name{#1} % #2{#1}% % \end{macrocode} % \changes{v0.3i}{1994/03/23} diff --git a/Master/texmf-dist/source/latex/graphics/graphicx.dtx b/Master/texmf-dist/source/latex/graphics/graphicx.dtx index aad8460ac5a..4134c4eed1f 100644 --- a/Master/texmf-dist/source/latex/graphics/graphicx.dtx +++ b/Master/texmf-dist/source/latex/graphics/graphicx.dtx @@ -2,7 +2,7 @@ % \iffalse % %% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz -%% Copyright (C) 1995--2015,2017 David Carlisle, LaTeX3 Project +%% Copyright (C) 1995-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/keyval.dtx b/Master/texmf-dist/source/latex/graphics/keyval.dtx index f656961d0b4..1e1581eee36 100644 --- a/Master/texmf-dist/source/latex/graphics/keyval.dtx +++ b/Master/texmf-dist/source/latex/graphics/keyval.dtx @@ -1,7 +1,7 @@ % % \iffalse %% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/lscape.dtx b/Master/texmf-dist/source/latex/graphics/lscape.dtx index 733e183ee6c..a5a3dc3220f 100644 --- a/Master/texmf-dist/source/latex/graphics/lscape.dtx +++ b/Master/texmf-dist/source/latex/graphics/lscape.dtx @@ -2,7 +2,7 @@ % \iffalse % %% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2019 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 diff --git a/Master/texmf-dist/source/latex/graphics/rotating.dtx b/Master/texmf-dist/source/latex/graphics/rotating.dtx index 41bd399d4ed..149c19d049d 100644 --- a/Master/texmf-dist/source/latex/graphics/rotating.dtx +++ b/Master/texmf-dist/source/latex/graphics/rotating.dtx @@ -3,9 +3,9 @@ % % % File: rotating.dtx -%% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca -%% Copyright 2001--2003,2007--2009 Robin Fairbairns -%% Copyright 2016 LaTeX3 Project +%% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca +%% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns +%% Copyright (C) 2016-2019 LaTeX3 Project % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/source/latex/graphics/trig.dtx b/Master/texmf-dist/source/latex/graphics/trig.dtx index 712db13ba2a..2b152578ad7 100644 --- a/Master/texmf-dist/source/latex/graphics/trig.dtx +++ b/Master/texmf-dist/source/latex/graphics/trig.dtx @@ -1,6 +1,6 @@ % \iffalse %% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle -%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project +%% Copyright (C) 2000-2019 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 -- cgit v1.2.3