diff options
| -rw-r--r-- | Master/texmf-dist/tex/latex/import/import.sty (renamed from Master/texmf-dist/tex/latex/ltxmisc/import.sty) | 43 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/import.tlpsrc | 2 |
4 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/ltxmisc/import.sty b/Master/texmf-dist/tex/latex/import/import.sty index 48c529a598e..cce424c46ad 100644 --- a/Master/texmf-dist/tex/latex/ltxmisc/import.sty +++ b/Master/texmf-dist/tex/latex/import/import.sty @@ -1,22 +1,30 @@ -% import.sty Ver 3.0 17-Dec-1997 Donald Arseneau (asnd@reg.triumf.ca) +% import.sty Ver 5.1 23-Mar-2009 Donald Arseneau (asnd@triumf.ca) % -% Allow input of a file with its own inputs from another directory. +% This software is in the public domain; free of any restrictions. +% +% Two new \LaTeX\ commands, "\import {full_path} {file}" and +% "\subimport {path_extension} {file}" are defined to input a file +% from another directory, allowing that file to find its own inputs +% (using "\input", "\includegraphics" etc.) in that directory. % -% \import {full_path} {file} \subimport {path_extension} {file} -% Also \includefrom, \subincludefrom, and * variants. +% Alias command names are "\inputfrom" and "\subinputfrom". % -% This software is free of any restrictions. +% Also provided are "\includefrom" and "\subincludefrom", which are +% based on the "\include" command, rather than "\input". There are +% also "*" variants described below. % % For example, if a remote file "/usr5/friend/work/report.tex" has contents: +% % My graph: \includegraphics{picture} % \input{explanation} +% % then you can safely input that file in your own document with the command % "\import{/usr5/friend/work/}{report}"; the explanation and picture will -% be taken from the remote directory. You can then import documents from -% other friends, even if they use the same file names. +% be taken from the "/usr5/friend/work/" directory. % -% The "\subimport" command allows imported files to import files themselves, -% using their own directory as the root of a "path_extension". Do not use +% The "\subimport" command takes a relative path instead of a full absolute +% file path, and it allows imported files to import files themselves, using +% their own directory as the root of another "path_extension". Do not use % both "\import" and "\subimport" in the same file. % % For example, if a file is imported (using either command) from directory @@ -32,7 +40,7 @@ % TEXINPUTS path, that other file will be read in preference to one in the % import directory. So here is the real behavior of the previous example: % Given the sequence "\import{abc/}{one}", "\subimport{lmn/uvw/}{two}" (in -% file one), "\input{three}" (in file two), LaTeX first looks for three.tex +% file one), "\input{three}" (in file two), \LaTeX\ first looks for three.tex % in the TEXINPUTS search path; if not found, it tries "abc/lmn/uvw/three"; % if that doesn't exist, it tries "abc/three"; if still not found, it tries % the defined "\input@path", if there is one. @@ -47,9 +55,20 @@ % % Presently, the paths are defined ``locally'' so input files must have % balanced grouping. +%====================== END INSTRUCTIONS =========================== -\newcommand{\import}{\global\let\import@path\@empty \@doimport\input} +\ProvidesPackage{import}[2009/03/23 \space v 5.1] +\ProcessOptions + +\@ifundefined{import}{% + \newcommand{\import}{\global\let\import@path\@empty \@doimport\input} +}{ + \PackageWarning{import}{\string\import\space command is already defined!^^J% + Defining only its \string\inputfrom\space alias.} +} +\newcommand{\inputfrom}{\global\let\import@path\@empty \@doimport\input} \newcommand{\subimport}{\@doimport\input} +\newcommand{\subinputfrom}{\@doimport\input} \newcommand{\includefrom}{\global\let\import@path\@empty \@doimport\include} \newcommand{\subincludefrom}{\@doimport\include} @@ -60,7 +79,7 @@ \def\@sub@import#1#2#3{% \begingroup \protected@edef\@tempa{\endgroup - \let\noexpand\IfFileExists\noexpand#2 + \let\noexpand\IfFileExists\noexpand#2% \noexpand\@import \noexpand#1% param 1 {\@ifundefined{input@path}{}{\input@path}}% 2 {\@ifundefined{Ginput@path}{}{\Ginput@path}}% 3 diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index abb61ca8029..a454cfbdf30 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -117,7 +117,7 @@ my @WorkingTLP = qw( hypdvips hyperref hyperxmp hyph-utf8 hyphen-base hyphenat hyphenex hyplain ibygrk icsv IEEEconf IEEEtran ifplatform ifxetex - ijmart ijqc image-gallery impatient impatient-fr imtekda + ijmart ijqc image-gallery impatient impatient-fr import imtekda inlinebib inlinedef interactiveworkbook intro-scientific inversepath invoice ionumbers iopart-num iso diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index d00946a72b2..c3ac2b37f66 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -242,6 +242,7 @@ depend hyphenat depend ifmslide depend ifplatform depend image-gallery +depend import depend inlinedef depend interactiveworkbook depend inversepath diff --git a/Master/tlpkg/tlpsrc/import.tlpsrc b/Master/tlpkg/tlpsrc/import.tlpsrc new file mode 100644 index 00000000000..a9a132c9a0b --- /dev/null +++ b/Master/tlpkg/tlpsrc/import.tlpsrc @@ -0,0 +1,2 @@ +name import +category Package |