From 5031fda20395916471a58e1919661489514440ed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 25 Oct 2019 21:02:21 +0000 Subject: subfiles (25oct19) git-svn-id: svn://tug.org/texlive/trunk@52532 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/subfiles/subfiles.cls | 5 +- Master/texmf-dist/tex/latex/subfiles/subfiles.sty | 62 ++++++++++++----------- 2 files changed, 37 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls index 8086e79db2e..4837f82d3e3 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls @@ -26,12 +26,15 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{subfiles}[2019/09/28 v1.3 Federico Garcia, Gernot Salzer] +\ProvidesClass{subfiles}[2019/10/25 v1.4 Multi-file projects (class)] \DeclareOption*{\typeout{Preamble taken from file `\CurrentOption'}% \let\preamble@file\CurrentOption} \ProcessOptions \let\subfiles@documentclass\documentclass \let\documentclass\LoadClass\relax +\RequirePackage{verbatim} +\let\subfiles@comment\comment +\let\subfiles@endcomment\endcomment \RequirePackage{import} \def\subfiles@split#1{% \edef\subfiles@filename{#1}% diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty index ea6d1d4e97e..4a9a89b820a 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty @@ -26,45 +26,49 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{subfiles}[2019/09/28 v1.3 Federico Garcia, Gernot Salzer] +\ProvidesPackage{subfiles}[2019/10/25 v1.4 Multi-file projects (package)] \DeclareOption*{\PackageWarning{\CurrentOption ignored}} \ProcessOptions -\RequirePackage{verbatim} -\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 +\@ifclassloaded{subfiles}{% + \let\subfiles@document\document + \let\subfiles@enddocument\enddocument + \let\document\subfiles@comment + \let\enddocument\subfiles@endcomment +}{% subfiles class not loaded + \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 + }% } \newcommand\subfile[1]{% \begingroup \renewcommand\documentclass[2][subfiles]{\ignorespaces}% - \renewenvironment{document}{\let\document\@onlypreamble\ignorespaces}{}% + \renewenvironment{document}{% + \let\document\@onlypreamble + \ignorespaces + }{% + \@ignoretrue + }% \subfiles@split{#1}% \subimport{\subfiles@dir}{\subfiles@base}% - \unskip \endgroup } -\@ifclassloaded{subfiles}{% - \let\subfiles@document\document - \let\subfiles@enddocument\enddocument - \let\document\comment - \let\enddocument\endcomment -}{} \endinput %% %% End of file `subfiles.sty'. -- cgit v1.2.3