summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-04-11 22:52:54 +0000
committerKarl Berry <karl@freefriends.org>2020-04-11 22:52:54 +0000
commit753d75c751e4ecf68dadce0ac320068c8a03f947 (patch)
tree4be1d8b6a650ab83a7a592aa2b758256372a24b2
parent3762831356905ca6472a7b751d16cb2b157ce8d5 (diff)
import (4apr20)
git-svn-id: svn://tug.org/texlive/trunk@54683 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/import/README2
-rw-r--r--Master/texmf-dist/doc/latex/import/import.pdfbin243069 -> 243114 bytes
-rw-r--r--Master/texmf-dist/doc/latex/import/import.tex8
-rw-r--r--Master/texmf-dist/tex/latex/import/import.sty40
4 files changed, 37 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/import/README b/Master/texmf-dist/doc/latex/import/README
index 8f6f9549c39..958814c8041 100644
--- a/Master/texmf-dist/doc/latex/import/README
+++ b/Master/texmf-dist/doc/latex/import/README
@@ -1,4 +1,4 @@
-import.sty Version 6.1 06-Mar-2020
+import.sty Version 6.2 01-Apr-2020
Donald Arseneau (asnd@triumf.ca) Vancouver, Canada.
This software is in the public domain; free of any restrictions.
diff --git a/Master/texmf-dist/doc/latex/import/import.pdf b/Master/texmf-dist/doc/latex/import/import.pdf
index c05163699e9..a7e07e54228 100644
--- a/Master/texmf-dist/doc/latex/import/import.pdf
+++ b/Master/texmf-dist/doc/latex/import/import.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/import/import.tex b/Master/texmf-dist/doc/latex/import/import.tex
index ea02e30f2d7..83d0f9a7216 100644
--- a/Master/texmf-dist/doc/latex/import/import.tex
+++ b/Master/texmf-dist/doc/latex/import/import.tex
@@ -9,7 +9,7 @@
\usepackage{microtype}
%\usepackage{hyperref}
-\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
+%\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
\newcommand*{\pkg}[1]{\textsf{#1}}
\newcommand*{\cls}[1]{\textsf{#1}}
\newcommand*{\cs}[1]{\texttt{\textbackslash#1}}
@@ -26,7 +26,7 @@
\title{The import package}
\author{Donald Arseneau (\texttt{asnd@triumf.ca})}
-\date{Version 6.1, \quad 06--Mar--2020}
+\date{Version 6.2, \quad 01--Apr--2020}
\setlength{\parskip}{5pt plus 2pt minus 1pt}
@@ -113,7 +113,7 @@ Note that the import package works by manipulating the internal `commands'
\cmd{\input@path} and \cmd{\Ginput@path}, so may behave badly if you
redefine them manually, or via another package, within the document.
-Presently, the paths are defined `locally' so input files must have
-balanced grouping.
+Presently, the paths are defined `locally' (not globally) so input files must
+have balanced grouping.
\end{document}
diff --git a/Master/texmf-dist/tex/latex/import/import.sty b/Master/texmf-dist/tex/latex/import/import.sty
index e22e32a7904..69bc86215ed 100644
--- a/Master/texmf-dist/tex/latex/import/import.sty
+++ b/Master/texmf-dist/tex/latex/import/import.sty
@@ -1,4 +1,4 @@
-% import.sty Ver 6.0 22-Jan-2020 Donald Arseneau (asnd@triumf.ca)
+% import.sty Ver 6.2 01-Apr-2020 Donald Arseneau (asnd@triumf.ca)
%
% This software is in the public domain; free of any restrictions.
%
@@ -38,11 +38,11 @@
% definition ensures paths end with "/" on most systems, but removes
% "][" from within sub-import directory paths on VMS systems.
%
-% Presently, the paths are defined ``locally'' so input files must have
-% balanced grouping.
+% Presently, the paths are defined `locally' (not globally) so input
+% files must have balanced grouping.
%====================== END INSTRUCTIONS ===========================
-\ProvidesPackage{import}[2020/01/22 \space v 6.0]
+\ProvidesPackage{import}[2020/04/01 \space v 6.2]
\ProcessOptions
\@ifundefined{import}{%
@@ -84,7 +84,7 @@
\protected@edef\input@path{{\import@path}#2}%
\protected@edef\Ginput@path{{\import@path}#3}%
\protected@edef\import@path@file{% use full path/file for non-*
- \ifx\IfFileExists\@iffileonpath\else \import@path\fi #7}%
+ \import@path #7}%
%
\expandafter#1\expandafter{\import@path@file}%
%
@@ -96,6 +96,8 @@
% Our version of \IfFileExists that gives priority to files on \input@path,
% #1 = file name, #2 = action when exists, #3 = action when not exists
+% In 2020 LaTeX redefines \IfFileExists, so I need two variants.
+\@ifundefined{IfFileExists@}{% pre-2020
\long\def \im@iffileexists#1#2#3{%
\let\@filef@und\@undefined
\ifx\input@path\@undefined\else
@@ -112,10 +114,31 @@
\edef\@filef@und{#1 }%
\def\reserved@a{#2}%
\fi\fi
- \reserved@a
-}
+ \reserved@a}
+}{% ca 2020
+\DeclareRobustCommand\im@iffileexists[1]{%
+ \set@curr@file{#1}%
+ \expandafter\im@iffileexists@\expandafter{\@curr@file}}
+\long\def \im@iffileexists@#1#2#3{%
+ \let\@filef@und\@undefined
+ \ifx\input@path\@undefined\else
+ \@iffileonpath{#1}{% (also defines \@filef@und)
+ \def\reserved@a{#2}%
+ }{}% no action yet for not found
+ \fi
+ \ifx\@filef@und\@undefined % not found on \input@path
+ \openin\@inputcheck"#1" %
+ \ifeof\@inputcheck
+ \def\reserved@a{#3}%
+ \else
+ \closein\@inputcheck
+ \edef\@filef@und{"#1" }%
+ \def\reserved@a{#2}%
+ \fi\fi
+ \reserved@a}
+ }
-\let\im@@IfFileExists\IfFileExists
+\let\im@@IfFileExists\IfFileExists % remember original
\gdef\import@path{}
\let\import@path@fix\@firstofone % default
@@ -129,6 +152,7 @@
\fi
% Check for "[]" currdir (VMS file names) and set \import@path@fix appropriately
+% \subimport{[.subdir]}{file}
\gdef\@gtempa{[]}
\ifx\@gtempa\@currdir % VMS directory syntax
\gdef\import@path@fix#1{\@gobbleVMSbrack#1][>}