put collection-* dependencies first, hyphen-* dependencies sorted normally

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

54 files changed, 203 insertions, 112 deletions

diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 03af80871d0..3ba96a54837 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -3,8 +3,9 @@ shortdesc TeX auxiliary programs
 longdesc Various useful, but non-essential, support programs. Includes
 longdesc programs and macros for DVI file manipulation, literate
 longdesc programming, patgen, and the TeX Works Editor.
+#
 depend collection-basic
-
+#
 depend a2ping
 depend adhocfilelist
 depend arara
diff --git a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
index ce1dfaf74f4..86b70a65c7e 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsextra.tlpsrc
@@ -1,5 +1,8 @@
 category Collection
 shortdesc Extra fonts
+#
+depend collection-basic
+#
 depend Asana-Math
 depend adforn
 depend adfsymbols
@@ -185,4 +188,3 @@ depend venturisadf
 depend wsuipa
 depend xits
 depend yfonts
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
index 1a5e63c5854..ebe7d68e112 100644
--- a/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontsrecommended.tlpsrc
@@ -3,6 +3,9 @@ shortdesc Recommended fonts
 longdesc Recommended fonts, including the base 35 PostScript fonts,
 longdesc Latin Modern, TeX Gyre, and T1 and other encoding support for
 longdesc Computer Modern, in outline form.
+#
+depend collection-basic
+#
 depend avantgar
 depend bookman
 depend charter
@@ -33,4 +36,3 @@ depend wasy
 depend wasysym
 depend zapfchan
 depend zapfding
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
index 0b6269a719b..d785af8f436 100644
--- a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
@@ -4,7 +4,9 @@ longdesc Programs for conversion between font formats, testing fonts,
 longdesc virtual fonts, .gf and .pk manipulation, mft, fontinst, etc.
 longdesc Manipulating OpenType, TrueType, PostScript Type 1, and
 longdesc PostScript and other images.
+#
 depend collection-basic
+#
 depend accfonts
 depend afm2pl
 depend dosepsbin
