merge languages into collection-langother, (new) collection-langeuro, and others

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

22 files changed, 93 insertions, 202 deletions

diff --git a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
deleted file mode 100644
index 83188a39b92..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
+++ /dev/null
@@ -1,9 +0,0 @@
-category Collection
-shortdesc Croatian
-longdesc Support for Croatian.
-#
-depend collection-basic
-#
-depend babel-croatian
-depend hrlatex
-depend hyphen-croatian
diff --git a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
index 6deb9d447b1..98ecf416091 100644
--- a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
@@ -41,3 +41,4 @@ depend t2
 depend texlive-ru
 depend texlive-sr
 depend ukrhyph
+depend hyphen-georgian
diff --git a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
deleted file mode 100644
index 40919dbbe28..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Danish
-longdesc Support for Danish.
-#
-depend collection-basic
-#
-depend babel-danish
-depend hyphen-danish
diff --git a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
deleted file mode 100644
index bd4ec818042..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
+++ /dev/null
@@ -1,9 +0,0 @@
-category Collection
-shortdesc Dutch
-longdesc Support for Dutch.
-#
-depend collection-basic
-#
-depend babel-dutch
-depend hyphen-dutch
-depend lshort-dutch
diff --git a/Master/tlpkg/tlpsrc/collection-langeuro.tlpsrc b/Master/tlpkg/tlpsrc/collection-langeuro.tlpsrc
new file mode 100644
index 00000000000..00fe82082ea
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/collection-langeuro.tlpsrc
@@ -0,0 +1,64 @@
+category Collection
+shortdesc European languages
+longdesc Support for a number of European languages; others (Greek,
+longdesc German, French, ...) have their own collections, depending
+longdesc simply on the size of the support.
+#
+depend collection-basic
+#
+depend babel-albanian
+depend babel-breton
+depend babel-croatian
+depend babel-danish
+depend babel-dutch
+depend babel-estonian
+depend babel-finnish
+depend babel-friulan
+depend babel-hungarian
+depend babel-icelandic
+depend babel-irish
+depend babel-kurmanji
+depend babel-latin
+depend babel-norsk
+depend babel-piedmontese
+depend babel-romanian
+depend babel-romansh
+depend babel-samin
+depend babel-scottish
+depend babel-slovenian
+depend babel-swedish
+depend babel-turkish
+depend babel-welsh
+depend finbib
+depend hrlatex
+depend hyphen-armenian
+depend hyphen-croatian
+depend hyphen-danish
+depend hyphen-dutch
+depend hyphen-estonian
+depend hyphen-finnish
+depend hyphen-friulan
+depend hyphen-hungarian
+depend hyphen-icelandic
+depend hyphen-irish
+depend hyphen-kurmanji
+depend hyphen-latin
+depend hyphen-latvian
+depend hyphen-lithuanian
+depend hyphen-norwegian
+depend hyphen-piedmontese
+depend hyphen-romanian
+depend hyphen-romansh
+depend hyphen-slovenian
+depend hyphen-swedish
+depend hyphen-turkish
+depend hyphen-turkmen
+depend hyphen-uppersorbian
+depend hyphen-welsh
+depend lithuanian
+depend lshort-dutch
+depend lshort-finnish
+depend lshort-slovenian
+depend lshort-turkish
+depend swebib
+depend turkmen
diff --git a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
deleted file mode 100644
index 9787c0adc64..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc Finnish
-longdesc Support for Finnish.
-#
-depend collection-basic
-#
-depend babel-finnish
-depend finbib
-depend hyphen-finnish
-depend lshort-finnish
diff --git a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
deleted file mode 100644
index 874517107b2..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
+++ /dev/null
@@ -1,9 +0,0 @@
-category Collection
-shortdesc Hebrew
-longdesc Support for Hebrew.
-#
-depend collection-basic
-#
-depend aramaic-serto
-depend babel-hebrew
-depend cjhebrew
diff --git a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
deleted file mode 100644
index e0fe36c9876..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Hungarian
-longdesc Support for Hungarian.
-#
-depend collection-basic
-#
-depend babel-hungarian
-depend hyphen-hungarian
diff --git a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
deleted file mode 100644
index 02437ac87c6..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Latin
-longdesc Support for Latin (the language).
-#
-depend collection-basic
-#
-depend babel-latin
-depend hyphen-latin
diff --git a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
deleted file mode 100644
index 789f09bc194..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
+++ /dev/null
@@ -1,7 +0,0 @@
-category Collection
-shortdesc Latvian
-longdesc Support for Latvian.
-#
-depend collection-basic
-#
-depend hyphen-latvian
diff --git a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
deleted file mode 100644
index 0b8bb72b1e5..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Lithuanian
-longdesc Support for Lithuanian.
-#
-depend collection-basic
-#
-depend hyphen-lithuanian
-depend lithuanian
diff --git a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
deleted file mode 100644
index 60b39d76ef3..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc Mongolian
-longdesc Support for Mongolian.
-#
-depend collection-basic
-#
-depend hyphen-mongolian
-depend lshort-mongol
-depend mongolian-babel
-depend montex
diff --git a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
deleted file mode 100644
index 179fbc2c375..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Norwegian
-longdesc Support for Norwegian.
-#
-depend collection-basic
-#
-depend babel-norsk
-depend hyphen-norwegian
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index 03d81889d08..ab3f5565ecc 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -1,49 +1,29 @@
 category Collection
