make4ht (23feb24)

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

2 files changed, 15 insertions, 9 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
index f6358956774..73a1978e5a4 100755
--- a/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
+++ b/Build/source/texk/texlive/linked_scripts/make4ht/make4ht
@@ -29,7 +29,7 @@ make4ht [options] filename ["tex4ht.sty op." "tex4ht op." "t4ht op" "latex op"]
 
 -- set version number. the template should be replaced by the
 -- actual version number by the build script
-local version = "v0.3m"
+local version = "v0.4"
 mkparams.version_number = version
 
 local args = mkparams.get_args()
@@ -39,6 +39,11 @@ local parameters = mkparams.process_args(args)
 log:status("Conversion started")
 log:status("Input file: " .. parameters.tex_file)
 
+
+if parameters.builddir and parameters.builddir ~= "" then
+  mkutils.make_path(parameters.builddir)
+end
+
 local mode = parameters.mode
 local build_file = parameters.build_file 
 
@@ -127,9 +132,10 @@ make:match(".*",function(filename,par)
     log:info("No output directory")
     return true
   end
-	log:info("outdir: "..outdir)
-	local outfilename = outdir .. filename
-	mkutils.copy(filename,outfilename)
+  log:info("outdir: "..outdir)
+  local outfilename = filename:gsub("^" .. (par.builddir or ""), "")
+  outfilename = outdir .. outfilename
+  mkutils.copy(filename,outfilename)
 	return true
 end)
 
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 4e41b037bdc..3d0830e5169 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 70001 2024-02-19 23:17:07Z karl $
+# $Id: tlmgr.pl 70080 2024-02-22 23:13:07Z karl $
 # Copyright 2008-2024 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
@@ -8,8 +8,8 @@
 
 use strict; use warnings;
 
-my $svnrev = '$Revision: 70001 $';
-my $datrev = '$Date: 2024-02-20 00:17:07 +0100 (Tue, 20 Feb 2024) $';
+my $svnrev = '$Revision: 70080 $';
+my $datrev = '$Date: 2024-02-23 00:13:07 +0100 (Fri, 23 Feb 2024) $';
 my $tlmgrrevision;
 my $tlmgrversion;
 my $prg;
@@ -8451,7 +8451,7 @@ name and in package descriptions, as complete words, and in filenames,
 as any substring, and outputs bug-reporting and other information for
 the package selected from the results.
 
-The search is equivalent to C<tlmgr search --word --file I<search-string>.
+The search is equivalent to C<tlmgr search --word --file> I<search-string>.
 Thus, I<search-string> is interpreted as a (Perl) regular expression.
 
 =head2 candidates I<pkg>
@@ -10552,7 +10552,7 @@ This script and its documentation were written for the TeX Live
 distribution (L<https://tug.org/texlive>) and both are licensed under the
 GNU General Public License Version 2 or later.
 
-$Id: tlmgr.pl 70001 2024-02-19 23:17:07Z karl $
+$Id: tlmgr.pl 70080 2024-02-22 23:13:07Z karl $
 =cut
 
 # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html