caption (17sep15)

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

1 files changed, 12 insertions, 9 deletions

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}{%