-shortdesc Other languages
-longdesc Support for languages not otherwise listed.
-#
-# Some have extra packages (cbcoptic, etc.), but I just didn't want to
-# split them off into tiny collections of their own.  Maybe another
-# time.  --karl
+shortdesc Hebrew, Vietnamese, Mongolian, and other languages
+longdesc Support for languages not otherwise listed; the split is made
+longdesc simply on the basis of the size of the support, to keep
+longdesc both collection sizes and the number of collections reasonable.
 #
 depend collection-basic
 # 
-depend babel-albanian
+depend amsldoc-vn
+depend aramaic-serto
 depend babel-bahasa
-depend babel-breton
 depend babel-esperanto
-depend babel-estonian
-depend babel-friulan
-depend babel-icelandic
+depend babel-hebrew
 depend babel-interlingua
-depend babel-irish
-depend babel-kurmanji
-depend babel-piedmontese
-depend babel-romanian
-depend babel-romansh
-depend babel-samin
-depend babel-scottish
-depend babel-slovenian
 depend babel-sorbian
-depend babel-welsh
+depend cjhebrew
+depend ctib
 depend hyphen-afrikaans
-depend hyphen-armenian
 depend hyphen-coptic
 depend hyphen-esperanto
-depend hyphen-estonian
-depend hyphen-friulan
-depend hyphen-georgian
-depend hyphen-icelandic
 depend hyphen-indonesian
 depend hyphen-interlingua
-depend hyphen-irish
-depend hyphen-kurmanji
-depend hyphen-piedmontese
-depend hyphen-romanian
-depend hyphen-romansh
-depend hyphen-slovenian
-depend hyphen-turkish
-depend hyphen-uppersorbian
-depend hyphen-welsh
-#
-depend lshort-slovenian
+depend hyphen-mongolian
+depend lshort-mongol
+depend lshort-vietnamese
+depend mongolian-babel
+depend montex
+depend ntheorem-vn
+depend vntex
diff --git a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
deleted file mode 100644
index afe6bcf1181..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
+++ /dev/null
@@ -1,9 +0,0 @@
-category Collection
-shortdesc Swedish
-longdesc Support for Swedish.
-#
-depend collection-basic
-#
-depend babel-swedish
-depend hyphen-swedish
-depend swebib
diff --git a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
deleted file mode 100644
index fdfb8d87e85..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
+++ /dev/null
@@ -1,8 +0,0 @@
-category Collection
-shortdesc Tibetan
-longdesc Support for Tibetan.
-#
-depend collection-basic
-#
-depend ctib
-depend otibet
diff --git a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc b/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
deleted file mode 100644
index 8fb811999ab..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc Turkish and Turkmen
-longdesc Support for Turkish and Turkmen.
-#
-depend collection-basic
-#
-depend babel-turkish
-depend hyphen-turkmen
-depend lshort-turkish
-depend turkmen
diff --git a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
deleted file mode 100644
index 75bfadfd268..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc Vietnamese
-longdesc Support for Vietnamese.
-#
-depend collection-basic
-#
-depend amsldoc-vn
-depend lshort-vietnamese
-depend ntheorem-vn
-depend vntex
diff --git a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
index cd2ed265e4d..60bdf8c2806 100644
--- a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
@@ -12,3 +12,4 @@ depend lambda
 depend mxedruli
 depend omega
 depend omegaware
