diff options
24 files changed, 96 insertions, 24 deletions
diff --git a/Build/source/texk/texlive/context/mtxrun b/Build/source/texk/texlive/context/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Build/source/texk/texlive/context/mtxrun +++ b/Build/source/texk/texlive/context/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/alpha-linux/mtxrun b/Master/bin/alpha-linux/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/alpha-linux/mtxrun +++ b/Master/bin/alpha-linux/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/amd64-freebsd/mtxrun b/Master/bin/amd64-freebsd/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/amd64-freebsd/mtxrun +++ b/Master/bin/amd64-freebsd/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/amd64-kfreebsd/mtxrun b/Master/bin/amd64-kfreebsd/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/amd64-kfreebsd/mtxrun +++ b/Master/bin/amd64-kfreebsd/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-cygwin/mtxrun +++ b/Master/bin/i386-cygwin/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-freebsd/mtxrun b/Master/bin/i386-freebsd/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-freebsd/mtxrun +++ b/Master/bin/i386-freebsd/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-kfreebsd/mtxrun +++ b/Master/bin/i386-kfreebsd/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-linux/mtxrun b/Master/bin/i386-linux/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-linux/mtxrun +++ b/Master/bin/i386-linux/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-netbsd/mtxrun +++ b/Master/bin/i386-netbsd/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/i386-solaris/mtxrun +++ b/Master/bin/i386-solaris/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/mips-irix/mtxrun b/Master/bin/mips-irix/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/mips-irix/mtxrun +++ b/Master/bin/mips-irix/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/powerpc-aix/mtxrun +++ b/Master/bin/powerpc-aix/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/powerpc-linux/mtxrun +++ b/Master/bin/powerpc-linux/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/sparc-linux/mtxrun +++ b/Master/bin/sparc-linux/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/sparc-solaris/mtxrun b/Master/bin/sparc-solaris/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/sparc-solaris/mtxrun +++ b/Master/bin/sparc-solaris/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/universal-darwin/mtxrun b/Master/bin/universal-darwin/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/universal-darwin/mtxrun +++ b/Master/bin/universal-darwin/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/win32/mtxrun.lua +++ b/Master/bin/win32/mtxrun.lua @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/x86_64-darwin/mtxrun b/Master/bin/x86_64-darwin/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/x86_64-darwin/mtxrun +++ b/Master/bin/x86_64-darwin/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/x86_64-linux/mtxrun b/Master/bin/x86_64-linux/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/x86_64-linux/mtxrun +++ b/Master/bin/x86_64-linux/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/bin/x86_64-solaris/mtxrun +++ b/Master/bin/x86_64-solaris/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua index 8debdf95551..7adcd3023a8 100755 --- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua +++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua index 8debdf95551..7adcd3023a8 100755 --- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua +++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun index 8debdf95551..7adcd3023a8 100755 --- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun +++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun @@ -12150,7 +12150,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then diff --git a/Master/texmf-dist/tex/context/base/data-res.lua b/Master/texmf-dist/tex/context/base/data-res.lua index 3422564139c..d28a8a69767 100644 --- a/Master/texmf-dist/tex/context/base/data-res.lua +++ b/Master/texmf-dist/tex/context/base/data-res.lua @@ -1066,7 +1066,10 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if doscan then files = resolvers.scanfiles(ppname) end for k=1,#wantedfiles do local w = wantedfiles[k] - local subpath = files[w] or '' + local subpath = '' + if files[w] then + subpath = type(files[w]) == "table" and files[w][1] or files[w] + end local fname = filejoin(ppname,subpath,w) if isreadable(fname) then if trace_detail then |