summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev/graphics
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-15 20:08:23 +0000
committerKarl Berry <karl@freefriends.org>2022-03-15 20:08:23 +0000
commit269db182a3b5d6df307e49e15092cbd1dd26d898 (patch)
tree3291c66dc473e571ccd897b781c5c39f776ba720 /Master/texmf-dist/tex/latex-dev/graphics
parent664dc1f78cafa6dae96ff3bad0b0c4a5906dc9c2 (diff)
latex-dev (15mar22)
git-svn-id: svn://tug.org/texlive/trunk@62725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev/graphics')
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/graphics.sty32
-rw-r--r--Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx5
2 files changed, 17 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
index 1b4989643d6..e8f630bc665 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
+++ b/Master/texmf-dist/tex/latex-dev/graphics/graphics.sty
@@ -31,7 +31,7 @@
\DeclareCurrentRelease{}{2019-10-01}
\ProvidesPackage{graphics}
- [2021/03/04 v1.4d Standard LaTeX Graphics (DPC,SPQR)]
+ [2022/03/10 v1.4e Standard LaTeX Graphics (DPC,SPQR)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -171,25 +171,21 @@
\let\Gin@ext\relax
\def\Gin@sepdefault{.}
\edef\Gin@gzext{\detokenize{gz}}
-\def\Gin@temp#1{%
- \begingroup
- \escapechar\m@ne
- \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%
- \endgroup
-}
-\ifx\set@curr@file\@Gin@temp
- \let\set@curr@file\@undefined
-\fi
-\ifx\set@curr@file\@undefined
-\def\set@curr@file#1{%
+\def\Gin@set@curr@file#1{%
\begingroup
\escapechar\m@ne
\xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}%
- \endgroup
-}
-\def\quote@name#1{"\quote@@name#1\@gobble""}
-\def\quote@@name#1"{#1\quote@@name}
-\def\unquote@name#1{\quote@@name#1\@gobble"}
+ \endgroup}
+\ifx\set@curr@file@nosearch\@undefined
+ \ifx\set@curr@file\@undefined
+ \def\quote@name#1{"\quote@@name#1\@gobble""}
+ \def\quote@@name#1"{#1\quote@@name}
+ \def\unquote@name#1{\quote@@name#1\@gobble"}
+ \else
+ \let\Gin@set@curr@file\set@curr@file
+ \fi
+\else
+ \let\Gin@set@curr@file\set@curr@file@nosearch
\fi
\def\Ginclude@graphics#1{%
\ifx\detokenize\@undefined\else
@@ -197,7 +193,7 @@
\fi
\begingroup
\let\input@path\Ginput@path
- \set@curr@file{#1}%
+ \Gin@set@curr@file{#1}%
\expandafter\filename@parse\expandafter{\@curr@file}%
\ifx\filename@ext\Gin@gzext
\expandafter\filename@parse\expandafter{\filename@base}%
diff --git a/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx b/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx
index c7d15ccd930..c7588a3e195 100644
--- a/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx
+++ b/Master/texmf-dist/tex/latex-dev/graphics/mathcolor.ltx
@@ -13,14 +13,15 @@
%%
%% File: mathcolor.dtx (C) Copyright 2021-2022
%%% From File: mathcolor.dtx
-\def\mathcolorversion{v1.0a}
-\def\mathcolordate{2022/01/07}
+\def\mathcolorversion{v1.0b}
+\def\mathcolordate{2022/01/28}
\ifcsname mathcolor\endcsname \endinput \fi
\ExplSyntaxOn
\seq_new:N \g__mathcolor_seq
\DeclareDocumentCommand \mathcolor { o m m } {
+ \mode_if_math:F { \non@alpherr {\mathcolor\space} }
\seq_gpush:No \g__mathcolor_seq \current@color
\group_insert_after:N \use_none:n
\IfValueTF{#1} { \color[#1]{#2} }{ \color{#2} }