diff --git a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
index f5c5484b557..371376fcfec 100644
--- a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
@@ -3,10 +3,12 @@ shortdesc Extra formats
 longdesc Collected TeX `formats', i.e., large-scale macro packages
 longdesc designed to be dumped into .fmt files, other than most common
 longdesc ones, such as latex and context.
+#
+depend collection-basic
+#
 depend edmac
 depend eplain
 depend mltex
 depend psizzl
 depend startex
 depend texsis
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-games.tlpsrc b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
index a2fa84f923a..20d5c27bece 100644
--- a/Master/tlpkg/tlpsrc/collection-games.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-games.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Games typesetting
 longdesc Setups for typesetting various games, including chess.
+#
+depend collection-latex
+#
 depend bartel-chess-fonts
 depend chess
 depend chess-problem-diagrams
@@ -26,4 +29,3 @@ depend sudoku
 depend sudokubundle
 depend xq
 depend xskak
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
index dd84447762e..199b61cd76d 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
@@ -2,6 +2,9 @@ category Collection
 shortdesc Extra generic packages
 longdesc Extra packages that work with multiple formats, typically both
 longdesc TeX and LaTeX.
+#
+depend collection-basic
+#
 depend abbr
 depend abstyles
 depend barr
@@ -42,5 +45,3 @@ depend texapi
 depend upca
 depend xlop
 depend yax
-#
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
index 58289faac29..94d03c3a642 100644
--- a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Recommended generic packages
 longdesc Recommended packages that work with multiple formats.
+#
+depend collection-basic
+#
 depend epsf
 depend fontname
 depend genmisc
@@ -9,4 +12,3 @@ depend multido
 depend path
 depend tex-ps
 depend ulem
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
index 98a3281edd0..3749680f668 100644
--- a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
@@ -1,10 +1,12 @@
 category Collection
 shortdesc HTML/SGML/XML support
 longdesc Packages to convert LaTeX to XML/HTML, and typset XML/SGML
+#
+depend collection-basic
+depend collection-fontsrecommended
+depend collection-latex
+#
 depend jadetex
 depend passivetex
 depend tex4ht
 depend xmltex
-depend collection-basic
-depend collection-fontsrecommended
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
index 1921c931514..c1f3f820e51 100644
--- a/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-humanities.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Humanities packages
-longdesc Packages for law, linguistics, the social sciences, the
-longdesc humanities, etc.
+longdesc Packages for law, linguistics, social sciences, humanities, etc.
+#
+depend collection-latex
+#
 depend alnumsec
 depend arydshln
 depend bibleref
@@ -43,4 +45,3 @@ depend stage
 depend tree-dvips
 depend verse
 depend xyling
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
index f0710283826..8c342c13099 100644
--- a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
@@ -1,8 +1,10 @@
 category Collection
 shortdesc African scripts
 longdesc Support for typesetting some African scripts
+#
+depend collection-basic
+#
 depend ethiop
 depend ethiop-t1
 depend fc
 depend hyphen-ethiopic
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
index b7147b63499..dd092cede4c 100644
--- a/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langarabic.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Arabic
 longdesc Support for typesetting Arabic and Persian.
+#
+depend collection-basic
+#
 depend amiri
 depend arabi
 depend arabtex
@@ -14,5 +17,3 @@ depend persian-hm-ftx
 depend persian-hm-xbs
 depend persian-modern
 depend tram
-#
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
index 832edd8c995..ff51e931906 100644
--- a/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcroatian.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Croatian
 longdesc Support for typesetting Croatian.
-babel-croatian
+#
+depend collection-basic
+#
+depend babel-croatian
 depend hrlatex
 depend hyphen-croatian
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
index a925c7b529c..817f6d208fd 100644
--- a/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langcyrillic.tlpsrc
@@ -1,6 +1,10 @@
 category Collection
 shortdesc Cyrillic
 longdesc Support for typesetting Cyrillic.
+#
+depend collection-basic
+depend collection-latex
+#
 depend babel-bulgarian
 depend babel-russian
 depend babel-ukraineb
@@ -12,6 +16,9 @@ depend disser
 depend eskd
 depend eskdx
 depend gost
+depend hyphen-bulgarian
+depend hyphen-russian
+depend hyphen-ukrainian
 depend lcyw
 depend lh
 depend lhcyr
@@ -19,9 +26,3 @@ depend ruhyphen
 depend russ
 depend t2
 depend ukrhyph
-depend hyphen-bulgarian
-depend hyphen-russian
-depend hyphen-ukrainian
-#
-depend collection-basic
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
index 874c229d26f..78fffa589cc 100644
--- a/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langczechslovak.tlpsrc
@@ -1,6 +1,10 @@
 category Collection
 shortdesc Czech/Slovak
 longdesc Support for typesetting Czech/Slovak.
+#
+depend collection-basic
+depend collection-latex
+#
 depend babel-czech
 depend babel-slovak
 depend cs
@@ -8,8 +12,6 @@ depend csbulletin
 depend cslatex
 depend csplain
 depend cstex
-depend vlna
 depend hyphen-czech
 depend hyphen-slovak
-depend collection-basic
-depend collection-latex
+depend vlna
diff --git a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
index 93abbd20c62..6e3d00900b5 100644
--- a/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdanish.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Danish
 longdesc Support for typesetting Danish.
+#
+depend collection-basic
+#
 depend babel-danish
 depend hyphen-danish
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
index 4067e272c51..fc101071e08 100644
--- a/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langdutch.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Dutch
 longdesc Support for typesetting Dutch.
+#
+depend collection-basic
+#
 depend babel-dutch
 depend hyphen-dutch
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
index 423dd434897..6c41fd2b857 100644
--- a/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langenglish.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc US and UK English
 longdesc Support for typesetting US and UK English.
+#
+depend collection-basic
+#
 depend babel-english
 depend hyphen-english
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
index b227d0917f2..1be57e04f34 100644
--- a/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfinnish.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Finnish
 longdesc Support for typesetting Finnish.
+#
+depend collection-basic
+#
 depend babel-finnish
 depend finbib
 depend hyphen-finnish
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
index 712af8f35a8..a7cc70c213b 100644
--- a/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langfrench.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc French
 longdesc Support for typesetting French and Basque.
+#
+depend collection-basic
+#
 depend aeguill
 depend babel-basque
 depend babel-frenchb
@@ -13,11 +16,10 @@ depend droit-fr
 depend facture
 depend frenchle
 depend frletter
+depend hyphen-basque
+depend hyphen-french
 depend impnattypo
 depend mafr
 depend tabvar
 depend tdsfrmath
 depend variations
-depend hyphen-basque
-depend hyphen-french
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
index a53d8435c7a..dbddc1a2f63 100644
--- a/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgerman.tlpsrc
@@ -1,20 +1,22 @@
 category Collection
 shortdesc German
 longdesc Support for typesetting German.
+#
+depend collection-basic
+#
 depend babel-german
 depend bibleref-german
-depend dehyph-exptl
-depend dhua
 depend booktabs-de
 depend csquotes-de
+depend dehyph-exptl
+depend dhua
 depend etoolbox-de
 depend geometry-de
 depend germbib
 depend germkorr
 depend hausarbeit-jura
+depend hyphen-german
 depend microtype-de
 depend r_und_s
 depend tipa-de
 depend umlaute
-depend hyphen-german
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
index ddf363e9656..47596f50737 100644
--- a/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langgreek.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Greek
 longdesc Support for typesetting Greek.
+#
+depend collection-basic
+#
 depend babel-greek
 depend betababel
 depend bgreek
@@ -11,6 +14,8 @@ depend greek-inputenc
 depend greekdates
 depend greektex
 depend grverb
+depend hyphen-greek
+depend hyphen-ancientgreek
 depend ibycus-babel
 depend ibygrk
 depend kerkis
@@ -21,6 +26,3 @@ depend mkgrkindex
 depend teubner
 depend xgreek
 depend yannisgr
-depend hyphen-greek
-depend hyphen-ancientgreek
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
index 689fd385eb7..736336bdf4c 100644
--- a/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhebrew.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Hebrew
 longdesc Support for typesetting Hebrew.
+#
+depend collection-basic
+#
 depend aramaic-serto
 depend babel-hebrew
 depend cjhebrew
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
index f390fec842d..084b8864793 100644
--- a/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langhungarian.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Hungarian
 longdesc Support for typesetting Hungarian.
+#
+depend collection-basic
+#
 depend babel-hungarian
 depend hyphen-hungarian
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
index a4456532abb..d2c6a179cc2 100644
--- a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Indic scripts
 longdesc Support for typesetting some Indic scripts.
+#
+depend collection-basic
+#
 depend bangtex
 depend bengali
 depend burmese
@@ -13,4 +16,3 @@ depend velthuis
 depend wnri
 depend wnri-latex
 depend xetex-devanagari
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
index 15f126b606a..3a92293cd0b 100644
--- a/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langitalian.tlpsrc
@@ -1,11 +1,13 @@
 category Collection
 shortdesc Italian
 longdesc Support for typesetting Italian.
+#
 depend collection-basic
-depend codicefiscaleitaliano
+#
 depend babel-italian
+depend codicefiscaleitaliano
 depend fixltxhyph
-depend hyphen-italian
 depend frontespizio
+depend hyphen-italian
 depend itnumpar
 depend layaureo
diff --git a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
index 2e1de07b78b..7a8d71abb10 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatin.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Latin
 longdesc Support for typesetting Latin.
+#
+depend collection-basic
+#
 depend babel-latin
 depend hyphen-latin
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
index 8a79e5462b2..0e18534818d 100644
--- a/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlatvian.tlpsrc
@@ -1,5 +1,7 @@
 category Collection
 shortdesc Latvian
 longdesc Support for typesetting Latvian.
-depend hyphen-latvian
+#
 depend collection-basic
+#
+depend hyphen-latvian
diff --git a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
index 9aa5543b880..66017ddb9d5 100644
--- a/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langlithuanian.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Lithuanian
 longdesc Support for typesetting Lithuanian.
-depend lithuanian
-depend hyphen-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
index 32910e8d34c..a2e5661e03a 100644
--- a/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langmongolian.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Mongolian
 longdesc Support for typesetting Mongolian.
+#
 depend collection-basic
+#
 depend hyphen-mongolian
 depend mongolian-babel
 depend montex
diff --git a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
index 78f9b3b3968..a7b9acac230 100644
--- a/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langnorwegian.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Norwegian
 longdesc Support for typesetting Norwegian.
+#
+depend collection-basic
+#
 depend babel-norsk
 depend hyphen-norwegian
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index fc6a1d1ebf7..253d9c7dd8f 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -6,27 +6,29 @@ longdesc Hyphenation patterns for languages without (much) other support.
 # in collection-latexextra at present), but I just didn't want to split
 # them off into tiny collections of their own.  Maybe another time.
 # --karl
+#
+depend collection-basic
 # 
-babel-albanian
-babel-bahasa
-babel-breton
-babel-esperanto
-babel-estonian
-babel-friulan
-babel-icelandic
-babel-interlingua
-babel-irish
-babel-kurmanji
-babel-piedmontese
-babel-romanian
-babel-romansh
-babel-samin
-babel-scottish
-babel-serbian
-babel-serbianc
-babel-slovene
-babel-sorbian
-babel-welsh
+depend babel-albanian
+depend babel-bahasa
+depend babel-breton
+depend babel-esperanto
+depend babel-estonian
+depend babel-friulan
+depend babel-icelandic
+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-serbian
+depend babel-serbianc
+depend babel-slovene
+depend babel-sorbian
+depend babel-welsh
 depend hyphen-afrikaans
 depend hyphen-armenian
 depend hyphen-coptic
@@ -46,5 +48,3 @@ depend hyphen-slovenian
 depend hyphen-turkish
 depend hyphen-uppersorbian
 depend hyphen-welsh
-#
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
index 7457d066a39..27f4abdb14e 100644
--- a/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langpolish.tlpsrc
@@ -1,10 +1,15 @@
 category Collection
 shortdesc Polish
 longdesc Support for typesetting Polish.
+#
+depend collection-latex
+depend collection-basic
+#
 depend babel-polish
 depend cc-pl
 depend gustlib
 depend gustprog
+depend hyphen-polish
 depend mex
 depend mwcls
 depend pl
@@ -13,6 +18,3 @@ depend przechlewski-book
 depend qpxqtx
 depend tap
 depend utf8mex
-depend hyphen-polish
-depend collection-latex
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
index d4fa64a0db0..aed6d541746 100644
--- a/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langportuguese.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Portuguese
 longdesc Support for typesetting Portuguese.
+#
+depend collection-basic
+#
 depend babel-portuges
-depend ordinalpt
 depend hyphen-portuguese
-depend collection-basic
+depend ordinalpt
diff --git a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
index 1928eb1e8ec..9a397e4bfef 100644
--- a/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langspanish.tlpsrc
@@ -1,11 +1,13 @@
 category Collection
 shortdesc Spanish
 longdesc Support for typesetting Spanish.
+#
+depend collection-basic
+#
 depend babel-catalan
 depend babel-galician
 depend babel-spanish
-depend hyphen-spanish
 depend hyphen-catalan
 depend hyphen-galician
+depend hyphen-spanish
 depend spanish-mx
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
index f4354e94253..f42e1eaec98 100644
--- a/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langswedish.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Swedish
 longdesc Support for typesetting Swedish.
+#
+depend collection-basic
+#
 depend babel-swedish
-depend swebib
 depend hyphen-swedish
-depend collection-basic
+depend swebib
diff --git a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
index cdd09f18411..3c814dd4851 100644
--- a/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langtibetan.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
 shortdesc Tibetan
 longdesc Support for typesetting Tibetan.
+#
+depend collection-basic
+#
 depend ctib
 depend otibet
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc b/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
index f0dbcce7718..9924508bd7c 100644
--- a/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langturkmen.tlpsrc
@@ -1,7 +1,9 @@
 category Collection
 shortdesc Turkmen
 longdesc Support for typesetting Turkish and Turkmen.
+#
+depend collection-basic
+#
 depend babel-turkish
-depend turkmen
 depend hyphen-turkmen
-depend collection-basic
+depend turkmen
diff --git a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
index aceb6471b60..30a53b1df23 100644
--- a/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langvietnamese.tlpsrc
@@ -1,5 +1,7 @@
 category Collection
 shortdesc Vietnamese
 longdesc Support for typesetting Vietnamese.
-depend vntex
+#
 depend collection-basic
+#
+depend vntex
diff --git a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
index 99e9788b5cd..e690c012b0e 100644
--- a/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latex.tlpsrc
@@ -1,7 +1,8 @@
 category Collection
-shortdesc Basic LaTeX packages
+shortdesc LaTeX fundamental packages
 longdesc These packages are mandated by the core LaTeX team, or
 longdesc at least very strongly recommended.
+#
 depend collection-basic
 #
 depend ae
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index ffd1b34b7ca..055f66d5614 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -1,6 +1,7 @@
 category Collection
 shortdesc LaTeX supplementary packages
 longdesc A large collection of add-on packages for LaTeX.
+#
 depend collection-latexrecommended
 depend collection-pictures
 #
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index b5f6f964386..6a6989500dc 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -2,6 +2,7 @@ category Collection
 shortdesc LaTeX recommended packages
 longdesc A collection of recommended add-on packages for LaTeX which have
 longdesc widespread use.
+#
 depend collection-latex
 #
 depend anysize
@@ -10,7 +11,6 @@ depend booktabs
 depend caption
 depend cite
 depend cmap
-depend collection-latex
 depend crop
 depend ctable
 depend ec
@@ -56,4 +56,3 @@ depend underscore
 depend url
 depend xcolor
 depend xkeyval
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
index d73d00ee38e..64b0dd09e92 100644
--- a/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-mathextra.tlpsrc
@@ -1,6 +1,10 @@
 category Collection
 shortdesc Advanced math typesetting
 longdesc Extra math
+#
+depend collection-fontsrecommended
+depend collection-latex
+#
 depend 12many
 depend amstex
 depend backnaur
@@ -45,5 +49,3 @@ depend unicode-math
 depend venn
 depend yhmath
 depend ytableau
-depend collection-fontsrecommended
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
index 80f07f59b37..2348088956e 100644
--- a/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-metapost.tlpsrc
@@ -1,5 +1,8 @@
 category Collection
 shortdesc MetaPost (and Metafont) drawing packages
+#
+depend collection-basic
+#
 depend automata
 depend bbcard
 depend blockdraw_mp
@@ -36,4 +39,3 @@ depend splines
 depend suanpan
 depend textpath
 depend threeddice
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-music.tlpsrc b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
index 552c57cc181..7c94dee37d3 100644
--- a/Master/tlpkg/tlpsrc/collection-music.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-music.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Music typesetting
 longdesc Music-related fonts and packages.
+#
+depend collection-latex
+#
 depend abc
 depend figbas
 depend gchords
@@ -14,4 +17,3 @@ depend musixtex-fonts
 depend pmx
 depend songbook
 depend songs
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
index 800417b36a3..cd2ed265e4d 100644
--- a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
@@ -1,11 +1,14 @@
 category Collection
 shortdesc Omega packages
-longdesc Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous.
+longdesc Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous,
+longdesc now updated to Aleph.
+#
+depend collection-basic
+depend collection-latex
+#
+depend aleph
 depend antomega
 depend lambda
 depend mxedruli
 depend omega
-depend aleph
 depend omegaware
-depend collection-basic
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
index 5d65fbc3753..89e165778cf 100644
--- a/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pictures.tlpsrc
@@ -1,5 +1,9 @@
 category Collection
-shortdesc Graphics packages and programs
+shortdesc Graphics, pictures, diagrams.
+longdesc Including TikZ, pict, etc.; MetaPost and PStricks are separate.
+#
+depend collection-basic
+#
 depend asyfig
 depend autoarea
 depend bardiag
@@ -110,4 +114,3 @@ depend tufte-latex
 depend venndiagram
 depend xpicture
 depend xypic
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
index fa4de4fa698..d0a582312a0 100644
--- a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
@@ -1,6 +1,9 @@
 category Collection
 shortdesc Plain TeX supplementary packages
 longdesc Add-on packages and macros that work with plain TeX.
+#
+depend collection-basic
+#
 depend figflow
 depend fixpdfmag
 depend font-change
@@ -20,5 +23,3 @@ depend resumemac
 depend timetable
 depend treetex
 depend varisize
-#
-depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
index 0a9cdc308f5..22041e525d2 100644
--- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
@@ -1,5 +1,6 @@
 category Collection
-shortdesc PSTricks packages
+shortdesc PSTricks
+longdesc PSTricks core and all add-on packages.
 #
 depend collection-basic
 depend collection-genericrecommended
diff --git a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
index 249a86f8100..1f0e73826ce 100644
--- a/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-publishers.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
-shortdesc Support for publishers, theses, standards, conferences, etc.
-
+shortdesc Publisher styles, theses, conferences, etc.
+#
+depend collection-latex
+#
 depend IEEEconf
 depend IEEEtran
 depend aastex
@@ -117,5 +119,3 @@ depend uwthesis
 depend vancouver
 depend xcookybooky
 depend york-thesis
-#
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-science.tlpsrc b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
index 4d2adfc0f9d..514d81210c7 100644
--- a/Master/tlpkg/tlpsrc/collection-science.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-science.tlpsrc
@@ -1,6 +1,8 @@
 category Collection
-shortdesc Typesetting for natural and computer sciences
-longdesc Typesetting for natural and computer sciences
+shortdesc Natural and computer sciences
+#
+depend collection-latex
+#
 depend SIstyle
 depend SIunits
 depend alg
@@ -59,4 +61,3 @@ depend textopo
 depend ulqda
 depend unitsdef
 depend youngtab
-depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
index c3d178a4d9d..3f2c16e958f 100644
--- a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
@@ -3,8 +3,10 @@ shortdesc GNU Texinfo
 longdesc TeX macros for the GNU Texinfo documentation system.  The programs
 longdesc and documentation are no longer distributed with TeX Live; get
 longdesc the original Texinfo package for your system.
+#
 # Even though collection-texinfo is tiny now, we'll leave it as a
 # separate collection for the benefit of distributors and others who
 # want it, but not all the other random stuff that is in formatsextra.
+#
 depend texinfo
 depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
index 8794938cbef..848addc7f18 100644
--- a/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-wintools.tlpsrc
@@ -1,5 +1,5 @@
 category Collection
-shortdesc Windows support programs
+shortdesc Windows-only support programs
 longdesc Utilities for Windows, since they are not readily available there:
 longdesc chktex, unzip, wget, xpdf, and the dviout previewer.
 depend wintools.win32
diff --git a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
index 8706b0a3e4a..3ed675a4943 100644
--- a/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-xetex.tlpsrc
@@ -2,6 +2,9 @@ category Collection
 shortdesc XeTeX packages
 longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew,
 longdesc http://tug.org/xetex.
+#
+depend collection-basic
+#
 depend arabxetex
 depend euenc
 depend fixlatvian
@@ -31,4 +34,3 @@ depend xetexko
 depend xevlna
 depend xltxtra
 depend xunicode
-depend collection-basic