From b644be7550076c874437a062a31c63be6daaa12e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jul 2008 00:58:13 +0000 Subject: cjk 4.8.0 update (named CJK before) git-svn-id: svn://tug.org/texlive/trunk@9456 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/ctan2tds | 41 +++++++++++++++++++++++++++++++------- Master/tlpkg/bin/tlpkg-ctan-check | 4 ++-- Master/tlpkg/tlpsrc/cjk.tlpsrc | 8 ++++++++ Master/tlpkg/tlpsrc/wadalab.tlpsrc | 15 ++++++++++---- 4 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 Master/tlpkg/tlpsrc/cjk.tlpsrc (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds index 914270f7ef2..0c4393b78b8 100755 --- a/Master/tlpkg/bin/ctan2tds +++ b/Master/tlpkg/bin/ctan2tds @@ -103,7 +103,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw 'cheq', "die 'skipping, nosell license'", 'circuit_macros', "die 'skipping, needs m4'", 'cjhebrew', "&MAKEflatten", - 'cjk', "die 'skipping, not ready'", #"&MAKEcjk", + 'cjk', "&MAKEcjk", 'clock', "&MAKEflatten", 'cm-lgc', '&MAKEcmlgc', 'cm-super', "&MAKEflatten", @@ -2732,15 +2732,18 @@ sub MAKEvossde { # wadalab provides nearly TDS-ready .tar.gz with additional stuff +# sub MAKEwadalab { - print "MAKEwadalab $package\n"; + print "MAKEwadalab $package - munge tds-ready tarballs\n"; &setup; &xchdir ("$DEST/doc/$whichdocformat/$package"); + # each XX.tar.gz contains a tds-ready tree under XX/texmf: use it - opendir (HERE, ".") or die "this should no happen: $!"; + opendir (HERE, ".") || die "opendir(.) failed: $!"; my @tarfiles = grep /\.tar\.gz$/, readdir HERE; - closedir HERE; + closedir (HERE); + my $destfonts = "$DEST/fonts"; &SYSTEM ("mkdir -p $destfonts"); foreach my $tarfile (@tarfiles) { @@ -2749,9 +2752,14 @@ sub MAKEwadalab &SYSTEM ("cp -r $tarfile/texmf/* $DEST"); &SYSTEM ("rm -r $tarfile/texmf && rmdir $tarfile"); } + + # except the mincho-1-8-* tarball misses the doc/fonts level. + &SYSTEM ("$MV $DEST/doc/wadalab/* $DEST/doc/fonts/wadalab/"); + # wadalab has a dir of xdelta from the original fonts -d "xdelta" && &SYSTEM ("$MV xdelta $DEST/source/$whichdocformat/$package"); - # rm unused directories + + # rm unused directories. &SYSTEM ("rmdir $DEST/*/$whichformat/$package 2>/dev/null"); } @@ -3091,11 +3099,30 @@ sub MAKEcjk &SYSTEM ("$RM *.zip && $MV 4.8.0/* . && rmdir 4.8.0"); # &xchdir ($DEST); + # + # move contrib into source subdir. + &SYSTEM ("$MV $DOCDIR/contrib source/latex/cjk/"); + # # rename texinput to tex/latex/cjk. &SYSTEM ("rmdir tex/latex/cjk; $MV $DOCDIR/texinput tex/latex/cjk"); # - # miscellany for source subdir. - &SYSTEM ("$MV $DOCDIR/contrib $DOCDIR/utils source/latex/cjk/"); + # rename texlive, contains modified KS/HLaTeX .fd files. + my $ksl_dest = "tex/latex/cjk/contrib/hlatex-texlive"; + &xmkdir ($ksl_dest); + &SYSTEM ("$MV $DOCDIR/texlive $ksl_dest"); + # + # move utils into source subdir too, wht we have in + # Build/source/texk/cjkutils is a tiny subset. + &SYSTEM ("$MV $DOCDIR/utils source/latex/cjk/"); + # + # remove the thaifont runtime files which we painfully package separately. + # but leave other thaifont files here, not worth dealing. + &SYSTEM ("rm -rf source/latex/cjk/utils/thaifont/texmf"); + # + # We need the wadalab fd files. + my $wada_dest = "tex/latex/cjk/contrib/wadalab"; + &xmkdir ($wada_dest); + &SYSTEM ("$MV source/latex/cjk/contrib/wadalab/*.fd* $wada_dest/"); } sub MAKEcmlgc diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 9414a7492b0..aae07ad7c0e 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -42,7 +42,7 @@ my @WorkingTLP = qw( changebar changepage changes chappg chem-journal chemcompounds chemscheme chemstyle cherokee chessboard chessfss circ - citeref cjhebrew classicthesis + citeref cjhebrew cjk classicthesis clefval cleveref clock clrscode cm-super cmap cmastro cmcyr cmdstring cmdtrack cmll colorinfo @@ -200,7 +200,7 @@ my @WorkingTLP = qw( vancouver variations varindex varsfromjobname vector velthuis venn verse versions vertex vhistory visualfaq vmargin vntex volumes vpe vwcol vxu - wallpaper warning warpcol williams wordlike wrapfig + wadalab wallpaper warning warpcol williams wordlike wrapfig xargs xbase xcolor xdoc xecyr xetex-def xetex-pstricks xetexfontinfo xetexref xfor xgreek xifthen xkeyval xltxtra xmpincl xnewcommand xoptarg diff --git a/Master/tlpkg/tlpsrc/cjk.tlpsrc b/Master/tlpkg/tlpsrc/cjk.tlpsrc new file mode 100644 index 00000000000..d6393d4f7a8 --- /dev/null +++ b/Master/tlpkg/tlpsrc/cjk.tlpsrc @@ -0,0 +1,8 @@ +name cjk +category Package +depend arphic +depend cns +depend garuda +depend norasi +depend uhc +depend wadalab diff --git a/Master/tlpkg/tlpsrc/wadalab.tlpsrc b/Master/tlpkg/tlpsrc/wadalab.tlpsrc index b04b02af54a..14f7ca68e80 100644 --- a/Master/tlpkg/tlpsrc/wadalab.tlpsrc +++ b/Master/tlpkg/tlpsrc/wadalab.tlpsrc @@ -1,6 +1,13 @@ name wadalab category Package -execute addMap wadalab.map -srcpattern +!d texmf-dist/source/latex/CJK/contrib/wadalab -runpattern +!d texmf-dist/tex/latex/CJK/contrib/wadalab -docpattern +!d texmf-dist/doc/latex/CJK/contrib/wadalab +execute addMap dgj.map +execute addMap dmj.map +execute addMap mc2j.map +execute addMap mcj.map +execute addMap mr2j.map +execute addMap mrj.map +# +# these are part of the cjk package, despite being in a wadalab subdir. +srcpattern +!d texmf-dist/source/latex/cjk/contrib/wadalab +runpattern +!d texmf-dist/tex/latex/cjk/contrib/wadalab +docpattern +!d texmf-dist/doc/latex/cjk/contrib/wadalab -- cgit v1.2.3