summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm131
-rw-r--r--Master/tlpkg/TeXLive/TLPOBJ.pm2
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm88
-rw-r--r--Master/tlpkg/texlive.tlpdb285
-rw-r--r--Master/tlpkg/tlpsrc/collection-langarab.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-langother.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-czechslovak.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-french.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-german.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ibycus.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc7
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-pinyin.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-usorbian.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/plain.tlpsrc1
58 files changed, 361 insertions, 336 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index f81a171951b..53adfb59be5 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -62,7 +62,7 @@ our $TeXLiveAlternativeURL;
our $WinSpecialUpdatePackagesRegexp =
- '^(texlive\.infra|luatex|bin-tlperl\.win32$|texlive\.infra|bin-texlive)';
+ '^(texlive\.infra|luatex|bin-tlperl\.win32$|bin-texlive)';
1;
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 160d783ba60..a5107eb3e5d 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -38,6 +38,7 @@ C<TeXLive::TLPDB> -- A database of TeX Live Packages
$tlpdb->updmap_cfg_lines;
$tlpdb->fmtutil_cnf_lines;
$tlpdb->language_dat_lines;
+ $tlpdb->language_def_lines;
$tlpdb->package_revision("packagename");
$tlpdb->location;
$tlpdb->config_src_container;
@@ -912,11 +913,6 @@ sub fmtutil_cnf_lines {
}
}
my @formatlines;
- open(INFILE,"<$self->{'root'}/texmf/fmtutil/fmtutil-hdr.cnf")
- or die("Cannot open $self->{'root'}/texmf/fmtutil/fmtutil-hdr.cnf\n");
- my @tmp = <INFILE>;
- close (INFILE);
- push @formatlines, @tmp;
foreach my $f (sort keys %fmtcnffiles) {
open(INFILE,"<$self->{'root'}/texmf/fmtutil/format.$f.cnf")
or tlwarn("Cannot open $self->{'root'}/texmf/fmtutil/format.$f.cnf\nThe generated fmtutil.cnf file might be incomplete!\nError: $!\n");
@@ -949,11 +945,6 @@ sub updmap_cfg_lines {
}
}
my @updmaplines;
- open(UPDHDR,"<$self->{'root'}/texmf/web2c/updmap-hdr.cfg")
- or die("Cannot find $self->{'root'}/texmf/web2c/updmap-hdr.cfg!\n");
- my @tmp = <UPDHDR>;
- close(UPDHDR);
- push @updmaplines, @tmp;
foreach (sort keys %maps) {
if ($maps{$_} == 2) {
push @updmaplines, "MixedMap $_\n";
@@ -966,50 +957,106 @@ sub updmap_cfg_lines {
=item C<< $tlpdb->language_dat_lines >>
-The function C<language_dat_lines> returns the concatenation of all
-files specified in C<BuildLanguageDat execute> directives in the present
-TLPDB. Exception: the result always begins with the contents of
-C<language.us> file. This and all the other files are looked for in
-C<TLROOT/texmf/tex/generic/config>.
+The function C<language_dat_lines> returns the list of all
+lines for language.dat that can be generated from the tlpdb.
=cut
+
sub language_dat_lines {
+ sub make_dat_lines {
+ my ($name, $lhm, $rhm, $file, @syn) = @_;
+ my @ret;
+ push @ret, "$name $file\n";
+ foreach (@syn) {
+ push @ret, "=$_\n";
+ }
+ return(@ret);
+ }
my $self = shift;
- my %langfiles;
- foreach my $p ($self->list_packages) {
- my $obj = $self->get_package ($p);
- die "No TeX Live package named $p, too strange" if ! $obj;
- foreach my $e ($obj->executes) {
- if ($e =~ m/BuildLanguageDat (.*)$/) {
- $langfiles{$1} = 1;
- }
- # others are ignored here
+ my @lines = $self->_parse_hyphen_execute(\&make_dat_lines);
+ return(@lines);
+}
+
+=item C<< $tlpdb->language_def_lines >>
+
+The function C<language_def_lines> returns the list of all
+lines for language.def that can be generated from the tlpdb.
+
+=cut
+
+sub language_def_lines {
+ sub make_def_lines {
+ my ($name, $lhm, $rhm, $file, @syn) = @_;
+ my $exc = "";
+ my @ret;
+ push @ret, "\\addlanguage\{$name\}\{$file\}\{$exc\}\{$lhm\}\{$rhm\}\n";
+ foreach (@syn) {
+ # synonyms in language.def ???
+ push @ret, "\\addlanguage\{$_\}\{$file\}\{$exc\}\{$lhm\}\{$rhm\}\n";
+ #debug("Ignoring synonym $_ for $name when creating language.def\n");
}
+ return(@ret);
}
+ my $self = shift;
+ my @lines = $self->_parse_hyphen_execute(\&make_def_lines);
+ return(@lines);
+}
+
+
+
+sub _parse_hyphen_execute {
+ my ($self, $coderef) = @_;
my @langlines = ();
- # must start with language.us.
- local *LANHDR;
- $LANHDR = "<$self->{'root'}/texmf/tex/generic/config/language.us";
- open (LANHDR) or die "open($LANHDR) failed: $!";
- my @tmp = <LANHDR>;
- close (LANHDR);
- push @langlines, @tmp;
-
- local *INFILE;
- foreach my $f (sort keys %langfiles) {
- $INFILE = "<$self->{'root'}/texmf/tex/generic/config/language.$f.dat";
- open (INFILE)
- or tlwarn("Cannot open $self->{'root'}/texmf/tex/generic/config/language.$f.dat\nThe generated language.dat file might be incomplete!\nError: $!\n");
- @tmp = <INFILE>;
- close (INFILE);
- push @langlines, @tmp;
+ foreach my $pkg ($self->list_packages) {
+ my $obj = $self->get_package ($pkg);
+ die "No TeX Live package named $pkg, too strange" if ! $obj;
+ foreach my $e ($obj->executes) {
+ my $first = 1;
+ if ($e =~ m/AddHyphen\s+(.*)\s*/) {
+ my $name;
+ my $lefthyphenmin;
+ my $righthyphenmin;
+ my $file;
+ my @synonyms;
+ if ($first) {
+ push @langlines, "% lines generated from $pkg\n";
+ $first = 0;
+ }
+ foreach my $p (split(' ', $1)) {
+ my ($a, $b) = split /=/, $p;
+ if ($a eq "name") {
+ die "AddHyphen line needs name=something: $pkg, $e" unless $b;
+ $name = $b; next;
+ }
+ if ($a eq "lefthyphenmin") {
+ # lefthyphenmin default to 3
+ $lefthyphenmin = ( $b ? $b : 2 );
+ next;
+ }
+ if ($a eq "righthyphenmin") {
+ $righthyphenmin = ( $b ? $b : 3);
+ next;
+ }
+ if ($a eq "file") {
+ die "AddHyphen line needs file=something: $pkg, $e" unless $b;
+ $file = $b;
+ next;
+ }
+ if ($a eq "synonyms") {
+ @synonyms = split /,/, $b;
+ next;
+ }
+ die "Unknown language directive in $pkg: $e";
+ }
+ my @foo = &$coderef ($name, $lefthyphenmin, $righthyphenmin, $file, @synonyms);
+ push @langlines, @foo;
+ }
+ }
}
-
return @langlines;
}
-
=back
=pod
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 20ed1d82358..90ab62ba313 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -810,7 +810,7 @@ sub make_return_hash_from_executes {
}
} elsif ($e =~ m/^BuildFormat\s+([^\s]+)\s*$/) {
push @formats, $1;
- } elsif ($e =~ m/^BuildLanguageDat\s+([^\s]+)\s*$/) {
+ } elsif ($e =~ m/^AddHyphen\s+([^\s]+)\s*$/) {
push @dats, $1;
} else {
tlwarn("Unknown execute $e in ", $self->name);
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index f766f812109..6f4ee1ef320 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -51,7 +51,8 @@ C<TeXLive::TLUtils> -- utilities used in the TeX Live infrastructure
TeXLive::TLUtils::make_local_skeleton($path);
TeXLive::TLUtils::create_fmtutil($tlpdb,$dest,$localconf);
TeXLive::TLUtils::create_updmap($tlpdb,$dest,$localconf);
- TeXLive::TLUtils::create_language($tlpdb,$dest,$localconf);
+ TeXLive::TLUtils::create_language_dat($tlpdb,$dest,$localconf);
+ TeXLive::TLUtils::create_language_def($tlpdb,$dest,$localconf);
TeXLive::TLUtils::install_packages($from_tlpdb,$to_tlpdb,$what,$opt_src, $opt_doc)>);
TeXLive::TLUtils::install_package($what, $filelistref, $target, $platform);
@@ -94,10 +95,11 @@ BEGIN {
&media
&initialize_installer
&make_var_skeleton
- &sub make_local_skeleton
+ &make_local_skeleton
&create_fmtutil
&create_updmap
- &create_language
+ &create_language_dat
+ &create_language_def
&sort_uniq
&push_uniq
&texdir_check
@@ -790,7 +792,7 @@ sub setup_programs {
=pod
-=item C<download_file( $path, $destination [, $progs ] )>
+=item C<download_file( $relpath, $destination [, $progs ] )>
Try to download the file given in C<$relpath> from either C<$TeXLiveURL>
or C<TeXLiveAlternativeURL> into C<$destination>, which can be either
@@ -1045,10 +1047,12 @@ sub make_local_skeleton {
=item C<create_updmap($tlpdb, $dest, $localconf)>
-=item C<create_language($tlpdb, $dest, $localconf)>
+=item C<create_language_dat($tlpdb, $dest, $localconf)>
-These three functions create C<fmtutil.cnf>, C<updmap.cfg>, and
-C<language.dat>, respectively, in C<$dest> (which by default is below
+=item C<create_language_def($tlpdb, $dest, $localconf)>
+
+These four functions create C<fmtutil.cnf>, C<updmap.cfg>, C<language.dat>,
+and C<language.def> respectively, in C<$dest> (which by default is below
C<$TEXMFSYSVAR>). These functions merge the information present in the
TLPDB C<$tlpdb> (formats, maps, hyphenations) with local configuration
additions: C<$localconf>.
@@ -1061,54 +1065,39 @@ improved (checking for duplicates).
sub create_fmtutil {
my ($tlpdb,$dest,$localconf) = @_;
- my $root = $tlpdb->root;
my @lines = $tlpdb->fmtutil_cnf_lines;
- if (-r "$localconf") {
- #
- # this should be done more intelligently, but for now only add those
- # lines without any duplication check ...
- open FOO, "<$localconf"
- or die "strange, -r ok but cannot open $localconf: $!";
- my @tmp = <FOO>;
- push @lines, @tmp;
- }
- if ($#lines >= 0) {
- open(OUTFILE,">$dest")
- or die("Cannot open $dest for writing: $!");
-
- printf OUTFILE "# Generated by %s on %s\n", "$0", scalar localtime;
- print OUTFILE @lines;
- close(OUTFILE) || warn "close(>$dest) failed: $!";
- }
+ _create_config_files ($tlpdb, "texmf/fmtutil/fmtutil-hdr.cnf", $dest, $localconf, 0, '#', \@lines);
}
-
+
sub create_updmap {
my ($tlpdb,$dest,$localconf) = @_;
- my $root = $tlpdb->root;
my @lines = $tlpdb->updmap_cfg_lines;
- if (-r "$localconf") {
- #
- # this should be done more intelligently, but for now only add those
- # lines without any duplication check ...
- open FOO, "<$localconf"
- or die "strange, -r ok but cannot open $localconf: $!";
- my @tmp = <FOO>;
- push @lines, @tmp;
- }
- if ($#lines >= 0) {
- open(OUTFILE,">$dest")
- or die("Cannot open $dest for writing: $!");
+ _create_config_files ($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest, $localconf, 0, '#', \@lines);
+}
- printf OUTFILE "# Generated by %s on %s\n", "$0", scalar localtime;
- print OUTFILE @lines;
- close(OUTFILE) || warn "close(>$dest) failed: $!";
- }
+sub create_language_dat {
+ my ($tlpdb,$dest,$localconf) = @_;
+ my @lines = $tlpdb->language_dat_lines;
+ _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us", $dest, $localconf, 0, '%', \@lines);
}
-sub create_language {
+sub create_language_def {
my ($tlpdb,$dest,$localconf) = @_;
+ my @lines = $tlpdb->language_def_lines;
+ my @postlines;
+ push @postlines, "%%% No changes may be made beyond this point.\n";
+ push @postlines, "\n";
+ push @postlines, "\\uselanguage {USenglish} %%% This MUST be the last line of the file.\n";
+ _create_config_files ($tlpdb, "texmf/tex/plain/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines);
+}
+
+sub _create_config_files {
+ my ($tlpdb, $headfile, $dest,$localconf, $keepfirstline, $cc, $tlpdblinesref, @postlines) = @_;
my $root = $tlpdb->root;
- my @lines = $tlpdb->language_dat_lines;
+ open(INFILE,"<$root/$headfile") or die("Cannot open $root/$headfile");
+ my @lines = <INFILE>;
+ push @lines, @$tlpdblinesref;
+ close (INFILE);
if (-r "$localconf") {
#
# this should be done more intelligently, but for now only add those
@@ -1118,17 +1107,22 @@ sub create_language {
my @tmp = <FOO>;
push @lines, @tmp;
}
+ if (@postlines) {
+ push @lines, @postlines;
+ }
if ($#lines >= 0) {
open(OUTFILE,">$dest")
or die("Cannot open $dest for writing: $!");
- printf OUTFILE "%% Generated by %s on %s\n", "$0", scalar localtime;
+ if (!$keepfirstline) {
+ print OUTFILE $cc;
+ printf OUTFILE " Generated by %s on %s\n", "$0", scalar localtime;
+ }
print OUTFILE @lines;
close(OUTFILE) || warn "close(>$dest) failed: $!";
}
}
-
=pod
=back
diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 5847071bcae..e4e380949ce 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -39,7 +39,7 @@ depend container_split_src_files
depend container_split_doc_files
depend container_format/lzma
depend release/2008
-depend revision/8915
+depend revision/8919
name 00texlive.core
category TLCore
@@ -21040,7 +21040,7 @@ binfiles arch=win32 size=5290
name bin-tlperl.win32
category TLCore
revision 8833
-runfiles size=4198
+runfiles size=4195
tlpkg/tlperl/README.TEXLIVE
tlpkg/tlperl/bin/perl.exe
tlpkg/tlperl/bin/perl58.dll
@@ -21291,7 +21291,6 @@ runfiles size=4198
tlpkg/tlperl/lib/Tk/Scale.pm
tlpkg/tlperl/lib/Tk/Scrollbar.pm
tlpkg/tlperl/lib/Tk/Spinbox.pm
- tlpkg/tlperl/lib/Tk/Splashscreen.pm
tlpkg/tlperl/lib/Tk/Stats.pm
tlpkg/tlperl/lib/Tk/Submethods.pm
tlpkg/tlperl/lib/Tk/TList.pm
@@ -21353,7 +21352,6 @@ runfiles size=4198
tlpkg/tlperl/lib/Tk/tranicon.gif
tlpkg/tlperl/lib/Tk/typemap
tlpkg/tlperl/lib/Tk/vtab.def
- tlpkg/tlperl/lib/Tk/waitVariableX.pm
tlpkg/tlperl/lib/Tk/widgets.pm
tlpkg/tlperl/lib/Tk/win.xbm
tlpkg/tlperl/lib/Tk/winfolder.xpm
@@ -32851,6 +32849,7 @@ longdesc Fonts and support for typesetting Arabic
depend arabi
depend arabtex
depend hyphen-arabic
+depend hyphen-farsi
depend collection-basic
name collection-langarmenian
@@ -32876,7 +32875,7 @@ depend uhc
depend wadalab
depend yi4latex
depend bin-cjkutils
-depend hyphen-pinyin
+depend hyphen-chinese
depend collection-basic
depend collection-documentation-chinese
@@ -32928,7 +32927,8 @@ depend cslatex
depend csplain
depend bin-cslatex
depend bin-csplain
-depend hyphen-czechslovak
+depend hyphen-czech
+depend hyphen-slovak
depend collection-basic
depend collection-latex
@@ -33008,7 +33008,7 @@ depend teubner
depend xgreek
depend yannisgr
depend hyphen-greek
-depend hyphen-ibycus
+depend hyphen-ancientgreek
depend collection-basic
name collection-langhebrew
@@ -33098,7 +33098,7 @@ depend hyphen-romanian
depend hyphen-serbian
depend hyphen-slovenian
depend hyphen-turkish
-depend hyphen-usorbian
+depend hyphen-uppersorbian
depend hyphen-welsh
depend collection-basic
@@ -33135,6 +33135,8 @@ revision 8572
shortdesc Spanish
depend glhyph
depend hyphen-spanish
+depend hyphen-catalan
+depend hyphen-galician
depend spanish-mx
depend collection-basic
@@ -51700,14 +51702,18 @@ catalogue-date 2007-03-07 20:05:57 +0100
catalogue-license lppl
catalogue-version 1.1
+name hyphen-ancientgreek
+category TLCore
+revision 5571
+execute AddHyphen name=ancientgreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-grc.tex
+execute AddHyphen name=ibycus lefthyphenmin=2 righthyphenmin=2 file=ibyhyph.tex
+runfiles size=7
+ texmf/tex/generic/hyphen/ibyhyph.tex
+
name hyphen-arabic
category TLCore
revision 7340
-execute BuildLanguageDat ar
-execute BuildLanguageDat fa
-runfiles size=2
- texmf/tex/generic/config/language.ar.dat
- texmf/tex/generic/config/language.fa.dat
+execute AddHyphen name=arabic lefthyphenmin= righthyphenmin= file=zerohyph.tex
name hyphen-base
category TLCore
@@ -51725,52 +51731,58 @@ runfiles size=24
name hyphen-basque
category TLCore
revision 7340
-execute BuildLanguageDat ba
-runfiles size=5
- texmf/tex/generic/config/language.ba.dat
+execute AddHyphen name=basque lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eu.tex
+runfiles size=4
texmf/tex/generic/hyphen/bahyph.sh
texmf/tex/generic/hyphen/bahyph.tex
name hyphen-bulgarian
category TLCore
revision 7340
-execute BuildLanguageDat bg
+depend bghyphen
+execute AddHyphen name=bulgarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-bg.tex
+
+name hyphen-catalan
+category TLCore
+revision 34
+execute AddHyphen name=catalan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ca.tex
+runfiles size=4
+ texmf/tex/generic/hyphen/cahyph.tex
+
+name hyphen-chinese
+category TLCore
+revision 2361
+execute AddHyphen name=pinyin lefthyphenmin=1 righthyphenmin=1 file=loadhyph-zh-latn.tex
runfiles size=1
- texmf/tex/generic/config/language.bg.dat
+ texmf/tex/generic/hyphen/pyhyph.tex
name hyphen-coptic
category TLCore
revision 7340
-execute BuildLanguageDat cop
-runfiles size=3
- texmf/tex/generic/config/language.cop.dat
+execute AddHyphen name=coptic lefthyphenmin=1 righthyphenmin=1 file=loadhyph-cop.tex
+runfiles size=2
texmf/tex/generic/hyphen/copthyph.tex
name hyphen-croatian
category TLCore
revision 7340
-execute BuildLanguageDat hr
-runfiles size=4
- texmf/tex/generic/config/language.hr.dat
+execute AddHyphen name=croatian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hr.tex
+runfiles size=3
texmf/tex/generic/hyphen/hrhyph.tex
-name hyphen-czechslovak
+name hyphen-czech
category TLCore
-revision 7340
-execute BuildLanguageDat cz
-runfiles size=5
- texmf/tex/generic/config/language.cz.dat
+revision 34
+execute AddHyphen name=czech lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cs.tex
+runfiles size=2
texmf/tex/generic/hyphen/czhyph.tex
texmf/tex/generic/hyphen/czhyphen.ex
- texmf/tex/generic/hyphen/skhyph.tex
- texmf/tex/generic/hyphen/skhyphen.ex
name hyphen-danish
category TLCore
revision 7340
-execute BuildLanguageDat dk
-runfiles size=5
- texmf/tex/generic/config/language.dk.dat
+execute AddHyphen name=danish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-da.tex
+runfiles size=4
texmf/tex/generic/hyphen/dkcommon.tex
texmf/tex/generic/hyphen/dkhyph.tex
texmf/tex/generic/hyphen/dkspecial.tex
@@ -51778,49 +51790,56 @@ runfiles size=5
name hyphen-dutch
category TLCore
revision 7340
-execute BuildLanguageDat ne
-runfiles size=23
- texmf/tex/generic/config/language.ne.dat
+execute AddHyphen name=dutch lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nl.tex
+runfiles size=22
texmf/tex/generic/hyphen/nehyph96.tex
name hyphen-esperanto
category TLCore
revision 7340
-execute BuildLanguageDat eo
-runfiles size=6
- texmf/tex/generic/config/language.eo.dat
+execute AddHyphen name=esperanto lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eo.tex
+runfiles size=5
texmf/tex/generic/hyphen/eohyph.tex
name hyphen-estonian
category TLCore
revision 7340
-execute BuildLanguageDat et
-runfiles size=4
- texmf/tex/generic/config/language.et.dat
+execute AddHyphen name=estonian lefthyphenmin=2 righthyphenmin=3 file=loadhyph-et.tex
+runfiles size=3
texmf/tex/generic/hyphen/ethyph.tex
+name hyphen-farsi
+category TLCore
+revision 1
+execute AddHyphen name=farsi synonyms=persian lefthyphenmin= righthyphenmin= file=zerohyph.tex
+
name hyphen-finnish
category TLCore
revision 7340
-execute BuildLanguageDat fi
-runfiles size=3
- texmf/tex/generic/config/language.fi.dat
+execute AddHyphen name=finnish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fi.tex
+runfiles size=2
texmf/tex/generic/hyphen/fihyph.tex
name hyphen-french
category TLCore
revision 7340
-execute BuildLanguageDat fr
-runfiles size=10
- texmf/tex/generic/config/language.fr.dat
+execute AddHyphen name=french synonyms=patois,francais lefthyphenmin= righthyphenmin= file=loadhyph-fr.tex
+runfiles size=9
texmf/tex/generic/hyphen/frhyph.tex
+name hyphen-galician
+category TLCore
+revision 5930
+execute AddHyphen name=galician lefthyphenmin=2 righthyphenmin=2 file=loadhyph-gl.tex
+runfiles size=6
+ texmf/tex/generic/hyphen/glhyph.tex
+
name hyphen-german
category TLCore
revision 7340
-execute BuildLanguageDat de
-runfiles size=58
- texmf/tex/generic/config/language.de.dat
+execute AddHyphen name=german lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1901.tex
+execute AddHyphen name=ngerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1996.tex
+runfiles size=57
texmf/tex/generic/hyphen/dehyphn.tex
texmf/tex/generic/hyphen/dehypht.tex
texmf/tex/generic/hyphen/dehyphtex.tex
@@ -51829,8 +51848,9 @@ runfiles size=58
name hyphen-greek
category TLCore
revision 8825
-execute BuildLanguageDat gr
-runfiles size=494
+execute AddHyphen name=monogreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-monoton.tex
+execute AddHyphen name=greek synonyms=polygreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-polyton.tex
+runfiles size=493
texmf/doc/generic/elhyphen/README
texmf/doc/generic/elhyphen/anc-test.ltx
texmf/doc/generic/elhyphen/anc-test.pdf
@@ -51839,7 +51859,6 @@ runfiles size=494
texmf/doc/generic/elhyphen/compound.pdf
texmf/doc/generic/elhyphen/copyrite.txt
texmf/doc/generic/elhyphen/modern.pdf
- texmf/tex/generic/config/language.gr.dat
texmf/tex/generic/hyphen/grahyph4.tex
texmf/tex/generic/hyphen/grahyph5.tex
texmf/tex/generic/hyphen/grmhyph4.tex
@@ -51850,196 +51869,171 @@ runfiles size=494
name hyphen-hungarian
category TLCore
revision 8522
-execute BuildLanguageDat hu
+execute AddHyphen name=hungarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hu.tex
docfiles size=48
texmf/doc/generic/huhyphen/huhyphn.pdf
texmf/doc/generic/huhyphen/hyph_hu.dic
texmf/doc/generic/huhyphen/searchforerrors.rb
texmf/doc/generic/huhyphen/testhyphenation.rb
-runfiles size=25
- texmf/tex/generic/config/language.hu.dat
+runfiles size=24
texmf/tex/generic/hyphen/huhyphn.tex
-name hyphen-ibycus
-category TLCore
-revision 7340
-execute BuildLanguageDat iby
-runfiles size=8
- texmf/tex/generic/config/language.iby.dat
- texmf/tex/generic/hyphen/ibyhyph.tex
-
name hyphen-icelandic
category TLCore
revision 7340
-execute BuildLanguageDat is
-runfiles size=9
- texmf/tex/generic/config/language.is.dat
+execute AddHyphen name=icelandic lefthyphenmin=2 righthyphenmin=2 file=loadhyph-is.tex
+runfiles size=8
texmf/tex/generic/hyphen/icehyph.tex
name hyphen-indonesian
category TLCore
revision 7340
-execute BuildLanguageDat in
-runfiles size=2
- texmf/tex/generic/config/language.in.dat
+execute AddHyphen name=indonesian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-id.tex
+runfiles size=1
texmf/tex/generic/hyphen/inhyph.tex
name hyphen-interlingua
category TLCore
revision 7340
-execute BuildLanguageDat ia
-runfiles size=3
- texmf/tex/generic/config/language.ia.dat
+execute AddHyphen name=interlingua lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ia.tex
+runfiles size=2
texmf/tex/generic/hyphen/iahyphen.tex
+name hyphen-irish
+category TLCore
+revision 1
+execute AddHyphen name=irish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-ga.tex
+runfiles size=13
+ texmf/tex/generic/hyphen/gahyph.tex
+
name hyphen-italian
category TLCore
revision 8522
-execute BuildLanguageDat it
-runfiles size=3
- texmf/tex/generic/config/language.it.dat
+execute AddHyphen name=italian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-it.tex
+runfiles size=2
texmf/tex/generic/hyphen/ithyph.tex
name hyphen-latin
category TLCore
revision 7340
-execute BuildLanguageDat la
-runfiles size=4
- texmf/tex/generic/config/language.la.dat
+execute AddHyphen name=latin lefthyphenmin=2 righthyphenmin=2 file=loadhyph-la.tex
+runfiles size=3
texmf/tex/generic/hyphen/lahyph.tex
name hyphen-mongolian
category TLCore
-revision 8183
-execute BuildLanguageDat mn
-execute BuildLanguageDat mn2a
-runfiles size=7
- texmf/tex/generic/config/language.mn.dat
- texmf/tex/generic/config/language.mn2a.dat
+revision 7340
+execute AddHyphen name=mongolian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl.tex
+execute AddHyphen name=mongolian2a lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl-x-2a.tex
+runfiles size=5
texmf/tex/generic/hyphen/mnhyph.tex
texmf/tex/generic/hyphen/mnhyphn.tex
name hyphen-norwegian
category TLCore
revision 7340
-execute BuildLanguageDat no
-runfiles size=53
- texmf/tex/generic/config/language.no.dat
+execute AddHyphen name=bokmal synonyms=norwegian,norsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nb.tex
+execute AddHyphen name=nynorsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nn.tex
+runfiles size=52
texmf/tex/generic/hyphen/nbhyph.tex
texmf/tex/generic/hyphen/nnhyph.tex
texmf/tex/generic/hyphen/nohyphbx.tex
-name hyphen-pinyin
-category TLCore
-revision 7340
-execute BuildLanguageDat py
-runfiles size=2
- texmf/tex/generic/config/language.py.dat
- texmf/tex/generic/hyphen/pyhyph.tex
-
name hyphen-polish
category TLCore
revision 7340
-execute BuildLanguageDat pl
-runfiles size=10
- texmf/tex/generic/config/language.pl.dat
+execute AddHyphen name=polish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-pl.tex
+runfiles size=9
texmf/tex/generic/hyphen/plhyph.tex
name hyphen-portuguese
category TLCore
revision 7340
-execute BuildLanguageDat pt
-runfiles size=2
- texmf/tex/generic/config/language.pt.dat
+execute AddHyphen name=portuguese synonyms=portuges lefthyphenmin=2 righthyphenmin=3 file=loadhyph-pt.tex
+runfiles size=1
texmf/tex/generic/hyphen/pthyph.tex
name hyphen-romanian
category TLCore
revision 7340
-execute BuildLanguageDat ro
-runfiles size=4
- texmf/tex/generic/config/language.ro.dat
+execute AddHyphen name=romanian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ro.tex
+runfiles size=3
texmf/tex/generic/hyphen/rohyphen.tex
name hyphen-russian
category TLCore
revision 7340
depend ruhyphen
-execute BuildLanguageDat ru
-runfiles size=1
- texmf/tex/generic/config/language.ru.dat
+execute AddHyphen name=russian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ru.tex
name hyphen-serbian
category TLCore
revision 7340
-execute BuildLanguageDat sr
-runfiles size=7
- texmf/tex/generic/config/language.sr.dat
+execute AddHyphen name=serbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-latn.tex
+execute AddHyphen name=serbianc lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-cyrl.tex
+runfiles size=6
texmf/tex/generic/hyphen/srhyphc.tex
+name hyphen-slovak
+category TLCore
+revision 34
+execute AddHyphen name=slovak lefthyphenmin=2 righthyphenmin=3 file=loadhyph-sk.tex
+runfiles size=2
+ texmf/tex/generic/hyphen/skhyph.tex
+ texmf/tex/generic/hyphen/skhyphen.ex
+
name hyphen-slovenian
category TLCore
revision 8120
-execute BuildLanguageDat sl
-runfiles size=4
- texmf/tex/generic/config/language.sl.dat
+execute AddHyphen name=slovenian synonyms=slovene lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sl.tex
+runfiles size=3
texmf/tex/generic/hyphen/sihyph.tex
name hyphen-spanish
category TLCore
revision 7340
-execute BuildLanguageDat es
-runfiles size=18
- texmf/tex/generic/config/language.es.dat
- texmf/tex/generic/hyphen/cahyph.tex
+execute AddHyphen name=spanish synonyms=espanol lefthyphenmin=2 righthyphenmin=2 file=loadhyph-es.tex
+runfiles size=7
texmf/tex/generic/hyphen/eshyph.tex
- texmf/tex/generic/hyphen/glhyph.tex
name hyphen-swedish
category TLCore
revision 7340
-execute BuildLanguageDat sw
-runfiles size=10
- texmf/tex/generic/config/language.sw.dat
+execute AddHyphen name=swedish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sv.tex
+runfiles size=9
texmf/tex/generic/hyphen/svhyph.tex
name hyphen-turkish
category TLCore
revision 7340
-execute BuildLanguageDat tk
-runfiles size=3
- texmf/tex/generic/config/language.tk.dat
+execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex
+runfiles size=2
texmf/tex/generic/hyphen/tkhyph.tex
name hyphen-ukenglish
category TLCore
revision 7340
-execute BuildLanguageDat uk
-runfiles size=15
- texmf/tex/generic/config/language.uk.dat
+execute AddHyphen name=ukenglish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-en-gb.tex
+runfiles size=14
texmf/tex/generic/hyphen/ukhyphen.tex
name hyphen-ukrainian
category TLCore
revision 8522
-execute BuildLanguageDat ur
-runfiles size=1
- texmf/tex/generic/config/language.ur.dat
+execute AddHyphen name=ukrainian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-uk.tex
-name hyphen-usorbian
+name hyphen-uppersorbian
category TLCore
-revision 7340
-execute BuildLanguageDat sor
-runfiles size=5
- texmf/tex/generic/config/language.sor.dat
+revision 34
+execute AddHyphen name=uppersorbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hsb.tex
+runfiles size=4
texmf/tex/generic/hyphen/sorhyph.tex
name hyphen-welsh
category TLCore
revision 7340
-execute BuildLanguageDat cy
-runfiles size=12
- texmf/tex/generic/config/language.cy.dat
+execute AddHyphen name=welsh lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cy.tex
+runfiles size=11
texmf/tex/generic/hyphen/cyhyph.tex
name hyphenat
@@ -74437,7 +74431,7 @@ revision 8659
shortdesc The Plain TeX format.
longdesc The file plain.tex is used to build the Plain TeX format, as
longdesc described in the TeXbook.
-runfiles size=58
+runfiles size=59
texmf-dist/makeindex/plain/plaintex.ist
texmf-dist/tex/plain/base/fontchart.tex
texmf-dist/tex/plain/base/gkpmac.tex
@@ -74465,6 +74459,7 @@ runfiles size=58
texmf-dist/tex/plain/config/pdftexmagfix.tex
texmf-dist/tex/plain/config/tex.ini
texmf-dist/tex/plain/config/xetex.ini
+ texmf/tex/plain/config/language.us.def
catalogue-ctan /macros/plain/base
catalogue-date 2008-06-05 08:55:30 +0200
catalogue-license knuth
@@ -78195,7 +78190,7 @@ longdesc Adobe.
docfiles size=183
texmf-dist/doc/latex/refman/lay_d2.tex
texmf-dist/doc/latex/refman/lay_e2.tex
- texmf-dist/doc/latex/refman/layout_d.pdf details="Layout-Änderungen mit LaTeX" language="de"
+ texmf-dist/doc/latex/refman/layout_d.pdf details="Layout-Änderungen mit LaTeX" language="de"
texmf-dist/doc/latex/refman/layout_d.tex
texmf-dist/doc/latex/refman/layout_e.pdf details="Changing the layout with LaTeX" language="en"
texmf-dist/doc/latex/refman/layout_e.tex
@@ -88893,8 +88888,9 @@ docfiles size=349
tlpkg/man/TeXLive-TLPSRC.1
tlpkg/man/TeXLive-TLUtils.1
tlpkg/man/tlpsrc2tlpdb.1
-runfiles size=57
+runfiles size=60
release-texlive.txt
+ tlpkg/TeXLive/Splashscreen.pm
tlpkg/TeXLive/TLConfig.pm
tlpkg/TeXLive/TLMedia.pm
tlpkg/TeXLive/TLPDB.pm
@@ -88905,6 +88901,7 @@ runfiles size=57
tlpkg/TeXLive/TLUtils.pm
tlpkg/TeXLive/TLWinGoo.pm
tlpkg/TeXLive/TeXCatalogue.pm
+ tlpkg/TeXLive/waitVariableX.pm
tlpkg/installer/wgetrc
name texlive.infra.alpha-linux
diff --git a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
index c8b8e2f2e3c..36977c291e8 100644
--- a/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarab.tlpsrc
@@ -5,4 +5,5 @@ longdesc Fonts and support for typesetting Arabic
depend arabi
depend arabtex
depend hyphen-arabic
+depend hyphen-farsi
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
index 33467b45bad..154a8b3085f 100644
--- a/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcjk.tlpsrc
@@ -12,6 +12,6 @@ depend uhc
depend wadalab
depend yi4latex
depend bin-cjkutils
-depend hyphen-pinyin
+depend hyphen-chinese
depend collection-basic
depend collection-documentation-chinese
diff --git a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
index bbdf8658fb9..fd199dd05c1 100644
--- a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
@@ -7,6 +7,7 @@ depend cslatex
depend csplain
depend bin-cslatex
depend bin-csplain
-depend hyphen-czechslovak
+depend hyphen-czech
+depend hyphen-slovak
depend collection-basic
depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
index 75a822400a1..9eed64aa586 100644
--- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
@@ -19,5 +19,5 @@ depend teubner
depend xgreek
depend yannisgr
depend hyphen-greek
-depend hyphen-ibycus
+depend hyphen-ancientgreek
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index 09e73e1b49a..bd0290e9fc0 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -12,6 +12,6 @@ depend hyphen-romanian
depend hyphen-serbian
depend hyphen-slovenian
depend hyphen-turkish
-depend hyphen-usorbian
+depend hyphen-uppersorbian
depend hyphen-welsh
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index 5c1b1991932..388907a54be 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -3,5 +3,7 @@ category Collection
shortdesc Spanish
depend glhyph
depend hyphen-spanish
+depend hyphen-catalan
+depend hyphen-galician
depend spanish-mx
depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
new file mode 100644
index 00000000000..7a9498be568
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-ancientgreek.tlpsrc
@@ -0,0 +1,5 @@
+name hyphen-ancientgreek
+category TLCore
+execute AddHyphen name=ancientgreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-grc.tex
+execute AddHyphen name=ibycus lefthyphenmin=2 righthyphenmin=2 file=ibyhyph.tex
+runpattern f texmf/tex/generic/hyphen/ibyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
index 8b8db47f260..abd1364b37f 100644
--- a/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-arabic.tlpsrc
@@ -1,6 +1,3 @@
name hyphen-arabic
category TLCore
-execute BuildLanguageDat ar
-execute BuildLanguageDat fa
-runpattern f texmf/tex/generic/config/language.ar.dat
-runpattern f texmf/tex/generic/config/language.fa.dat
+execute AddHyphen name=arabic lefthyphenmin= righthyphenmin= file=zerohyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
index d67b5fb29e8..7c3944f141d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-basque.tlpsrc
@@ -1,6 +1,5 @@
name hyphen-basque
category TLCore
-execute BuildLanguageDat ba
-runpattern f texmf/tex/generic/config/language.ba.dat
+execute AddHyphen name=basque lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eu.tex
runpattern f texmf/tex/generic/hyphen/bahyph.sh
runpattern f texmf/tex/generic/hyphen/bahyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
index 4f2c8469fc2..a3ccd4e29ce 100644
--- a/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-bulgarian.tlpsrc
@@ -1,4 +1,4 @@
name hyphen-bulgarian
category TLCore
-execute BuildLanguageDat bg
-runpattern f texmf/tex/generic/config/language.bg.dat
+depend bghyphen
+execute AddHyphen name=bulgarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-bg.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
new file mode 100644
index 00000000000..ca37f4f086b
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-catalan.tlpsrc
@@ -0,0 +1,4 @@
+name hyphen-catalan
+category TLCore
+execute AddHyphen name=catalan lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ca.tex
+runpattern f texmf/tex/generic/hyphen/cahyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
new file mode 100644
index 00000000000..6d1dfaaaa32
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-chinese.tlpsrc
@@ -0,0 +1,4 @@
+name hyphen-chinese
+category TLCore
+execute AddHyphen name=pinyin lefthyphenmin=1 righthyphenmin=1 file=loadhyph-zh-latn.tex
+runpattern f texmf/tex/generic/hyphen/pyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
index 747bbaceda7..c52ae4138c3 100644
--- a/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-coptic.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-coptic
category TLCore
-execute BuildLanguageDat cop
-runpattern f texmf/tex/generic/config/language.cop.dat
+execute AddHyphen name=coptic lefthyphenmin=1 righthyphenmin=1 file=loadhyph-cop.tex
runpattern f texmf/tex/generic/hyphen/copthyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
index 5cd347c96ea..7190463c088 100644
--- a/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-croatian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-croatian
category TLCore
-execute BuildLanguageDat hr
-runpattern f texmf/tex/generic/config/language.hr.dat
+execute AddHyphen name=croatian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hr.tex
runpattern f texmf/tex/generic/hyphen/hrhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
new file mode 100644
index 00000000000..00849bbf9d2
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-czech.tlpsrc
@@ -0,0 +1,5 @@
+name hyphen-czech
+category TLCore
+execute AddHyphen name=czech lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cs.tex
+runpattern f texmf/tex/generic/hyphen/czhyph.tex
+runpattern f texmf/tex/generic/hyphen/czhyphen.ex
diff --git a/Master/tlpkg/tlpsrc/hyphen-czechslovak.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-czechslovak.tlpsrc
deleted file mode 100644
index d6078e83448..00000000000
--- a/Master/tlpkg/tlpsrc/hyphen-czechslovak.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-name hyphen-czechslovak
-category TLCore
-execute BuildLanguageDat cz
-runpattern f texmf/tex/generic/config/language.cz.dat
-runpattern f texmf/tex/generic/hyphen/czhyph.tex
-runpattern f texmf/tex/generic/hyphen/czhyphen.ex
-runpattern f texmf/tex/generic/hyphen/skhyph.tex
-runpattern f texmf/tex/generic/hyphen/skhyphen.ex
diff --git a/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
index 605765c6ec5..3f3607c60e9 100644
--- a/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-danish.tlpsrc
@@ -1,7 +1,6 @@
name hyphen-danish
category TLCore
-execute BuildLanguageDat dk
-runpattern f texmf/tex/generic/config/language.dk.dat
+execute AddHyphen name=danish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-da.tex
runpattern f texmf/tex/generic/hyphen/dkcommon.tex
runpattern f texmf/tex/generic/hyphen/dkhyph.tex
runpattern f texmf/tex/generic/hyphen/dkspecial.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
index 0858c7de204..2ad66ca3242 100644
--- a/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-dutch.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-dutch
category TLCore
-execute BuildLanguageDat ne
-runpattern f texmf/tex/generic/config/language.ne.dat
+execute AddHyphen name=dutch lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nl.tex
runpattern f texmf/tex/generic/hyphen/nehyph96.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
index d11b17fcdf8..c33ff1650d7 100644
--- a/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-esperanto.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-esperanto
category TLCore
-execute BuildLanguageDat eo
-runpattern f texmf/tex/generic/config/language.eo.dat
+execute AddHyphen name=esperanto lefthyphenmin=2 righthyphenmin=2 file=loadhyph-eo.tex
runpattern f texmf/tex/generic/hyphen/eohyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
index 397e55b5bfe..177018aba43 100644
--- a/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-estonian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-estonian
category TLCore
-execute BuildLanguageDat et
-runpattern f texmf/tex/generic/config/language.et.dat
+execute AddHyphen name=estonian lefthyphenmin=2 righthyphenmin=3 file=loadhyph-et.tex
runpattern f texmf/tex/generic/hyphen/ethyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc
new file mode 100644
index 00000000000..bed90cb097a
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-farsi.tlpsrc
@@ -0,0 +1,3 @@
+name hyphen-farsi
+category TLCore
+execute AddHyphen name=farsi synonyms=persian lefthyphenmin= righthyphenmin= file=zerohyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
index 11117c856ed..70ca26205f2 100644
--- a/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-finnish.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-finnish
category TLCore
-execute BuildLanguageDat fi
-runpattern f texmf/tex/generic/config/language.fi.dat
+execute AddHyphen name=finnish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-fi.tex
runpattern f texmf/tex/generic/hyphen/fihyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
index 179d3511e50..20642d85cab 100644
--- a/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-french.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-french
category TLCore
-execute BuildLanguageDat fr
-runpattern f texmf/tex/generic/config/language.fr.dat
+execute AddHyphen name=french synonyms=patois,francais lefthyphenmin= righthyphenmin= file=loadhyph-fr.tex
runpattern f texmf/tex/generic/hyphen/frhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
new file mode 100644
index 00000000000..5ad846b8376
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-galician.tlpsrc
@@ -0,0 +1,4 @@
+name hyphen-galician
+category TLCore
+execute AddHyphen name=galician lefthyphenmin=2 righthyphenmin=2 file=loadhyph-gl.tex
+runpattern f texmf/tex/generic/hyphen/glhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
index a2d043972af..7093a9f6268 100644
--- a/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-german.tlpsrc
@@ -1,8 +1,8 @@
name hyphen-german
category TLCore
-execute BuildLanguageDat de
-runpattern f texmf/tex/generic/config/language.de.dat
-runpattern f texmf/tex/generic/hyphen/dehyphn.tex
+execute AddHyphen name=german lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1901.tex
+execute AddHyphen name=ngerman lefthyphenmin=2 righthyphenmin=2 file=loadhyph-de-1996.tex
runpattern f texmf/tex/generic/hyphen/dehypht.tex
runpattern f texmf/tex/generic/hyphen/dehyphtex.tex
runpattern f texmf/tex/generic/hyphen/ghyphen.README
+runpattern f texmf/tex/generic/hyphen/dehyphn.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
index fd89d80342f..a6bbd8d312a 100644
--- a/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-greek.tlpsrc
@@ -1,6 +1,6 @@
name hyphen-greek
category TLCore
-execute BuildLanguageDat gr
+execute AddHyphen name=monogreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-monoton.tex
+execute AddHyphen name=greek synonyms=polygreek lefthyphenmin=1 righthyphenmin=1 file=loadhyph-el-polyton.tex
runpattern f texmf/doc/generic/elhyphen/*
-runpattern f texmf/tex/generic/config/language.gr.dat
runpattern f texmf/tex/generic/hyphen/gr*hyph*.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
index 9402834f5f5..546b34aac2c 100644
--- a/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-hungarian.tlpsrc
@@ -1,6 +1,5 @@
name hyphen-hungarian
category TLCore
-execute BuildLanguageDat hu
-runpattern f texmf/tex/generic/config/language.hu.dat
+execute AddHyphen name=hungarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hu.tex
runpattern f texmf/tex/generic/hyphen/huhyphn.tex
docpattern f texmf/doc/generic/huhyphen/*
diff --git a/Master/tlpkg/tlpsrc/hyphen-ibycus.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ibycus.tlpsrc
deleted file mode 100644
index fa93ba3ff63..00000000000
--- a/Master/tlpkg/tlpsrc/hyphen-ibycus.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-name hyphen-ibycus
-category TLCore
-execute BuildLanguageDat iby
-runpattern f texmf/tex/generic/config/language.iby.dat
-runpattern f texmf/tex/generic/hyphen/ibyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
index 4d03b780aa2..83e9ca7ab85 100644
--- a/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-icelandic.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-icelandic
category TLCore
-execute BuildLanguageDat is
-runpattern f texmf/tex/generic/config/language.is.dat
+execute AddHyphen name=icelandic lefthyphenmin=2 righthyphenmin=2 file=loadhyph-is.tex
runpattern f texmf/tex/generic/hyphen/icehyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
index ed536667ccc..92dc8a2059d 100644
--- a/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-indonesian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-indonesian
category TLCore
-execute BuildLanguageDat in
-runpattern f texmf/tex/generic/config/language.in.dat
+execute AddHyphen name=indonesian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-id.tex
runpattern f texmf/tex/generic/hyphen/inhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
index 1d7dfc64adc..db40de5d1b0 100644
--- a/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-interlingua.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-interlingua
category TLCore
-execute BuildLanguageDat ia
-runpattern f texmf/tex/generic/config/language.ia.dat
+execute AddHyphen name=interlingua lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ia.tex
runpattern f texmf/tex/generic/hyphen/iahyphen.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
new file mode 100644
index 00000000000..fb37f51023f
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-irish.tlpsrc
@@ -0,0 +1,4 @@
+name hyphen-irish
+category TLCore
+execute AddHyphen name=irish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-ga.tex
+runpattern f texmf/tex/generic/hyphen/gahyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
index 527798f1202..7e3ecc368dc 100644
--- a/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-italian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-italian
category TLCore
-execute BuildLanguageDat it
-runpattern f texmf/tex/generic/config/language.it.dat
+execute AddHyphen name=italian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-it.tex
runpattern f texmf/tex/generic/hyphen/ithyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
index 2fbe10e4d71..9246c12db8e 100644
--- a/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-latin.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-latin
category TLCore
-execute BuildLanguageDat la
-runpattern f texmf/tex/generic/config/language.la.dat
+execute AddHyphen name=latin lefthyphenmin=2 righthyphenmin=2 file=loadhyph-la.tex
runpattern f texmf/tex/generic/hyphen/lahyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
index 145ec1ce68e..bf001034d21 100644
--- a/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-mongolian.tlpsrc
@@ -1,9 +1,6 @@
name hyphen-mongolian
category TLCore
-# comes from both mnhyphn and montex on CTAN.
-execute BuildLanguageDat mn
-execute BuildLanguageDat mn2a
-runpattern f texmf/tex/generic/config/language.mn.dat
-runpattern f texmf/tex/generic/config/language.mn2a.dat
+execute AddHyphen name=mongolian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl.tex
+execute AddHyphen name=mongolian2a lefthyphenmin=2 righthyphenmin=2 file=loadhyph-mn-cyrl-x-2a.tex
runpattern f texmf/tex/generic/hyphen/mnhyph.tex
runpattern f texmf/tex/generic/hyphen/mnhyphn.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
index 48c4681f6d3..ca9ec508290 100644
--- a/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-norwegian.tlpsrc
@@ -1,7 +1,7 @@
name hyphen-norwegian
category TLCore
-execute BuildLanguageDat no
-runpattern f texmf/tex/generic/config/language.no.dat
+execute AddHyphen name=bokmal synonyms=norwegian,norsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nb.tex
+execute AddHyphen name=nynorsk lefthyphenmin=2 righthyphenmin=2 file=loadhyph-nn.tex
runpattern f texmf/tex/generic/hyphen/nohyphbx.tex
runpattern f texmf/tex/generic/hyphen/nnhyph.tex
runpattern f texmf/tex/generic/hyphen/nbhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-pinyin.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-pinyin.tlpsrc
deleted file mode 100644
index cb332d82f64..00000000000
--- a/Master/tlpkg/tlpsrc/hyphen-pinyin.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-name hyphen-pinyin
-category TLCore
-execute BuildLanguageDat py
-runpattern f texmf/tex/generic/config/language.py.dat
-runpattern f texmf/tex/generic/hyphen/pyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
index 68be09e4da9..38f60181dbd 100644
--- a/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-polish.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-polish
category TLCore
-execute BuildLanguageDat pl
-runpattern f texmf/tex/generic/config/language.pl.dat
+execute AddHyphen name=polish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-pl.tex
runpattern f texmf/tex/generic/hyphen/plhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
index bebd63dca57..e00d5e91ff9 100644
--- a/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-portuguese.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-portuguese
category TLCore
-execute BuildLanguageDat pt
-runpattern f texmf/tex/generic/config/language.pt.dat
+execute AddHyphen name=portuguese synonyms=portuges lefthyphenmin=2 righthyphenmin=3 file=loadhyph-pt.tex
runpattern f texmf/tex/generic/hyphen/pthyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
index e80964a0b24..9441053ac92 100644
--- a/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-romanian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-romanian
category TLCore
-execute BuildLanguageDat ro
-runpattern f texmf/tex/generic/config/language.ro.dat
+execute AddHyphen name=romanian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ro.tex
runpattern f texmf/tex/generic/hyphen/rohyphen.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
index f85769ce62d..b2d9d6a7246 100644
--- a/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-russian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-russian
category TLCore
depend ruhyphen
-execute BuildLanguageDat ru
-runpattern f texmf/tex/generic/config/language.ru.dat
+execute AddHyphen name=russian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-ru.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
index 8546e2e911e..764f5a4a4b7 100644
--- a/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-serbian.tlpsrc
@@ -1,5 +1,6 @@
name hyphen-serbian
category TLCore
-execute BuildLanguageDat sr
-runpattern f texmf/tex/generic/config/language.sr.dat
+execute AddHyphen name=serbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-latn.tex
+execute AddHyphen name=serbianc lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sr-cyrl.tex
+runpattern f texmf/tex/generic/hyphen/shhyphl.tex
runpattern f texmf/tex/generic/hyphen/srhyphc.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
new file mode 100644
index 00000000000..d85090450a5
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-slovak.tlpsrc
@@ -0,0 +1,5 @@
+name hyphen-slovak
+category TLCore
+execute AddHyphen name=slovak lefthyphenmin=2 righthyphenmin=3 file=loadhyph-sk.tex
+runpattern f texmf/tex/generic/hyphen/skhyph.tex
+runpattern f texmf/tex/generic/hyphen/skhyphen.ex
diff --git a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
index 697a429d189..a10eb92f056 100644
--- a/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-slovenian.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-slovenian
category TLCore
-execute BuildLanguageDat sl
-runpattern f texmf/tex/generic/config/language.sl.dat
+execute AddHyphen name=slovenian synonyms=slovene lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sl.tex
runpattern f texmf/tex/generic/hyphen/sihyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
index 0b263668545..8c71e3bb1ca 100644
--- a/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-spanish.tlpsrc
@@ -1,7 +1,4 @@
name hyphen-spanish
category TLCore
-execute BuildLanguageDat es
-runpattern f texmf/tex/generic/config/language.es.dat
-runpattern f texmf/tex/generic/hyphen/cahyph.tex
+execute AddHyphen name=spanish synonyms=espanol lefthyphenmin=2 righthyphenmin=2 file=loadhyph-es.tex
runpattern f texmf/tex/generic/hyphen/eshyph.tex
-runpattern f texmf/tex/generic/hyphen/glhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
index 8e80a570dc1..3592d7c69b0 100644
--- a/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-swedish.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-swedish
category TLCore
-execute BuildLanguageDat sw
-runpattern f texmf/tex/generic/config/language.sw.dat
+execute AddHyphen name=swedish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-sv.tex
runpattern f texmf/tex/generic/hyphen/svhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
index 1a0b484b21c..03f84e6c634 100644
--- a/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-turkish.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-turkish
category TLCore
-execute BuildLanguageDat tk
-runpattern f texmf/tex/generic/config/language.tk.dat
+execute AddHyphen name=turkish lefthyphenmin=2 righthyphenmin=2 file=loadhyph-tr.tex
runpattern f texmf/tex/generic/hyphen/tkhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
index 3e1e9b265b7..e063595a3fd 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ukenglish.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-ukenglish
category TLCore
-execute BuildLanguageDat uk
-runpattern f texmf/tex/generic/config/language.uk.dat
+execute AddHyphen name=ukenglish lefthyphenmin=2 righthyphenmin=3 file=loadhyph-en-gb.tex
runpattern f texmf/tex/generic/hyphen/ukhyphen.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
index b2db2026199..9c108988048 100644
--- a/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-ukrainian.tlpsrc
@@ -1,4 +1,3 @@
name hyphen-ukrainian
category TLCore
-execute BuildLanguageDat ur
-runpattern f texmf/tex/generic/config/language.ur.dat
+execute AddHyphen name=ukrainian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-uk.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc
new file mode 100644
index 00000000000..af553332b3e
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/hyphen-uppersorbian.tlpsrc
@@ -0,0 +1,4 @@
+name hyphen-uppersorbian
+category TLCore
+execute AddHyphen name=uppersorbian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-hsb.tex
+runpattern f texmf/tex/generic/hyphen/sorhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-usorbian.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-usorbian.tlpsrc
deleted file mode 100644
index 82c5e5bf1c3..00000000000
--- a/Master/tlpkg/tlpsrc/hyphen-usorbian.tlpsrc
+++ /dev/null
@@ -1,5 +0,0 @@
-name hyphen-usorbian
-category TLCore
-execute BuildLanguageDat sor
-runpattern f texmf/tex/generic/config/language.sor.dat
-runpattern f texmf/tex/generic/hyphen/sorhyph.tex
diff --git a/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc b/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
index ca9482d96d3..d26060608d4 100644
--- a/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
+++ b/Master/tlpkg/tlpsrc/hyphen-welsh.tlpsrc
@@ -1,5 +1,4 @@
name hyphen-welsh
category TLCore
-execute BuildLanguageDat cy
-runpattern f texmf/tex/generic/config/language.cy.dat
+execute AddHyphen name=welsh lefthyphenmin=2 righthyphenmin=3 file=loadhyph-cy.tex
runpattern f texmf/tex/generic/hyphen/cyhyph.tex
diff --git a/Master/tlpkg/tlpsrc/plain.tlpsrc b/Master/tlpkg/tlpsrc/plain.tlpsrc
index 004f13a610b..fb2a49a57ec 100644
--- a/Master/tlpkg/tlpsrc/plain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/plain.tlpsrc
@@ -4,4 +4,5 @@ srcpattern f ignore
runpattern d texmf-dist/makeindex/plain
runpattern d texmf-dist/tex/plain/base
runpattern d texmf-dist/tex/plain/config
+runpattern f texmf/tex/plain/config/language.us.def
docpattern f ignore