summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/subfiles
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-31 20:54:49 +0000
committerKarl Berry <karl@freefriends.org>2018-07-31 20:54:49 +0000
commit00c2e60e9bb0df2e2d450bb002812819a8c6212a (patch)
treec644599294c77f7c71f0e6f7cca9cc550e17223e /Master/texmf-dist/tex/latex/subfiles
parentfce3abdfd43404b920cfc76afb8faef4fa5e815c (diff)
subfiles (31jul18)
git-svn-id: svn://tug.org/texlive/trunk@48323 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/subfiles')
-rw-r--r--Master/texmf-dist/tex/latex/subfiles/subfiles.cls11
-rw-r--r--Master/texmf-dist/tex/latex/subfiles/subfiles.sty12
2 files changed, 12 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls
index 1a37cabc6fb..f6e78f885f8 100644
--- a/Master/texmf-dist/tex/latex/subfiles/subfiles.cls
+++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.cls
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia
+%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,22 +20,17 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Federico Garcia.
+%% The Current Maintainer of this work is Gernot Salzer (salzer@logic.at).
%%
%% This work consists of the files subfiles.dtx and subfiles.ins
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{subfiles}[2012/05/23 Federico Garcia]
-\RequirePackage{verbatim}
+\ProvidesClass{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
\DeclareOption*{\typeout{Preamble taken from file `\CurrentOption'}%
\let\preamble@file\CurrentOption}
\ProcessOptions
-\let\old@document@subfiles\document
-\let\old@enddocument@subfiles\enddocument
\let\old@documentclass@subfiles\documentclass
-\let\document\comment
-\let\enddocument\endcomment
\let\documentclass\LoadClass\relax
\input{\preamble@file}
{\catcode`\@=11
diff --git a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty
index fc3e91fcca9..04d8ef19032 100644
--- a/Master/texmf-dist/tex/latex/subfiles/subfiles.sty
+++ b/Master/texmf-dist/tex/latex/subfiles/subfiles.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia
+%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,13 +20,13 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Federico Garcia.
+%% The Current Maintainer of this work is Gernot Salzer (salzer@logic.at).
%%
%% This work consists of the files subfiles.dtx and subfiles.ins
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{subfiles}[2012/05/23 Federico Garcia]
+\ProvidesPackage{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
\DeclareOption*{\PackageWarning{\CurrentOption ignored}}
\ProcessOptions
\RequirePackage{verbatim}
@@ -35,6 +35,12 @@
\newenvironment{document}{}{}%
\renewcommand{\documentclass}[2][subfiles]{}}
\newcommand\subfile[1]{\begingroup\skip@preamble\input{#1}\endgroup}
+\@ifclassloaded{subfiles}{%
+ \let\old@document@subfiles\document
+ \let\old@enddocument@subfiles\enddocument
+ \let\document\comment
+ \let\enddocument\endcomment
+}{}
\endinput
%%
%% End of file `subfiles.sty'.