84 files changed, 73 insertions, 233 deletions

diff --git a/Master/bin/powerpc-linux/afm2pl b/Master/bin/powerpc-linux/afm2pl
index e5d13e07f82..10a149b170a 100755
--- a/Master/bin/powerpc-linux/afm2pl
+++ b/Master/bin/powerpc-linux/afm2pl
diff --git a/Master/bin/powerpc-linux/afm2tfm b/Master/bin/powerpc-linux/afm2tfm
index a5a6f812ab9..afe1c076c8c 100755
--- a/Master/bin/powerpc-linux/afm2tfm
+++ b/Master/bin/powerpc-linux/afm2tfm
diff --git a/Master/bin/powerpc-linux/aleph b/Master/bin/powerpc-linux/aleph
index 7dd54a89ffc..ac4f9a7d3cb 100755
--- a/Master/bin/powerpc-linux/aleph
+++ b/Master/bin/powerpc-linux/aleph
diff --git a/Master/bin/powerpc-linux/asy b/Master/bin/powerpc-linux/asy
index 0ce2e01d9ab..697a4f29241 100755
--- a/Master/bin/powerpc-linux/asy
+++ b/Master/bin/powerpc-linux/asy
diff --git a/Master/bin/powerpc-linux/bibtex b/Master/bin/powerpc-linux/bibtex
index ea5b298fa5d..d3811c2d68d 100755
--- a/Master/bin/powerpc-linux/bibtex
+++ b/Master/bin/powerpc-linux/bibtex
diff --git a/Master/bin/powerpc-linux/bibtex8 b/Master/bin/powerpc-linux/bibtex8
index 2ce0094b3d1..e70e210c425 100755
--- a/Master/bin/powerpc-linux/bibtex8
+++ b/Master/bin/powerpc-linux/bibtex8
diff --git a/Master/bin/powerpc-linux/bibtexu b/Master/bin/powerpc-linux/bibtexu
index 1ed92ba250f..2fa7ab61071 100755
--- a/Master/bin/powerpc-linux/bibtexu
+++ b/Master/bin/powerpc-linux/bibtexu
diff --git a/Master/bin/powerpc-linux/chktex b/Master/bin/powerpc-linux/chktex
index 763c4b9cfcd..e570acfec4a 100755
--- a/Master/bin/powerpc-linux/chktex
+++ b/Master/bin/powerpc-linux/chktex
diff --git a/Master/bin/powerpc-linux/ctangle b/Master/bin/powerpc-linux/ctangle
index 77add19f230..c57cd022eef 100755
--- a/Master/bin/powerpc-linux/ctangle
+++ b/Master/bin/powerpc-linux/ctangle
diff --git a/Master/bin/powerpc-linux/ctie b/Master/bin/powerpc-linux/ctie
index 1adfdebd2c5..ee15b14b109 100755
--- a/Master/bin/powerpc-linux/ctie
+++ b/Master/bin/powerpc-linux/ctie
diff --git a/Master/bin/powerpc-linux/cweave b/Master/bin/powerpc-linux/cweave
index a2d3f2cb222..fa5df80dedb 100755
--- a/Master/bin/powerpc-linux/cweave
+++ b/Master/bin/powerpc-linux/cweave
diff --git a/Master/bin/powerpc-linux/detex b/Master/bin/powerpc-linux/detex
index 4961803cb2d..8e40d38345d 100755
--- a/Master/bin/powerpc-linux/detex
+++ b/Master/bin/powerpc-linux/detex
diff --git a/Master/bin/powerpc-linux/dvicopy b/Master/bin/powerpc-linux/dvicopy
index a40060545aa..dee33516e32 100755
--- a/Master/bin/powerpc-linux/dvicopy
+++ b/Master/bin/powerpc-linux/dvicopy
diff --git a/Master/bin/powerpc-linux/dvilj b/Master/bin/powerpc-linux/dvilj
index e15111f322c..b5524ecd0db 100755
--- a/Master/bin/powerpc-linux/dvilj
+++ b/Master/bin/powerpc-linux/dvilj
diff --git a/Master/bin/powerpc-linux/dvilj2p b/Master/bin/powerpc-linux/dvilj2p
index 50fefe4282d..49349eb3387 100755
--- a/Master/bin/powerpc-linux/dvilj2p
+++ b/Master/bin/powerpc-linux/dvilj2p
diff --git a/Master/bin/powerpc-linux/dvilj4 b/Master/bin/powerpc-linux/dvilj4
index 1b94915f9e0..2baddefdc58 100755
--- a/Master/bin/powerpc-linux/dvilj4
+++ b/Master/bin/powerpc-linux/dvilj4
diff --git a/Master/bin/powerpc-linux/dvilj4l b/Master/bin/powerpc-linux/dvilj4l
index 22ff37ab187..034c1498ce5 100755
--- a/Master/bin/powerpc-linux/dvilj4l
+++ b/Master/bin/powerpc-linux/dvilj4l
diff --git a/Master/bin/powerpc-linux/dvipdfmx b/Master/bin/powerpc-linux/dvipdfmx
index 6a5913ffa40..03e528d7580 100755
--- a/Master/bin/powerpc-linux/dvipdfmx
+++ b/Master/bin/powerpc-linux/dvipdfmx
diff --git a/Master/bin/powerpc-linux/dvipng b/Master/bin/powerpc-linux/dvipng
index 3162465e7a0..9b8d9b130b5 100755
--- a/Master/bin/powerpc-linux/dvipng
+++ b/Master/bin/powerpc-linux/dvipng
diff --git a/Master/bin/powerpc-linux/dvipos b/Master/bin/powerpc-linux/dvipos
index 053665b9c27..09ec7399363 100755
--- a/Master/bin/powerpc-linux/dvipos
+++ b/Master/bin/powerpc-linux/dvipos
diff --git a/Master/bin/powerpc-linux/dvips b/Master/bin/powerpc-linux/dvips
index b97bd008fdd..9386f1f73f0 100755
--- a/Master/bin/powerpc-linux/dvips
+++ b/Master/bin/powerpc-linux/dvips
diff --git a/Master/bin/powerpc-linux/dvisvgm b/Master/bin/powerpc-linux/dvisvgm
index fe593d2b35c..19a62798bc8 100755
--- a/Master/bin/powerpc-linux/dvisvgm
+++ b/Master/bin/powerpc-linux/dvisvgm
diff --git a/Master/bin/powerpc-linux/dvitype b/Master/bin/powerpc-linux/dvitype
index 7b251bbb4d2..b97d4ba4094 100755
--- a/Master/bin/powerpc-linux/dvitype
+++ b/Master/bin/powerpc-linux/dvitype
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index 2aa8c3a0643..a24df810123 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 18913 2010-06-12 16:17:53Z karl $'
+version='$Id: fmtutil 18642 2010-05-31 11:55:10Z mpg $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -86,9 +86,9 @@ help()
   cat <<eof
 $version
 Usage: fmtutil [OPTION]... CMD [ARG]...
