diff options
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2010-05-31 11:55:10 +0000 |
|---|---|---|
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2010-05-31 11:55:10 +0000 |
| commit | 2e29be81b9ee04c3c194ef698fc789d40578dc34 (patch) | |
| tree | 7a42cf57fbc9c881c7d52130dbc9f5f4df135c2c /Build/source | |
| parent | aeac1d705a8adf313891d96be54261e384e9ca5d (diff) | |
Allow multiple language files in fmtutil.cnf.
git-svn-id: svn://tug.org/texlive/trunk@18642 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
| -rw-r--r-- | Build/source/texk/tetex/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/texk/tetex/fmtutil | 8 | ||||
| -rw-r--r-- | Build/source/texk/tetex/fmtutil.cnf.5 | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 1a7c7c6be7d..535ed5d2e30 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2010-05-31 Manuel Pégourié-Gonnard <mpg@elzevir.fr> + + * fmtutil: allow more than one language file per format. + 2010-05-20 Karl Berry <karl@tug.org> * doc/TETEXDOC.dvi, diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil index c29237e3fb3..025cece5568 100755 --- a/Build/source/texk/tetex/fmtutil +++ b/Build/source/texk/tetex/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/Build/source/texk/tetex/fmtutil.cnf.5 b/Build/source/texk/tetex/fmtutil.cnf.5 index 7c5aeb905d2..e00b537a261 100644 --- a/Build/source/texk/tetex/fmtutil.cnf.5 +++ b/Build/source/texk/tetex/fmtutil.cnf.5 @@ -15,7 +15,7 @@ arguments (name of an \fI\&.ini\fP file)\&. Fields are separated by whitespace\& and complete lines can be commented out with ``#\'\'\&. The ``pattern file\'\' field cannot be used to define a file that is used while building the format\&. -It tells \fBfmtutil\fP which file the +It tells \fBfmtutil\fP which files (separated by comas) the format creation procedure reads\& and it has an effect to the options \fI--showhyphen\fP and \fI--byhyphen\fP\&. If the format has no way to @@ -49,6 +49,8 @@ default configuration file hyphenation pattern file .IP "\fIlanguage\&.def\fP" hyphenation pattern file +.IP "\fIlanguage\&.dat.lua\fP" +hyphenation pattern file .PP .SH "SEE ALSO" .PP |