summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-19 22:44:14 +0000
committerKarl Berry <karl@freefriends.org>2019-12-19 22:44:14 +0000
commit7b525605181864e250c7d93fe37e1f5d7cccc466 (patch)
tree8c814f61210bf0dcfcf3c48e04807594780775b5 /Master
parentf722eae3dedfe72b7b59aa68ab29ac0b14a45268 (diff)
prevent caption from patching other packages, tex4ht r642
git-svn-id: svn://tug.org/texlive/trunk@53189 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht11
1 files changed, 8 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index b0203d20e17..f1f88bc88f8 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2019-12-13-14:32), generated from tex4ht-4ht.tex
+% usepackage.4ht (2019-12-19-14:27), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2019 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2019-12-13-14:32}
+\immediate\write-1{version 2019-12-19-14:27}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -33,7 +33,7 @@
\fi
\fi
-\gdef\a:usepackage{\use:package xr,xr-hyper,eso-pic,expl3,savetrees,biblatex,xeCJK,polyglossia,fontspec,tikz,pdfbase,graphics,xcolor,imakeidx,minted,fancyhdr,,!*?: }
+\gdef\a:usepackage{\use:package xr,xr-hyper,eso-pic,expl3,savetrees,biblatex,xeCJK,polyglossia,fontspec,tikz,pdfbase,caption,graphics,xcolor,imakeidx,minted,fancyhdr,,!*?: }
\gdef\use:package#1,{%
\if :#1:\def\:temp##1!*?: {}\else
\def\:temp{#1}\ifx \@currname\:temp
@@ -160,6 +160,11 @@
\def\@outputpage{\old:outputpage{}}
}
\fi
+\def\:temp{caption}\ifx\@currname\:temp
+\AtEndOfPackage{%
+ \long\def\caption@If@Package@Loaded#1[#2]#3#4{}
+}
+\fi
\def\:temp{graphics}\ifx\@currname\:temp
\ifdefined\XeTeXversion
\PassOptionsToPackage{dvips}{graphics}