-Usage: mktexfmt FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT
+Usage: mktexfmt FMT.fmt|BASE.base|MEM.mem|FMTNAME
 
-Rebuild and manage TeX formats, Metafont bases and MetaPost mems.
+Rebuild and manage TeX formats (and Metafont bases and MetaPost mems).
 
 If the command name ends in mktexfmt, only one format can be created.
 The only options supported are --help and --version, and the command
@@ -100,11 +100,11 @@ nothing else.
 If not operating in mktexfmt mode, the command line can be more general,
 and multiple formats can be generated, as follows.
 
-Optional behavior:
-  --cnffile FILE             read FILE instead of fmtutil.cnf.
+Valid options for fmtutil:
+  --cnffile FILE
   --fmtdir DIRECTORY
   --no-engine-subdir         don't use engine-specific subdir of the fmtdir
-  --quiet                    be silent
+  --quiet                    (not implemented, just for compatibility)
   --test                     (not implemented, just for compatibility)
   --dolinks                  (not implemented, just for compatibility)
   --force                    (not implemented, just for compatibility)
@@ -122,17 +122,13 @@ Valid commands for fmtutil:
                              filtered to available formats
   --catcfg                   output the content of the config file
   --showhyphen FORMATNAME    print name of hyphenfile for format FORMATNAME
-  --edit                     no-op in TeX Live
+  --edit                     edit config file
   --version                  show version info
   --help                     show this message
 
 The config file is named fmtutil.cnf, and
 running  kpsewhich fmtutil.cnf  should show the active file.
 
