summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-22 16:05:18 +0000
committerKarl Berry <karl@freefriends.org>2012-05-22 16:05:18 +0000
commit81ded10ef06e5d6301899b8aaf098953e7bfc3e7 (patch)
treec0db280afbd903740e7cc8249e9638d3c7235c52
parent9c0e439e5a92dd81f8125232b68d97de85a19b4a (diff)
$name for csso12*, from Debian/Norbert
git-svn-id: svn://tug.org/texlive/trunk@26569 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rwxr-xr-xBuild/source/texk/kpathsea/mktexmf19
2 files changed, 16 insertions, 8 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 2e97d683f5e..1fb829f5d34 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-22 Karl Berry <karl@tug.org>
+
+ * mktexmf: test $name for csso12*, not $rootname.
+ From Debian via Norbert, 21 May 2012 10:11:08.
+
2012-05-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* cnf.[ch]: Add KPSEDLL to kpathsea_cnf_get(), and reintroduce
diff --git a/Build/source/texk/kpathsea/mktexmf b/Build/source/texk/kpathsea/mktexmf
index bf30feece8f..314b7af2e72 100755
--- a/Build/source/texk/kpathsea/mktexmf
+++ b/Build/source/texk/kpathsea/mktexmf
@@ -36,17 +36,20 @@ if test -n "$sauterroot"; then
rootfile=$sauterroot
rootname=b-$rootname
else
- case $rootname in
+ case $name in
# csso12[0-5][0-9] from CJK package; unsupported by mktexmf
csso12[0-5][0-9])
- rootfile=;;
- cs*|lcsss*|icscsc*|icstt*|ilcsss*)
- rootfile=`kpsewhich cscode.mf`;;
- wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
- lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
- rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+ rootfile=;;
*)
- rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+ case $rootname in
+ cs*|lcsss*|icscsc*|icstt*|ilcsss*)
+ rootfile=`kpsewhich cscode.mf`;;
+ wn[bcdfirstuv]*|rx[bcdfiorstuvx][bcfhilmostx]|l[abcdhl][bcdfiorstuvx]*)
+ lhprefix=`echo "$name" | sed 's/^\(..\).*/\1/'`
+ rootfile=`kpsewhich ${lhprefix}codes.mf 2>/dev/null`;;
+ *)
+ rootfile=`kpsewhich $rootname.mf 2>/dev/null`;;
+ esac;;
esac
fi
{ test -z "$rootfile" || test ! -f "$rootfile"; } && exit 1