From 3bf10794f6f92b2d3bf52691e002ef8150432010 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 Nov 2020 21:43:17 +0000 Subject: subfiles (8nov20) git-svn-id: svn://tug.org/texlive/trunk@56888 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/subfiles/subfiles.pdf | Bin 246620 -> 237451 bytes .../texmf-dist/source/latex/subfiles/subfiles.dtx | 357 ++++++++++++++------- Master/texmf-dist/tex/latex/subfiles/subfiles.cls | 2 +- Master/texmf-dist/tex/latex/subfiles/subfiles.sty | 140 ++++---- 4 files changed, 316 insertions(+), 183 deletions(-) diff --git a/Master/texmf-dist/doc/latex/subfiles/subfiles.pdf b/Master/texmf-dist/doc/latex/subfiles/subfiles.pdf index ae8b02f6afe..da668490647 100644 Binary files a/Master/texmf-dist/doc/latex/subfiles/subfiles.pdf and b/Master/texmf-dist/doc/latex/subfiles/subfiles.pdf differ diff --git a/Master/texmf-dist/source/latex/subfiles/subfiles.dtx b/Master/texmf-dist/source/latex/subfiles/subfiles.dtx index 1a510c59b12..f5749c54cca 100644 --- a/Master/texmf-dist/source/latex/subfiles/subfiles.dtx +++ b/Master/texmf-dist/source/latex/subfiles/subfiles.dtx @@ -23,12 +23,12 @@ % %<*driver> % \fi -\ProvidesFile{subfiles.dtx}[2020/09/07 v2.0 Multi-file projects] +\ProvidesFile{subfiles.dtx}[2020/10/29 v2.1 Multi-file projects] % \iffalse \documentclass{ltxdoc} \GetFileInfo{subfiles.dtx} \title{A Document Class and a Package\\for Handling Multi-File Projects} -\date{2020/09/07 v2.0} +\date{2020/10/29 v2.1} \author{Federico Garcia, Gernot Salzer} \usepackage{hyperref} \begin{document} @@ -200,15 +200,15 @@ % The preamble of subfiles is skipped when loaded with |\subfile|, and everything after |\end{document}| is ignored. % In most cases this is what you want. % -% \DescribeMacro{v1} -% For reasons of compatibility, the option |v1| restores the behaviour of older versons: +% \DescribeMacro{[v1]} +% For reasons of compatibility, the option |v1| restores the behaviour of previous versions. % \begin{center} % |\usepackage[v1]{subfiles}| % \end{center} % This will have three effects. % % \emph{Code after the end of the main document} is added to the preamble of the subfiles, but is ignored when typesetting the main file. -% Here one can add commands that are to be processed as part of the preamble when the subfiles are typeset on their one. +% Here, one can add commands that are to be processed as part of the preamble when the subfiles are typeset on their one. % But this also means that any syntax error after |\end{document}| will ruin the \LaTeX ing of the subfile(s). % % \emph{Code in the preamble of a subfile} is processed as part of the text when typesetting the main file, but as part of the preamble when typesetting the subfile. @@ -279,6 +279,25 @@ % \end{center} % Then each of the three files can be typeset individually in its respective directory, where \LaTeX\ is able to locate all included text files and images. % +% \subsection{Cross-referencing between subfiles} +% When working with multiple subfiles under a main file, say |main.tex|, one may want to refer in subfile |A.tex| to labels in subfile |B.tex|. To make this work, load the package |xr| in the preamble of the main file and add an |\externaldocument| command after loading the |subfiles| package: +% \begin{center} +% \begin{tabular}{l} +% |\usepackage{xr}| \\ +% |\usepackage{subfiles}| \\ +% |\externaldocument[M-]{\subfix{main}}| +% \end{tabular} +% \end{center} +% In the |\externaldocument| command, |main| is the name of the main document. +% Moreover, |M-| is an arbitrary sequence of characters that is added as prefix to the labels. +% The |\subfix| command is only needed if the subfiles are not in the same directory as the main file, but it doesn't hurt if you add it in any case. +% +% To cross-reference between documents, add labels as usual. +% Suppose you have |\label{mylabel}| in any of the files. +% Then you can use |\ref{M-mylabel}| and |\pageref{M-mylabel}| to obtain the (page) number that the label refers to in the main document. +% +% Note that you first have to compile |main.tex|. +% This generates |main.aux|, which then can be loaded by the subfiles to provide the information for the labels prefixed with |M-|. % % \subsection{Avoiding extra spaces} % @@ -323,56 +342,57 @@ % \item % Make sure that |\usepackage{subfiles}| appears near the end of the main preamble. % \item -% Make sure that the strings |\begin{document}| and |\end{document}| appear on lines of their own and that there are no additional characters preceding or trailing them. -% \item % If some external program that cooperates with \TeX, like |bibtex| or |biber|, complains about not being able to find a file, locate the name of the file in the \LaTeX\ source and replace \meta{filename} by |\subfix{|\meta{filename}|}|. % \item -% If nothing of the above helps, ask the nice people on tex.stackexchange\footnote{\url{https://tex.stackexchange.com/}}. +% If nothing of the above helps, ask the nice people on tex.stackexchange\footnote{\url{https://tex.stackexchange.com/}} or file an issue in the bug tracker of the Github repository\footnote{\url{https://github.com/gsalzer/subfiles/issues}}. % \end{enumerate} +% % % \section{Dependencies} % -% The |subfiles| package uses the |import| package by Donald Arsenau to load subfiles from different directories. -% |import.sty| is part of the standard \TeX\ distribution. +% The |import| package by Donald Arsenau is needed to load subfiles from different directories. +% When the |standalone| package is used, the |subfiles| package requires the |xpatch| package by Enrico Gregorio to patch the command |\includestandalone|. +% Both packages are part of the standard \TeX\ distributions. +% % % \section{Version history} % -% \begin{description} +% \begin{enumerate} % \item[v1.1:] -% Initial version by Federico Garcia. Subsequent versions by Gernot Salzer. -% \item[v1.2:] \mbox{} +% Initial version by Federico Garcia. (Subsequent versions by Gernot Salzer.) +% \item[v1.2:] % \begin{itemize} % \item Incompatibility with classes and packages removed that modify the |\document| command, like the class |revtex4|. % \end{itemize} -% \item[v1.3:] \mbox{} +% \item[v1.3:] % \begin{itemize} % \item Use of |import| package to handle directory hierarchies. % \item |\ignorespaces| added to avoid spurious spaces. % \item Incompatibility with commands removed that expect |\document| to be equal to |\@onlypreamble| after the preamble. Thanks to Eric Domenjoud for analysing the problem. % \end{itemize} -% \item[v1.4:] \mbox{} +% \item[v1.4:] % \begin{itemize} % \item Incompatibility with |memoir| class and |comment| package removed. % \item Bug `|\unskip| cannot be used in vertical mode` fixed. % \end{itemize} -% \item[v1.5:] \mbox{} +% \item[v1.5:] % \begin{itemize} % \item Command |\subfileinclude| added. % \item Basic support for |bibtex| related bibliographies in subfiles added. % Seems to suffice also for sub-bibliographies with the package |chapterbib|. % \item Support for sub-bibliographies with package |bibunits| added. % \end{itemize} -% \item[v1.6:] \mbox{} +% \item[v1.6:] % \begin{itemize} % \item Support for sub-bibliographies with package |bibunits| dropped, in favor of |\subfix|. % \item Command |\subfix| added. % \item Incompatibility with |standalone| class removed. % \item The options of the main class are now also processed when typesetting a subfile; before they were ignored. Thanks to J\'an Kl'uka for analysing the problem. % \end{itemize} -% \item[v2.0:] \mbox{} +% \item[v2.0:] % \begin{itemize} % \item Incompatibility with \LaTeX\ Oct.~2020 removed. -% Thanks to Ulrike \mbox{Fischer} from the \LaTeX~3 team for the warning in time. +% Thanks to Ulrike \mbox{Fischer} from the \LaTeX3 team for the timely warning. % \item By default, text after |\end{document}| as well as the preamble of subfiles, when loaded with |\subfile|, are ignored now. % The old behaviour is available via the new package option |v1|. % \item Command |\ifSubfilesClassLoaded| added and documentation regarding the use of the |\bibliography| command corrected. @@ -382,14 +402,26 @@ % \item Problem with the search path for images resolved. % Thanks to Github user |maxnick| for reporting the issue. % \end{itemize} -% \end{description} +% \item[v2.1] +% \begin{itemize} +% \item Bugfix: In some situations, the hooks of |\begin{document}| and |\end{document}| were triggered when loading a subfile. +% This occurred in particular with packages for handling CJK languages. +% Thanks to Github user |yuishin-kikuchi| for reporting the issue. +% \item Section about cross-referencing added. +% Thanks to Github user |ndvanforeest| for the input. +% \end{itemize} +% \end{enumerate} % %\section{The Implementation} %\subsection{The class} -% \begin{macrocode} +% +% \iffalse %<*class> +% \fi +% +% \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{subfiles}[2020/09/07 v2.0 Multi-file projects (class)] +\ProvidesClass{subfiles}[2020/10/29 v2.1 Multi-file projects (class)] \DeclareOption*{% \typeout{Preamble taken from file `\CurrentOption'}% \let\preamble@file\CurrentOption @@ -422,6 +454,7 @@ % In earlier versions, we used |\subimport| to load the preamble of the main file, which has the unwanted effect of undoing changes to the graphics path. % Therefore we use |\input| and initialize |\import@path| and |\input@path| to the path of the main file. % We use the internal \LaTeX\ macro |\filename@parse| to obtain this path. +% % \begin{macrocode} \filename@parse{\preamble@file} \edef\import@path{\filename@area} @@ -429,112 +462,195 @@ \input{\preamble@file} % \end{macrocode} % -% After loading the preamble of the main file, we reset |\import@path{}|. +% After loading the preamble of the main file, we reset |\import@path|. % Since the preamble may have changed the catcode of the |@| sign, we make it (again) a letter. Better safe than sorry. % % \begin{macrocode} {\makeatletter \gdef\import@path{} } -% % \end{macrocode} % +% \iffalse +% +% \fi +% % % \subsection{The package} -% \begin{macrocode} +% +% \iffalse %<*package> +% \fi +% +% \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{subfiles}[2020/09/07 v2.0 Multi-file projects (package)] +\ProvidesPackage{subfiles}[2020/10/29 v2.1 Multi-file projects (package)] +% \end{macrocode} +% \subsubsection*{Auxiliary commands} +% \begin{flushleft} +% |\ifDOCUMENT{|\meta{string}|}{|\meta{then code}|}{|\meta{else code}|}|\\ +% If \meta{string} equals |document|, then execute \meta{then code}, else \meta{else code}. +% \end{flushleft} +% \begin{macrocode} +\def\subfiles@DOCUMENT{document} +\def\ifDOCUMENT#1#2#3{% + \def\subfiles@tmp{#1}% + \ifx\subfiles@tmp\subfiles@DOCUMENT + \def\subfiles@tmp{#2}% + \else + \def\subfiles@tmp{#3}% + \fi + \subfiles@tmp +} % \end{macrocode} % -% The package has one option, |v1|, which affects the way how the text after |\end{document}| and in the preamble of subfiles is handled. -% With this option, |subfiles| behaves like in version 1.x. -% To implement the retro behaviour, we need a few definitions. +% \begin{flushleft} +% |\subfiles@renewDocument{begin}{|\meta{begin-document-code}|}|\\ +% |\subfiles@renewDocument{end}{|\meta{end-document-code}|}|\\ +% Redefines |\begin|/|\end| to execute the given code in place of the next |\begin{document}|/|\end{document}|. +% \end{flushleft} +% \begin{macrocode} +\def\subfiles@renewDocument#1#2{% + \expandafter\def\csname#1\endcsname##1{% + \ifDOCUMENT{##1}{% + \expandafter\let\csname#1\expandafter\endcsname\csname subfiles@#1\endcsname + #2% + }{% + \csname subfiles@#1\endcsname{##1}% + }% + }% +} +% \end{macrocode} +% |\subfiles@renewDocument{begin}{}| is actually the same as +% \begin{verbatim} +%\def\begin#1{% +% \ifDOCUMENT{#1}{% +% \let\begin\subfiles@begin +% +% }{% +% \subfiles@begin{#1}% +% }% +%}%\end{verbatim} +% \begin{flushleft} +% |\subfiles@newSkipToDocument\begin|\meta{cmd}|{|\meta{continuation}|}|\\ +% |\subfiles@newSkipToDocument\end|\meta{cmd}|{|\meta{continuation}|}|\\ +% Defines \meta{cmd} to skip to the next |\begin{document}| or |\end{document}| and to execute \meta{continuation}. +% \end{flushleft} % -% First, we define three macros containing the strings |\begin{document}|, |\end{document}| and |document|. -% We need them later to detect these strings in the input. % \begin{macrocode} -\def\subfiles@DOCUMENT{document} -{\escapechar=-1\relax - \xdef\subfiles@BEGINDOCUMENT{\string\\begin\string\{document\string\}}% - \xdef\subfiles@ENDDOCUMENT{\string\\end\string\{document\string\}}% +\def\subfiles@newSkipToDocument#1#2#3{% + \long\def#2##1#1##2{\ifDOCUMENT{##2}{#3}{#2}}% } % \end{macrocode} % -% The macro |\subfiles@skipDocument| skips everything until it encounters the string |\end{document}|. -% In earlier versions of the package, this was accomplished by redefining the |document| environment to the |comment| environment of the |verbatim| package. -% This clashes with the \LaTeX\ format published in October 2020, so we copy and adapt the code from the |verbatim| package (see the definition of |\subfiles@skiplines| below). +% \subsubsection*{Handling the main document} % +% When the main document is loaded from a subfile, the preamble is read, but the document itself is skipped. +% The lines after |\end{document}| are treated again as part of the preamble in old versions (1.x), but are ignored in new versions (2.x). +% % \begin{macrocode} -\def\subfiles@skipDocument{% - \let\subfiles@skiplinescont\ignorespaces - \let\subfiles@skiplinesend\subfiles@ENDDOCUMENT - \subfiles@skiplines +\def\subfiles@handleMainDocumentVi{% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \subfiles@newSkipToDocument\end\subfiles@skipToEndDocument\ignorespaces + \subfiles@skipToEndDocument + }% +} +\def\subfiles@handleMainDocumentVii{% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \endinput + \ignorespaces + }% } % \end{macrocode} % -% To skip |\documentclass| the old way, we redefine it to do nothing except restoring its original definition. +% \subsubsection*{Handling subfiles} +% +% When a subfile is loaded, the preamble and |\end{document}| have to be ignored. +% More precisely, in older versions (v1.x), the following happens: +% \begin{itemize} +% \item |\documentclass[...]{subfiles}| is ignored. +% \item The contents of the preamble becomes part of the text. +% \item |\begin{document}| is ignored. +% \item |\end{document}| is ignored. +% \item Any lines after |\end{document}| are also part of the text. +% \end{itemize} % % \begin{macrocode} -\def\subfiles@skipDocumentclass{% - \renewcommand\documentclass[2][]{% +\def\subfiles@handleSubDocumentVi{% + \let\subfiles@documentclass\documentclass + \def\documentclass{% + \@ifnextchar[\subfiles@documentclass@{\subfiles@documentclass@[]}% + }% + \def\subfiles@documentclass@[##1]##2{% \let\documentclass\subfiles@documentclass \ignorespaces }% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \subfiles@saveEnd + \subfiles@renewDocument{end}\ignorespaces + \ignorespaces + }% } % \end{macrocode} +% In newer versions (v2.x), the following happens: +% \begin{itemize} +% \item The preamble, up to |\begin{document}|, is ignored. +% \item |\end{document}| as well as any lines after it are ignored. +% \end{itemize} % -% To ignore the preamble of a subfile, we redefine |\documentclass| to skip everything until the string |\begin{document}| is encountered. % \begin{macrocode} -\def\subfiles@skipPreamble{% - \def\documentclass{% +\def\subfiles@handleSubDocumentVii{% + \let\subfiles@documentclass\documentclass + \subfiles@newSkipToDocument\begin\documentclass{% \let\documentclass\subfiles@documentclass - \def\subfiles@skiplinescont{\begin{document}}% - \let\subfiles@skiplinesend\subfiles@BEGINDOCUMENT - \subfiles@skiplines + \subfiles@saveEnd + \subfiles@renewDocument{end}{% + \endinput + \ignorespaces + }% + \ignorespaces }% } % \end{macrocode} % -% Now we set the default behaviour of the subfiles package: -% When loading the main preamble in a subfile, everything after the preamble is ignored. -% Moreover, when reading a subfile, its preamble as well as everything after |\end{document}| is ignored. +% Before redefining |\begin| and |\end|, we remember their original definitions in |\subfiles@begin| and |\subfiles@end|. +% We don't do this once and for all in the preamble, because there might be other packages also fiddling with these commands. +% To reset |\begin| to the definition it had at the point where we modified it, we do |\let\subfiles@begin\begin| immediately before redefining it. +% For |\end|, the situation is different. +% For nested subfiles, |\end| does not have its original definition but ours. +% Therefore we save |\end| only if |\subfiles@end| is still undefined (meaning that we are outside of subfiles). +% % \begin{macrocode} -\let\subfiles@handleMain\endinput -\let\subfiles@handleSubpreamble\subfiles@skipPreamble -\let\subfiles@handleTextAfterSubdocument\endinput +\def\subfiles@saveEnd{% + \ifcsname subfiles@end\endcsname + \else + \let\subfiles@end\end + \fi +} % \end{macrocode} % -% The option |v1| restores the behaviour of the old |subfiles| package: When loading the main preamble in a subfile, only the contents of the |document| environent is ignored, but not the stuff following it. Moreover, when reading a subfile, only the |\documentclass| command and the lines |\begin{document}| and |\end{document}| are ignored, but the subfile preamble as well as everything after |\end{document}| is retained. +% \subsubsection*{Processing the package options} +% +% The package has currently only one option, |v1|, which affects the way how the text after |\end{document}| and in the preamble of subfiles is handled. +% We initialize the macros for handling main and sub documents with the behavior of version 2.x. +% \begin{macrocode} +\let\subfiles@handleMainDocument\subfiles@handleMainDocumentVii +\let\subfiles@handleSubDocument\subfiles@handleSubDocumentVii +% \end{macrocode} +% When option |v1| is present, the macros are set to the behavior of version 1.x. % \begin{macrocode} \DeclareOption{v1}{% - \let\subfiles@handleMain\subfiles@skipDocument - \let\subfiles@handleSubpreamble\subfiles@skipDocumentclass - \let\subfiles@handleTextAfterSubdocument\relax + \let\subfiles@handleMainDocument\subfiles@handleMainDocumentVi + \let\subfiles@handleSubDocument\subfiles@handleSubDocumentVi } \DeclareOption*{\PackageWarning{subfiles}{Option '\CurrentOption' ignored}} \ProcessOptions\relax % \end{macrocode} -% -% To skip everything until a specific string is read, we adapt code from the |verbatim| package. -% The skipping of lines is controlled by two macros that have to be set before calling |\subfiles@skiplines|. -% |\subfiles@skiplinesend| is the string that marks the end of the skipped area; it has to appear on a line of its own, as the only content of this line. -% |\subfiles@skiplinescont| contains the code to be executed after skipping has ended. -% -% \begin{macrocode} -\def\subfiles@skiplines{% - \begingroup - \let\do\@makeother\dospecials - \@makeother\^^L% - \endlinechar`\^^M\relax \catcode`\^^M=12\relax \subfiles@skipline} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\subfiles@skipline#1^^M{\def\subfiles@tmp{#1}% - \ifx\subfiles@tmp\subfiles@skiplinesend - \def\subfiles@tmp{\endgroup\subfiles@skiplinescont}% - \else\let\subfiles@tmp\subfiles@skipline - \fi \subfiles@tmp} -} -% \end{macrocode} +% +% \subsubsection*{Loading subfiles} % % To handle subfiles in separate directories, we use the |import| package. % If it has already been loaded, e.g.\ by the |subfiles| class, this line does nothing. @@ -542,7 +658,7 @@ \RequirePackage{import} % \end{macrocode} % -% The |\subimport| command requires path and filename as separate arguments, so we have to split file locations into these two components. +% The |\subimport| command requires path and filename as separate arguments, so we have to split qualified filenames into these two components. % The internal \LaTeX\ command |\filename@parse| almost fits the bill, except that it additionally splits the filename into basename and extension. % Unfortunately, concatenating basename and extension to recover the filename is not clean: % Under Unix/Linux, the filenames |base| and |base.| denote different entities, but after |\filename@parse| both have the same basename and an empty extension. @@ -579,36 +695,21 @@ } % \end{macrocode} % -% The main functionality of the two commands is implemented in |\subfiles@subfile|. -% It redefines |\documentclass| and the |document| environment to do nothing but reverting these command to their original meaning and avoiding spurious spaces. -% Reverting |\documentclass| and |\document| to their original definition is important for being compatible with classes like |standalone| or packages like |bibentry|, which rely on this definition. +% The main functionality is implemented in |\subfiles@subfile|. +% It sets up the handling of the sub-preamble, splits the filename and loads the subfile. % % \begin{macrocode} -\newcommand\subfiles@subfile[1]{% +\def\subfiles@subfile#1{% \begingroup - \let\subfiles@documentclass\documentclass - \let\subfiles@document\document - \let\subfiles@enddocument\enddocument - \subfiles@handleSubpreamble - \renewenvironment{document}{% - \let\document\subfiles@document - \ignorespaces - }{% - \let\enddocument\subfiles@enddocument - \@ignoretrue - \subfiles@handleTextAfterSubdocument - }% -% \end{macrocode} -% -% Now we split the file name into path and base name and load the file. -% -% \begin{macrocode} + \subfiles@handleSubDocument \subfiles@split{#1}% \subfiles@loadfile{\filename@area}{\filename@base}% \endgroup } % \end{macrocode} % +% \subsubsection*{Fixing incompatibilities} +% % \DescribeMacro{\subfix} % If some package provides a command that takes a filename as argument, then it has to be prefixed with the current |\import@path|. % This is what the |\subfix| command tries to do. @@ -643,13 +744,13 @@ % % \begin{macrocode} \let\subfiles@bibliography\bibliography -\renewcommand\bibliography[1]{% +\def\bibliography#1{% \subfiles@fixfilelist{#1}% \expandafter\subfiles@bibliography\expandafter{\subfiles@list}% } \@ifpackageloaded{graphics}{% \let\subfiles@graphicspath\graphicspath - \renewcommand\graphicspath[1]{% + \def\graphicspath#1{% \subfiles@fixpathlist{#1}% \edef\subfiles@list{{\subfix{}}\subfiles@list}% \expandafter\subfiles@graphicspath\expandafter{\subfiles@list}% @@ -657,6 +758,25 @@ }{} % \end{macrocode} % +% \DescribeMacro{\includestandalone} +% The command |\includestandalone| handles subfiles in its own way. +% Therefore we modify it to use the original definition of |\end|. +% +% \begin{macrocode} +\@ifpackageloaded{standalone}{ + \RequirePackage{xpatch} + \xpretocmd\includestandalone{% + \let\subfiles@end@\end + \ifcsname subfiles@end\endcsname + \let\end\subfiles@end + \fi + }{}{} + \xapptocmd\includestandalone{\let\end\subfiles@end@}{}{} +}{} +% \end{macrocode} +% +% \subsubsection*{Do we typeset the main file or a subfile?} +% % \DescribeMacro{\ifSubfilesClassLoaded} % To add code or text conditionally, depending on whether the main document or a subfile is typeset, we provide the command |\ifSubfilesClassLoaded|. % @@ -670,26 +790,17 @@ } % \end{macrocode} % -% The |subfiles| package is loaded near the end of the main preamble. -% If it is loaded from a subfile, i.e., if |subfiles.cls| has been loaded, then we have to prepare for skipping the main document. -% We do this be redefining the |\begin| command. -% Normally, the first |\begin| after the |subfiles| package starts the main document. -% To allow for the case that some other environment occurs before (does it really happen?) we test whether we are dealing with |\begin{document}|. -% If not, we execute the original definition of |\begin|; otherwise we skip the main document as specified by |\subfiles@handleMain|. % +% \subsubsection*{The end is near} +% +% The |subfiles| package is loaded near the end of the main preamble. +% If it is loaded from a subfile, i.e., if |subfiles.cls| has been loaded, then we prepare for skipping the main document. % \begin{macrocode} \ifSubfilesClassLoaded{% - \let\subfiles@begin\begin - \def\begin#1{% - \def\subfiles@tmp{#1}% - \ifx\subfiles@tmp\subfiles@DOCUMENT - \let\begin\subfiles@begin - \let\subfiles@tmp\subfiles@handleMain - \else - \def\subfiles@tmp{\subfiles@begin{#1}}% - \fi - \subfiles@tmp - }% + \subfiles@handleMainDocument }{} -% % \end{macrocode} +% +% \iffalse +% +% \fi diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls index 8ed10c07c0d..51d0aa76894 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls @@ -26,7 +26,7 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{subfiles}[2020/09/07 v2.0 Multi-file projects (class)] +\ProvidesClass{subfiles}[2020/10/29 v2.1 Multi-file projects (class)] \DeclareOption*{% \typeout{Preamble taken from file `\CurrentOption'}% \let\preamble@file\CurrentOption diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty index 0d773d81897..aba9b2882e6 100644 --- a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty +++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty @@ -26,53 +26,86 @@ %% and the derived files subfiles.sty and subfiles.pdf %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{subfiles}[2020/09/07 v2.0 Multi-file projects (package)] +\ProvidesPackage{subfiles}[2020/10/29 v2.1 Multi-file projects (package)] \def\subfiles@DOCUMENT{document} -{\escapechar=-1\relax - \xdef\subfiles@BEGINDOCUMENT{\string\\begin\string\{document\string\}}% - \xdef\subfiles@ENDDOCUMENT{\string\\end\string\{document\string\}}% +\def\ifDOCUMENT#1#2#3{% + \def\subfiles@tmp{#1}% + \ifx\subfiles@tmp\subfiles@DOCUMENT + \def\subfiles@tmp{#2}% + \else + \def\subfiles@tmp{#3}% + \fi + \subfiles@tmp } -\def\subfiles@skipDocument{% - \let\subfiles@skiplinescont\ignorespaces - \let\subfiles@skiplinesend\subfiles@ENDDOCUMENT - \subfiles@skiplines +\def\subfiles@renewDocument#1#2{% + \expandafter\def\csname#1\endcsname##1{% + \ifDOCUMENT{##1}{% + \expandafter\let\csname#1\expandafter\endcsname\csname subfiles@#1\endcsname + #2% + }{% + \csname subfiles@#1\endcsname{##1}% + }% + }% } -\def\subfiles@skipDocumentclass{% - \renewcommand\documentclass[2][]{% - \let\documentclass\subfiles@documentclass +\def\subfiles@newSkipToDocument#1#2#3{% + \long\def#2##1#1##2{\ifDOCUMENT{##2}{#3}{#2}}% +} +\def\subfiles@handleMainDocumentVi{% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \subfiles@newSkipToDocument\end\subfiles@skipToEndDocument\ignorespaces + \subfiles@skipToEndDocument + }% +} +\def\subfiles@handleMainDocumentVii{% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \endinput \ignorespaces }% } -\def\subfiles@skipPreamble{% +\def\subfiles@handleSubDocumentVi{% + \let\subfiles@documentclass\documentclass \def\documentclass{% + \@ifnextchar[\subfiles@documentclass@{\subfiles@documentclass@[]}% + }% + \def\subfiles@documentclass@[##1]##2{% \let\documentclass\subfiles@documentclass - \def\subfiles@skiplinescont{\begin{document}}% - \let\subfiles@skiplinesend\subfiles@BEGINDOCUMENT - \subfiles@skiplines + \ignorespaces + }% + \let\subfiles@begin\begin + \subfiles@renewDocument{begin}{% + \subfiles@saveEnd + \subfiles@renewDocument{end}\ignorespaces + \ignorespaces }% } -\let\subfiles@handleMain\endinput -\let\subfiles@handleSubpreamble\subfiles@skipPreamble -\let\subfiles@handleTextAfterSubdocument\endinput +\def\subfiles@handleSubDocumentVii{% + \let\subfiles@documentclass\documentclass + \subfiles@newSkipToDocument\begin\documentclass{% + \let\documentclass\subfiles@documentclass + \subfiles@saveEnd + \subfiles@renewDocument{end}{% + \endinput + \ignorespaces + }% + \ignorespaces + }% +} +\def\subfiles@saveEnd{% + \ifcsname subfiles@end\endcsname + \else + \let\subfiles@end\end + \fi +} +\let\subfiles@handleMainDocument\subfiles@handleMainDocumentVii +\let\subfiles@handleSubDocument\subfiles@handleSubDocumentVii \DeclareOption{v1}{% - \let\subfiles@handleMain\subfiles@skipDocument - \let\subfiles@handleSubpreamble\subfiles@skipDocumentclass - \let\subfiles@handleTextAfterSubdocument\relax + \let\subfiles@handleMainDocument\subfiles@handleMainDocumentVi + \let\subfiles@handleSubDocument\subfiles@handleSubDocumentVi } \DeclareOption*{\PackageWarning{subfiles}{Option '\CurrentOption' ignored}} \ProcessOptions\relax -\def\subfiles@skiplines{% - \begingroup - \let\do\@makeother\dospecials - \@makeother\^^L% - \endlinechar`\^^M\relax \catcode`\^^M=12\relax \subfiles@skipline} -{\catcode`\^^M=12 \endlinechar=-1 % - \gdef\subfiles@skipline#1^^M{\def\subfiles@tmp{#1}% - \ifx\subfiles@tmp\subfiles@skiplinesend - \def\subfiles@tmp{\endgroup\subfiles@skiplinescont}% - \else\let\subfiles@tmp\subfiles@skipline - \fi \subfiles@tmp} -} \RequirePackage{import} \def\subfiles@split#1{% \let\subfiles@filename@simple\filename@simple @@ -88,20 +121,9 @@ \let\subfiles@loadfile\subincludefrom \subfiles@subfile } -\newcommand\subfiles@subfile[1]{% +\def\subfiles@subfile#1{% \begingroup - \let\subfiles@documentclass\documentclass - \let\subfiles@document\document - \let\subfiles@enddocument\enddocument - \subfiles@handleSubpreamble - \renewenvironment{document}{% - \let\document\subfiles@document - \ignorespaces - }{% - \let\enddocument\subfiles@enddocument - \@ignoretrue - \subfiles@handleTextAfterSubdocument - }% + \subfiles@handleSubDocument \subfiles@split{#1}% \subfiles@loadfile{\filename@area}{\filename@base}% \endgroup @@ -122,18 +144,28 @@ }% } \let\subfiles@bibliography\bibliography -\renewcommand\bibliography[1]{% +\def\bibliography#1{% \subfiles@fixfilelist{#1}% \expandafter\subfiles@bibliography\expandafter{\subfiles@list}% } \@ifpackageloaded{graphics}{% \let\subfiles@graphicspath\graphicspath - \renewcommand\graphicspath[1]{% + \def\graphicspath#1{% \subfiles@fixpathlist{#1}% \edef\subfiles@list{{\subfix{}}\subfiles@list}% \expandafter\subfiles@graphicspath\expandafter{\subfiles@list}% }% }{} +\@ifpackageloaded{standalone}{ + \RequirePackage{xpatch} + \xpretocmd\includestandalone{% + \let\subfiles@end@\end + \ifcsname subfiles@end\endcsname + \let\end\subfiles@end + \fi + }{}{} + \xapptocmd\includestandalone{\let\end\subfiles@end@}{}{} +}{} \newcommand\ifSubfilesClassLoaded{% \expandafter\ifx\csname ver@subfiles.cls\endcsname\relax \expandafter\@secondoftwo @@ -142,17 +174,7 @@ \fi } \ifSubfilesClassLoaded{% - \let\subfiles@begin\begin - \def\begin#1{% - \def\subfiles@tmp{#1}% - \ifx\subfiles@tmp\subfiles@DOCUMENT - \let\begin\subfiles@begin - \let\subfiles@tmp\subfiles@handleMain - \else - \def\subfiles@tmp{\subfiles@begin{#1}}% - \fi - \subfiles@tmp - }% + \subfiles@handleMainDocument }{} \endinput %% -- cgit v1.2.3