texlive[61160] Master/texmf-dist: adjustbox fixes, tex4ht r1017

[commits+karl at tug.org]

Revision: 61160
          http://tug.org/svn/texlive?view=revision&revision=61160
Author:   karl
Date:     2021-11-26 22:54:22 +0100 (Fri, 26 Nov 2021)
Log Message:
-----------
adjustbox fixes, tex4ht r1017

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1017

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-11-26 21:33:44 UTC (rev 61159)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2021-11-26 21:54:22 UTC (rev 61160)
@@ -1,7 +1,15 @@
+2021-11-26  Karl Berry  <karl at freefriends.org>
+
+	* tex4ht-4ht.tex (adjustbox.4ht): copyright.
+
+2021-11-26  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-4ht.tex (adjustbox.4ht): fixed Adjusbox support.
+
 2021-11-24  Michal Hoftich  <michal.h21 at 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 at freefriends.org>
 

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2021-11-26 21:33:44 UTC (rev 61159)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2021-11-26 21:54:22 UTC (rev 61160)
@@ -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 @@
 
 \<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,11 +31040,13 @@
 % suppress trying to draw the frame
 \def\adjbox at 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 at setkeys{#1}\a:Adjustbox}{\b:Adjustbox}
+\long\def\:temp#1#2{\update:adjustbox:id\adjbox at 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.  
 \def\@bgcolorbox#1{\update:adjustbox:id\a:Adjustbox\BOXCONTENT\b:Adjustbox}

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht	2021-11-26 21:33:44 UTC (rev 61159)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/adjustbox.4ht	2021-11-26 21:54:22 UTC (rev 61160)
@@ -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,11 +42,13 @@
 % suppress trying to draw the frame
 \def\adjbox at 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 at setkeys{#1}\a:Adjustbox}{\b:Adjustbox}
+\long\def\:temp#1#2{\update:adjustbox:id\adjbox at 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.
 \def\@bgcolorbox#1{\update:adjustbox:id\a:Adjustbox\BOXCONTENT\b:Adjustbox}