summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-10 21:20:38 +0000
committerKarl Berry <karl@freefriends.org>2020-03-10 21:20:38 +0000
commit14870f540d9edd1b21a301f7849aa2dc6e1f8a0c (patch)
tree62e498e1d556e49fe3fcecb8d2cc462e98587eaf /Master
parent5a559d6383cf49925c00a13b5e986847df89e6bb (diff)
import (10mar20)
git-svn-id: svn://tug.org/texlive/trunk@54225 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/import/README2
-rw-r--r--Master/texmf-dist/doc/latex/import/import.pdfbin243633 -> 243069 bytes
-rw-r--r--Master/texmf-dist/doc/latex/import/import.tex11
-rw-r--r--Master/texmf-dist/tex/latex/import/import.sty5
4 files changed, 9 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/import/README b/Master/texmf-dist/doc/latex/import/README
index 2a3886a5063..8f6f9549c39 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.0 22-Jan-2020
+import.sty Version 6.1 06-Mar-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 5f3f88f7a42..c05163699e9 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 36ff9a63d83..ea02e30f2d7 100644
--- a/Master/texmf-dist/doc/latex/import/import.tex
+++ b/Master/texmf-dist/doc/latex/import/import.tex
@@ -6,7 +6,6 @@
\usepackage{lmodern}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
-\usepackage{booktabs}
\usepackage{microtype}
%\usepackage{hyperref}
@@ -27,8 +26,8 @@
\title{The import package}
\author{Donald Arseneau (\texttt{asnd@triumf.ca})}
-\date{Version 6.0, \quad 22--Jan--2020}
-\setlength{\parskip}{3pt plus 2pt}
+\date{Version 6.1, \quad 06--Mar--2020}
+\setlength{\parskip}{5pt plus 2pt minus 1pt}
\begin{document}
@@ -106,9 +105,9 @@ the \texttt{TEXINPUTS} path) but now the ``$*$'' is ignored.
A command ``\cmd{\import@path@fix}'' is provided to reformat the import path
to fit the syntax of a particular operating system. It \emph{could} be
defined to convert unix-style path names to the local format. The default
-definition ensures paths end with ``\texttt{/}'' on most systems, but
-removes ``\texttt{]\hspace{-2pt}[}'' from within sub-import directory paths
-on VMS systems.
+definition ensures paths end with a single ``\texttt{/}'' on most systems
+(unless the path is empty), but on VMS systems it removes
+``\texttt{]\hspace{-2pt}[}'' from within combined paths.
Note that the import package works by manipulating the internal `commands'
\cmd{\input@path} and \cmd{\Ginput@path}, so may behave badly if you
diff --git a/Master/texmf-dist/tex/latex/import/import.sty b/Master/texmf-dist/tex/latex/import/import.sty
index 338fcc2b1cb..e22e32a7904 100644
--- a/Master/texmf-dist/tex/latex/import/import.sty
+++ b/Master/texmf-dist/tex/latex/import/import.sty
@@ -123,8 +123,9 @@
% Check for "./" currdir, and make \import@path@fix ensure trailing /
\gdef\@gtempa{./}
\ifx\@gtempa\@currdir % *x style paths
- \gdef\import@path@fix#1{\@ensure@one@trailing@slash#1////\delimiter}%
- \gdef\@ensure@one@trailing@slash#1////#2\delimiter{#1/}%
+\gdef\import@path@fix#1{\ifx\delimiter#1\delimiter\else
+ \@ensure@one@trailing@slash#1///\delimiter\fi}%
+ \gdef\@ensure@one@trailing@slash#1///#2\delimiter{#1/}%
\fi
% Check for "[]" currdir (VMS file names) and set \import@path@fix appropriately