-For more information about fmt generation in TeX Live, try
-tlmgr --help or see http://tug.org/texlive/doc/tlmgr.html.
-The \`generate' action in tlmgr does the work.
-
 Report bugs to: tex-k@tug.org
 TeX Live home page: <http://tug.org/texlive/>
 eof
@@ -483,12 +479,12 @@ main()
           cmd=catcfg;;
       --listcfg)
           cmd=listcfg;;
-      --quiet|-q|--silent)
+      --quiet|-q)
           verboseFlag=false;;
       --test|--dolinks|--force)
           ;;
       "") break;;
-      *) abort "unknown option \`$1'. Try $progname --help for help";;
+      *) abort "$progname: unknown option \`$1'. Try $progname --help for help";;
     esac
   do test $# -gt 0 && shift; done
 
@@ -517,24 +513,26 @@ main()
     fi
   fi
 
-  # these commands need no temp directory, so do them here:
+  # showhyphen and edit do not need any temp. directory, so do it here:
   case "$cmd" in
-    catcfg)
-      grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
-      cleanup $? ;;
+    showhyphen)
+      show_hyphen_file "$arg"
+      cleanup $?
+      ;;
     edit)
-      echo "$0: fmtutil --edit is disabled in TeX Live;" >&2
-      echo "$0: use a file fmtutil-local.cnf instead." >&2
-      echo "$0: See tlmgr --help or http://tug.org/texlive/doc/tlmgr.html." >&2
-      cleanup 0 ;;
+      ${VISUAL-${EDITOR-vi}} $cnf_file
+      ;;
     enablefmt|disablefmt)
-      $cmd $arg ;;  # does not return
+      $cmd $arg
+      ;;
+    catcfg)
+      grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort
+      cleanup $?
+      ;;
     listcfg)
       listcfg_loop
-      cleanup $? ;;
-    showhyphen)
-      show_hyphen_file "$arg"
-      cleanup $? ;;
+      cleanup $?
+      ;;
   esac
 
   if test -n "$cfgmaint"; then
diff --git a/Master/bin/powerpc-linux/gftodvi b/Master/bin/powerpc-linux/gftodvi
index bf62e7e7fef..24461770705 100755
--- a/Master/bin/powerpc-linux/gftodvi
+++ b/Master/bin/powerpc-linux/gftodvi
diff --git a/Master/bin/powerpc-linux/gftopk b/Master/bin/powerpc-linux/gftopk
index 9db67d92c9a..1dc9b8b99c3 100755
--- a/Master/bin/powerpc-linux/gftopk
+++ b/Master/bin/powerpc-linux/gftopk
diff --git a/Master/bin/powerpc-linux/gftype b/Master/bin/powerpc-linux/gftype
index 3a8aaa4db2f..24c703c259c 100755
--- a/Master/bin/powerpc-linux/gftype
+++ b/Master/bin/powerpc-linux/gftype
diff --git a/Master/bin/powerpc-linux/gsftopk b/Master/bin/powerpc-linux/gsftopk
index cc5fe054750..cb15a609cd1 100755
--- a/Master/bin/powerpc-linux/gsftopk
+++ b/Master/bin/powerpc-linux/gsftopk
diff --git a/Master/bin/powerpc-linux/hbf2gf b/Master/bin/powerpc-linux/hbf2gf
index 952d55a841b..88dead4fa24 100755
--- a/Master/bin/powerpc-linux/hbf2gf
+++ b/Master/bin/powerpc-linux/hbf2gf
diff --git a/Master/bin/powerpc-linux/kpseaccess b/Master/bin/powerpc-linux/kpseaccess
index c4a84d6b430..f77cb73ab6f 100755
--- a/Master/bin/powerpc-linux/kpseaccess
+++ b/Master/bin/powerpc-linux/kpseaccess
diff --git a/Master/bin/powerpc-linux/kpsereadlink b/Master/bin/powerpc-linux/kpsereadlink
index d67f6fe9689..660192b8f1d 100755
--- a/Master/bin/powerpc-linux/kpsereadlink
+++ b/Master/bin/powerpc-linux/kpsereadlink
diff --git a/Master/bin/powerpc-linux/kpsestat b/Master/bin/powerpc-linux/kpsestat
index 8c78a4f4418..7322275dda1 100755
--- a/Master/bin/powerpc-linux/kpsestat
+++ b/Master/bin/powerpc-linux/kpsestat
diff --git a/Master/bin/powerpc-linux/kpsewhich b/Master/bin/powerpc-linux/kpsewhich
index ff4a08c3d58..06c0a44edf1 100755
--- a/Master/bin/powerpc-linux/kpsewhich
+++ b/Master/bin/powerpc-linux/kpsewhich
diff --git a/Master/bin/powerpc-linux/luatex b/Master/bin/powerpc-linux/luatex
index 04116845c8a..c0f68d8e6d6 100755
--- a/Master/bin/powerpc-linux/luatex
+++ b/Master/bin/powerpc-linux/luatex
diff --git a/Master/bin/powerpc-linux/luatools b/Master/bin/powerpc-linux/luatools
index c060beff8fe..581ba70c86a 100755
--- a/Master/bin/powerpc-linux/luatools
+++ b/Master/bin/powerpc-linux/luatools
@@ -2214,107 +2214,22 @@ end
 
 -- we can hash them weakly
 
-
-local insert = table.insert
-
-function file.collapse_path(str,anchor)
-    if anchor and not find(str,"^/") and not find(str,"^%a:") then
-        str = getcurrentdir() .. "/" .. str
-    end
-    if str == "" or str =="." then
-        return "."
-    elseif find(str,"^%.%.") then
-        str = gsub(str,"\\","/")
-        return str
-    elseif not find(str,"%.") then
-        str = gsub(str,"\\","/")
-        return str
-    end
+function file.collapse_path(str)
     str = gsub(str,"\\","/")
-    local starter, rest = match(str,"^(%a+:/*)(.-)$")
-    if starter then
-        str = rest
-    end
-    local oldelements = checkedsplit(str,"/")
-    local newelements = { }
-    local i = #oldelements
-    while i > 0 do
-        local element = oldelements[i]
-        if element == '.' then
-            -- do nothing
-        elseif element == '..' then
-            local n = i -1
-            while n > 0 do
-                local element = oldelements[n]
-                if element ~= '..' and element ~= '.' then
-                    oldelements[n] = '.'
-                    break
-                else
-                    n = n - 1
-                end
-             end
-            if n < 1 then
-               insert(newelements,1,'..')
-            end
-        elseif element ~= "" then
-            insert(newelements,1,element)
-        end
-        i = i - 1
-    end
-    if #newelements == 0 then
-        return starter or "."
-    elseif starter then
-        return starter .. concat(newelements, '/')
-    elseif find(str,"^/") then
-        return "/" .. concat(newelements,'/')
-    else
-        return concat(newelements, '/')
-    end
-end
-function file.xcollapse_path(str)
-    print('collapse', str)
-    if str == "" or str =="." then
-        return "."
-    elseif find(str,"^%.%.") then
-        return str
-    elseif not find(str,"%.") then
-        return str
-    end
-    str = gsub(str,"^%./",lfs.currentdir() .. "/") -- ./xx in qualified
-    str = gsub(str,"\\","/")
-    local oldelements = checkedsplit(str,"/")
-    local newelements = { }
-    local i = #oldelements
-    while i > 0 do
-        local element = oldelements[i]
-        if element == '.' then
-            -- do nothing
-        elseif element == '..' then
-            local n = i -1
-            while n > 0 do
-                local element = oldelements[n]
-                if element ~= '..' and element ~= '.' then
-                    oldelements[n] = '.'
-                    break
-                else
-                    n = n - 1
-                end
-             end
-            if n<1 then
-               insert(newelements,1,'..')
-            end
-        elseif element ~= "" then
-            insert(newelements,1,element)
+    if find(str,"/") then
+        str = gsub(str,"^%./",(gsub(lfs.currentdir(),"\\","/")) .. "/") -- ./xx in qualified
+        str = gsub(str,"/%./","/")
+        local n, m = 1, 1
+        while n > 0 or m > 0 do
+            str, n = gsub(str,"[^/%.]+/%.%.$","")
+            str, m = gsub(str,"[^/%.]+/%.%./","")
         end
-        i = i - 1
-    end
-    if #newelements == 0 then
-        return "."
-    elseif find(str,"^/") then
-        return "/" .. concat(newelements,'/')
-    else
-        return concat(newelements, '/')
+        str = gsub(str,"([^/])/$","%1")
+    --  str = gsub(str,"^%./","") -- ./xx in qualified
+        str = gsub(str,"/%.$","")
     end
+    if str == "" then str = "." end
+    return str
 end
 
 --~ print(file.collapse_path("/a"))
@@ -7947,7 +7862,6 @@ if own.path ~= '.' then
     table.insert(own.list,own.path)
 end
 
-table.insert(own.list,own.path.."/../../texmf-dist/tex/context/base")
 table.insert(own.list,own.path.."/../../../tex/context/base")
 table.insert(own.list,own.path.."/mtx")
 table.insert(own.list,own.path.."/../sources")
diff --git a/Master/bin/powerpc-linux/makeindex b/Master/bin/powerpc-linux/makeindex
index 7d00e1a1d38..5bb6b5d1a00 100755
--- a/Master/bin/powerpc-linux/makeindex
+++ b/Master/bin/powerpc-linux/makeindex
diff --git a/Master/bin/powerpc-linux/makejvf b/Master/bin/powerpc-linux/makejvf
index 6ac48852e5b..7b0cca1449d 100755
--- a/Master/bin/powerpc-linux/makejvf
+++ b/Master/bin/powerpc-linux/makejvf
diff --git a/Master/bin/powerpc-linux/mendex b/Master/bin/powerpc-linux/mendex
index 05e4f17e189..0237a24cfae 100755
--- a/Master/bin/powerpc-linux/mendex
+++ b/Master/bin/powerpc-linux/mendex
diff --git a/Master/bin/powerpc-linux/mf b/Master/bin/powerpc-linux/mf
index 9f8b2830cc8..e1fdacca40d 100755
--- a/Master/bin/powerpc-linux/mf
+++ b/Master/bin/powerpc-linux/mf
diff --git a/Master/bin/powerpc-linux/mf-nowin b/Master/bin/powerpc-linux/mf-nowin
index 0d0785c5255..c09b004d6f8 100755
--- a/Master/bin/powerpc-linux/mf-nowin
+++ b/Master/bin/powerpc-linux/mf-nowin
diff --git a/Master/bin/powerpc-linux/mft b/Master/bin/powerpc-linux/mft
index aa874fc7669..4aad99c3d81 100755
--- a/Master/bin/powerpc-linux/mft
+++ b/Master/bin/powerpc-linux/mft
diff --git a/Master/bin/powerpc-linux/mktexpk b/Master/bin/powerpc-linux/mktexpk
index 1d0a4b4e2be..48a57bd25c2 100755
--- a/Master/bin/powerpc-linux/mktexpk
+++ b/Master/bin/powerpc-linux/mktexpk
@@ -8,7 +8,7 @@
 # Report bugs to tex-k@tug.org.
 # Public domain.
 
-version='$Id: mktexpk 16497 2009-12-24 18:38:47Z karl $'
+version='$Id: mktexpk 18407 2010-05-21 18:16:31Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
   Create a PK font.
@@ -19,14 +19,27 @@ usage="Usage: $progname [OPTIONS] NAME [REDIRECT],
 --mfmode MODE       use MODE as the METAFONT mode.
 --destdir DESTDIR   write fonts in DESTDIR.
 
-Try to create a PK file for NAME at resolution DPI, with an assumed
-device base resolution of BDPI, and a Metafont \`mag' of MAG. Use MODE
-for the METAFONT mode.  Use DESTDIR for the root of where to install
-into, either the absolute directory name to use (if it starts with a
-/) or relative to the default DESTDIR (if not). REDIRECT, if supplied,
-is a string of the form '>&n', where n is the number of the file
-descriptor which is to receive, instead of stdout, the name of the
-newly created pk file."
+Try to create a bitmap PK file for NAME at resolution DPI, with an
+assumed device base resolution of BDPI, and a Metafont \`mag' of
+MAG. Use MODE for the METAFONT mode.  Use DESTDIR for the root of where
+to install into, either the absolute directory name to use (if it starts
+with a /) or relative to the default DESTDIR (if not). REDIRECT, if
+supplied, is a string of the form '>&n', where n is the number of the
+file descriptor which is to receive, instead of stdout, the name of the
+newly created pk file.
+
+If you expected the font to be available as an outline, and thus this
+script does not work and should not have been called, most likely the
+font's .tfm name is missing from the relevant map file (e.g.,
+psfonts.map for dvips, pdftex.map for pdftex).  These map files are
+typically maintained using updmap; q.v.
+
+For step-by-step instructions on making new fonts known to TeX, see
+http://tug.org/fonts/fontinstall.html.
+
+Report bugs to: tex-k@tug.org
+TeX Live home page: <http://tug.org/texlive/>
+"
 
 # Handle non-positional options, except for --version/--help
 while test $# -gt 0; do
@@ -190,6 +203,7 @@ else
       cmd="hbf2gf -q -p $NAME $DPI"
     else
       echo "$progname: don't know how to create bitmap font for $NAME." >&2
+      echo "$progname: perhaps $NAME is missing from the map file." >&2
       exit 1
     fi
   fi
diff --git a/Master/bin/powerpc-linux/mpost b/Master/bin/powerpc-linux/mpost
index 1f3e7345c40..ad30a0b0c18 100755
--- a/Master/bin/powerpc-linux/mpost
+++ b/Master/bin/powerpc-linux/mpost
diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index 2bdd1b8f020..d6b2d13a71a 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -2223,107 +2223,22 @@ end
 
 -- we can hash them weakly
 
-
-local insert = table.insert
-
-function file.collapse_path(str,anchor)
-    if anchor and not find(str,"^/") and not find(str,"^%a:") then
-        str = getcurrentdir() .. "/" .. str
-    end
-    if str == "" or str =="." then
-        return "."
-    elseif find(str,"^%.%.") then
-        str = gsub(str,"\\","/")
-        return str
-    elseif not find(str,"%.") then
-        str = gsub(str,"\\","/")
-        return str
-    end
+function file.collapse_path(str)
     str = gsub(str,"\\","/")
-    local starter, rest = match(str,"^(%a+:/*)(.-)$")
-    if starter then
-        str = rest
-    end
-    local oldelements = checkedsplit(str,"/")
-    local newelements = { }
-    local i = #oldelements
-    while i > 0 do
-        local element = oldelements[i]
-        if element == '.' then
-            -- do nothing
-        elseif element == '..' then
-            local n = i -1
-            while n > 0 do
-                local element = oldelements[n]
-                if element ~= '..' and element ~= '.' then
-                    oldelements[n] = '.'
-                    break
-                else
-                    n = n - 1
-                end
-             end
-            if n < 1 then
-               insert(newelements,1,'..')
-            end
-        elseif element ~= "" then
-            insert(newelements,1,element)
-        end
-        i = i - 1
-    end
-    if #newelements == 0 then
-        return starter or "."
-    elseif starter then
-        return starter .. concat(newelements, '/')
-    elseif find(str,"^/") then
-        return "/" .. concat(newelements,'/')
-    else
-        return concat(newelements, '/')
-    end
-end
-function file.xcollapse_path(str)
-    print('collapse', str)
-    if str == "" or str =="." then
-        return "."
-    elseif find(str,"^%.%.") then
-        return str
-    elseif not find(str,"%.") then
-        return str
-    end
-    str = gsub(str,"^%./",lfs.currentdir() .. "/") -- ./xx in qualified
-    str = gsub(str,"\\","/")
-    local oldelements = checkedsplit(str,"/")
-    local newelements = { }
-    local i = #oldelements
-    while i > 0 do
-        local element = oldelements[i]
-        if element == '.' then
-            -- do nothing
-        elseif element == '..' then
-            local n = i -1
-            while n > 0 do
-                local element = oldelements[n]
-                if element ~= '..' and element ~= '.' then
-                    oldelements[n] = '.'
-                    break
-                else
-                    n = n - 1
-                end
-             end
-            if n<1 then
-               insert(newelements,1,'..')
-            end
-        elseif element ~= "" then
-            insert(newelements,1,element)
+    if find(str,"/") then
+        str = gsub(str,"^%./",(gsub(lfs.currentdir(),"\\","/")) .. "/") -- ./xx in qualified
+        str = gsub(str,"/%./","/")
+        local n, m = 1, 1
+        while n > 0 or m > 0 do
+            str, n = gsub(str,"[^/%.]+/%.%.$","")
+            str, m = gsub(str,"[^/%.]+/%.%./","")
         end
-        i = i - 1
-    end
-    if #newelements == 0 then
-        return "."
-    elseif find(str,"^/") then
-        return "/" .. concat(newelements,'/')
-    else
-        return concat(newelements, '/')
+        str = gsub(str,"([^/])/$","%1")
+    --  str = gsub(str,"^%./","") -- ./xx in qualified
+        str = gsub(str,"/%.$","")
     end
+    if str == "" then str = "." end
+    return str
 end
 
 --~ print(file.collapse_path("/a"))
@@ -11951,7 +11866,6 @@ own.list = { '.' }
 if own.path ~= '.' then
     table.insert(own.list,own.path)
 end
-table.insert(own.list,own.path.."/../../texmf-dist/tex/context/base")
 table.insert(own.list,own.path.."/../../../tex/context/base")
 table.insert(own.list,own.path.."/mtx")
 table.insert(own.list,own.path.."/../sources")
diff --git a/Master/bin/powerpc-linux/odvicopy b/Master/bin/powerpc-linux/odvicopy
index 85222073192..83297f178d5 100755
--- a/Master/bin/powerpc-linux/odvicopy
+++ b/Master/bin/powerpc-linux/odvicopy
diff --git a/Master/bin/powerpc-linux/odvitype b/Master/bin/powerpc-linux/odvitype
index 74762456934..49ffc9ec0bf 100755
--- a/Master/bin/powerpc-linux/odvitype
+++ b/Master/bin/powerpc-linux/odvitype
diff --git a/Master/bin/powerpc-linux/omfonts b/Master/bin/powerpc-linux/omfonts
index 3b1e43ddf22..1833b871489 100755
--- a/Master/bin/powerpc-linux/omfonts
+++ b/Master/bin/powerpc-linux/omfonts
diff --git a/Master/bin/powerpc-linux/otangle b/Master/bin/powerpc-linux/otangle
index 0e31ece6489..02f35074eab 100755
--- a/Master/bin/powerpc-linux/otangle
+++ b/Master/bin/powerpc-linux/otangle
diff --git a/Master/bin/powerpc-linux/otftotfm b/Master/bin/powerpc-linux/otftotfm
index e5b073031af..1233cf4acb3 100755
--- a/Master/bin/powerpc-linux/otftotfm
+++ b/Master/bin/powerpc-linux/otftotfm
diff --git a/Master/bin/powerpc-linux/otp2ocp b/Master/bin/powerpc-linux/otp2ocp
index 65b1dfc0152..10fca8302a2 100755
--- a/Master/bin/powerpc-linux/otp2ocp
+++ b/Master/bin/powerpc-linux/otp2ocp
diff --git a/Master/bin/powerpc-linux/outocp b/Master/bin/powerpc-linux/outocp
index eca5682aa29..9d1d90a5bee 100755
--- a/Master/bin/powerpc-linux/outocp
+++ b/Master/bin/powerpc-linux/outocp
diff --git a/Master/bin/powerpc-linux/patgen b/Master/bin/powerpc-linux/patgen
index ca11b685d47..2defd983eb9 100755
--- a/Master/bin/powerpc-linux/patgen
+++ b/Master/bin/powerpc-linux/patgen
diff --git a/Master/bin/powerpc-linux/pbibtex b/Master/bin/powerpc-linux/pbibtex
index 1ea77572d3f..15c6bc2cd18 100755
--- a/Master/bin/powerpc-linux/pbibtex
+++ b/Master/bin/powerpc-linux/pbibtex
diff --git a/Master/bin/powerpc-linux/pdftex b/Master/bin/powerpc-linux/pdftex
index a828ff94e61..227c5051cb4 100755
--- a/Master/bin/powerpc-linux/pdftex
+++ b/Master/bin/powerpc-linux/pdftex
diff --git a/Master/bin/powerpc-linux/pdvitype b/Master/bin/powerpc-linux/pdvitype
index 67fb43c83a7..9d9d73e94be 100755
--- a/Master/bin/powerpc-linux/pdvitype
+++ b/Master/bin/powerpc-linux/pdvitype
diff --git a/Master/bin/powerpc-linux/pktogf b/Master/bin/powerpc-linux/pktogf
index 2224342d7fd..28539730170 100755
--- a/Master/bin/powerpc-linux/pktogf
+++ b/Master/bin/powerpc-linux/pktogf
diff --git a/Master/bin/powerpc-linux/pktype b/Master/bin/powerpc-linux/pktype
index 053db0fa829..3f9d3b98142 100755
--- a/Master/bin/powerpc-linux/pktype
+++ b/Master/bin/powerpc-linux/pktype
diff --git a/Master/bin/powerpc-linux/pltotf b/Master/bin/powerpc-linux/pltotf
index 3543d7c3fc4..b8c7dd6b01a 100755
--- a/Master/bin/powerpc-linux/pltotf
+++ b/Master/bin/powerpc-linux/pltotf
diff --git a/Master/bin/powerpc-linux/pooltype b/Master/bin/powerpc-linux/pooltype
index 6f2e8fb8d93..ebd0c67886f 100755
--- a/Master/bin/powerpc-linux/pooltype
+++ b/Master/bin/powerpc-linux/pooltype
diff --git a/Master/bin/powerpc-linux/ppltotf b/Master/bin/powerpc-linux/ppltotf
index f5acc95f186..ef588f89941 100755
--- a/Master/bin/powerpc-linux/ppltotf
+++ b/Master/bin/powerpc-linux/ppltotf
diff --git a/Master/bin/powerpc-linux/ps2pk b/Master/bin/powerpc-linux/ps2pk
index fce715787dd..ed1ef864b91 100755
--- a/Master/bin/powerpc-linux/ps2pk
+++ b/Master/bin/powerpc-linux/ps2pk
diff --git a/Master/bin/powerpc-linux/ptex b/Master/bin/powerpc-linux/ptex
index 87ef76d2242..1fe57098be2 100755
--- a/Master/bin/powerpc-linux/ptex
+++ b/Master/bin/powerpc-linux/ptex
diff --git a/Master/bin/powerpc-linux/ptftopl b/Master/bin/powerpc-linux/ptftopl
index f86c8ba571b..f255b114110 100755
--- a/Master/bin/powerpc-linux/ptftopl
+++ b/Master/bin/powerpc-linux/ptftopl
diff --git a/Master/bin/powerpc-linux/t1ascii b/Master/bin/powerpc-linux/t1ascii
index 9cf35ea434a..5153f00a9c8 100755
--- a/Master/bin/powerpc-linux/t1ascii
+++ b/Master/bin/powerpc-linux/t1ascii
diff --git a/Master/bin/powerpc-linux/t1asm b/Master/bin/powerpc-linux/t1asm
index 194bcaa56da..eaa5eb012b2 100755
--- a/Master/bin/powerpc-linux/t1asm
+++ b/Master/bin/powerpc-linux/t1asm
diff --git a/Master/bin/powerpc-linux/t1binary b/Master/bin/powerpc-linux/t1binary
index f9a21bee72e..968979f9301 100755
--- a/Master/bin/powerpc-linux/t1binary
+++ b/Master/bin/powerpc-linux/t1binary
diff --git a/Master/bin/powerpc-linux/t1disasm b/Master/bin/powerpc-linux/t1disasm
index cbcb84ce759..41c716dcf49 100755
--- a/Master/bin/powerpc-linux/t1disasm
+++ b/Master/bin/powerpc-linux/t1disasm
diff --git a/Master/bin/powerpc-linux/t1mac b/Master/bin/powerpc-linux/t1mac
index 27e60badd12..ce3533407d2 100755
--- a/Master/bin/powerpc-linux/t1mac
+++ b/Master/bin/powerpc-linux/t1mac
diff --git a/Master/bin/powerpc-linux/t1unmac b/Master/bin/powerpc-linux/t1unmac
index 1d3a082dfad..59cd256f154 100755
--- a/Master/bin/powerpc-linux/t1unmac
+++ b/Master/bin/powerpc-linux/t1unmac
diff --git a/Master/bin/powerpc-linux/t4ht b/Master/bin/powerpc-linux/t4ht
index 14caab6b8b3..d4bdce6533a 100755
--- a/Master/bin/powerpc-linux/t4ht
+++ b/Master/bin/powerpc-linux/t4ht
diff --git a/Master/bin/powerpc-linux/tangle b/Master/bin/powerpc-linux/tangle
index 566d64bece7..84f1c5d691c 100755
--- a/Master/bin/powerpc-linux/tangle
+++ b/Master/bin/powerpc-linux/tangle
diff --git a/Master/bin/powerpc-linux/tex b/Master/bin/powerpc-linux/tex
index 6f2af1bfd53..f2ffc6e718f 100755
--- a/Master/bin/powerpc-linux/tex
+++ b/Master/bin/powerpc-linux/tex
diff --git a/Master/bin/powerpc-linux/tex4ht b/Master/bin/powerpc-linux/tex4ht
index 0a75415b481..0335126964c 100755
--- a/Master/bin/powerpc-linux/tex4ht
+++ b/Master/bin/powerpc-linux/tex4ht
diff --git a/Master/bin/powerpc-linux/tftopl b/Master/bin/powerpc-linux/tftopl
index 7dfbdbc2060..2fc3e741eb4 100755
--- a/Master/bin/powerpc-linux/tftopl
+++ b/Master/bin/powerpc-linux/tftopl
diff --git a/Master/bin/powerpc-linux/tie b/Master/bin/powerpc-linux/tie
index 6c9f800ba90..acb755a154a 100755
--- a/Master/bin/powerpc-linux/tie
+++ b/Master/bin/powerpc-linux/tie
diff --git a/Master/bin/powerpc-linux/ttf2afm b/Master/bin/powerpc-linux/ttf2afm
index 4567b573445..1c7d35619ef 100755
--- a/Master/bin/powerpc-linux/ttf2afm
+++ b/Master/bin/powerpc-linux/ttf2afm
diff --git a/Master/bin/powerpc-linux/ttf2pk b/Master/bin/powerpc-linux/ttf2pk
index 4fc4aae7802..ec2f3ed6b7e 100755
--- a/Master/bin/powerpc-linux/ttf2pk
+++ b/Master/bin/powerpc-linux/ttf2pk
diff --git a/Master/bin/powerpc-linux/ttf2tfm b/Master/bin/powerpc-linux/ttf2tfm
index be0cc8f49db..12bba9277f5 100755
--- a/Master/bin/powerpc-linux/ttf2tfm
+++ b/Master/bin/powerpc-linux/ttf2tfm
diff --git a/Master/bin/powerpc-linux/vftovp b/Master/bin/powerpc-linux/vftovp
index bdedecf6c72..e0656bdc7e5 100755
--- a/Master/bin/powerpc-linux/vftovp
+++ b/Master/bin/powerpc-linux/vftovp
diff --git a/Master/bin/powerpc-linux/vptovf b/Master/bin/powerpc-linux/vptovf
index 8ee16f55886..9e49e06a180 100755
--- a/Master/bin/powerpc-linux/vptovf
+++ b/Master/bin/powerpc-linux/vptovf
diff --git a/Master/bin/powerpc-linux/weave b/Master/bin/powerpc-linux/weave
index a07f8adccc0..e5ae670d413 100755
--- a/Master/bin/powerpc-linux/weave
+++ b/Master/bin/powerpc-linux/weave
diff --git a/Master/bin/powerpc-linux/xdvi-xaw b/Master/bin/powerpc-linux/xdvi-xaw
index ced7c8c8bef..eadc6229ff7 100755
--- a/Master/bin/powerpc-linux/xdvi-xaw
+++ b/Master/bin/powerpc-linux/xdvi-xaw
diff --git a/Master/bin/powerpc-linux/xdvipdfmx b/Master/bin/powerpc-linux/xdvipdfmx
index baa10fdaedf..d64eae396fd 100755
--- a/Master/bin/powerpc-linux/xdvipdfmx
+++ b/Master/bin/powerpc-linux/xdvipdfmx
diff --git a/Master/bin/powerpc-linux/xetex b/Master/bin/powerpc-linux/xetex
index e460805453f..d29f2802f9e 100755
--- a/Master/bin/powerpc-linux/xetex
+++ b/Master/bin/powerpc-linux/xetex