summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption/subcaption.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/subcaption.sty')
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty46
1 files changed, 29 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 271bfebf997..932900ca917 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -39,25 +39,37 @@
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
\def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
-\caption@tempa $Id: subcaption.sty 142 2016-02-20 19:59:43Z sommerfeldt $
+\caption@tempa $Id: subcaption.sty 161 2016-05-22 14:39:14Z sommerfeldt $
\ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)]
\RequirePackage{caption}[2012/03/25] % needs v3.3 or newer
-\caption@AtBeginDocument{\caption@ifcompatibility{%
- \caption@Error{%
- The `subcaption' package does not work correctly\MessageBreak
- in compatibility mode}}{}}
-\@ifpackageloaded{subfigure}{%
- \PackageError{subcaption}%
- {This package can't be used in cooperation\MessageBreak
- with the subfigure package}%
- {RTFM}%
- \endinput}{}%
-\@ifpackageloaded{subfig}{%
- \PackageError{subcaption}%
- {This package can't be used in cooperation\MessageBreak
- with the subfig package}%
- {RTFM}%
- \endinput}{}%
+\newcommand\subcaption@CheckCompatibility{%
+ \@ifpackageloaded{subfigure}{%
+ \PackageError{subcaption}%
+ {This package can't be used in cooperation\MessageBreak
+ with the subfigure package}%
+ {\subcaption@EH}%
+ \endinput}{}%
+ \@ifpackageloaded{subfig}{%
+ \PackageError{subcaption}%
+ {This package can't be used in cooperation\MessageBreak
+ with the subfig package}%
+ {\subcaption@EH}%
+ \endinput}{}%
+}
+\newcommand*\subcaption@EH{%
+ If you do not understand this error, please take a closer look\MessageBreak
+ at the documentation of the `subcaption' package, especially the\MessageBreak
+ section about errors.\MessageBreak\@ehc}
+\subcaption@CheckCompatibility
+\caption@AtBeginDocument{%
+ \caption@ifcompatibility{%
+ \caption@Error{%
+ The `subcaption' package does not work correctly\MessageBreak
+ in compatibility mode}}{}%
+ \subcaption@CheckCompatibility
+ \let\subcaption@CheckCompatibility\@undefined
+ \let\subcaption@EH\@undefined
+}
\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}%
\caption@ExecuteOptions{subcaption}{%
font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0}