From 2e29be81b9ee04c3c194ef698fc789d40578dc34 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Mon, 31 May 2010 11:55:10 +0000 Subject: Allow multiple language files in fmtutil.cnf. git-svn-id: svn://tug.org/texlive/trunk@18642 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/alpha-linux/fmtutil | 8 +++--- Master/bin/amd64-freebsd/fmtutil | 8 +++--- Master/bin/amd64-kfreebsd/fmtutil | 8 +++--- Master/bin/i386-cygwin/fmtutil | 8 +++--- Master/bin/i386-freebsd/fmtutil | 8 +++--- Master/bin/i386-kfreebsd/fmtutil | 8 +++--- Master/bin/i386-linux/fmtutil | 8 +++--- Master/bin/i386-netbsd/fmtutil | 8 +++--- Master/bin/i386-solaris/fmtutil | 8 +++--- Master/bin/mips-irix/fmtutil | 56 ++++++++++++++++++++++--------------- Master/bin/powerpc-aix/fmtutil | 56 ++++++++++++++++++++++--------------- Master/bin/powerpc-linux/fmtutil | 8 +++--- Master/bin/sparc-linux/fmtutil | 8 +++--- Master/bin/sparc-solaris/fmtutil | 56 ++++++++++++++++++++++--------------- Master/bin/universal-darwin/fmtutil | 8 +++--- Master/bin/x86_64-darwin/fmtutil | 8 +++--- Master/bin/x86_64-linux/fmtutil | 8 +++--- Master/bin/x86_64-solaris/fmtutil | 8 +++--- 18 files changed, 162 insertions(+), 126 deletions(-) (limited to 'Master') diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/alpha-linux/fmtutil +++ b/Master/bin/alpha-linux/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/amd64-freebsd/fmtutil +++ b/Master/bin/amd64-freebsd/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/amd64-kfreebsd/fmtutil b/Master/bin/amd64-kfreebsd/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/amd64-kfreebsd/fmtutil +++ b/Master/bin/amd64-kfreebsd/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-cygwin/fmtutil b/Master/bin/i386-cygwin/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-cygwin/fmtutil +++ b/Master/bin/i386-cygwin/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-freebsd/fmtutil +++ b/Master/bin/i386-freebsd/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-kfreebsd/fmtutil b/Master/bin/i386-kfreebsd/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-kfreebsd/fmtutil +++ b/Master/bin/i386-kfreebsd/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-linux/fmtutil +++ b/Master/bin/i386-linux/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-netbsd/fmtutil +++ b/Master/bin/i386-netbsd/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/i386-solaris/fmtutil +++ b/Master/bin/i386-solaris/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil index f12885629e2..2cb5743a463 100755 --- a/Master/bin/mips-irix/fmtutil +++ b/Master/bin/mips-irix/fmtutil @@ -1,6 +1,7 @@ #!/bin/sh # fmtutil - utility to maintain format files. # Public domain. Originally written by Thomas Esser. +# Run with --help for usage. # program history: # further changes in texk/tetex/ChangeLog. @@ -58,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version=20091223.1047 +version='$Id: fmtutil 17423 2010-03-11 17:53:34Z karl $' cnf=fmtutil.cnf # name of the config file export PATH @@ -82,13 +83,24 @@ cleanup() ############################################################################### help() { - cat <<'eof' + cat < eof cleanup 0 } @@ -398,18 +413,15 @@ main() mktexfmtMode=true fullfmt=$1; shift case $fullfmt in + ""|--help) help ;; + --version) version ;; + --*) abort "unknown option $fullfmt, try --help" ;; *.fmt|*.mem|*.base) - set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift - ;; - *.*) - abort "unknown format type: $fullfmt" - ;; - "") - help - ;; - *) - set x --byfmt $fullfmt; shift - ;; + set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"} + shift + ;; + *.*) abort "unknown format type: $fullfmt" ;; + *) set x --byfmt $fullfmt; shift ;; esac ;; esac @@ -482,7 +494,7 @@ main() esac if test -n "$cfgparam"; then - test -f "$cnf_file" || abort "config file \`$cnf_file' not found" + test -f "$cnf_file" || abort "config file \`$cnf_file' not found (ls-R missing?)" fi if test -n "$cfgmaint"; then @@ -660,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -830,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -897,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil index f12885629e2..2cb5743a463 100755 --- a/Master/bin/powerpc-aix/fmtutil +++ b/Master/bin/powerpc-aix/fmtutil @@ -1,6 +1,7 @@ #!/bin/sh # fmtutil - utility to maintain format files. # Public domain. Originally written by Thomas Esser. +# Run with --help for usage. # program history: # further changes in texk/tetex/ChangeLog. @@ -58,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version=20091223.1047 +version='$Id: fmtutil 17423 2010-03-11 17:53:34Z karl $' cnf=fmtutil.cnf # name of the config file export PATH @@ -82,13 +83,24 @@ cleanup() ############################################################################### help() { - cat <<'eof' + cat < eof cleanup 0 } @@ -398,18 +413,15 @@ main() mktexfmtMode=true fullfmt=$1; shift case $fullfmt in + ""|--help) help ;; + --version) version ;; + --*) abort "unknown option $fullfmt, try --help" ;; *.fmt|*.mem|*.base) - set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift - ;; - *.*) - abort "unknown format type: $fullfmt" - ;; - "") - help - ;; - *) - set x --byfmt $fullfmt; shift - ;; + set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"} + shift + ;; + *.*) abort "unknown format type: $fullfmt" ;; + *) set x --byfmt $fullfmt; shift ;; esac ;; esac @@ -482,7 +494,7 @@ main() esac if test -n "$cfgparam"; then - test -f "$cnf_file" || abort "config file \`$cnf_file' not found" + test -f "$cnf_file" || abort "config file \`$cnf_file' not found (ls-R missing?)" fi if test -n "$cfgmaint"; then @@ -660,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -830,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -897,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/powerpc-linux/fmtutil +++ b/Master/bin/powerpc-linux/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/sparc-linux/fmtutil +++ b/Master/bin/sparc-linux/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil index f12885629e2..2cb5743a463 100755 --- a/Master/bin/sparc-solaris/fmtutil +++ b/Master/bin/sparc-solaris/fmtutil @@ -1,6 +1,7 @@ #!/bin/sh # fmtutil - utility to maintain format files. # Public domain. Originally written by Thomas Esser. +# Run with --help for usage. # program history: # further changes in texk/tetex/ChangeLog. @@ -58,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' progname=fmtutil argv0=$0 -version=20091223.1047 +version='$Id: fmtutil 17423 2010-03-11 17:53:34Z karl $' cnf=fmtutil.cnf # name of the config file export PATH @@ -82,13 +83,24 @@ cleanup() ############################################################################### help() { - cat <<'eof' + cat < eof cleanup 0 } @@ -398,18 +413,15 @@ main() mktexfmtMode=true fullfmt=$1; shift case $fullfmt in + ""|--help) help ;; + --version) version ;; + --*) abort "unknown option $fullfmt, try --help" ;; *.fmt|*.mem|*.base) - set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}; shift - ;; - *.*) - abort "unknown format type: $fullfmt" - ;; - "") - help - ;; - *) - set x --byfmt $fullfmt; shift - ;; + set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"} + shift + ;; + *.*) abort "unknown format type: $fullfmt" ;; + *) set x --byfmt $fullfmt; shift ;; esac ;; esac @@ -482,7 +494,7 @@ main() esac if test -n "$cfgparam"; then - test -f "$cnf_file" || abort "config file \`$cnf_file' not found" + test -f "$cnf_file" || abort "config file \`$cnf_file' not found (ls-R missing?)" fi if test -n "$cfgmaint"; then @@ -660,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -830,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -897,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/universal-darwin/fmtutil +++ b/Master/bin/universal-darwin/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/x86_64-darwin/fmtutil b/Master/bin/x86_64-darwin/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/x86_64-darwin/fmtutil +++ b/Master/bin/x86_64-darwin/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/x86_64-linux/fmtutil +++ b/Master/bin/x86_64-linux/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false diff --git a/Master/bin/x86_64-solaris/fmtutil b/Master/bin/x86_64-solaris/fmtutil index 6257aba50e7..2cb5743a463 100755 --- a/Master/bin/x86_64-solaris/fmtutil +++ b/Master/bin/x86_64-solaris/fmtutil @@ -672,10 +672,10 @@ parse_line() ############################################################################### find_hyphenfile() { - format="$1"; hyphenation="$2" + format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`" case $hyphenation in -) ;; - *) kpsewhich -progname="$format" -format=tex "$hyphenation";; + *) kpsewhich -progname="$format" -format=tex $hyphenation;; esac } @@ -842,7 +842,7 @@ listcfg_loop() check_match() { $need_find_hyphenfile && \ - this_hyphenfile=`find_hyphenfile "$format" "$hyphenation"` + this_hyphenfile="`find_hyphenfile "$format" "$hyphenation"`" eval $match_cmd && setmatch true } @@ -909,7 +909,7 @@ recreate_by_hyphenfile() ;; esac need_find_hyphenfile=true - match_cmd="test x\$this_hyphenfile = x$hyphenfile" + match_cmd="echo \"\$this_hyphenfile\" | grep $hyphenfile >/dev/null" # No match before the loop: setmatch false -- cgit v1.2.3