summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/ctan2tds45
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rw-r--r--Master/tlpkg/tlpsrc/collection-xetex.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/xecyr.tlpsrc5
4 files changed, 39 insertions, 19 deletions
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 30181149d25..539c6fd15a0 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -181,8 +181,8 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'gfsneohellenic', "&MAKEflatten",
'gfsporson', "&MAKEflatten",
'gfssolomos', "&MAKEflatten",
-# 'glossaries', "die 'needs setup from ctan:install, sorry'", #&MAKEcopy",
- 'glossaries', "&MAKEcopy",
+ 'glossaries', "die 'needs setup from ctan:install, sorry'",
+# 'glossaries', "&MAKEcopy",
'glhyph', "die 'hyphenation madness needs work, sorry'",
'graphics', "&MAKEcopy", # we use latex-tds/graphics.zip
'graphicxsp', "die 'skipping, requires adobe distiller'",
@@ -424,6 +424,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'interactiveworkbook' => '&POSTinteractiveworkbook',
'pgf' => '&POSTpgf',
'pst-cox' => '&POSTpstcox',
+ 'xecyr' => '&POSTxecyr',
);
@@ -1426,27 +1427,27 @@ sub MAKEcopy
# move CHANGELOG for stellenbosch.
-r "$dest/CHANGELOG"
- && &SYSTEM ("mv $dest/CHANGELOG $dest/doc/$whichdocformat/$package/");
+ && &SYSTEM ("$MV $dest/CHANGELOG $dest/doc/$whichdocformat/$package/");
# move README.eulervm for eulervm.
-r "$dest/README.eulervm"
- && &SYSTEM ("mv $dest/README.eulervm $dest/doc/$whichdocformat/$package/");
+ && &SYSTEM ("$MV $dest/README.eulervm $dest/doc/$whichdocformat/$package/");
# for tex-gyre, rename context subdir. (shouldn't be needed next time.)
if (-d "$dest/fonts/map/pdftex/context") {
print "$package: rename context map dir.\n";
- &SYSTEM ("mv $dest/fonts/map/pdftex/context $dest/fonts/map/pdftex/tex-gyre");
+ &SYSTEM ("$MV $dest/fonts/map/pdftex/context $dest/fonts/map/pdftex/tex-gyre");
}
# for eplain, move info file (with warning).
if (-r "$dest/doc/$package/doc/eplain.info") {
warn "WARNING: moving eplain.info to /tmp\n";
warn " -- YOU must put it in texmf/doc/info!\n";
- &SYSTEM ("mv $dest/doc/$package/doc/eplain.info /tmp");
+ &SYSTEM ("$MV $dest/doc/$package/doc/eplain.info /tmp");
}
# for velthuis, remove bin dir (with warning).
- if (-d "$dest/bin") {
+ if ($package eq "velthuis" && -d "$dest/bin") {
warn "WARNING: removing bin/ dir in $dest\n";
warn " -- YOU must deal with it!\n";
&SYSTEM ("rm -rf $dest/bin");
@@ -1456,7 +1457,7 @@ sub MAKEcopy
if ($package eq "lm") {
my $srcdir = " $dest/source/$whichdocformat/$package/";
&SYSTEM ("mkdir -p $srcdir");
- &SYSTEM ("mv $dest/lm*mt1.zip $srcdir/");
+ &SYSTEM ("$MV $dest/lm*mt1.zip $srcdir/");
}
my $postaction = $specialpostaction{$package};
@@ -3229,26 +3230,27 @@ sub POSTbabel
# in texmf-dist/tex/generic/hyphen -- they have to be in texmf, not
# texmf-dist. Just remove them here; keeping the hyphenation files in
# sync is something we don't know how to tackle yet.
- print "\t POST $package remove hyphenations\n";
+ print "POST$package - remove hyphenations\n";
&SYSTEM ("rm -rf $DEST/tex/generic/hyphen");
}
sub POSTfpl
{
- print "\t POST$package - rename README.source\n";
+ print "POST$package - rename README.source\n";
&SYSTEM ("$MV README.source $DEST/source/fonts/fpl/README");
}
sub POSTglossaries
{
+ print "POST$package - move .bat\n";
my $wdir = "$TOPDEST/bin/win32";
&SYSTEM ("mkdir -p $wdir");
- &SYSTEM ("$CP $DEST/scripts/glossaries/makeglossaries.bat $wdir");
+ &SYSTEM ("$CP $DEST/scripts/glossaries/makeglossaries.bat $wdir/");
}
sub FLATTEN_PREHOOK_ibygrk
{
- print "\t FLATTEN_PREHOOK_$package - handle ibycus4.map\n";
+ print "FLATTEN_PREHOOK_$package - handle ibycus4.map\n";
# ibygrk has two instances of the same file ibycus4.map; it is
# both tex source and mf source. the usual method cannot deal, of course.
&SYSTEM ("$MV fonts/source/public/ibycus4/ibycus4.map .");
@@ -3257,7 +3259,7 @@ sub FLATTEN_PREHOOK_ibygrk
sub POSTibygrk
{
- print "\t POST$package - second copy of ibycus4.map\n";
+ print "POST$package - second copy of ibycus4.map\n";
# after the ibygrk structure has been set up, copy ibycus4.map to the
# tex dir.
&SYSTEM ("cd $DEST && $CP fonts/source/public/ibygrk/ibycus4.map "
@@ -3266,7 +3268,7 @@ sub POSTibygrk
sub POSTinteractiveworkbook
{
- print "\t POST$package mv .sty directory\n";
+ print "POST$package - mv .sty directory\n";
my $dest = "$DEST/tex/latex/$package";
&SYSTEM ("mkdir -p $dest");
&SYSTEM ("$MV interactiveworkbook.sty/* $dest/");
@@ -3275,13 +3277,13 @@ sub POSTinteractiveworkbook
sub POSTpgf
{
- print "\t POST$package mv generic+latex directories\n";
+ print "POST$package - mv generic+latex directories\n";
&SYSTEM ("cd $DEST && mkdir tex && mv context generic latex plain tex");
}
sub POSTpstcox
{
- print "\t POST$package mv latex .sty, doc Gallery\n";
+ print "POST$package - mv latex .sty, doc Gallery\n";
&SYSTEM ("mkdir -p $DEST/tex/latex/$package");
&SYSTEM ("mv -v $DEST/doc/generic/$package/*sty $DEST/tex/latex/$package");
&xchdir ("$DEST/doc/generic/$package");
@@ -3292,6 +3294,17 @@ sub POSTpstcox
&SYSTEM ("mv -v pst-coxcoor?* pst-coxcoor");
}
+sub POSTxecyr
+{
+ print "POST$package - handling bat, moving language.dat.add from runtime\n";
+ &SYSTEM ("$MV $DEST/tex/generic/xecyr/language.dat.add"
+ . " $DEST/doc/xelatex/xecyr");
+
+ my $wdir = "$TOPDEST/bin/win32";
+ &SYSTEM ("mkdir -p $wdir");
+ &SYSTEM ("$MV $DEST/bin/xecyr/*.bat $wdir/");
+}
+
# Allow overrides. In particular, CTAN can change some hashes to make
# packages with licenses that TL doesn't allow.
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 091aff081e2..673869a2ab2 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -180,7 +180,7 @@ my @WorkingTLP = qw(
vancouver variations varindex vector velthuis verse versions
vhistory visualfaq vmargin vntex volumes vpe vxu
wallpaper warning warpcol williams wordcount wordlike wrapfig
- xargs xbase xcolor xdoc xetexref xfor xfrac xgreek xifthen
+ xargs xbase xcolor xdoc xecyr xetexref xfor xfrac xgreek xifthen
xkeyval xltxtra xnewcommand xoptarg
xq xskak xtab xtcapts xunicode xyling xypic-tut-pt xytree
york-thesis
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 61d1e8e96ad..3bb0febb619 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -1,13 +1,15 @@
name collection-xetex
category Collection
-shortdesc XeTeX macros
-longdesc Macro files for XeTeX, Unicode-enabled TeX by Jonathan Kew.
+shortdesc XeTeX packages
+longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
+longdesc http://scripts.sil.org/xetex.
depend arabxetex
depend euenc
depend bidi
depend fontspec
depend ifxetex
depend philokalia
+depend xecyr
depend xetex
depend xetexconfig
depend xetexurl
diff --git a/Master/tlpkg/tlpsrc/xecyr.tlpsrc b/Master/tlpkg/tlpsrc/xecyr.tlpsrc
new file mode 100644
index 00000000000..f58addb5f65
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/xecyr.tlpsrc
@@ -0,0 +1,5 @@
+name xecyr
+category Package
+binpattern f bin/win32/rubibtexx.bat
+binpattern f bin/win32/rumakeindexx.bat
+binpattern f bin/win32/rumakeindexx2.bat