dev-texlive/texlive-latexrecommended: Fix subcaption package for latest beamer. Bug #560654 by Dennis Schridde.

Package-Manager: portage-2.2.23

2 files changed, 43 insertions, 1 deletions

diff --git a/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch b/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch
new file mode 100644
index 000000000000..27351bf6816e
--- /dev/null
+++ b/dev-texlive/texlive-latexrecommended/files/caption_beamer_fix.patch
@@ -0,0 +1,39 @@
+Ported from upstream by Dennis Schridde.
+
+https://bugs.gentoo.org/show_bug.cgi?id=560654
+
+https://bitbucket.org/rivanvx/beamer/issues/261/beamer-and-subcaption
+https://sourceforge.net/p/latex-caption/tickets/21/
+https://sourceforge.net/p/latex-caption/code/100/
+
+Index: texmf-dist/tex/latex/caption/caption.sty
+===================================================================
+--- texmf-dist/tex/latex/caption/caption.sty	(revision 99)
++++ texmf-dist/tex/latex/caption/caption.sty	(revision 100)
+@@ -36,7 +36,6 @@
+ %% 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 }}
+@@ -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
diff --git a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015.ebuild b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild
index d22426768e6c..303e42600b08 100644
--- a/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015.ebuild
+++ b/dev-texlive/texlive-latexrecommended/texlive-latexrecommended-2015-r1.ebuild
@@ -27,4 +27,7 @@ DEPEND=">=dev-texlive/texlive-latex-2015
 "
 RDEPEND="${DEPEND} "
 TEXLIVE_MODULE_BINSCRIPTS="texmf-dist/scripts/thumbpdf/thumbpdf.pl"
-PATCHES=( "${FILESDIR}/thumbpdf_invocation.patch" )
+PATCHES=(
+	"${FILESDIR}/thumbpdf_invocation.patch" 
+	"${FILESDIR}/caption_beamer_fix.patch" 
+)