1 files changed, 2 insertions, 65 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 890c33294d4..a0e209ff156 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -471,7 +471,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
  'html2latex',	"die 'skipping, no self-locating of Perl modules'",
  'hyph-utf8',	"&MAKEcopy",
  'hyphen-german',"die 'skipping, part of hyph-utf8'",
- 'ibycus-babel',"&MAKEibycusbabel",
  'ibygrk',	"&MAKEflatten",
  'ieeeconf',	"die 'skipping, use IEEEconf'",
  'ieeetran',	"die 'skipping, use IEEEtran'",
@@ -2459,6 +2458,7 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
  'fundus'	=> $standardclean . '|outline.sty',	# in own package
  'gentle'	=> 'gentle.ps.gz',			# pdf is enough
  'hyph-utf8'	=> 'README',
+ 'ibycus-babel' => $standardclean . '|ibyhyph.tex',    # in hyphen-ancientgreek
  'jadetex'	=> $standardclean  # these sty files are in passivetex
 		   . '|(dummyels|mlnames|ucharacters|unicode)\.sty',
  'lshort-russian'=>'lshortbk.zip',			# sources are enough
@@ -3472,68 +3472,6 @@ sub MAKEnosymlinks {
   &donormal ("nosetup");
 }
 
-# do some stuff for simple packages with hyphenation files, like
-# cbcoptic and ibycus-babel.  The arguments are:
-# LANGNAME - full language name, like "coptic" (first arg of .dat line)
-# LANGABBREV - abbreviated language name, like "cop" (in .dat filename)
-# HYPHFILE - hyphenation .tex file name, like "copthyph.tex"
-# 
-# General procedure is:
-# 
-# create: tlpkg/tlpsrc/hyphen-language.tlpsrc
-#   (must be done by hand)
-# create: texmf-dist/tex/generic/config/language.ll.dat
-#   (done here, unless it already exists)
-# install pattern file from ctan: texmf-dist/tex/generic/hyphen/langhyph.tex
-#   (done here)
-# add in: tlpkg/tlpsrc/collection-langwhatever.tlpsrc
-#   (must be done by hand)
-# 
-sub GENMAKEhyphenation {
- my ($langname,$langabbrev,$hyphfile) = @_;
- &setup;
- &buildfilelist;
- &donormal;
- print "\t SPECIAL $package: install $hyphfile\n";
- my $generichyphdir = "$TOPDEST/texmf-dist/tex/generic/hyphen";
- &SYSTEM("mkdir -p $generichyphdir");
- &SYSTEM("$MV $hyphfile $generichyphdir");
- 
- my $genericconfigdir = "$TOPDEST/texmf-dist/tex/generic/config";
- my $configfile = "$genericconfigdir/language.$langabbrev.dat";
- if (! -r $configfile) {
-   print "\t SPECIAL $package: create $configfile\n";
-   &SYSTEM("mkdir -p $genericconfigdir");
-   &SYSTEM("echo $langname $hyphfile >$configfile");
- }
-
- print "YOU-MUST-DO! $package: create hyphen-$langname.tlpsrc\n";
- print "YOU-MUST-DO! $package: add to collection-langwhatever.tpm\n";
-}
-
-sub MAKEcbcoptic {
-  &GENMAKEhyphenation ("coptic", "cop", "copthyph.tex");
-}
-
-sub MAKEibycusbabel {
-  &GENMAKEhyphenation ("ibycus", "iby", "ibyhyph.tex");
-}
-
-# since existing mongolian is written in a different encoding,
-# seems best to keep both?
-sub MAKEmnhyphn
-{
- &GENMAKEhyphenation ("mongolian2a", "mn2a", "mnhyphn.tex");
-}
-
-# we don't want a package named nohyph.  Hmm.
-#sub MAKEnohyph
-#{
-# &GENMAKEhyphenation ("norsk", "no", "nohyphbx.tex");
-# &GENMAKEhyphenation ("nynorsk", "no", "nnhyph.tex");
-# &GENMAKEhyphenation ("bokmal", "no", "nbhyph.tex");
-#}
-
 sub MAKEaqcm {
   print "\t SPECIAL $package";
 
@@ -3565,8 +3503,7 @@ sub MAKEarabi {
   &SYSTEM ("$CP -r * $DEST/");
 }
 
-sub MAKEarabtex
-{
+sub MAKEarabtex {
   &xchdir ($packagedir);
   #
   print "\t SPECIAL $package: removing top-level links\n";