summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-11-26 21:54:22 +0000
committerKarl Berry <karl@freefriends.org>2021-11-26 21:54:22 +0000
commit965ee888b459af7323124323b6df5820aa2c4e1d (patch)
tree4767a7dd796a6d06716b54b71b51d7bb8aa71424 /Master
parentfa0b0761c2a54daf39a7f709693acaa638250226 (diff)
adjustbox fixes, tex4ht r1017
git-svn-id: svn://tug.org/texlive/trunk@61160 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog12
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex12
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht14
3 files changed, 25 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 8993f036656..4170cad2cf0 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,7 +1,15 @@
+2021-11-26 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-4ht.tex (adjustbox.4ht): copyright.
+
+2021-11-26 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (adjustbox.4ht): fixed Adjusbox support.
+
2021-11-24 Michal Hoftich <michal.h21@gmail.com>
- * tex4ht-4ht.tex (tcolorbox.4ht): delete label name after use, to prevent
- it's use in subsequent Tcolorbox environments.
+ * tex4ht-4ht.tex (tcolorbox.4ht): delete label name after use, to
+ prevent its use in subsequent Tcolorbox environments.
2021-11-23 Karl Berry <karl@freefriends.org>
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index d47a96a81b2..8586f345d3b 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1016 2021-11-24 13:29:14Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1019 2021-11-26 21:54:00Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -31014,7 +31014,7 @@ The following might be problematic with a caption
\<adjustbox.4ht\><<<
% adjustbox.4ht (|version), generated from |jobname.tex
-% Copyright 2019 TeX Users Group
+% Copyright 2019-2021 TeX Users Group
|<TeX4ht license text|>
\NewConfigure{AdjustboxValignTop}{1}
\NewConfigure{AdjustboxValignMiddle}{1}
@@ -31040,10 +31040,12 @@ The following might be problematic with a caption
% suppress trying to draw the frame
\def\adjbox@boxframe#1#2#3{}
-% we should redefine all adjustbox environments, they may produce unvanted artifacts, math mode, etc.
+% patch macro that collects adjustbox contents and draw box. we disable this functionality, as all
+% of this should be handled by CSS
% keys are set, so it should be possible to extract colors or frame size in theory
-% I just haven't found a working solution yet
-\renewenvironment{adjustbox}[1]{\update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox}{\b:Adjustbox}
+\long\def\:temp#1#2{\update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox #2\b:Adjustbox\endgroup}
+\HLet\@adjustbox\:temp
+
% definitions for macros
% we don't save any colors and just use one configuration for all box types.
diff --git a/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht b/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht
index 2c7d5deff98..6e737c73034 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht
@@ -1,5 +1,5 @@
-% adjustbox.4ht (2019-05-21-14:50), generated from tex4ht-4ht.tex
-% Copyright 2019 TeX Users Group
+% adjustbox.4ht (2021-11-26-13:53), generated from tex4ht-4ht.tex
+% Copyright 2019-2021 TeX Users Group
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -16,7 +16,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2019-05-21-14:50}
+\immediate\write-1{version 2021-11-26-13:53}
\NewConfigure{AdjustboxValignTop}{1}
\NewConfigure{AdjustboxValignMiddle}{1}
@@ -42,10 +42,12 @@
% suppress trying to draw the frame
\def\adjbox@boxframe#1#2#3{}
-% we should redefine all adjustbox environments, they may produce unvanted artifacts, math mode, etc.
+% patch macro that collects adjustbox contents and draw box. we disable this functionality, as all
+% of this should be handled by CSS
% keys are set, so it should be possible to extract colors or frame size in theory
-% I just haven't found a working solution yet
-\renewenvironment{adjustbox}[1]{\update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox}{\b:Adjustbox}
+\long\def\:temp#1#2{\update:adjustbox:id\adjbox@setkeys{#1}\a:Adjustbox #2\b:Adjustbox\endgroup}
+\HLet\@adjustbox\:temp
+
% definitions for macros
% we don't save any colors and just use one configuration for all box types.