draftwatermark support, tex4ht r1483; xltabular, tex4ht r1482,r1484

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

6 files changed, 162 insertions, 2 deletions

diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 086599fff3a..737d8995ded 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,13 @@
+2024-01-01  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (draftwatermark.4ht, draftwatermark-hooks.4ht):
+	disable the watermarks inserted by the Draftwatermark package.
+
+	* tex4ht-4ht.tex (xltabular.4ht): a better fix for Xltabular.
+
+	* tex4ht-4ht.tex (xltabular.4ht): fixed longtable errors caused by
+	Xltabular.
+
 2024-02-29  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-html4.tex (html4.4ht): use \HCode to print <div> for
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 13b9e3dee4e..953ee65cece 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1461 2024-02-13 15:20:24Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1483 2024-03-01 13:57:26Z michal_h21 $
 % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
 % Read by tex4ht-cond4ht.
 %
@@ -39,6 +39,8 @@
 \AddFile{9}{path}
 \AddFile{7}{hyperref}
 \AddFile{9}{hypcap}
+\AddFile{9}{draftwatermark}
+\AddFile{9}{draftwatermark-hooks}
 \AddFile{8}{fleqn}
 \AddFile{7}{supertabular}
 \AddFile{7}{array}
@@ -48,6 +50,7 @@
 \AddFile{8}{tabulary}
 \AddFile{8}{tabulary-a}
 \AddFile{7}{tabularx}
+\AddFile{7}{xltabular}
 \AddFile{9}{tabu}
 \AddFile{7}{arydshln}
 \AddFile{9}{threeparttable}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index dada4784b3e..079c5a12483 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 1480 2024-02-29 16:20:20Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1484 2024-03-01 21:17:29Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2024 TeX Users Group    
@@ -6574,7 +6574,9 @@ Hype: \hyperref[sec:foobar]{Link to Section \ref*{sec:foobar}}
 \EndVerbatim
 \EndHPage{}]
 
+%%%%%%%%%%%%%%%%%%%%%%%%%
 \Section{bookmark.sty}
+%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \<add to usepackage\><<<
 \Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht}
@@ -6595,6 +6597,41 @@ want, as it clashes with TeX4ht. It is useful only in the PDF mode anayway.
 \PassOptionsToPackage{draft}{bookmark}
 >>>
 
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{draftwatermark.sty}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<draftwatermark.4ht\><<<
+% draftwatermark.4ht (|version), generated from |jobname.tex
+% Copyright 2024 TeX Users Group
+|<TeX4ht license text|>
+% disable the watermark printing command
+\HLet\draftwatermark@printwm\@gobble
+\Hinput{draftwatermark}
+\endinput
+>>>        \AddFile{9}{draftwatermark}
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{draftwatermark.sty}{draftwatermark-hooks.4ht}
+>>>
+
+\<draftwatermark-hooks.4ht\><<<
+% draftwatermark-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2024 TeX Users Group
+|<TeX4ht license text|>
+|<disable draft watermark|>
+\endinput
+>>>        \AddFile{9}{draftwatermark-hooks}
+
+We don't want to print watermarks, they cause unnecessary pictures and 
+slow compilation.
+
+\<disable draft watermark\><<<
+\:AtEndOfPackage{
+  \draftwatermark@stampfalse
+}
+>>>
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
 \Chapter{Miscellaneous Environments}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
@@ -11084,6 +11121,32 @@ the  recursive macro \`'\inspect:cline' checks the digits separately.
 \endinput
 >>>        \AddFile{7}{tabularx}
 
+%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{xltabular}
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<xltabular.4ht\><<<
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
+% xltabular.4ht (|version), generated from |jobname.tex 
+% Copyright 2024 TeX Users Group 
+|<TeX4ht license text|> 
+|<xltabular restore longtable|>
+\Hinput{xltabular}
+\endinput
+>>> \AddFile{7}{xltabular}
+
+
+\<xltabular restore longtable\><<<
+% xltabular redefines \LT@array, which breaks all TeX4ht patches for this command
+% we must restore TeX4ht's version
+\let\xltabular\tabularx
+\let\endxltabular\endtabularx
+\let\longtable\XLT@longtable
+\AtBeginDocument{
+  \HLet\XLT@LT@array\n:LT@array:
+}
+>>>
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%
 \Section{Arydshln}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/draftwatermark-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/draftwatermark-hooks.4ht
new file mode 100644
index 00000000000..06ec3aced06
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/draftwatermark-hooks.4ht
@@ -0,0 +1,26 @@
+% draftwatermark-hooks.4ht (2024-03-01-14:08), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-03-01-14:08}
+
+\:AtEndOfPackage{
+  \draftwatermark@stampfalse
+}
+
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/draftwatermark.4ht b/Master/texmf-dist/tex/generic/tex4ht/draftwatermark.4ht
new file mode 100644
index 00000000000..9d70592f61c
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/draftwatermark.4ht
@@ -0,0 +1,25 @@
+% draftwatermark.4ht (2024-03-01-14:08), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-03-01-14:08}
+
+% disable the watermark printing command
+\HLet\draftwatermark@printwm\@gobble
+\Hinput{draftwatermark}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xltabular.4ht b/Master/texmf-dist/tex/generic/tex4ht/xltabular.4ht
new file mode 100644
index 00000000000..c796cb0927f
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/xltabular.4ht
@@ -0,0 +1,33 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% xltabular.4ht (2024-03-01-14:08), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-03-01-14:08}
+
+% xltabular redefines \LT@array, which breaks all TeX4ht patches for this command
+% we must restore TeX4ht's version
+\let\xltabular\tabularx
+\let\endxltabular\endtabularx
+\let\longtable\XLT@longtable
+\AtBeginDocument{
+  \HLet\XLT@LT@array\n:LT@array:
+}
+
+\Hinput{xltabular}
+\endinput
+