+depend otibet
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index 45a373b5b78..c16c02ef720 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -17,33 +17,19 @@ depend collection-humanities
 depend collection-langafrican
 depend collection-langarabic
 depend collection-langcjk
-depend collection-langcroatian
 depend collection-langcyrillic
 depend collection-langczechslovak
-depend collection-langdanish
-depend collection-langdutch
-depend collection-langfinnish
+depend collection-langenglish
+depend collection-langeuro
 depend collection-langfrench
 depend collection-langgerman
 depend collection-langgreek
-depend collection-langhebrew
-depend collection-langhungarian
 depend collection-langindic
 depend collection-langitalian
-depend collection-langlatin
-depend collection-langlatvian
-depend collection-langlithuanian
-depend collection-langmongolian
-depend collection-langnorwegian
 depend collection-langother
 depend collection-langpolish
 depend collection-langportuguese
 depend collection-langspanish
-depend collection-langswedish
-depend collection-langtibetan
-depend collection-langturkmen
-depend collection-langenglish
-depend collection-langvietnamese
 depend collection-latex
 depend collection-latexextra
 depend collection-latexrecommended
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index cc424d61a0a..ad0215908ab 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -1,29 +1,28 @@
 category Scheme
 shortdesc medium scheme (small + more packages and languages)
 longdesc This is the medium TeX Live collection: it contains plain TeX,
-longdesc LaTeX, many recommended packages, and support for some
-longdesc widely-used European languages.
+longdesc LaTeX, many recommended packages, and support for most
+longdesc European languages.
 depend collection-basic
 depend collection-binextra
 depend collection-context
-depend collection-fontutils
 depend collection-fontsrecommended
+depend collection-fontutils
+depend collection-genericrecommended
 depend collection-langczechslovak
-depend collection-langdutch
 depend collection-langenglish
+depend collection-langeuro
 depend collection-langfrench
 depend collection-langgerman
 depend collection-langitalian
 depend collection-langpolish
 depend collection-langportuguese
 depend collection-langspanish
-depend collection-langenglish
 depend collection-latex
 depend collection-latexrecommended
+depend collection-luatex
 depend collection-mathextra
 depend collection-metapost
 depend collection-texinfo
 depend collection-texworks
 depend collection-xetex
-depend collection-luatex
-depend collection-genericrecommended
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index a1ad69ce5ab..2096de11c16 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -41,31 +41,22 @@ depend tds
 depend tex-refs
 depend collection-basic
 depend collection-context
-depend collection-fontutils
 depend collection-fontsrecommended
+depend collection-fontutils
 depend collection-genericrecommended
 depend collection-langcjk
-depend collection-langcroatian
 depend collection-langcyrillic
 depend collection-langczechslovak
-depend collection-langdanish
-depend collection-langdutch
-depend collection-langfinnish
+depend collection-langenglish
+depend collection-langeuro
 depend collection-langfrench
 depend collection-langgerman
 depend collection-langgreek
-depend collection-langhungarian
 depend collection-langitalian
-depend collection-langlatin
-depend collection-langmongolian
-depend collection-langnorwegian
 depend collection-langother
 depend collection-langpolish
 depend collection-langportuguese
 depend collection-langspanish
-depend collection-langswedish
-depend collection-langenglish
-depend collection-langvietnamese
 depend collection-latex
 depend collection-latexrecommended
 depend collection-mathextra