From 7254c1be8ff5654e37a078be83a1c77ce723ff3a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 14 Feb 2020 22:34:36 +0000 Subject: subfiles (14feb20) git-svn-id: svn://tug.org/texlive/trunk@53782 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/subfiles/subfiles.cls | 26 +++-------- Master/texmf-dist/tex/latex/subfiles/subfiles.sty | 55 ++++++++++------------- 2 files changed, 31 insertions(+), 50 deletions(-) (limited to 'Master/texmf-dist/tex/latex/subfiles') diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls index eed0b1c431f..258a4544165 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls @@ -26,10 +26,11 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{subfiles}[2019/10/30 v1.5 Multi-file projects (class)] +\ProvidesClass{subfiles}[2020/02/14 v1.6 Multi-file projects (class)] \DeclareOption*{\typeout{Preamble taken from file `\CurrentOption'}% \let\preamble@file\CurrentOption} \ProcessOptions +\let\@classoptionslist\relax \let\subfiles@documentclass\documentclass \let\documentclass\LoadClass\relax \RequirePackage{verbatim} @@ -37,26 +38,13 @@ \let\subfiles@endcomment\endcomment \RequirePackage{import} \def\subfiles@split#1{% - \edef\subfiles@filename{#1}% - \def\subfiles@dir{}% - \def\subfiles@base{}% - \def\subfiles@sep{}% - \expandafter\subfiles@split@\subfiles@filename/\@nil/% -} -\def\subfiles@split@#1/{% - \def\tmp{#1}% - \ifx\tmp\@nnil - \let\subfiles@next\relax - \else - \edef\subfiles@dir{\subfiles@dir\subfiles@base\subfiles@sep}% - \def\subfiles@base{#1}% - \def\subfiles@sep{/}% - \let\subfiles@next\subfiles@split@ - \fi - \subfiles@next + \let\subfiles@filename@simple\filename@simple + \def\filename@simple##1.\\{\edef\filename@base{##1}}% + \filename@parse{#1}% + \let\filename@simple\subfiles@filename@simple } \subfiles@split{\preamble@file} -\subimport{\subfiles@dir}{\subfiles@base} +\subimport{\filename@area}{\filename@base} {\catcode`\@=11 \global\let\document\subfiles@document \global\let\enddocument\subfiles@enddocument diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty index c2afedb3bad..ea82359ca55 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty @@ -26,7 +26,7 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{subfiles}[2019/10/30 v1.5 Multi-file projects (package)] +\ProvidesPackage{subfiles}[2020/02/14 v1.6 Multi-file projects (package)] \DeclareOption*{\PackageWarning{\CurrentOption ignored}} \ProcessOptions \@ifclassloaded{subfiles}{% @@ -34,27 +34,14 @@ \let\subfiles@enddocument\enddocument \let\document\subfiles@comment \let\enddocument\subfiles@endcomment -}{% subfiles class not loaded +}{% subfiles class not loaded, we typeset the main document \RequirePackage{import} \def\subfiles@split#1{% - \edef\subfiles@filename{#1}% - \def\subfiles@dir{}% - \def\subfiles@base{}% - \def\subfiles@sep{}% - \expandafter\subfiles@split@\subfiles@filename/\@nil/% - }% - \def\subfiles@split@#1/{% - \def\tmp{#1}% - \ifx\tmp\@nnil - \let\subfiles@next\relax - \else - \edef\subfiles@dir{\subfiles@dir\subfiles@base\subfiles@sep}% - \def\subfiles@base{#1}% - \def\subfiles@sep{/}% - \let\subfiles@next\subfiles@split@ - \fi - \subfiles@next - }% + \let\subfiles@filename@simple\filename@simple + \def\filename@simple##1.\\{\edef\filename@base{##1}}% + \filename@parse{#1}% + \let\filename@simple\subfiles@filename@simple + } } \newcommand\subfile{% \let\subfiles@loadfile\subimport @@ -66,22 +53,34 @@ } \newcommand\subfiles@subfile[1]{% \begingroup - \renewcommand\documentclass[2][subfiles]{\ignorespaces}% + \let\subfiles@documentclass\documentclass + \let\subfiles@document\document + \let\subfiles@enddocument\enddocument + \renewcommand\documentclass[2][subfiles]{% + \let\documentclass\subfiles@documentclass + \ignorespaces + }% \renewenvironment{document}{% - \let\document\@onlypreamble + \let\document\subfiles@document \ignorespaces }{% + \let\enddocument\subfiles@enddocument \@ignoretrue }% \subfiles@split{#1}% - \subfiles@loadfile{\subfiles@dir}{\subfiles@base}% + \subfiles@loadfile{\filename@area}{\filename@base}% \endgroup } \def\subfiles@addimportpath#1{% \def\subfiles@filelist{}% \def\subfiles@sep{}% \@for\subfiles@filename:=#1\do{% - \edef\subfiles@filelist{\subfiles@filelist\subfiles@sep\import@path\subfiles@filename}% + \edef\subfiles@filelist{% + \subfiles@filelist + \subfiles@sep + \import@path + \subfiles@filename + }% \def\subfiles@sep{,}% } } @@ -90,13 +89,7 @@ \subfiles@addimportpath{#1}% \expandafter\subfiles@bibliography\expandafter{\subfiles@filelist}% } -\@ifpackageloaded{bibunits}{% - \let\subfiles@putbib\@putbib - \def\@putbib[#1]{% - \subfiles@addimportpath{#1}% - \expandafter\subfiles@putbib\expandafter[\subfiles@filelist]% - }% -}{} +\def\subfix#1{\import@path#1} \endinput %% %% End of file `subfiles.sty'. -- cgit v1.2.3