big switch to hyph-utf8 ... for sure not all problems found ...

git-svn-id: svn://tug.org/texlive/trunk@8935 c570f23f-e606-0410-a88d-b1316a301751

53 files changed, 88 insertions, 101 deletions

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