summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/texlive/tl-w32-starter.bat8
-rwxr-xr-xBuild/source/texk/texlive/tl-w32-wrapper.texlua20
-rw-r--r--Master/bin/win32/a2ping.bat8
-rw-r--r--Master/bin/win32/e2pall.bat8
-rwxr-xr-xMaster/bin/win32/e2pall.texlua92
-rw-r--r--Master/bin/win32/epstopdf.bat8
-rwxr-xr-xMaster/bin/win32/epstopdf.texlua92
-rw-r--r--Master/bin/win32/fmtutil-sys.bat8
-rwxr-xr-xMaster/bin/win32/fmtutil-sys.texlua92
-rw-r--r--Master/bin/win32/getnonfreefonts-sys.bat8
-rwxr-xr-xMaster/bin/win32/getnonfreefonts-sys.texlua92
-rw-r--r--Master/bin/win32/getnonfreefonts.bat8
-rwxr-xr-xMaster/bin/win32/getnonfreefonts.texlua92
-rwxr-xr-xMaster/bin/win32/makeglossaries.bat11
-rwxr-xr-xMaster/bin/win32/makeglossaries.texlua92
-rw-r--r--Master/bin/win32/pdfcrop.bat8
-rwxr-xr-xMaster/bin/win32/pdfcrop.texlua92
-rw-r--r--Master/bin/win32/pdfthumb.bat8
-rwxr-xr-xMaster/bin/win32/pdfthumb.texlua92
-rwxr-xr-xMaster/bin/win32/perltex.bat384
-rwxr-xr-xMaster/bin/win32/perltex.texlua92
-rw-r--r--Master/bin/win32/pkfix.bat8
-rwxr-xr-xMaster/bin/win32/pkfix.texlua92
-rw-r--r--Master/bin/win32/ppower4.bat8
-rwxr-xr-xMaster/bin/win32/ppower4.texlua92
-rw-r--r--Master/bin/win32/ps2eps.bat8
-rwxr-xr-xMaster/bin/win32/ps2eps.texlua92
-rw-r--r--Master/bin/win32/rungs.bat8
-rwxr-xr-xMaster/bin/win32/rungs.texlua92
-rw-r--r--Master/bin/win32/texcount.bat8
-rwxr-xr-xMaster/bin/win32/texcount.texlua92
-rw-r--r--Master/bin/win32/texdoctk.bat8
-rwxr-xr-xMaster/bin/win32/texdoctk.texlua92
-rw-r--r--Master/bin/win32/texindy.bat8
-rwxr-xr-xMaster/bin/win32/texindy.texlua92
-rw-r--r--Master/bin/win32/thumbpdf.bat8
-rwxr-xr-xMaster/bin/win32/thumbpdf.texlua92
-rwxr-xr-xMaster/bin/win32/tl-w32-wrapper.texlua (renamed from Master/bin/win32/a2ping.texlua)20
-rw-r--r--Master/bin/win32/tlmgr.bat8
-rwxr-xr-xMaster/bin/win32/tlmgr.texlua92
-rw-r--r--Master/bin/win32/updmap-sys.bat8
-rwxr-xr-xMaster/bin/win32/updmap-sys.texlua92
-rw-r--r--Master/bin/win32/updmap.bat8
-rwxr-xr-xMaster/bin/win32/updmap.texlua92
-rw-r--r--Master/bin/win32/vpe.bat8
-rwxr-xr-xMaster/bin/win32/vpe.texlua92
-rw-r--r--Master/bin/win32/xindy.bat8
-rwxr-xr-xMaster/bin/win32/xindy.texlua92
-rwxr-xr-xMaster/install-tl12
-rwxr-xr-xMaster/texmf/scripts/texlive/texconf.tlu13
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.tlu2
-rw-r--r--Master/tlpkg/TeXLive/TLTREE.pm1
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency14
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers94
-rw-r--r--Master/tlpkg/texlive.tlpdb474
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc1
56 files changed, 523 insertions, 2723 deletions
diff --git a/Build/source/texk/texlive/tl-w32-starter.bat b/Build/source/texk/texlive/tl-w32-starter.bat
new file mode 100644
index 00000000000..fe949613d7c
--- /dev/null
+++ b/Build/source/texk/texlive/tl-w32-starter.bat
@@ -0,0 +1,8 @@
+@echo off
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Build/source/texk/texlive/tl-w32-wrapper.texlua b/Build/source/texk/texlive/tl-w32-wrapper.texlua
index 81c8a83940c..03ce75a91c3 100755
--- a/Build/source/texk/texlive/tl-w32-wrapper.texlua
+++ b/Build/source/texk/texlive/tl-w32-wrapper.texlua
@@ -21,23 +21,23 @@ function fixwin(args_unix)
end
if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
+ progname = select(1, string.gsub(arg[1], '.*/', ''))
elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
+ progname = select(1, string.gsub(arg[1], '.*\\', ''))
else -- no path
- filename=arg[0]
+ progname = arg[1]
end
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
sys=false
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
+if string.find(progname, '-sys$') then
+ basename = select(1, string.gsub(progname, '-sys$', ''))
sys=true
+else
+ basename = progname
end
-kpse.set_program_name(filename, basename)
+kpse.set_program_name(progname..".bat", progname)
TEXDIR=kpse.var_value('SELFAUTOPARENT')
BINDIR=kpse.var_value('SELFAUTOLOC')
@@ -71,11 +71,11 @@ elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
script=kpse.find_file(basename..'.tlu', 'texmfscripts')
command={'texlua', script}
else
- io.stderr:write(filename..'.texlua: '..basename..
+ io.stderr:write(basename..'.bat: '..basename..
': No appropriate script found.\n')
end
-for i=1, #arg do
+for i=2, #arg do
command[#command+1]=arg[i]
end
diff --git a/Master/bin/win32/a2ping.bat b/Master/bin/win32/a2ping.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/a2ping.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/e2pall.bat b/Master/bin/win32/e2pall.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/e2pall.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/e2pall.texlua b/Master/bin/win32/e2pall.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/e2pall.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/epstopdf.bat b/Master/bin/win32/epstopdf.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/epstopdf.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/epstopdf.texlua b/Master/bin/win32/epstopdf.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/epstopdf.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/fmtutil-sys.bat b/Master/bin/win32/fmtutil-sys.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/fmtutil-sys.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/fmtutil-sys.texlua b/Master/bin/win32/fmtutil-sys.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/fmtutil-sys.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/getnonfreefonts-sys.bat b/Master/bin/win32/getnonfreefonts-sys.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/getnonfreefonts-sys.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/getnonfreefonts-sys.texlua b/Master/bin/win32/getnonfreefonts-sys.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/getnonfreefonts-sys.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/getnonfreefonts.bat b/Master/bin/win32/getnonfreefonts.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/getnonfreefonts.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/getnonfreefonts.texlua b/Master/bin/win32/getnonfreefonts.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/getnonfreefonts.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/makeglossaries.bat b/Master/bin/win32/makeglossaries.bat
index 64a6a20750c..aa2854f6b40 100755
--- a/Master/bin/win32/makeglossaries.bat
+++ b/Master/bin/win32/makeglossaries.bat
@@ -1,3 +1,8 @@
-@rem = '-*- Perl -*-
-@echo off
-perl -S "%~dp0makeglossaries" %*
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/makeglossaries.texlua b/Master/bin/win32/makeglossaries.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/makeglossaries.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/pdfcrop.bat b/Master/bin/win32/pdfcrop.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/pdfcrop.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/pdfcrop.texlua b/Master/bin/win32/pdfcrop.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/pdfcrop.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/pdfthumb.bat b/Master/bin/win32/pdfthumb.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/pdfthumb.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/pdfthumb.texlua b/Master/bin/win32/pdfthumb.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/pdfthumb.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/perltex.bat b/Master/bin/win32/perltex.bat
index e896269900d..43d7d637c7d 100755
--- a/Master/bin/win32/perltex.bat
+++ b/Master/bin/win32/perltex.bat
@@ -1,376 +1,8 @@
-@PERL@
-
-###########################################################
-# Prepare a LaTeX run for two-way communication with Perl #
-# By Scott Pakin <scott+pt@pakin.org> #
-###########################################################
-
-#-------------------------------------------------------------------
-# This is file `perltex.pl',
-# generated with the docstrip utility.
-#
-# The original source files were:
-#
-# perltex.dtx (with options: `perltex')
-#
-# This is a generated file.
-#
-# Copyright (C) 2004 by Scott Pakin <scott+pt@pakin.org>
-#
-# This file may be distributed and/or modified under the conditions
-# of the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX
-# version 1999/12/01 or later.
-#-------------------------------------------------------------------
-
-use Safe;
-use Opcode;
-use Getopt::Long;
-use Pod::Usage;
-use File::Basename;
-use POSIX;
-use warnings;
-use strict;
-my $latexprog;
-my $runsafely = 1;
-my @permittedops;
-my $progname = basename $0;
-my $jobname = "texput";
-my @latexcmdline;
-my $toperl;
-my $fromperl;
-my $toflag;
-my $fromflag;
-my $doneflag;
-my $logfile;
-my $sandbox = new Safe;
-my $latexpid;
-$latexprog = $ENV{"PERLTEX"} || "latex";
-Getopt::Long::Configure("require_order", "pass_through");
-GetOptions("help" => sub {pod2usage(-verbose => 1)},
- "latex=s" => \$latexprog,
- "safe!" => \$runsafely,
- "permit=s" => \@permittedops) || pod2usage(2);
-@latexcmdline = @ARGV;
-my $firstcmd = 0;
-for ($firstcmd=0; $firstcmd<=$#latexcmdline; $firstcmd++) {
- my $option = $latexcmdline[$firstcmd];
- next if substr($option, 0, 1) eq "-";
- if (substr ($option, 0, 1) ne "\\") {
- $jobname = basename $option, ".tex" ;
- $latexcmdline[$firstcmd] = "\\input $option";
- }
- last;
-}
-push @latexcmdline, "" if $#latexcmdline==-1;
-my $separator = "";
-foreach (1 .. 20) {
- $separator .= chr(ord("A") + rand(26));
-}
-$toperl = $jobname . ".topl";
-$fromperl = $jobname . ".frpl";
-$toflag = $jobname . ".tfpl";
-$fromflag = $jobname . ".ffpl";
-$doneflag = $jobname . ".dfpl";
-$logfile = $jobname . ".lgpl";
-$latexcmdline[$firstcmd] =
- sprintf '\makeatletter' . '\def%s{%s}' x 6 . '\makeatother%s',
- '\plmac@tag', $separator,
- '\plmac@tofile', $toperl,
- '\plmac@fromfile', $fromperl,
- '\plmac@toflag', $toflag,
- '\plmac@fromflag', $fromflag,
- '\plmac@doneflag', $doneflag,
- $latexcmdline[$firstcmd];
-foreach my $file ($toperl, $fromperl, $toflag, $fromflag, $doneflag) {
- unlink $file while -e $file;
-}
-open (LOGFILE, ">$logfile") || die "open(\"$logfile\"): $!\n";
-defined ($latexpid = fork) || die "fork: $!\n";
-unshift @latexcmdline, $latexprog;
-if (!$latexpid) {
- exec {$latexcmdline[0]} @latexcmdline;
- die "exec('@latexcmdline'): $!\n";
-}
-@permittedops=(":browse") if $#permittedops==-1;
-@permittedops=(Opcode::full_opset()) if !$runsafely;
-$sandbox->permit_only (@permittedops);
-while (1) {
- my $awaitexists = sub {
- while (!-e $_[0]) {
- sleep 0;
- if (waitpid($latexpid, &WNOHANG)==-1) {
- foreach my $file ($toperl, $fromperl, $toflag,
- $fromflag, $doneflag) {
- unlink $file while -e $file;
- }
- undef $latexpid;
- exit 0;
- }
- }
- };
- $awaitexists->($toflag);
- my $entirefile;
- {
- local $/ = undef;
- open (TOPERL, "<$toperl") || die "open($toperl): $!\n";
- $entirefile = <TOPERL>;
- close TOPERL;
- }
- my ($optag, $macroname, @otherstuff) =
- map {chomp; $_} split "$separator\n", $entirefile;
- $macroname =~ s/^[^A-Za-z]+//;
- $macroname =~ s/\W/_/g;
- $macroname = "latex_" . $macroname;
- if ($optag eq "USE") {
- foreach (@otherstuff) {
- s/\\/\\\\/g;
- s/\'/\\\'/g;
- $_ = "'$_'";
- }
- }
- my $perlcode;
- if ($optag eq "DEF") {
- $perlcode =
- sprintf "sub %s {%s}\n",
- $macroname, $otherstuff[0];
- }
- else {
- $perlcode = sprintf "%s (%s);\n", $macroname, join(", ", @otherstuff);
- }
- print LOGFILE "#" x 31, " PERL CODE ", "#" x 32, "\n";
- print LOGFILE $perlcode, "\n";
- undef $_;
- my $result;
- {
- my $warningmsg;
- local $SIG{__WARN__} =
- sub {chomp ($warningmsg=$_[0]); return 0};
- $result = $sandbox->reval ($perlcode);
- if (defined $warningmsg) {
- $warningmsg =~ s/at \(eval \d+\) line \d+\W+//;
- print LOGFILE "# ===> $warningmsg\n\n";
- }
- }
- $result="" if !$result;
- if ($@) {
- my $msg = $@;
- $msg =~ s/at \(eval \d+\) line \d+\W+//;
- $msg =~ s/\s+/ /;
- $result = "\\PackageError{perlmacros}{$msg}";
- my @helpstring;
- if ($msg =~ /\btrapped by\b/) {
- @helpstring =
- ("The preceding error message comes from Perl. Apparently,",
- "the Perl code you tried to execute attempted to perform an",
- "`unsafe' operation. If you trust the Perl code (e.g., if",
- "you wrote it) then you can invoke perltex with the --nosafe",
- "option to allow arbitrary Perl code to execute.",
- "Alternatively, you can selectively enable Perl features",
- "using perltex's --permit option. Don't do this if you don't",
- "trust the Perl code, however; malicious Perl code can do a",
- "world of harm to your computer system.");
- }
- else {
- @helpstring =
- ("The preceding error message comes from Perl. Apparently,",
- "there's a bug in your Perl code. You'll need to sort that",
- "out in your document and re-run perltex.");
- }
- my $helpstring = join ("\\MessageBreak\n", @helpstring);
- $helpstring =~ s/\. /.\\space\\space /g;
- $result .= "{$helpstring}";
- }
- print LOGFILE "%" x 30, " LATEX RESULT ", "%" x 30, "\n";
- print LOGFILE $result, "\n\n";
- $result .= '\endinput';
- open (FROMPERL, ">$fromperl") || die "open($fromperl): $!\n";
- syswrite FROMPERL, $result;
- close FROMPERL;
- unlink $toflag while -e $toflag;
- unlink $toperl while -e $toperl;
- unlink $doneflag while -e $doneflag;
- open (FROMFLAG, ">$fromflag") || die "open($fromflag): $!\n";
- close FROMFLAG;
- $awaitexists->($toperl);
- unlink $fromflag while -e $fromflag;
- open (DONEFLAG, ">$doneflag") || die "open($doneflag): $!\n";
- close DONEFLAG;
-}
-END {
- close LOGFILE;
- if (defined $latexpid) {
- kill (9, $latexpid);
- exit 1;
- }
- exit 0;
-}
-
-__END__
-
-=head1 NAME
-
-perltex - enable LaTeX macros to be defined in terms of Perl code
-
-=head1 SYNOPSIS
-
-perltex
-[B<--help>]
-[B<--latex>=I<program>]
-[B<-->[B<no>]B<safe>]
-[B<--permit>=I<feature>]
-[I<latex options>]
-
-=head1 DESCRIPTION
-
-LaTeX -- through the underlying TeX typesetting system -- produces
-beautifully typeset documents but has a macro language that is
-difficult to program. In particular, support for complex string
-manipulation is largely lacking. Perl is a popular general-purpose
-programming language whose forte is string manipulation. However, it
-has no typesetting capabilities whatsoever.
-
-Clearly, Perl's programmability could complement LaTeX's typesetting
-strengths. B<perltex> is the tool that enables a symbiosis between
-the two systems. All a user needs to do is compile a LaTeX document
-using B<perltex> instead of B<latex>. (B<perltex> is actually a
-wrapper for B<latex>, so no B<latex> functionality is lost.) If the
-document includes a C<\usepackage{perlmacros}> in its preamble, then
-C<\perlnewcommand> and C<\perlrenewcommand> macros will be made
-available. These behave just like LaTeX's C<\newcommand> and
-C<\renewcommand> except that the macro body contains Perl code instead
-of LaTeX code.
-
-=head1 OPTIONS
-
-B<perltex> accepts the following command-line options:
-
-=over 4
-
-=item B<--help>
-
-Display basic usage information.
-
-=item B<--latex>=I<program>
-
-Specify a program to use instead of B<latex>. For example,
-C<--latex=pdflatex> would typeset the given document using
-B<pdflatex> instead of ordinary B<latex>.
-
-=item B<-->[B<no>]B<safe>
-
-Enable or disable sandboxing. With the default of C<--safe>,
-B<perltex> executes the code from a C<\perlnewcommand> or
-C<\perlrenewcommand> macro within a protected environment that
-prohibits ``unsafe'' operations such as accessing files or executing
-external programs. Specifying C<--nosafe> gives the LaTeX document
-I<carte blanche> to execute any arbitrary Perl code, including that
-which can harm the user's files. See L<Safe> for more information.
-
-=item B<--permit>=I<feature>
-
-Permit particular Perl operations to be performed. The C<--permit>
-option, which can be specified more than once on the command line,
-enables finer-grained control over the B<perltex> sandbox. See
-L<Opcode> for more information.
-
-=back
-
-These options are then followed by whatever options are normally
-passed to B<latex> (or whatever program was specified with
-C<--latex>), including, for instance, the name of the F<.tex> file to
-compile.
-
-=head1 EXAMPLES
-
-In its simplest form, B<perltex> is run just like B<latex>:
-
- perltex myfile.tex
-
-To use B<pdflatex> instead of regular B<latex>, use the C<--latex>
-option:
-
- perltex --latex=pdflatex myfile.tex
-
-If LaTeX gives a ``C<trapped by operation mask>'' error and you trust
-the F<.tex> file you're trying to compile not to execute malicious
-Perl code (e.g., because you wrote it yourself), you can disable
-B<perltex>'s safety mechansisms with C<--nosafe>:
-
- perltex --nosafe myfile.tex
-
-The following command gives documents only B<perltex>'s default
-permissions (C<:browse>) plus the ability to open files and invoke the
-C<time> command:
-
- perltex --permit=:browse --permit=:filesys_open
- --permit=time myfile.tex
-
-=head1 ENVIRONMENT
-
-B<perltex> honors the following environment variables:
-
-=over 4
-
-=item PERLTEX
-
-Specify the filename of the LaTeX compiler. The LaTeX compiler
-defaults to ``C<latex>''. The C<PERLTEX> environment variable
-overrides this default, and the C<--latex> command-line option (see
-L</OPTIONS>) overrides that.
-
-=back
-
-=head1 FILES
-
-While compiling F<jobname.tex>, B<perltex> makes use of the following
-files:
-
-=over 4
-
-=item F<jobname.lgpl>
-
-log file written by Perl; helpful for debugging Perl macros
-
-=item F<jobname.topl>
-
-information sent from LaTeX to Perl
-
-=item F<jobname.frpl>
-
-information sent from Perl to LaTeX
-
-=item F<jobname.tfpl>
-
-``flag'' file whose existence indicates that F<jobname.topl> contains
-valid data
-
-=item F<jobname.ffpl>
-
-``flag'' file whose existence indicates that F<jobname.frpl> contains
-valid data
-
-=item F<jobname.dfpl>
-
-``flag'' file whose existence indicates that F<jobname.ffpl> has been
-deleted
-
-=back
-
-=head1 NOTES
-
-B<perltex>'s sandbox defaults to what L<Opcode> calls ``C<:browse>''.
-
-=head1 SEE ALSO
-
-latex(1), pdflatex(1), perl(1), Safe(3pm), Opcode(3pm)
-
-=head1 AUTHOR
-
-Scott Pakin, I<scott+pt@pakin.org>
-@END@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/perltex.texlua b/Master/bin/win32/perltex.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/perltex.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/pkfix.bat b/Master/bin/win32/pkfix.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/pkfix.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/pkfix.texlua b/Master/bin/win32/pkfix.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/pkfix.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/ppower4.bat b/Master/bin/win32/ppower4.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/ppower4.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/ppower4.texlua b/Master/bin/win32/ppower4.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/ppower4.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/ps2eps.bat b/Master/bin/win32/ps2eps.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/ps2eps.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/ps2eps.texlua b/Master/bin/win32/ps2eps.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/ps2eps.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/rungs.bat b/Master/bin/win32/rungs.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/rungs.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/rungs.texlua b/Master/bin/win32/rungs.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/rungs.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/texcount.bat b/Master/bin/win32/texcount.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/texcount.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/texcount.texlua b/Master/bin/win32/texcount.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/texcount.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/texdoctk.bat b/Master/bin/win32/texdoctk.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/texdoctk.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/texdoctk.texlua b/Master/bin/win32/texdoctk.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/texdoctk.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/texindy.bat b/Master/bin/win32/texindy.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/texindy.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/texindy.texlua b/Master/bin/win32/texindy.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/texindy.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/thumbpdf.bat b/Master/bin/win32/thumbpdf.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/thumbpdf.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/thumbpdf.texlua b/Master/bin/win32/thumbpdf.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/thumbpdf.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/a2ping.texlua b/Master/bin/win32/tl-w32-wrapper.texlua
index 45aa25162e5..30333ae7166 100755
--- a/Master/bin/win32/a2ping.texlua
+++ b/Master/bin/win32/tl-w32-wrapper.texlua
@@ -21,23 +21,23 @@ function fixwin(args_unix)
end
if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
+ progname = select(1, string.gsub(arg[1], '.*/', ''))
elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
+ progname = select(1, string.gsub(arg[1], '.*\\', ''))
else -- no path
- filename=arg[0]
+ progname = arg[1]
end
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
sys=false
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
+if string.find(progname, '-sys$') then
+ basename = select(1, string.gsub(progname, '-sys$', ''))
sys=true
+else
+ basename = progname
end
-kpse.set_program_name(filename, basename)
+kpse.set_program_name(progname..".bat", progname)
TEXDIR=kpse.var_value('SELFAUTOPARENT')
BINDIR=kpse.var_value('SELFAUTOLOC')
@@ -71,11 +71,11 @@ elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
script=kpse.find_file(basename..'.tlu', 'texmfscripts')
command={'texlua', script}
else
- io.stderr:write(filename..'.texlua: '..basename..
+ io.stderr:write(basename..'.bat: '..basename..
': No appropriate script found.\n')
end
-for i=1, #arg do
+for i=2, #arg do
command[#command+1]=arg[i]
end
diff --git a/Master/bin/win32/tlmgr.bat b/Master/bin/win32/tlmgr.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/tlmgr.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/tlmgr.texlua b/Master/bin/win32/tlmgr.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/tlmgr.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/updmap-sys.bat b/Master/bin/win32/updmap-sys.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/updmap-sys.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/updmap-sys.texlua b/Master/bin/win32/updmap-sys.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/updmap-sys.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/updmap.bat b/Master/bin/win32/updmap.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/updmap.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/updmap.texlua b/Master/bin/win32/updmap.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/updmap.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/vpe.bat b/Master/bin/win32/vpe.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/vpe.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/vpe.texlua b/Master/bin/win32/vpe.texlua
deleted file mode 100755
index 45aa25162e5..00000000000
--- a/Master/bin/win32/vpe.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tl-w32-wrapper.texlua 7659 2008-04-26 00:33:32Z karl $
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/bin/win32/xindy.bat b/Master/bin/win32/xindy.bat
new file mode 100644
index 00000000000..43d7d637c7d
--- /dev/null
+++ b/Master/bin/win32/xindy.bat
@@ -0,0 +1,8 @@
+rem tl-w32-starter.bat
+rem universal script starter, batch file part
+rem this program calls the tl-w32-wrapper.texlua
+@echo off
+setlocal
+set ownpath=%~dp0%
+texlua "%ownpath%tl-w32-wrapper.texlua" "%~dpn0" %*
+endlocal
diff --git a/Master/bin/win32/xindy.texlua b/Master/bin/win32/xindy.texlua
deleted file mode 100755
index 81c8a83940c..00000000000
--- a/Master/bin/win32/xindy.texlua
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007, 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for scripts.
-
-function fixwin(args_unix)
- if os.type == 'windows' then
- local args_win={} -- new table
- args_win[0]=args_unix[1]
- for i=1, #args_unix do
- args_win[i]='"'..args_unix[i]..'"'
- end
- return args_win
- else
- return args_unix
- end
-end
-
-if string.find(arg[0], '/') then -- UNIX path
- filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
- filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-sys=false
-
-if string.find(basename, '-sys$') then
- basename=select(1, string.gsub(basename, '-sys$', ''))
- sys=true
-end
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-
-os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..
- TEXDIR..'/tlpkg/installer;'..
- os.getenv('PATH'))
-
-os.setenv('WGETRC', TEXDIR..'/tlpkg/installer/wgetrc')
-os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')
-
-if sys then
- os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
- os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
- os.setenv('TEX_SYS_PROG', 'true')
-end
-
-if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
- command={BINDIR..'/'..basename..'.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
- command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
- script=BINDIR..'/'..basename..'.pl'
- command={perlbin, script}
-elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
- script=kpse.find_file(basename..'.pl', 'texmfscripts')
- command={perlbin, script}
-elseif kpse.find_file(basename..'.tlu', 'texmfscripts') then
- script=kpse.find_file(basename..'.tlu', 'texmfscripts')
- command={'texlua', script}
-else
- io.stderr:write(filename..'.texlua: '..basename..
- ': No appropriate script found.\n')
-end
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
---[[ Prepend an additional hyphen to activate this code.
-for i=0, #command do
- print (command[i])
-end
-os.exit(ret)
---]]
-
-ret=os.spawn(command)
-os.exit(ret)
diff --git a/Master/install-tl b/Master/install-tl
index d0e20d7cdf9..dec4a4830f3 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -273,8 +273,8 @@ if ($opt_arch) {
if (win32()) {
non_admin();
my $winpath = "$vars{'TEXDIR'}/bin/win32";
- register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
- update_assocs();
+ # register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
+ # update_assocs();
}
mkdirhier "$vars{'TEXMFCONFIG'}";
if (not -d "$vars{'TEXMFSYSVAR'}" ) {
@@ -855,7 +855,7 @@ sub do_postinst_stuff {
tllog($::LOG_DEBUG, "\n");
if (win32) {
- $ENV{'PATHEXT'}=".texlua;" . "$ENV{'PATHEXT'}";
+ #$ENV{'PATHEXT'}=".texlua;" . "$ENV{'PATHEXT'}";
$ENV{'TEXBINDIR'}=$TEXDIR . "\\bin\\win32";
$ENV{'TEXBINDIR'} =~ s!/!\\!g;
$ENV{'PERL5LIB'}="$perl_libdir";
@@ -1026,10 +1026,10 @@ sub do_win_registry_magic {
my $texbindir = $vars{'TEXDIR'}."\\bin\\win32";
$texbindir =~ s!/!\\!g;
add_texbindir_to_path($texbindir);
- setenv_reg('TEXBINDIR', $texbindir);
- register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
+ # setenv_reg('TEXBINDIR', $texbindir);
+ # register_script_type(".texlua", "%TEXBINDIR%/texlua.exe");
broadcast_env();
- update_assocs();
+ # update_assocs();
}
#
diff --git a/Master/texmf/scripts/texlive/texconf.tlu b/Master/texmf/scripts/texlive/texconf.tlu
index aca78efa492..32c6da8726f 100755
--- a/Master/texmf/scripts/texlive/texconf.tlu
+++ b/Master/texmf/scripts/texlive/texconf.tlu
@@ -583,18 +583,11 @@ if doformat then
-- on win32 texlua's os.spawn does not find fmtutil-sys.texlua as executable
-- even if I give it the full path. So we have to work around that
if sys then
- if os.type == 'windows' then
- local selfautoparent = kpse.var_value('SELFAUTOPARENT')
- command = { 'texlua.exe', selfautoparent..'/bin/win32/fmtutil-sys.texlua', '--refresh' }
- else
- command = { 'fmtutil-sys', '--refresh' }
- end
+ command = 'fmtutil-sys --refresh'
else
- command = { 'fmtutil', '--refresh' }
+ command = 'fmtutil --refresh'
end
- -- should we check the return value? (nil for spawn error, ow return code)
- command = fixwin(command)
- os.spawn(command)
+ os.execute(command)
end
-- Local Variables:
diff --git a/Master/texmf/scripts/texlive/tlmgr.tlu b/Master/texmf/scripts/texlive/tlmgr.tlu
index fce19370c9d..d7c99d8a022 100755
--- a/Master/texmf/scripts/texlive/tlmgr.tlu
+++ b/Master/texmf/scripts/texlive/tlmgr.tlu
@@ -37,7 +37,7 @@ end
-- filename without extension
--
if os.type == 'windows' then
- basename=select(1, string.gsub(filename, '\.tlu$', '.texlua'))
+ basename=select(1, string.gsub(filename, '\.tlu$', '.bat'))
else
basename=select(1, string.gsub(filename, '\.tlu$', ''))
end
diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm
index ca79902c795..9e009616b54 100644
--- a/Master/tlpkg/TeXLive/TLTREE.pm
+++ b/Master/tlpkg/TeXLive/TLTREE.pm
@@ -63,6 +63,7 @@ sub _initialize_lines {
if ($l =~ /^(.)(.)(.)(.)(.)(.)..\s*(\d+)\s+([\d\?]+)\s+([\w\?]+)\s+(.+)$/) {
my $lastchanged = ($8 eq "?" ? 1 : $8);
my $entry = "$10";
+ next if ($1 eq "D"); # ignore files which are removed
next if -d $entry; # TODO: what to do with links???
# collect architectures, assuming nothing is in bin/ but arch subdirs.
if ($entry =~ m,^bin/([^/]*)/,) {
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index f3025c2db1f..94a00fa7ab4 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -34,8 +34,18 @@ sub main
my %w = &unx_wrapper_entries ("i386-linux");
- $cww = "$Master/../Build/source/texk/texlive/tl-w32-wrapper.texlua";
+ # add some additional wrappers which are currently not found
+ # automatically
+ $w{'getnonfreefonts-sys'} = 1;
+ $w{'updmap-sys'} = 1;
+ $w{'updmap'} = 1;
+ $w{'xindy'} = 1;
+ $w{'texindy'} = 1;
+ $w{'fmtutil-sys'} = 1;
+
+ $cww = "$Master/../Build/source/texk/texlive/tl-w32-starter.bat";
$err += &check_w32 ("win32", $cww, %w);
+ system("cmp win32/tl-w32-wrapper.texlua $Master/../Build/source/texk/texlive/tl-w32-wrapper.texlua");
return $err;
}
@@ -78,7 +88,7 @@ sub check_w32
my ($w32dir, $w32canonical, %uw) = @_;
for my $k (sort keys %uw) {
- system ("cmp $w32dir/$k.texlua $w32canonical");
+ system ("cmp $w32dir/$k.bat $w32canonical");
#print "$k -> $uw{$k}\n";
}
}
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 99bf1c30f43..c051e58feec 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -27,11 +27,13 @@ our $mydir;
my $opt_debug = 0;
my $opt_location = ".";
my $opt_relative = 0;
+my $opt_recreate = 0;
my $help = 0;
GetOptions(
"location=s" => \$opt_location,
"debug!" => \$opt_debug,
+ "recreate" => \$opt_recreate,
"help|?" => \$help) or pod2usage(1);
pod2usage(-exitstatus => 0, -verbose => 2) if $help;
@@ -65,54 +67,58 @@ sub main
tllog($::LOG_DEBUG, "format=$type srcsplit=$srcsplit docsplit=$docsplit\n");
- my $nettlpdb = TeXLive::TLPDB->new(root => $opt_location);
- if (!defined($nettlpdb)) {
- die "Cannot init tlpdb from $opt_location ...";
- }
- my %archiverevs;
- foreach my $pkg ($nettlpdb->list_packages()) {
- $archiverevs{$pkg} = $nettlpdb->get_package($pkg)->revision();
- }
-
- # collect packages to be updated.
- my %count;
- $count{"new"} = $count{"removed"} = $count{"updated"} = $count{"unchanged"}
- = 0;
-
- my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::NetArchive";
my @todopacks = ();
- for my $pkg (@packs) {
- next if ($pkg eq "00texlive.config");
- next if ($pkg eq "00texlive.installer");
- my $oldrev = 0;
- if (-r "$opt_containerdir/$pkg.tar.$type"
- && defined($archiverevs{$pkg})) {
- $oldrev = $archiverevs{$pkg};
- } else {
- tllog($::LOG_NORMAL, "$pkg is new, found no containers\n");
- $count{"new"}++;
+ my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::NetArchive";
+ my %count;
+ if ($opt_recreate) {
+ @todopacks = $tlpdb->list_packages();
+ } else {
+ my $nettlpdb = TeXLive::TLPDB->new(root => $opt_location);
+ if (!defined($nettlpdb)) {
+ die "Cannot init tlpdb from $opt_location ...";
}
-
- my $tlp = $tlpdb->get_package($pkg);
- my $newrev = 0;
- if (defined($tlp)) {
- $newrev = $tlp->revision;
- } else {
- tllog($::LOG_NORMAL, "$pkg has disappeared, removing its containers\n");
- `rm $opt_containerdir/$pkg.*`;
- $count{"removed"}++;
+ my %archiverevs;
+ foreach my $pkg ($nettlpdb->list_packages()) {
+ $archiverevs{$pkg} = $nettlpdb->get_package($pkg)->revision();
}
- if ($oldrev == $newrev) {
- tllog($::LOG_DEBUG, "$pkg up to date\n");
- $count{"unchanged"}++;
- } elsif ($oldrev < $newrev) {
- push @todopacks, $pkg;
- $count{"updated"}++ if $oldrev;
- } else {
- die "This shouldn't happen! The revision of $pkg in texlive.tlpdb"
- . "($newrev) is OLDER than the one in"
- . "$opt_location/tlpkg/texlive.tlpdb ($oldrev), goodbye";
+ # collect packages to be updated.
+ $count{"new"} = $count{"removed"} = $count{"updated"} = $count{"unchanged"}
+ = 0;
+
+ for my $pkg (@packs) {
+ next if ($pkg eq "00texlive.config");
+ next if ($pkg eq "00texlive.installer");
+ my $oldrev = 0;
+ if (-r "$opt_containerdir/$pkg.tar.$type"
+ && defined($archiverevs{$pkg})) {
+ $oldrev = $archiverevs{$pkg};
+ } else {
+ tllog($::LOG_NORMAL, "$pkg is new, found no containers\n");
+ $count{"new"}++;
+ }
+
+ my $tlp = $tlpdb->get_package($pkg);
+ my $newrev = 0;
+ if (defined($tlp)) {
+ $newrev = $tlp->revision;
+ } else {
+ tllog($::LOG_NORMAL, "$pkg has disappeared, removing its containers\n");
+ `rm $opt_containerdir/$pkg.*`;
+ $count{"removed"}++;
+ }
+
+ if ($oldrev == $newrev) {
+ tllog($::LOG_DEBUG, "$pkg up to date\n");
+ $count{"unchanged"}++;
+ } elsif ($oldrev < $newrev) {
+ push @todopacks, $pkg;
+ $count{"updated"}++ if $oldrev;
+ } else {
+ die "This shouldn't happen! The revision of $pkg in texlive.tlpdb"
+ . "($newrev) is OLDER than the one in"
+ . "$opt_location/tlpkg/texlive.tlpdb ($oldrev), goodbye";
+ }
}
}
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 7a339cbe66a..3cd9c860c30 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -34,8 +34,8 @@ runfiles size=91
name 00texlive.installer
category TLCore
-revision 7774
-runfiles size=47
+revision 7783
+runfiles size=48
config.guess
install-tl
install-tl.html
@@ -44,6 +44,7 @@ runfiles size=47
tlpkg/installer/install-menu-text.pl
tlpkg/installer/lang/perltk-de
tlpkg/installer/lang/perltk-en.sample
+ tlpkg/installer/lang/perltk-fr
tlpkg/installer/lang/perltk-pl
tlpkg/installer/texlive2008.png
tlpkg/installer/wgetrc
@@ -1429,7 +1430,7 @@ catalogue-version 1.22b
name a2ping
category TLCore
-revision 7660
+revision 7340
shortdesc Advanced PS, PDF, EPS converter.
longdesc a2ping is a Perl script command line utility written for Unix
longdesc that converts many raster image and vector graphics formats to
@@ -1451,105 +1452,105 @@ catalogue-version
name a2ping.alpha-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for alpha-linux
binfiles arch=alpha-linux size=24
bin/alpha-linux/a2ping
name a2ping.hppa-hpux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for hppa-hpux
binfiles arch=hppa-hpux size=24
bin/hppa-hpux/a2ping
name a2ping.i386-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for i386-darwin
binfiles arch=i386-darwin size=24
bin/i386-darwin/a2ping
name a2ping.i386-freebsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for i386-freebsd
binfiles arch=i386-freebsd size=24
bin/i386-freebsd/a2ping
name a2ping.i386-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/a2ping
name a2ping.i386-openbsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for i386-openbsd
binfiles arch=i386-openbsd size=24
bin/i386-openbsd/a2ping
name a2ping.i386-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for i386-solaris
binfiles arch=i386-solaris size=24
bin/i386-solaris/a2ping
name a2ping.mips-irix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for mips-irix
binfiles arch=mips-irix size=24
bin/mips-irix/a2ping
name a2ping.powerpc-aix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for powerpc-aix
binfiles arch=powerpc-aix size=24
bin/powerpc-aix/a2ping
name a2ping.powerpc-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for powerpc-darwin
binfiles arch=powerpc-darwin size=24
bin/powerpc-darwin/a2ping
name a2ping.powerpc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for powerpc-linux
binfiles arch=powerpc-linux size=24
bin/powerpc-linux/a2ping
name a2ping.sparc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for sparc-linux
binfiles arch=sparc-linux size=24
bin/sparc-linux/a2ping
name a2ping.sparc-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for sparc-solaris
binfiles arch=sparc-solaris size=24
bin/sparc-solaris/a2ping
name a2ping.win32
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for win32
binfiles arch=win32 size=1
- bin/win32/a2ping.texlua
+ bin/win32/a2ping.bat
name a2ping.x86_64-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of a2ping for x86_64-linux
binfiles arch=x86_64-linux size=24
bin/x86_64-linux/a2ping
@@ -13774,8 +13775,8 @@ shortdesc binary files of bin-dvipsk for win32
binfiles arch=win32 size=41
bin/win32/afm2tfm.exe
bin/win32/dvips.exe
+ bin/win32/pkfix.bat
bin/win32/pkfix.exe
- bin/win32/pkfix.texlua
name bin-dvipsk.x86_64-linux
category TLCore
@@ -14414,7 +14415,7 @@ binfiles arch=x86_64-linux size=3
name bin-getnonfreefonts
category TLCore
-revision 7660
+revision 7340
depend bin-getnonfreefonts.ARCH
docfiles size=2
texmf/doc/man/man1/getnonfreefonts-sys.1
@@ -14424,7 +14425,7 @@ runfiles size=2
name bin-getnonfreefonts.alpha-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for alpha-linux
binfiles arch=alpha-linux size=3
bin/alpha-linux/getnonfreefonts
@@ -14432,7 +14433,7 @@ binfiles arch=alpha-linux size=3
name bin-getnonfreefonts.hppa-hpux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for hppa-hpux
binfiles arch=hppa-hpux size=3
bin/hppa-hpux/getnonfreefonts
@@ -14440,7 +14441,7 @@ binfiles arch=hppa-hpux size=3
name bin-getnonfreefonts.i386-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for i386-darwin
binfiles arch=i386-darwin size=3
bin/i386-darwin/getnonfreefonts
@@ -14448,7 +14449,7 @@ binfiles arch=i386-darwin size=3
name bin-getnonfreefonts.i386-freebsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for i386-freebsd
binfiles arch=i386-freebsd size=3
bin/i386-freebsd/getnonfreefonts
@@ -14456,7 +14457,7 @@ binfiles arch=i386-freebsd size=3
name bin-getnonfreefonts.i386-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for i386-linux
binfiles arch=i386-linux size=2
bin/i386-linux/getnonfreefonts
@@ -14464,7 +14465,7 @@ binfiles arch=i386-linux size=2
name bin-getnonfreefonts.i386-openbsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for i386-openbsd
binfiles arch=i386-openbsd size=3
bin/i386-openbsd/getnonfreefonts
@@ -14472,7 +14473,7 @@ binfiles arch=i386-openbsd size=3
name bin-getnonfreefonts.i386-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for i386-solaris
binfiles arch=i386-solaris size=3
bin/i386-solaris/getnonfreefonts
@@ -14480,7 +14481,7 @@ binfiles arch=i386-solaris size=3
name bin-getnonfreefonts.mips-irix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for mips-irix
binfiles arch=mips-irix size=3
bin/mips-irix/getnonfreefonts
@@ -14488,7 +14489,7 @@ binfiles arch=mips-irix size=3
name bin-getnonfreefonts.powerpc-aix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for powerpc-aix
binfiles arch=powerpc-aix size=3
bin/powerpc-aix/getnonfreefonts
@@ -14496,7 +14497,7 @@ binfiles arch=powerpc-aix size=3
name bin-getnonfreefonts.powerpc-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for powerpc-darwin
binfiles arch=powerpc-darwin size=3
bin/powerpc-darwin/getnonfreefonts
@@ -14504,7 +14505,7 @@ binfiles arch=powerpc-darwin size=3
name bin-getnonfreefonts.powerpc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for powerpc-linux
binfiles arch=powerpc-linux size=3
bin/powerpc-linux/getnonfreefonts
@@ -14512,7 +14513,7 @@ binfiles arch=powerpc-linux size=3
name bin-getnonfreefonts.sparc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for sparc-linux
binfiles arch=sparc-linux size=3
bin/sparc-linux/getnonfreefonts
@@ -14520,7 +14521,7 @@ binfiles arch=sparc-linux size=3
name bin-getnonfreefonts.sparc-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for sparc-solaris
binfiles arch=sparc-solaris size=3
bin/sparc-solaris/getnonfreefonts
@@ -14528,15 +14529,15 @@ binfiles arch=sparc-solaris size=3
name bin-getnonfreefonts.win32
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for win32
binfiles arch=win32 size=2
- bin/win32/getnonfreefonts-sys.texlua
- bin/win32/getnonfreefonts.texlua
+ bin/win32/getnonfreefonts-sys.bat
+ bin/win32/getnonfreefonts.bat
name bin-getnonfreefonts.x86_64-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-getnonfreefonts for x86_64-linux
binfiles arch=x86_64-linux size=2
bin/x86_64-linux/getnonfreefonts
@@ -17695,7 +17696,7 @@ binfiles arch=x86_64-linux size=353
name bin-pdftools
category TLCore
-revision 7660
+revision 7371
depend bin-pdftools.ARCH
docfiles size=4
texmf/doc/man/man1/e2pall.1
@@ -17707,7 +17708,7 @@ runfiles size=4
name bin-pdftools.alpha-linux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for alpha-linux
binfiles arch=alpha-linux size=163
bin/alpha-linux/e2pall
@@ -17718,7 +17719,7 @@ binfiles arch=alpha-linux size=163
name bin-pdftools.hppa-hpux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for hppa-hpux
binfiles arch=hppa-hpux size=162
bin/hppa-hpux/e2pall
@@ -17729,7 +17730,7 @@ binfiles arch=hppa-hpux size=162
name bin-pdftools.i386-darwin
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for i386-darwin
binfiles arch=i386-darwin size=111
bin/i386-darwin/e2pall
@@ -17738,7 +17739,7 @@ binfiles arch=i386-darwin size=111
name bin-pdftools.i386-freebsd
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for i386-freebsd
binfiles arch=i386-freebsd size=113
bin/i386-freebsd/e2pall
@@ -17749,7 +17750,7 @@ binfiles arch=i386-freebsd size=113
name bin-pdftools.i386-linux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for i386-linux
binfiles arch=i386-linux size=108
bin/i386-linux/e2pall
@@ -17760,7 +17761,7 @@ binfiles arch=i386-linux size=108
name bin-pdftools.i386-openbsd
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for i386-openbsd
binfiles arch=i386-openbsd size=111
bin/i386-openbsd/e2pall
@@ -17771,7 +17772,7 @@ binfiles arch=i386-openbsd size=111
name bin-pdftools.i386-solaris
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for i386-solaris
binfiles arch=i386-solaris size=149
bin/i386-solaris/e2pall
@@ -17782,7 +17783,7 @@ binfiles arch=i386-solaris size=149
name bin-pdftools.mips-irix
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for mips-irix
binfiles arch=mips-irix size=158
bin/mips-irix/e2pall
@@ -17793,7 +17794,7 @@ binfiles arch=mips-irix size=158
name bin-pdftools.powerpc-aix
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for powerpc-aix
binfiles arch=powerpc-aix size=133
bin/powerpc-aix/e2pall
@@ -17804,7 +17805,7 @@ binfiles arch=powerpc-aix size=133
name bin-pdftools.powerpc-darwin
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for powerpc-darwin
binfiles arch=powerpc-darwin size=101
bin/powerpc-darwin/e2pall
@@ -17813,7 +17814,7 @@ binfiles arch=powerpc-darwin size=101
name bin-pdftools.powerpc-linux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for powerpc-linux
binfiles arch=powerpc-linux size=134
bin/powerpc-linux/e2pall
@@ -17824,7 +17825,7 @@ binfiles arch=powerpc-linux size=134
name bin-pdftools.sparc-linux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for sparc-linux
binfiles arch=sparc-linux size=122
bin/sparc-linux/e2pall
@@ -17835,7 +17836,7 @@ binfiles arch=sparc-linux size=122
name bin-pdftools.sparc-solaris
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for sparc-solaris
binfiles arch=sparc-solaris size=134
bin/sparc-solaris/e2pall
@@ -17846,12 +17847,12 @@ binfiles arch=sparc-solaris size=134
name bin-pdftools.win32
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for win32
binfiles arch=win32 size=116
+ bin/win32/e2pall.bat
bin/win32/e2pall.exe
- bin/win32/e2pall.texlua
- bin/win32/epstopdf.texlua
+ bin/win32/epstopdf.bat
bin/win32/pdfatfi.exe
bin/win32/pdfclose.exe
bin/win32/pdfdde.exe
@@ -17860,7 +17861,7 @@ binfiles arch=win32 size=116
name bin-pdftools.x86_64-linux
category TLCore
-revision 7660
+revision 7371
shortdesc binary files of bin-pdftools for x86_64-linux
binfiles arch=x86_64-linux size=140
bin/x86_64-linux/e2pall
@@ -18343,7 +18344,7 @@ binfiles arch=x86_64-linux size=56
name bin-pstools
category TLCore
-revision 7660
+revision 7340
depend bin-pstools.ARCH
docfiles size=2
texmf/doc/man/man1/ps2frag.1
@@ -18353,7 +18354,7 @@ runfiles size=9
name bin-pstools.alpha-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for alpha-linux
binfiles arch=alpha-linux size=14
bin/alpha-linux/bbox
@@ -18363,7 +18364,7 @@ binfiles arch=alpha-linux size=14
name bin-pstools.hppa-hpux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for hppa-hpux
binfiles arch=hppa-hpux size=18
bin/hppa-hpux/bbox
@@ -18373,7 +18374,7 @@ binfiles arch=hppa-hpux size=18
name bin-pstools.i386-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for i386-darwin
binfiles arch=i386-darwin size=16
bin/i386-darwin/bbox
@@ -18383,7 +18384,7 @@ binfiles arch=i386-darwin size=16
name bin-pstools.i386-freebsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for i386-freebsd
binfiles arch=i386-freebsd size=13
bin/i386-freebsd/bbox
@@ -18393,7 +18394,7 @@ binfiles arch=i386-freebsd size=13
name bin-pstools.i386-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for i386-linux
binfiles arch=i386-linux size=5
bin/i386-linux/bbox
@@ -18403,7 +18404,7 @@ binfiles arch=i386-linux size=5
name bin-pstools.i386-openbsd
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for i386-openbsd
binfiles arch=i386-openbsd size=14
bin/i386-openbsd/bbox
@@ -18413,7 +18414,7 @@ binfiles arch=i386-openbsd size=14
name bin-pstools.i386-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for i386-solaris
binfiles arch=i386-solaris size=13
bin/i386-solaris/bbox
@@ -18423,7 +18424,7 @@ binfiles arch=i386-solaris size=13
name bin-pstools.mips-irix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for mips-irix
binfiles arch=mips-irix size=16
bin/mips-irix/bbox
@@ -18433,7 +18434,7 @@ binfiles arch=mips-irix size=16
name bin-pstools.powerpc-aix
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for powerpc-aix
binfiles arch=powerpc-aix size=13
bin/powerpc-aix/bbox
@@ -18443,7 +18444,7 @@ binfiles arch=powerpc-aix size=13
name bin-pstools.powerpc-darwin
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for powerpc-darwin
binfiles arch=powerpc-darwin size=15
bin/powerpc-darwin/bbox
@@ -18453,7 +18454,7 @@ binfiles arch=powerpc-darwin size=15
name bin-pstools.powerpc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for powerpc-linux
binfiles arch=powerpc-linux size=14
bin/powerpc-linux/bbox
@@ -18463,7 +18464,7 @@ binfiles arch=powerpc-linux size=14
name bin-pstools.sparc-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for sparc-linux
binfiles arch=sparc-linux size=14
bin/sparc-linux/bbox
@@ -18473,7 +18474,7 @@ binfiles arch=sparc-linux size=14
name bin-pstools.sparc-solaris
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for sparc-solaris
binfiles arch=sparc-solaris size=14
bin/sparc-solaris/bbox
@@ -18483,16 +18484,16 @@ binfiles arch=sparc-solaris size=14
name bin-pstools.win32
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for win32
binfiles arch=win32 size=5
bin/win32/bbox.exe
+ bin/win32/ps2eps.bat
bin/win32/ps2eps.exe
- bin/win32/ps2eps.texlua
name bin-pstools.x86_64-linux
category TLCore
-revision 7660
+revision 7340
shortdesc binary files of bin-pstools for x86_64-linux
binfiles arch=x86_64-linux size=14
bin/x86_64-linux/bbox
@@ -19600,11 +19601,11 @@ category TLCore
revision 7763
shortdesc binary files of bin-tetex for win32
binfiles arch=win32 size=8
- bin/win32/a2ping.texlua
- bin/win32/fmtutil-sys.texlua
+ bin/win32/a2ping.bat
+ bin/win32/fmtutil-sys.bat
bin/win32/fmtutil.exe
- bin/win32/updmap-sys.texlua
- bin/win32/updmap.texlua
+ bin/win32/updmap-sys.bat
+ bin/win32/updmap.bat
name bin-tetex.x86_64-linux
category TLCore
@@ -20177,7 +20178,7 @@ binfiles arch=x86_64-linux size=11
name bin-texdoc
category TLCore
-revision 7660
+revision 7649
depend bin-kpathsea
depend bin-texdoc.ARCH
docfiles size=4
@@ -20191,7 +20192,7 @@ runfiles size=25
name bin-texdoc.alpha-linux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for alpha-linux
binfiles arch=alpha-linux size=17
bin/alpha-linux/texdoc
@@ -20199,7 +20200,7 @@ binfiles arch=alpha-linux size=17
name bin-texdoc.hppa-hpux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for hppa-hpux
binfiles arch=hppa-hpux size=17
bin/hppa-hpux/texdoc
@@ -20207,7 +20208,7 @@ binfiles arch=hppa-hpux size=17
name bin-texdoc.i386-darwin
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for i386-darwin
binfiles arch=i386-darwin size=17
bin/i386-darwin/texdoc
@@ -20215,7 +20216,7 @@ binfiles arch=i386-darwin size=17
name bin-texdoc.i386-freebsd
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for i386-freebsd
binfiles arch=i386-freebsd size=17
bin/i386-freebsd/texdoc
@@ -20223,7 +20224,7 @@ binfiles arch=i386-freebsd size=17
name bin-texdoc.i386-linux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for i386-linux
binfiles arch=i386-linux size=3
bin/i386-linux/texdoc
@@ -20231,7 +20232,7 @@ binfiles arch=i386-linux size=3
name bin-texdoc.i386-openbsd
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for i386-openbsd
binfiles arch=i386-openbsd size=17
bin/i386-openbsd/texdoc
@@ -20239,7 +20240,7 @@ binfiles arch=i386-openbsd size=17
name bin-texdoc.i386-solaris
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for i386-solaris
binfiles arch=i386-solaris size=17
bin/i386-solaris/texdoc
@@ -20247,7 +20248,7 @@ binfiles arch=i386-solaris size=17
name bin-texdoc.mips-irix
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for mips-irix
binfiles arch=mips-irix size=17
bin/mips-irix/texdoc
@@ -20255,7 +20256,7 @@ binfiles arch=mips-irix size=17
name bin-texdoc.powerpc-aix
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for powerpc-aix
binfiles arch=powerpc-aix size=17
bin/powerpc-aix/texdoc
@@ -20263,7 +20264,7 @@ binfiles arch=powerpc-aix size=17
name bin-texdoc.powerpc-darwin
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for powerpc-darwin
binfiles arch=powerpc-darwin size=17
bin/powerpc-darwin/texdoc
@@ -20271,7 +20272,7 @@ binfiles arch=powerpc-darwin size=17
name bin-texdoc.powerpc-linux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for powerpc-linux
binfiles arch=powerpc-linux size=17
bin/powerpc-linux/texdoc
@@ -20279,7 +20280,7 @@ binfiles arch=powerpc-linux size=17
name bin-texdoc.sparc-linux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for sparc-linux
binfiles arch=sparc-linux size=17
bin/sparc-linux/texdoc
@@ -20287,7 +20288,7 @@ binfiles arch=sparc-linux size=17
name bin-texdoc.sparc-solaris
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for sparc-solaris
binfiles arch=sparc-solaris size=17
bin/sparc-solaris/texdoc
@@ -20295,16 +20296,16 @@ binfiles arch=sparc-solaris size=17
name bin-texdoc.win32
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for win32
binfiles arch=win32 size=7
bin/win32/texdoc.exe
bin/win32/texdocc.exe
- bin/win32/texdoctk.texlua
+ bin/win32/texdoctk.bat
name bin-texdoc.x86_64-linux
category TLCore
-revision 7660
+revision 7649
shortdesc binary files of bin-texdoc for x86_64-linux
binfiles arch=x86_64-linux size=3
bin/x86_64-linux/texdoc
@@ -20662,9 +20663,10 @@ name bin-texlive.win32
category TLCore
revision 7777
shortdesc binary files of bin-texlive for win32
-binfiles arch=win32 size=2
- bin/win32/rungs.texlua
- bin/win32/tlmgr.texlua
+binfiles arch=win32 size=3
+ bin/win32/rungs.bat
+ bin/win32/tl-w32-wrapper.texlua
+ bin/win32/tlmgr.bat
name bin-texlive.x86_64-linux
category TLCore
@@ -49476,7 +49478,7 @@ catalogue-version 1.5.2
name glossaries
category Package
-revision 7660
+revision 7340
shortdesc Create glossaries and lists of acronyms.
longdesc The glossaries package supports acronyms and multiple
longdesc glossaries. New entries are defined to have a name and
@@ -49540,82 +49542,81 @@ catalogue-version 1.12
name glossaries.alpha-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for alpha-linux
name glossaries.hppa-hpux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for hppa-hpux
name glossaries.i386-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for i386-darwin
name glossaries.i386-freebsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for i386-freebsd
name glossaries.i386-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/makeglossaries
name glossaries.i386-openbsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for i386-openbsd
name glossaries.i386-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for i386-solaris
name glossaries.mips-irix
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for mips-irix
name glossaries.powerpc-aix
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for powerpc-aix
name glossaries.powerpc-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for powerpc-darwin
name glossaries.powerpc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for powerpc-linux
name glossaries.sparc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for sparc-linux
name glossaries.sparc-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for sparc-solaris
name glossaries.win32
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for win32
-binfiles arch=win32 size=2
+binfiles arch=win32 size=1
bin/win32/makeglossaries.bat
- bin/win32/makeglossaries.texlua
name glossaries.x86_64-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of glossaries for x86_64-linux
name glyphlist
@@ -72283,7 +72284,7 @@ catalogue-version 1.7a
name pdfcrop
category Package
-revision 7660
+revision 7649
shortdesc Crop PDF graphics.
longdesc A Perl script that can either trim pages of any whitespace
longdesc border, or trim them of a fixed border.
@@ -72299,106 +72300,106 @@ catalogue-version 1.9
name pdfcrop.alpha-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for alpha-linux
binfiles arch=alpha-linux size=3
bin/alpha-linux/pdfcrop
name pdfcrop.hppa-hpux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for hppa-hpux
binfiles arch=hppa-hpux size=3
bin/hppa-hpux/pdfcrop
name pdfcrop.i386-darwin
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for i386-darwin
binfiles arch=i386-darwin size=3
bin/i386-darwin/pdfcrop
name pdfcrop.i386-freebsd
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for i386-freebsd
binfiles arch=i386-freebsd size=3
bin/i386-freebsd/pdfcrop
name pdfcrop.i386-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/pdfcrop
name pdfcrop.i386-openbsd
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for i386-openbsd
binfiles arch=i386-openbsd size=3
bin/i386-openbsd/pdfcrop
name pdfcrop.i386-solaris
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for i386-solaris
binfiles arch=i386-solaris size=3
bin/i386-solaris/pdfcrop
name pdfcrop.mips-irix
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for mips-irix
binfiles arch=mips-irix size=3
bin/mips-irix/pdfcrop
name pdfcrop.powerpc-aix
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for powerpc-aix
binfiles arch=powerpc-aix size=3
bin/powerpc-aix/pdfcrop
name pdfcrop.powerpc-darwin
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for powerpc-darwin
binfiles arch=powerpc-darwin size=3
bin/powerpc-darwin/pdfcrop
name pdfcrop.powerpc-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for powerpc-linux
binfiles arch=powerpc-linux size=3
bin/powerpc-linux/pdfcrop
name pdfcrop.sparc-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for sparc-linux
binfiles arch=sparc-linux size=3
bin/sparc-linux/pdfcrop
name pdfcrop.sparc-solaris
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for sparc-solaris
binfiles arch=sparc-solaris size=3
bin/sparc-solaris/pdfcrop
name pdfcrop.win32
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for win32
binfiles arch=win32 size=3
+ bin/win32/pdfcrop.bat
bin/win32/pdfcrop.exe
- bin/win32/pdfcrop.texlua
name pdfcrop.x86_64-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of pdfcrop for x86_64-linux
binfiles arch=x86_64-linux size=3
bin/x86_64-linux/pdfcrop
@@ -72633,7 +72634,7 @@ catalogue-version
name perltex
category Package
-revision 7660
+revision 7340
shortdesc Define LaTeX macros in terms of Perl code
longdesc PerlTeX is a combination Perl script (perltex.pl) and LaTeX2e
longdesc package (perltex.sty) that, together, give the user the ability
@@ -72663,106 +72664,105 @@ catalogue-version 1.5
name perltex.alpha-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for alpha-linux
binfiles arch=alpha-linux size=4
bin/alpha-linux/perltex
name perltex.hppa-hpux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for hppa-hpux
binfiles arch=hppa-hpux size=4
bin/hppa-hpux/perltex
name perltex.i386-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for i386-darwin
binfiles arch=i386-darwin size=4
bin/i386-darwin/perltex
name perltex.i386-freebsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for i386-freebsd
binfiles arch=i386-freebsd size=4
bin/i386-freebsd/perltex
name perltex.i386-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/perltex
name perltex.i386-openbsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for i386-openbsd
binfiles arch=i386-openbsd size=4
bin/i386-openbsd/perltex
name perltex.i386-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for i386-solaris
binfiles arch=i386-solaris size=4
bin/i386-solaris/perltex
name perltex.mips-irix
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for mips-irix
binfiles arch=mips-irix size=4
bin/mips-irix/perltex
name perltex.powerpc-aix
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for powerpc-aix
binfiles arch=powerpc-aix size=4
bin/powerpc-aix/perltex
name perltex.powerpc-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for powerpc-darwin
binfiles arch=powerpc-darwin size=4
bin/powerpc-darwin/perltex
name perltex.powerpc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for powerpc-linux
binfiles arch=powerpc-linux size=4
bin/powerpc-linux/perltex
name perltex.sparc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for sparc-linux
binfiles arch=sparc-linux size=4
bin/sparc-linux/perltex
name perltex.sparc-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for sparc-solaris
binfiles arch=sparc-solaris size=4
bin/sparc-solaris/perltex
name perltex.win32
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for win32
-binfiles arch=win32 size=4
+binfiles arch=win32 size=1
bin/win32/perltex.bat
- bin/win32/perltex.texlua
name perltex.x86_64-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of perltex for x86_64-linux
binfiles arch=x86_64-linux size=4
bin/x86_64-linux/perltex
@@ -74491,7 +74491,7 @@ catalogue-version 1.3
name ppower4
category Package
-revision 7660
+revision 7649
shortdesc A postprocessor for PDF presentations.
longdesc Ppower4 is post processor for PDF presentations created by
longdesc pdf(La)TeX. It can be used to prepare presentations which
@@ -74563,7 +74563,7 @@ catalogue-version 0.4
name ppower4.alpha-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for alpha-linux
binfiles arch=alpha-linux size=2
bin/alpha-linux/pdfthumb
@@ -74571,7 +74571,7 @@ binfiles arch=alpha-linux size=2
name ppower4.hppa-hpux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for hppa-hpux
binfiles arch=hppa-hpux size=2
bin/hppa-hpux/pdfthumb
@@ -74579,7 +74579,7 @@ binfiles arch=hppa-hpux size=2
name ppower4.i386-darwin
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for i386-darwin
binfiles arch=i386-darwin size=2
bin/i386-darwin/pdfthumb
@@ -74587,7 +74587,7 @@ binfiles arch=i386-darwin size=2
name ppower4.i386-freebsd
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for i386-freebsd
binfiles arch=i386-freebsd size=2
bin/i386-freebsd/pdfthumb
@@ -74595,7 +74595,7 @@ binfiles arch=i386-freebsd size=2
name ppower4.i386-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for i386-linux
binfiles arch=i386-linux size=2
bin/i386-linux/pdfthumb
@@ -74603,7 +74603,7 @@ binfiles arch=i386-linux size=2
name ppower4.i386-openbsd
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for i386-openbsd
binfiles arch=i386-openbsd size=2
bin/i386-openbsd/pdfthumb
@@ -74611,7 +74611,7 @@ binfiles arch=i386-openbsd size=2
name ppower4.i386-solaris
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for i386-solaris
binfiles arch=i386-solaris size=2
bin/i386-solaris/pdfthumb
@@ -74619,7 +74619,7 @@ binfiles arch=i386-solaris size=2
name ppower4.mips-irix
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for mips-irix
binfiles arch=mips-irix size=2
bin/mips-irix/pdfthumb
@@ -74627,7 +74627,7 @@ binfiles arch=mips-irix size=2
name ppower4.powerpc-aix
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for powerpc-aix
binfiles arch=powerpc-aix size=2
bin/powerpc-aix/pdfthumb
@@ -74635,7 +74635,7 @@ binfiles arch=powerpc-aix size=2
name ppower4.powerpc-darwin
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for powerpc-darwin
binfiles arch=powerpc-darwin size=2
bin/powerpc-darwin/pdfthumb
@@ -74643,7 +74643,7 @@ binfiles arch=powerpc-darwin size=2
name ppower4.powerpc-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for powerpc-linux
binfiles arch=powerpc-linux size=2
bin/powerpc-linux/pdfthumb
@@ -74651,7 +74651,7 @@ binfiles arch=powerpc-linux size=2
name ppower4.sparc-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for sparc-linux
binfiles arch=sparc-linux size=2
bin/sparc-linux/pdfthumb
@@ -74659,7 +74659,7 @@ binfiles arch=sparc-linux size=2
name ppower4.sparc-solaris
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for sparc-solaris
binfiles arch=sparc-solaris size=2
bin/sparc-solaris/pdfthumb
@@ -74667,15 +74667,15 @@ binfiles arch=sparc-solaris size=2
name ppower4.win32
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for win32
binfiles arch=win32 size=2
- bin/win32/pdfthumb.texlua
- bin/win32/ppower4.texlua
+ bin/win32/pdfthumb.bat
+ bin/win32/ppower4.bat
name ppower4.x86_64-linux
category Package
-revision 7660
+revision 7649
shortdesc binary files of ppower4 for x86_64-linux
binfiles arch=x86_64-linux size=2
bin/x86_64-linux/pdfthumb
@@ -87176,7 +87176,7 @@ docfiles size=559
name texcount
category Package
-revision 7660
+revision 7340
depend texcount.ARCH
docfiles size=42
texmf-dist/doc/support/texcount/README
@@ -87187,81 +87187,81 @@ runfiles size=7
name texcount.alpha-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for alpha-linux
name texcount.hppa-hpux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for hppa-hpux
name texcount.i386-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for i386-darwin
name texcount.i386-freebsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for i386-freebsd
name texcount.i386-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/texcount
name texcount.i386-openbsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for i386-openbsd
name texcount.i386-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for i386-solaris
name texcount.mips-irix
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for mips-irix
name texcount.powerpc-aix
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for powerpc-aix
name texcount.powerpc-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for powerpc-darwin
name texcount.powerpc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for powerpc-linux
name texcount.sparc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for sparc-linux
name texcount.sparc-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for sparc-solaris
name texcount.win32
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for win32
binfiles arch=win32 size=1
- bin/win32/texcount.texlua
+ bin/win32/texcount.bat
name texcount.x86_64-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of texcount for x86_64-linux
name texdraw
@@ -88068,7 +88068,7 @@ catalogue-version 1.0
name thumbpdf
category Package
-revision 7660
+revision 7525
shortdesc Thumbnails for pdfTeX and dvips/ps2pdf.
longdesc A Perl script that provides support for thumbnails in pdfTeX
longdesc and dvips/ps2pdf. The script uses ghostscript to generate the
@@ -88091,105 +88091,105 @@ catalogue-version 3.10
name thumbpdf.alpha-linux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for alpha-linux
binfiles arch=alpha-linux size=11
bin/alpha-linux/thumbpdf
name thumbpdf.hppa-hpux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for hppa-hpux
binfiles arch=hppa-hpux size=11
bin/hppa-hpux/thumbpdf
name thumbpdf.i386-darwin
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for i386-darwin
binfiles arch=i386-darwin size=11
bin/i386-darwin/thumbpdf
name thumbpdf.i386-freebsd
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for i386-freebsd
binfiles arch=i386-freebsd size=11
bin/i386-freebsd/thumbpdf
name thumbpdf.i386-linux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/thumbpdf
name thumbpdf.i386-openbsd
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for i386-openbsd
binfiles arch=i386-openbsd size=11
bin/i386-openbsd/thumbpdf
name thumbpdf.i386-solaris
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for i386-solaris
binfiles arch=i386-solaris size=11
bin/i386-solaris/thumbpdf
name thumbpdf.mips-irix
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for mips-irix
binfiles arch=mips-irix size=11
bin/mips-irix/thumbpdf
name thumbpdf.powerpc-aix
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for powerpc-aix
binfiles arch=powerpc-aix size=11
bin/powerpc-aix/thumbpdf
name thumbpdf.powerpc-darwin
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for powerpc-darwin
binfiles arch=powerpc-darwin size=11
bin/powerpc-darwin/thumbpdf
name thumbpdf.powerpc-linux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for powerpc-linux
binfiles arch=powerpc-linux size=11
bin/powerpc-linux/thumbpdf
name thumbpdf.sparc-linux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for sparc-linux
binfiles arch=sparc-linux size=11
bin/sparc-linux/thumbpdf
name thumbpdf.sparc-solaris
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for sparc-solaris
binfiles arch=sparc-solaris size=11
bin/sparc-solaris/thumbpdf
name thumbpdf.win32
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for win32
binfiles arch=win32 size=1
- bin/win32/thumbpdf.texlua
+ bin/win32/thumbpdf.bat
name thumbpdf.x86_64-linux
category Package
-revision 7660
+revision 7525
shortdesc binary files of thumbpdf for x86_64-linux
binfiles arch=x86_64-linux size=11
bin/x86_64-linux/thumbpdf
@@ -96676,7 +96676,7 @@ docfiles size=228
name vpe
category Package
-revision 7660
+revision 7340
shortdesc Source specials for PDF output.
longdesc VPE is a system to make the equivalent of “source special”
longdesc marks in a PDF file. Clicking on a mark will activate an
@@ -96699,106 +96699,106 @@ catalogue-version 0.1
name vpe.alpha-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for alpha-linux
binfiles arch=alpha-linux size=3
bin/alpha-linux/vpe
name vpe.hppa-hpux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for hppa-hpux
binfiles arch=hppa-hpux size=3
bin/hppa-hpux/vpe
name vpe.i386-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for i386-darwin
binfiles arch=i386-darwin size=3
bin/i386-darwin/vpe
name vpe.i386-freebsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for i386-freebsd
binfiles arch=i386-freebsd size=3
bin/i386-freebsd/vpe
name vpe.i386-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for i386-linux
binfiles arch=i386-linux size=1
bin/i386-linux/vpe
name vpe.i386-openbsd
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for i386-openbsd
binfiles arch=i386-openbsd size=3
bin/i386-openbsd/vpe
name vpe.i386-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for i386-solaris
binfiles arch=i386-solaris size=3
bin/i386-solaris/vpe
name vpe.mips-irix
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for mips-irix
binfiles arch=mips-irix size=3
bin/mips-irix/vpe
name vpe.powerpc-aix
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for powerpc-aix
binfiles arch=powerpc-aix size=3
bin/powerpc-aix/vpe
name vpe.powerpc-darwin
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for powerpc-darwin
binfiles arch=powerpc-darwin size=3
bin/powerpc-darwin/vpe
name vpe.powerpc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for powerpc-linux
binfiles arch=powerpc-linux size=3
bin/powerpc-linux/vpe
name vpe.sparc-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for sparc-linux
binfiles arch=sparc-linux size=3
bin/sparc-linux/vpe
name vpe.sparc-solaris
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for sparc-solaris
binfiles arch=sparc-solaris size=3
bin/sparc-solaris/vpe
name vpe.win32
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for win32
binfiles arch=win32 size=3
+ bin/win32/vpe.bat
bin/win32/vpe.exe
- bin/win32/vpe.texlua
name vpe.x86_64-linux
category Package
-revision 7660
+revision 7340
shortdesc binary files of vpe for x86_64-linux
binfiles arch=x86_64-linux size=3
bin/x86_64-linux/vpe
@@ -98138,7 +98138,7 @@ catalogue-version 1.1
name xindy
category TLCore
-revision 7660
+revision 7510
shortdesc A general-purpose index processor.
longdesc Xindy was designed to avoid an impasse encountered in the
longdesc attempt to complete internationalisation of makeindex. Xindy
@@ -98637,83 +98637,83 @@ catalogue-version 2.3
name xindy.alpha-linux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for alpha-linux
name xindy.hppa-hpux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for hppa-hpux
name xindy.i386-darwin
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for i386-darwin
name xindy.i386-freebsd
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for i386-freebsd
name xindy.i386-linux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for i386-linux
name xindy.i386-openbsd
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for i386-openbsd
name xindy.i386-solaris
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for i386-solaris
name xindy.mips-irix
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for mips-irix
name xindy.powerpc-aix
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for powerpc-aix
name xindy.powerpc-darwin
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for powerpc-darwin
name xindy.powerpc-linux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for powerpc-linux
name xindy.sparc-linux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for sparc-linux
name xindy.sparc-solaris
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for sparc-solaris
name xindy.win32
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for win32
binfiles arch=win32 size=1012
bin/win32/tex2xindy.exe
- bin/win32/texindy.texlua
+ bin/win32/texindy.bat
bin/win32/xindy-lisp.exe
+ bin/win32/xindy.bat
bin/win32/xindy.mem
- bin/win32/xindy.texlua
name xindy.x86_64-linux
category TLCore
-revision 7660
+revision 7510
shortdesc binary files of xindy for x86_64-linux
name xinitials
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index f41d7c5637e..428a6d2e81b 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -16,3 +16,4 @@ runpattern d texmf/scripts/texlive/lua
runpattern f texmf/web2c/updmap-hdr.cfg
binpattern f bin/${ARCH}/tlmgr
binpattern f bin/${ARCH}/rungs
+binpattern f bin/${ARCH}/tl-w32-wrapper.texlua