caption (17sep15)

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

7 files changed, 158 insertions, 86 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index 27735cb0998..05f7e511911 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -6,7 +6,7 @@
 %%
 %% bicaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -39,9 +39,9 @@
 \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: bicaption.dtx 89 2013-05-02 07:05:20Z sommerfeldt $
+\caption@tempa $Id: bicaption.sty 111 2015-09-17 09:48:20Z sommerfeldt $
 \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
-\RequirePackage{caption}[2012/12/26] % needs v3.3 or newer
+\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer
 \caption@AtBeginDocument{\caption@ifcompatibility{%
   \caption@Error{%
     The `bicaption' package does not work correctly\MessageBreak
@@ -152,8 +152,8 @@
       {}%
   \fi
   \ifnum\bicaption@lang=2\relax
-    \bicaption@label
-    \global\let\bicaption@label\relax
+    \caption@thelabel
+    \global\let\caption@thelabel\relax
   \else
     \begingroup
       \caption@setoptions{bi-first}%
@@ -184,37 +184,12 @@
 \long\def\@@@bicaption[#1]#2{%
   \caption@dblarg{\@@@@bicaption{#1}{#2}}}
 \long\def\@@@@bicaption#1#2[#3]#4{%
-  \bicaption@getlabel#2\label{}\@nil
+  \caption@getlabel#2\label{}\@nil
   \bicaption@ifswap
     {\bicaption@setup{#1}{#2}%
      \bicaption@cmd[{#3}]{#4}}%
     {\bicaption@setup{#3}{#4}%
      \bicaption@cmd[{#1}]{#2}}}
-\long\def\bicaption@getlabel#1\label#2#3\@nil{%
-  \def\@tempa{#2}%
-  \ifx\@tempa\@empty
-    \let\bicaption@label\relax
-  \else
-    \def\@tempb{*}%
-    \ifx\@tempa\@tempb
-      \def\bicaption@label{\label*}%
-      \bicaption@@getlabel#3\@nil
-    \else
-      \def\bicaption@label{\label}%
-      \bicaption@@getlabel{#2}#3\@nil
-    \fi
-  \fi}
-\long\def\bicaption@@getlabel#1#2\@nil{%
-  \def\@tempa{#1}%
-  \def\@tempb{[}%
-  \ifx\@tempa\@tempb
-    \bicaption@@@getlabel#1#2\@nil
-  \else
-    \l@addto@macro\bicaption@label{{#1}}%
-  \fi}
-\long\def\bicaption@@@getlabel[#1]#2\@nil{%
-  \l@addto@macro\bicaption@label{[{#1}]}%
-  \bicaption@@getlabel#2\@nil}
 \newcommand\bicaption@setup[2]{%
   \def\bicaption@lentry{#1}%
   \def\bicaption@text{\ignorespaces#2}}
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 26e461fd682..5e80c921d5c 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -6,7 +6,7 @@
 %%
 %% caption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -36,13 +36,12 @@
 %% and the user manuals
 %%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
- % bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
 \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.dtx 89 2013-05-02 07:05:20Z sommerfeldt $
+\caption@tempa $Id: caption.sty 111 2015-09-17 09:48:20Z sommerfeldt $
 \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)]
-\RequirePackage{caption3}[2013/05/01] % needs v1.6 or newer
+\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
     Unsupported document class (or package) detected,\MessageBreak
@@ -379,6 +378,18 @@
       {\@dblarg{\@caption\@captype}}%
     }}%
   \caption@CheckCommand\caption{%
+    % beamerbaselocalstructure.sty, Joseph Wright committed 4ac715c 2013-09-04
+    \def\caption{%
+      \ifx\@captype\@undefined
+        \@latex@error{\noexpand\caption outside figure or table}\@ehd
+        \expandafter\@gobble
+      \else
+        \refstepcounter\@captype
+        \expandafter\@firstofone
+      \fi
+      {\@dblarg{\@caption\@captype}}%
+    }}%
+  \caption@CheckCommand\caption{%
     % float.sty [2001/11/08 v1.3d Float enhancements (AL)]
     \long\def\caption{%
       \ifx\@captype\@undefined
@@ -678,7 +689,7 @@
       redefined by a document class or package which is\MessageBreak
       unknown to the caption package}%
     \renewcommand*\caption@redefine{}%
-    \renewcommand*\caption@ContinuedFloat[1]{%
+    \renewcommand*\caption@ContinuedFloatX[1]{%
       \caption@Error{Not available in compatibility mode}}%
     \caption@AtBeginDocument*{%
       \let\caption@start\relax
@@ -852,9 +863,9 @@
 \providecommand*\caption@hj@s{}
 \def\ContinuedFloat{%
   \caption@iftype
-    {\caption@ContinuedFloat\@captype}%
+    {\caption@ContinuedFloatX\@captype}%
     {\caption@Error{\noexpand\ContinuedFloat outside float}}}
-\newcommand*\caption@ContinuedFloat[1]{%
+\newcommand*\caption@ContinuedFloatX[1]{%
   \@ifstar
     {\caption@@refstepcounter\@captype
      \caption@@ContinuedFloat{#1}}%
@@ -867,21 +878,26 @@
   \else
     \caption@Error{Continued `#1' after `\caption@CFtype'}%
   \fi}
-\newcommand*\caption@@ContinuedFloat[1]{%
+\newcommand*\caption@@ContinuedFloat{%
   \caption@setflag{ContinuedFloat}%
+  \caption@@@ContinuedFloat}
+\newcommand*\caption@@@ContinuedFloat{%
   \stepcounter{ContinuedFloat}%
-  \caption@@@ContinuedFloat{#1}}
-\newcommand*\caption@@@ContinuedFloat[1]{%
+  \caption@@@@ContinuedFloat}
+\newcommand*\caption@@@@ContinuedFloat[1]{%
   \caption@setoptions{ContinuedFloat}%
   \caption@setoptions{continued#1}%
   \expandafter\l@addto@macro\csname the#1\endcsname\theContinuedFloat
   \@ifundefined{theH#1}{}{%
     \expandafter\l@addto@macro\csname theH#1\endcsname{%
       \@alph\c@ContinuedFloat}}%
-  \let\caption@@@ContinuedFloat\@gobble}
+  \let\caption@@@@ContinuedFloat\@gobble}
 \newcommand*\caption@CFtype{??}
 \newcounter{ContinuedFloat}
 \let\theContinuedFloat\@empty
+\def\caption@ContinuedFloat{%
+  \let\caption@resetContinuedFloat\@gobble
+  \caption@@@ContinuedFloat}
 \newcommand*\caption@resetContinuedFloat[1]{%
   \xdef\caption@CFtype{#1}%
   \@stpelt{ContinuedFloat}}
@@ -1022,6 +1038,8 @@
       \fi}%
     \let\caption\caption@subcaption
     \let\phantomcaption\caption@subphantom
+    \let\captionlistentry\caption@sublistentry
+    \let\caption@refstepcounter\caption@@@refstepcounter
     \if@subfloatrow
       \caption@Debug{Keeping \string\@makecaption}%
     \else
@@ -1040,11 +1058,15 @@
 \newcommand*\caption@subcaption{%
   \caption@checkgrouplevel{sub}\subcaption
   \caption@star
-    {\caption@@@refstepcounter\@subcaptype}%
+    {\caption@refstepcounter\@subcaptype}%
     {\caption@dblarg{\@caption\@subcaptype}}}
 \newcommand*\caption@subphantom{%
   \caption@checkgrouplevel{sub}\phantomsubcaption
-  \caption@@@refstepcounter\@subcaptype}
+  \caption@refstepcounter\@subcaptype}
+\newcommand*\caption@sublistentry{%
+  \caption@teststar\@subcaptionlistentry\@firstoftwo\@secondoftwo}
+\newcommand*\@subcaptionlistentry[1]{%
+  \@testopt{\caption@listentry{#1}}\@subcaptype}
 \newcommand*\caption@clearsubcontentslines{%
   \global\let\caption@subcontentslines\@empty}
 \caption@clearsubcontentslines
@@ -1177,7 +1199,7 @@
     \newcommand*\caption@freeze{%
       \let\caption@frozen@ContinuedFloat\ContinuedFloat
       \def\ContinuedFloat{%
-        \caption@@freeze{\caption@@@ContinuedFloat\@captype}%
+        \caption@@freeze{\caption@@@@ContinuedFloat\@captype}%
         \caption@frozen@ContinuedFloat}%
       \let\caption@frozen@setup\caption@setup
       \def\caption@setup##1{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index a4a37457c66..487aac682ce 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -6,7 +6,7 @@
 %%
 %% caption2.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -24,16 +24,22 @@
 %% 
 %% This Current Maintainer of this work is Axel Sommerfeldt.
 %% 
-%% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-%% the derived files caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%% This work consists of the files
+%%   CHANGELOG, README, SUMMARY, caption.ins,
+%%   caption.dtx, caption2.dtx, caption3.dtx,
+%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%%   newfloat.dtx, and totalcount.dtx
+%% the derived files
+%%   caption.sty, caption2.sty, caption3.sty,
+%%   bicaption.sty, ltcaption.sty, subcaption.sty,
+%%   newfloat.sty, and totalcount.sty
+%% and the user manuals
+%%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \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: caption2.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\caption@tempa $Id: caption2.sty 100 2015-09-15 17:00:16Z sommerfeldt $
 \ProvidesPackage{caption2}[\caption@tempa v2.2-\caption@tempb Customising captions (AR)]
 \PackageWarning{caption2}{%
   ****************************************************\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index c621116bf6e..43fa98f09f7 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,7 +6,7 @@
 %%
 %% caption3.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -39,8 +39,8 @@
 \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.dtx 88 2013-05-02 05:15:09Z sommerfeldt $
-\ProvidesPackage{caption3}[\caption@tempa v1.6-\caption@tempb caption3 kernel (AR)]
+\caption@tempa $Id: caption3.sty 111 2015-09-17 09:48:20Z sommerfeldt $
+\ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)]
 \providecommand*\@nameundef[1]{%
   \expandafter\let\csname #1\endcsname\@undefined}
 \begingroup\expandafter\expandafter\expandafter\endgroup
@@ -647,6 +647,7 @@
 \DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2}
 \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)}
 \DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)}
+\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}\autodot}
 \def\caption@lfmt@default{\caption@lfmt@simple}
 \newcommand\DeclareCaptionLabelSeparator{%
   \caption@teststar\caption@declarelabelseparator\@gobble\@firstofone}
