summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-11 18:50:28 +0000
committerKarl Berry <karl@freefriends.org>2011-04-11 18:50:28 +0000
commit8440a3ec7fc7010d4c08fe26cca97573da388780 (patch)
tree015d68b2570171bc5a60d31edd73d699ed5d0e8d /Master/tlpkg
parentac5a67016d4bdb590de1d3e93b0c4e975f7f20c2 (diff)
bookhands remove conflicts with auncial-new and ptex
git-svn-id: svn://tug.org/texlive/trunk@22053 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
1 files changed, 7 insertions, 3 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index d107b0e48f2..178938920e1 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2825,14 +2825,13 @@ sub runfonts {
&SYSTEM("mkdir -p $DEST/fonts/tfm/$Foundry/$package");
$needdir=0;
}
- &SYSTEM("$MV $FileBase.tfm $DEST/fonts/tfm/$Foundry/$package ");
+ &SYSTEM("$MV $FileBase.tfm $DEST/fonts/tfm/$Foundry/$package");
}
}
-sub MAKEflatten
-{
+sub MAKEflatten {
# don't to this in a tds-ready tree...
-e "$RAW_DIR/$packagedir/TDS_READY"
&& die "$0: using MAKEflatten with TDS_READY tree $RAW_DIR/$packagedir.\n";
@@ -3553,6 +3552,9 @@ sub MAKEwilson {
next;
}
+ # tgothic filenames conflict with ptex fonts.
+ next if $d eq "tgothic";
+
my $target = "$docdir/$d";
next if ! -d $target; # samples/readme files
print "\t PROCESS Wilson subdir $d\n";
@@ -3578,6 +3580,8 @@ sub MAKEwilson {
# rebuild again, as we have .dvi files now
&buildfilelist;
&runfonts;
+ unlink ("$DEST/fonts/tfm/$Foundry/$package/auncl10.tfm",
+ "$DEST/fonts/tfm/$Foundry/$package/aunclb10.tfm");
&dobst;
&dobib;
&dotex;