diff options
| -rwxr-xr-x | Master/bin/powerpc-linux/asy | bin | 3851548 -> 3851112 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/chktex | bin | 70024 -> 70024 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/detex | bin | 97792 -> 103872 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/dvipdfmx | bin | 797788 -> 797796 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/dvips | bin | 280212 -> 280212 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/dvisvgm | bin | 1771504 -> 1808504 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/fmtutil | 57 | ||||
| -rwxr-xr-x | Master/bin/powerpc-linux/luatex | bin | 4574560 -> 4574560 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/luatools | 112 | ||||
| -rwxr-xr-x | Master/bin/powerpc-linux/mtxrun | 112 | ||||
| -rwxr-xr-x | Master/bin/powerpc-linux/omfonts | bin | 185820 -> 185820 bytes | |||
| -rwxr-xr-x | Master/bin/powerpc-linux/xetex | bin | 18947536 -> 18947536 bytes | |||
| -rwxr-xr-x | Master/tlpkg/installer/xz/xz.powerpc-linux | bin | 189928 -> 193092 bytes | |||
| -rwxr-xr-x | Master/tlpkg/installer/xz/xzdec.powerpc-linux | bin | 77480 -> 77432 bytes |
14 files changed, 229 insertions, 52 deletions
diff --git a/Master/bin/powerpc-linux/asy b/Master/bin/powerpc-linux/asy Binary files differindex 697a4f29241..990dfe5fd3c 100755 --- a/Master/bin/powerpc-linux/asy +++ b/Master/bin/powerpc-linux/asy diff --git a/Master/bin/powerpc-linux/chktex b/Master/bin/powerpc-linux/chktex Binary files differindex e570acfec4a..a903954b23e 100755 --- a/Master/bin/powerpc-linux/chktex +++ b/Master/bin/powerpc-linux/chktex diff --git a/Master/bin/powerpc-linux/detex b/Master/bin/powerpc-linux/detex Binary files differindex 8e40d38345d..ce56d0a0604 100755 --- a/Master/bin/powerpc-linux/detex +++ b/Master/bin/powerpc-linux/detex diff --git a/Master/bin/powerpc-linux/dvipdfmx b/Master/bin/powerpc-linux/dvipdfmx Binary files differindex 03e528d7580..d0ca02092c5 100755 --- a/Master/bin/powerpc-linux/dvipdfmx +++ b/Master/bin/powerpc-linux/dvipdfmx diff --git a/Master/bin/powerpc-linux/dvips b/Master/bin/powerpc-linux/dvips Binary files differindex 9386f1f73f0..6bb14985f7a 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 Binary files differindex 19a62798bc8..cf10b75c9bd 100755 --- a/Master/bin/powerpc-linux/dvisvgm +++ b/Master/bin/powerpc-linux/dvisvgm diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil index a24df810123..7465b9680a2 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 18642 2010-05-31 11:55:10Z mpg $' +version='$Id: fmtutil 18938 2010-06-13 18:05:48Z karl $' 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 FMT.fmt|BASE.base|MEM.mem|FMTNAME +Usage: mktexfmt FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT -Rebuild and manage TeX formats (and Metafont bases and MetaPost mems). +Rebuild and manage TeX formats, 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. -Valid options for fmtutil: - --cnffile FILE +Optional behavior: + --cnffile FILE read FILE instead of fmtutil.cnf. --fmtdir DIRECTORY --no-engine-subdir don't use engine-specific subdir of the fmtdir - --quiet (not implemented, just for compatibility) + --quiet be silent --test (not implemented, just for compatibility) --dolinks (not implemented, just for compatibility) --force (not implemented, just for compatibility) @@ -122,12 +122,18 @@ 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 edit config file + --edit no-op in TeX Live --version show version info --help show this message -The config file is named fmtutil.cnf, and +The default config file is named fmtutil.cnf, and running kpsewhich fmtutil.cnf should show the active file. +The command kpsewhich --engine=/ --all foo.fmt should show the +locations of any and all foo.fmt files. + +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/> @@ -479,17 +485,18 @@ main() cmd=catcfg;; --listcfg) cmd=listcfg;; - --quiet|-q) + --quiet|-q|--silent) verboseFlag=false;; --test|--dolinks|--force) ;; "") break;; - *) abort "$progname: unknown option \`$1'. Try $progname --help for help";; + *) abort "unknown option \`$1'; try $progname --help if you need it";; esac do test $# -gt 0 && shift; done case "$cmd" in - help|"") help;; + "") abort "missing command; try $progname --help if you need it";; + help) help;; version) version;; esac @@ -513,26 +520,24 @@ main() fi fi - # showhyphen and edit do not need any temp. directory, so do it here: + # these commands need no temp directory, so do them here: case "$cmd" in - showhyphen) - show_hyphen_file "$arg" - cleanup $? - ;; - edit) - ${VISUAL-${EDITOR-vi}} $cnf_file - ;; - enablefmt|disablefmt) - $cmd $arg - ;; catcfg) grep -v '^ *#' "$cnf_file" | sed 's@^ *@@; s@ *$@@' | grep . | sort - cleanup $? - ;; + 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 ;; + enablefmt|disablefmt) + $cmd $arg ;; # does not return listcfg) listcfg_loop - cleanup $? - ;; + cleanup $? ;; + showhyphen) + show_hyphen_file "$arg" + cleanup $? ;; esac if test -n "$cfgmaint"; then diff --git a/Master/bin/powerpc-linux/luatex b/Master/bin/powerpc-linux/luatex Binary files differindex c0f68d8e6d6..2dc15d09642 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 581ba70c86a..c060beff8fe 100755 --- a/Master/bin/powerpc-linux/luatools +++ b/Master/bin/powerpc-linux/luatools @@ -2214,22 +2214,107 @@ end -- we can hash them weakly -function file.collapse_path(str) + +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 str = gsub(str,"\\","/") - 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,"[^/%.]+/%.%./","") + 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 - str = gsub(str,"([^/])/$","%1") - -- str = gsub(str,"^%./","") -- ./xx in qualified - str = gsub(str,"/%.$","") + 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) + end + i = i - 1 + end + if #newelements == 0 then + return "." + elseif find(str,"^/") then + return "/" .. concat(newelements,'/') + else + return concat(newelements, '/') end - if str == "" then str = "." end - return str end --~ print(file.collapse_path("/a")) @@ -7862,6 +7947,7 @@ 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/mtxrun b/Master/bin/powerpc-linux/mtxrun index d6b2d13a71a..2bdd1b8f020 100755 --- a/Master/bin/powerpc-linux/mtxrun +++ b/Master/bin/powerpc-linux/mtxrun @@ -2223,22 +2223,107 @@ end -- we can hash them weakly -function file.collapse_path(str) + +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 str = gsub(str,"\\","/") - 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,"[^/%.]+/%.%./","") + 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 - str = gsub(str,"([^/])/$","%1") - -- str = gsub(str,"^%./","") -- ./xx in qualified - str = gsub(str,"/%.$","") + 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) + end + i = i - 1 + end + if #newelements == 0 then + return "." + elseif find(str,"^/") then + return "/" .. concat(newelements,'/') + else + return concat(newelements, '/') end - if str == "" then str = "." end - return str end --~ print(file.collapse_path("/a")) @@ -11866,6 +11951,7 @@ 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/omfonts b/Master/bin/powerpc-linux/omfonts Binary files differindex 1833b871489..24ff8d690b8 100755 --- a/Master/bin/powerpc-linux/omfonts +++ b/Master/bin/powerpc-linux/omfonts diff --git a/Master/bin/powerpc-linux/xetex b/Master/bin/powerpc-linux/xetex Binary files differindex d29f2802f9e..d24a6070921 100755 --- a/Master/bin/powerpc-linux/xetex +++ b/Master/bin/powerpc-linux/xetex diff --git a/Master/tlpkg/installer/xz/xz.powerpc-linux b/Master/tlpkg/installer/xz/xz.powerpc-linux Binary files differindex ee3ddbbf764..fa6b450301e 100755 --- a/Master/tlpkg/installer/xz/xz.powerpc-linux +++ b/Master/tlpkg/installer/xz/xz.powerpc-linux diff --git a/Master/tlpkg/installer/xz/xzdec.powerpc-linux b/Master/tlpkg/installer/xz/xzdec.powerpc-linux Binary files differindex 556eceacd14..3fb045bd263 100755 --- a/Master/tlpkg/installer/xz/xzdec.powerpc-linux +++ b/Master/tlpkg/installer/xz/xzdec.powerpc-linux |