@@ -696,10 +697,44 @@
   \@ifundefined{caption@tfmt@#1}%
     {\caption@Error{Undefined text format `#1'}}%
     {\expandafter\let\expandafter\caption@tfmt\csname caption@tfmt@#1\endcsname}}
-\DeclareCaptionTextFormat{empty}{}
+\DeclareCaptionTextFormat{empty}{%
+  \caption@get@label#1\caption@makeanchor{}\@nil
+  \caption@thelabel}
+\long\def\caption@get@label#1\caption@makeanchor#2#3\@nil{%
+  \def\caption@tempa{#2}%
+  \ifx\caption@tempa\@empty
+    \caption@getlabel#1\label{}\@nil
+  \else
+    \caption@getlabel#2\label{}\@nil
+  \fi}
 \DeclareCaptionTextFormat{simple}{#1}
 \DeclareCaptionTextFormat{period}{#1.}
 \def\caption@tfmt@default{\caption@tfmt@simple}
+\long\def\caption@getlabel#1\label#2#3\@nil{%
+  \def\@tempa{#2}%
+  \ifx\@tempa\@empty
+    \let\caption@thelabel\relax
+  \else
+    \def\@tempb{*}%
+    \ifx\@tempa\@tempb
+      \def\caption@thelabel{\label*}%
+      \caption@@getlabel#3\@nil
+    \else
+      \def\caption@thelabel{\label}%
+      \caption@@getlabel{#2}#3\@nil
+    \fi
+  \fi}
+\long\def\caption@@getlabel#1#2\@nil{%
+  \def\@tempa{#1}%
+  \def\@tempb{[}%
+  \ifx\@tempa\@tempb
+    \caption@@@getlabel#1#2\@nil
+  \else
+    \l@addto@macro\caption@thelabel{{#1}}%
+  \fi}
+\long\def\caption@@@getlabel[#1]#2\@nil{%
+  \l@addto@macro\caption@thelabel{[{#1}]}%
+  \caption@@getlabel#2\@nil}
 \newcommand*\DeclareCaptionFont[2]{%
   \define@key{caption@fnt}{#1}[]{\l@addto@macro\caption@fnt{#2}}}
 \@onlypreamble\DeclareCaptionFont
@@ -915,7 +950,7 @@
 \newcommand*\caption@setlisttype@ext{%
   \caption@@setlisttype\caption@listtype@ext}
 \newcommand*\DeclareCaptionListFormat[2]{%
-  \global\@namedef{caption@lstfmt@#1}##1##2{#2}}
+  \global\@namedef{caption@lstfmt@#1}##1##2##3{#2}}
 \@onlypreamble\DeclareCaptionListFormat
 \DeclareCaptionOption{listformat}{\caption@setlistformat{#1}}
 \newcommand*\caption@setlistformat[1]{%
@@ -1307,7 +1342,7 @@
      {\caption@add@contentsline
        {\csname ext@#1\endcsname}%
        {#1}%
-       {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}}%
+       {\caption@lstfmt{\@nameuse{p@#1}}{\@nameuse{the#1}}{#1}}%
        {\ignorespaces #2}}}}
 \newcommand*\caption@add@contentsline{%
   \caption@@@addcontentsline}
@@ -1564,15 +1599,18 @@
 \@onlypreamble\caption@@@@declaresublistentry
 \newcommand*\caption@@@@@declaresublistentry[4]{%
   \@namedef{l@sub#2}{#1{2}{#3}{#4}}%
-  \caption@@@@@@declaresublistentry#1{c@\csname ext@#2\endcsname depth}}
+  \expandafter\caption@@@@@@declaresublistentry
+    \expandafter#1\expandafter{\csname ext@#2\endcsname depth}}
 \@onlypreamble\caption@@@@@declaresublistentry
 \newcommand*\caption@@@@@@declaresublistentry[2]{
   \ifx#1\relax
     \def#1##1{%
       \def\next{\@dottedtocline{##1}}%
-      \@ifundefined{#2}{}{%
-        \ifnum ##1>\@nameuse{#2}\relax
+      \@ifundefined{c@#2}{}{%
+        \ifnum ##1>\@nameuse{c@#2}\relax
           \let\next\@gobblefour
+        \else
+          \c@tocdepth=\@nameuse{c@#2}\relax
         \fi}%
       \next}%
   \fi}
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 153f4c875f0..74f6a26dde7 100644
--- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% ltcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -24,17 +24,23 @@
 %% 
 %% This Current Maintainer of this work is Axel Sommerfeldt.
 %% 
-%% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-%% the derived files caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%% This work consists of the files
+%%   CHANGELOG, README, SUMMARY, caption.ins,
+%%   caption.dtx, caption2.dtx, caption3.dtx,
+%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%%   newfloat.dtx, and totalcount.dtx
+%% the derived files
+%%   caption.sty, caption2.sty, caption3.sty,
+%%   bicaption.sty, ltcaption.sty, subcaption.sty,
+%%   newfloat.sty, and totalcount.sty
+%% and the user manuals
+%%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \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: ltcaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $
-\ProvidesPackage{ltcaption}[\caption@tempa v1.3-\caption@tempb longtable captions (AR)]
+\caption@tempa $Id: ltcaption.sty 94 2013-06-09 16:07:04Z sommerfeldt $
+\ProvidesPackage{ltcaption}[\caption@tempa v1.4-\caption@tempb longtable captions (AR)]
 \@ifpackageloaded{longtable}{}{%
   \PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
 \providecommand*\LTcaptype{table}
@@ -175,7 +181,7 @@
  {\endlongtable}
 \@ifundefined{@komalongtablefalse}{}{%
   \if@komalongtable
-    \renewcommand{\LT@makecaption}[3]{%
+    \renewcommand\LT@makecaption[3]{%
       \noalign{%
         \if@captionabove
           \vskip\belowcaptionskip
@@ -195,6 +201,22 @@
     }%
     \let\LT@@makecaption\@undefined
   \fi}
+\@ifclassloaded{memoir}{%
+  \@ifundefined{@@makecaption}{}{%
+    \renewcommand\LT@makecaption[3]{%
+      \caption@LT@make{%
+        \let\@memtempa\relax
+        % starred form -> #1 = \@gobble
+        \ifx#1\@gobble
+          \let\@contnfont\@empty
+          \let\@contdelim\@empty
+          \@@makecaption{}{#3}%
+        \else
+          \@@makecaption{#2}{#3}%
+        \fi
+        \endgraf\vskip\belowcaptionskip}}%
+    \let\LT@@makecaption\@undefined
+  }}{}
 \endinput
 %%
 %% End of file `ltcaption.sty'.
diff --git a/Master/texmf-dist/tex/latex/caption/newfloat.sty b/Master/texmf-dist/tex/latex/caption/newfloat.sty
index c72ffd9ab61..de68c5d1610 100644
--- a/Master/texmf-dist/tex/latex/caption/newfloat.sty
+++ b/Master/texmf-dist/tex/latex/caption/newfloat.sty
@@ -6,7 +6,7 @@
 %%
 %% newfloat.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -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: newfloat.sty 91 2013-05-11 12:25:57Z sommerfeldt $
+\caption@tempa $Id: newfloat.sty 109 2015-09-17 09:29:07Z sommerfeldt $
 \ProvidesPackage{newfloat}[\caption@tempa v1.1-\caption@tempb Defining new floating environments (AR)]
 \newcommand*\newfloat@Info[1]{%
   \PackageInfo{newfloat}{#1}}
@@ -66,11 +66,6 @@
 \@onlypreamble\DeclareFloatingEnvironment
 \def\@DeclareFloatingEnvironment[#1]#2{%
   \newfloat@Info{New float `#2' with options `#1'}%
-  \edef\newfloat@Type{\def\noexpand\newfloat@Type{\@car#2\@nil}}%
-  \uppercase\expandafter{\newfloat@Type}%
-  \edef\@tempa{%
-    \noexpand\g@addto@macro\noexpand\newfloat@Type{\@cdr#2\@nil}}%
-  \@tempa
   \newfloat@ifundefined{c@#2}{\newcounter{#2}}%
   \ifdefined\c@float@type % from float package
     \expandafter\edef\csname ftype@#2\endcsname{\the\value{float@type}}%
@@ -88,7 +83,8 @@
   \fi\fi
   \newfloat@Info{float type `#2'=\@nameuse{ftype@#2}}%
   \newfloat@def{fnum@#2}%
-   {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}}%
+   {\@nameuse{#2name}\nobreakspace\@nameuse{the#2}\@nameuse{autodot}}%
+  \newfloat@capitalize\newfloat@Type{#2}%
   \newfloat@let{#2name}{\newfloat@Type}%
   \newfloat@def{fleg#2}{\@nameuse{#2name}}% legend naming (memoir)
   \newfloat@ifundefined{flegtoc#2}{\@namedef{flegtoc#2}##1{}}%
@@ -128,6 +124,12 @@
 \def\newfloat@DFE@setlistname[#1]{%
   \KV@@newfloat@listname{#1}}
 \@onlypreamble\newfloat@DFE@setlistname
+\newcommand*\newfloat@capitalize[2]{%
+  \edef\newfloat@tempa{\gdef\noexpand#1{\@car#2\@nil}}%
+  \uppercase\expandafter{\newfloat@tempa}%
+  \edef\newfloat@tempa{%
+    \noexpand\g@addto@macro\noexpand#1{\@cdr#2\@nil}}%
+  \newfloat@tempa}
 \newcommand*\newfloat@listof[1]{%
   \@expandtwoargs\newfloat@list@of{#1}{\@nameuse{ext@#1}}}
 \newcommand*\newfloat@list@of[2]{%
@@ -161,7 +163,8 @@
   \ifcsname c@chapter\endcsname chapter\else none\fi}
 \@onlypreamble\newfloat@within@default
 \newcommand*\newfloat@setoption[1]{%
-  \expandafter\@expandtwoargs\csname newfloat@set#1\endcsname\newfloat@type}
+  \edef\caption@tempa{\noexpand\@nameuse{newfloat@set#1}{\newfloat@type}}%
+  \caption@tempa}
 \newcommand*\newfloat@setfileext[2]{%
   \@namedef{ext@#1}{#2}}
 \define@key{@newfloat}{fileext}{%
diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 759a19ab24d..2afa81d0727 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% subcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2013 Axel Sommerfeldt
+%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% http://sourceforge.net/projects/latex-caption/
 %% 
@@ -24,16 +24,22 @@
 %% 
 %% This Current Maintainer of this work is Axel Sommerfeldt.
 %% 
-%% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-%% the derived files caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%% This work consists of the files
+%%   CHANGELOG, README, SUMMARY, caption.ins,
+%%   caption.dtx, caption2.dtx, caption3.dtx,
+%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%%   newfloat.dtx, and totalcount.dtx
+%% the derived files
+%%   caption.sty, caption2.sty, caption3.sty,
+%%   bicaption.sty, ltcaption.sty, subcaption.sty,
+%%   newfloat.sty, and totalcount.sty
+%% and the user manuals
+%%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \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 62 2013-02-03 10:40:15Z sommerfeldt $
+\caption@tempa $Id: subcaption.sty 100 2015-09-15 17:00:16Z 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{%