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 ++++++----------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/subfiles/subfiles.cls') 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 -- cgit v1.2.3