From 5412d52974c365e2d5bc1a8320816a729f7c10ab Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 11 Mar 2020 03:01:11 +0000 Subject: CTAN sync 202003110301 --- macros/latex/contrib/import/README | 2 +- macros/latex/contrib/import/import.pdf | Bin 243633 -> 243069 bytes macros/latex/contrib/import/import.sty | 5 +++-- macros/latex/contrib/import/import.tex | 11 +++++------ 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'macros/latex/contrib/import') diff --git a/macros/latex/contrib/import/README b/macros/latex/contrib/import/README index 2a3886a506..8f6f9549c3 100644 --- a/macros/latex/contrib/import/README +++ b/macros/latex/contrib/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/macros/latex/contrib/import/import.pdf b/macros/latex/contrib/import/import.pdf index 5f3f88f7a4..c05163699e 100644 Binary files a/macros/latex/contrib/import/import.pdf and b/macros/latex/contrib/import/import.pdf differ diff --git a/macros/latex/contrib/import/import.sty b/macros/latex/contrib/import/import.sty index 338fcc2b1c..e22e32a790 100644 --- a/macros/latex/contrib/import/import.sty +++ b/macros/latex/contrib/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 diff --git a/macros/latex/contrib/import/import.tex b/macros/latex/contrib/import/import.tex index 36ff9a63d8..ea02e30f2d 100644 --- a/macros/latex/contrib/import/import.tex +++ b/macros/latex/contrib/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 -- cgit v1.2.3