summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-11 19:06:00 +0000
committerKarl Berry <karl@freefriends.org>2012-12-11 19:06:00 +0000
commit7fb7feb9e84e495b3140986af5f65206fe8e8379 (patch)
tree45f19b256634acf23c97e4457038809b34cfe571
parent3226a8894c9f90a96a776fe36456af2cc2d078c7 (diff)
dice non-update
git-svn-id: svn://tug.org/texlive/trunk@28501 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/fonts/dice/dice3d.dvibin2280 -> 0 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/dice/dice3d.tfmbin520 -> 456 bytes
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check6
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds31
4 files changed, 19 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/fonts/dice/dice3d.dvi b/Master/texmf-dist/doc/fonts/dice/dice3d.dvi
deleted file mode 100644
index 9cf6bcec5cb..00000000000
--- a/Master/texmf-dist/doc/fonts/dice/dice3d.dvi
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/dice/dice3d.tfm b/Master/texmf-dist/fonts/tfm/public/dice/dice3d.tfm
index 1ca3cc0bcf1..440029e978f 100644
--- a/Master/texmf-dist/fonts/tfm/public/dice/dice3d.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/dice/dice3d.tfm
Binary files differ
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index ba57dbd0961..54892512eda 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -133,7 +133,7 @@ my @TLP_working = qw(
dateiliste datenumber datetime
dblfloatfix dcpic de-macro decimal decorule dehyph-exptl dejavu
delim delimtxt dhua
- diagbox diagmac2 diagnose dichokey dictsym digiconfigs din1505
+ diagbox diagmac2 diagnose dice dichokey dictsym digiconfigs din1505
dinat dinbrief dingbat directory dirtree dirtytalk disser dk-bib dlfltxb
dnaseq doc-pictex docmfp docmute documentation doi doipubmed
dosepsbin dot2texi dotarrow dotseqn dottex
@@ -144,7 +144,7 @@ my @TLP_working = qw(
dvdcoll dviasm dviincl dvipdfmx-def
dvipsconfig dynblocks dyntree
ean ean13isbn easy easy-todo easyfig easylist
- ebezier ebong ebsthesis ec ecc ecclesiastic ecltree economic
+ ebezier ebong ebsthesis ec ecc ecclesiastic ecltree eco economic
ecv ed edfnotes edmac edmargin ednotes eemeir eepic egameps
egplot eiad eiad-ltx eijkhout einfuehrung ejpecp
elbioimp electrum eledform eledmac ellipsis elmath elpres elsarticle
@@ -285,7 +285,7 @@ my @TLP_working = qw(
moderncv moderntimeline modiagram modref modroman mongolian-babel
monofill montex
moreenum morefloats morehype moresize
- moreverb morewrites movie15 mp3d mparhack mpcolornames mpgraphics
+ moreverb morewrites movie15 mp3d mparhack mpattern mpcolornames mpgraphics
mpman-ru ms msc msg mslapa msu-thesis mtgreek
multenum multibbl multibib multicap multienv multirow
multido multiobjective munich musixguit
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2ad719afe5a..da480455e0b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -646,7 +646,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'morehelp', "die 'skipping, nonfree license'",
'morse', "die 'skipping, nosell license'",
'mp3d', "&MAKEflatten",
- 'mpattern', "&MAKEmpattern",
'mpcolornames',"&MAKEcopy",
'mpdinbrief', "die 'skipping, nosell license'",
'mptopdf', "die 'skipping, not ready, sorry'", #"&MAKEflatten",
@@ -1644,7 +1643,6 @@ $standardtex='\.(.bx|cfg|sty|clo|ldf|cls|def|fd|cmap|4ht)$';
'mkgrkindex', 'support',
'mkpattern', 'plain',
'mkjobtexmf', 'generic',
- 'mpattern', 'metapost',
'musixtex', 'generic',
'mxedruli', 'fonts',
'nkarta', 'fonts',
@@ -1735,8 +1733,6 @@ $standarddocfmt='latex';
'insbox', 'tex',
'iso10303', 'pdflatex',
'mfpic', 'tex',
- 'mpattern', 'true', # requires running mpp, but it's not executable and
- # anyway it's just a test file. ignore it.
'ofs', 'csplain',
'pdfscreen', 'pdflatex',
'pdfslide', 'pdflatex',
@@ -2113,7 +2109,7 @@ $standardmf='[0-9]\.mf';
'cookingsymbols', 'cookingsymbols\.mf',
'cmpica', 'cmpic.*\.mf',
'dancers', 'dancers\.mf',
- 'dice', 'dice3d\.mf',
+ 'dice', 'dice3d',
'dingbat', '\.mf',
'eiad-ltx', 'NULL', # Fr10.mf and Fbf10.mf don't compile (need cmbase)
'engwar', 'engwar\.mf',
@@ -3155,8 +3151,7 @@ sub rundvi {
# run a &SYSTEM job, and append stderr output to log file
#
-sub runjob
-{
+sub runjob {
my ($job) = @_;
my $status = 0;
@@ -3164,13 +3159,18 @@ sub runjob
print "WOULDRUNJOB $job\n";
} else {
my $Jobid = "_$$";
- &SYSTEM ("$job >$Jobid.log 2>&1");
+ chomp (my $PWD = `pwd`);
+ &SYSTEM ("$job >$PWD/$Jobid.log 2>&1");
$status = $?;
local *TMP;
open (TMP, "$Jobid.log") || die "open($Jobid.log) failed: $!";
my @output = (<TMP>);
if ($job =~ /^mktextfm/) {
- print $output[$#output-1]; # successfully generated line
+ my $lastline = $output[$#output-1];
+ print "runjob mktextfm last output line: $lastline\n";
+ # it's too verbose to print the full mf run of every font.
+ # but if mktextfm failed, show that.
+ print `cat $Jobid.log` if $status != 0;
$status = 0; # do not worry if the bitmap failed, e.g., grtt10.mf.
} else {
print `cat $Jobid.log`;
@@ -3968,20 +3968,21 @@ sub MAKEpslatex
}
sub MAKEeco {
-# this simply copies source files
- chdir($packagedir) || die ("ERROR: cannot open directory");
+ # this simply copies source files
+ chdir($packagedir) || die ("ERROR: cannot open directory");
&runjob("mkdir -p $DEST/fonts/tfm/$Foundry/eco");
&runjob("mkdir -p $DEST/fonts/vf/$Foundry/eco");
&runjob("mkdir -p $DEST/tex/latex/eco");
&runjob("mkdir -p $DEST/dvips/eco");
- &runjob("mkdir -p $DEST/doc/latex/eco");
+ &runjob("mkdir -p $DEST/doc/fonts/eco");
+ &runjob("mkdir -p $DEST/source/fonts/eco");
&runjob("$CP src/*sty $DEST/tex/latex/eco");
&runjob("$CP fd/* $DEST/tex/latex/eco");
&runjob("$CP tfm/* $DEST/fonts/tfm/$Foundry/eco");
&runjob("$CP vf/* $DEST/fonts/vf/$Foundry/eco");
- &runjob("$CP -r src/*tex src/*x src/*sh $DEST/doc/latex/eco");
- &runjob("$CP -r [A-Z]* $DEST/doc/latex/eco");
- }
+ &runjob("$CP -r [A-Z]* $DEST/doc/fonts/eco");
+ &runjob("$CP src/*x src/*.sh $DEST/source/fonts/eco/");
+}
sub MAKEelhyphen {
&setup;