caption (21feb16)

git-svn-id: svn://tug.org/texlive/trunk@39809 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 15 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 5668328743a..3cc549ed940 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -39,7 +39,7 @@
 \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: caption.sty 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: caption.sty 144 2016-02-21 09:45:24Z sommerfeldt $
 \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
 \RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer
 \caption@ifbool{documentclass}{}{%
@@ -796,7 +796,7 @@
 \newcommand*\caption@undefinedlabel{%
   \protect\caption@xref{\caption@labelname}{\on@line}}
 \DeclareRobustCommand*\caption@xref[2]{%
-  \caption@WarningNoLine{\noexpand\label without proper \string\caption#2}%
+  \caption@WarningNoLine{\noexpand\label without proper reference#2}%
   \@setref\relax\@undefined{#1}}
 \newcommand*\caption@labelname{??}
 \newcommand*\caption@xlabel{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index d082e95f366..c232acac5d7 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -39,8 +39,18 @@
 \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: caption3.sty 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: caption3.sty 139 2016-02-04 10:26:00Z sommerfeldt $
 \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
+\providecommand\caption@FixArabTeX{%
+  \def\caption@tempa##1{}%
+  \ifx\caption@tempa\@gobble
+    \PackageInfo{caption3}{Fixing ArabTeX}%
+    \long\def\@gobble##1{}%
+  \fi}
+\caption@FixArabTeX
+\AtBeginDocument{%
+  \caption@FixArabTeX
+  \let\caption@FixArabTeX\@undefined}
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \begingroup\expandafter\expandafter\expandafter\endgroup
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 68a9bf6d27c..271bfebf997 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -39,7 +39,7 @@
 \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 136 2016-02-02 09:41:30Z sommerfeldt $
+\caption@tempa $Id: subcaption.sty 142 2016-02-20 19:59:43Z 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{%
@@ -92,7 +92,7 @@
     \let\subcaption@ORI@label\label
     \let\label\subcaption@label
   \fi}
-\newcommand*\subcaption@label{
+\newcommand*\subcaption@label{%
   \caption@withoptargs\subcaption@@label}
 \newcommand*\subcaption@@label[2]{%
   \@bsphack\begingroup