alphabetize list components, for future stability

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

62 files changed, 107 insertions, 107 deletions

diff --git a/Master/texmf/lists/collection-basic b/Master/texmf/lists/collection-basic
index 71308036ce9..c830dcbebf1 100644
--- a/Master/texmf/lists/collection-basic
+++ b/Master/texmf/lists/collection-basic
@@ -4,9 +4,12 @@
 +bibtex
 +cm
 +cmex
++collection-basicbin
++collection-documentation-base
 +dvips
 +enctex
 +fontname
++hyphen-base
 +lm
 +makeindex
 +metafont
@@ -14,9 +17,6 @@
 +misc
 +plain
 +tex-ps
-+collection-basicbin
-+collection-documentation-base
-+hyphen-base
 
 
 texmf/tpm/collection-basic.tpm
diff --git a/Master/texmf/lists/collection-bibtexextra b/Master/texmf/lists/collection-bibtexextra
index 0598aabad72..39d78fc1ea8 100644
--- a/Master/texmf/lists/collection-bibtexextra
+++ b/Master/texmf/lists/collection-bibtexextra
@@ -7,6 +7,7 @@
 +biblist
 +bibtopic
 +bibunits
++collection-latex
 +compactbib
 +custom-bib
 +doipubmed
@@ -19,7 +20,6 @@
 +multibib
 +perception
 +urlbst
-+collection-latex
 
 
 texmf/tpm/collection-bibtexextra.tpm
diff --git a/Master/texmf/lists/collection-binextra b/Master/texmf/lists/collection-binextra
index fec94185c91..5d694bca09c 100644
--- a/Master/texmf/lists/collection-binextra
+++ b/Master/texmf/lists/collection-binextra
@@ -1,8 +1,5 @@
 *Title: TeX auxiliary programs
 *Size: 103888
-+cweb
-+mkind-english
-+mltex
 +bin-bibtex8
 +bin-chktex
 +bin-ctie
@@ -22,6 +19,9 @@
 +bin-tie
 +bin-web
 +collection-basic
++cweb
++mkind-english
++mltex
 
 
 texmf/tpm/collection-binextra.tpm
diff --git a/Master/texmf/lists/collection-chemistry b/Master/texmf/lists/collection-chemistry
index 9587794915c..eb714f03b97 100644
--- a/Master/texmf/lists/collection-chemistry
+++ b/Master/texmf/lists/collection-chemistry
@@ -5,9 +5,9 @@
 +chemcompounds
 +chemcono
 +chemsym
++collection-basic
 +mhchem
 +xymtex
-+collection-basic
 
 
 texmf/tpm/collection-chemistry.tpm
diff --git a/Master/texmf/lists/collection-context b/Master/texmf/lists/collection-context
index 725ba7b653d..d2b360413b6 100644
--- a/Master/texmf/lists/collection-context
+++ b/Master/texmf/lists/collection-context
@@ -1,10 +1,10 @@
 *Title: ConText macro package
 *Size: 12070948
-+context
-+jmn
 +bin-context
 +collection-basic
 +collection-pdfetex
++context
++jmn
 
 
 texmf/tpm/collection-context.tpm
diff --git a/Master/texmf/lists/collection-documentation-bulgarian b/Master/texmf/lists/collection-documentation-bulgarian
index 5d1d34e3816..7b767aba392 100644
--- a/Master/texmf/lists/collection-documentation-bulgarian
+++ b/Master/texmf/lists/collection-documentation-bulgarian
@@ -1,7 +1,7 @@
 *Title: Bulgarian documentation
 *Size: 2613587
-+lshort-bulgarian
 +collection-documentation-base
++lshort-bulgarian
 
 
 texmf/tpm/collection-documentation-bulgarian.tpm
diff --git a/Master/texmf/lists/collection-documentation-czechslovak b/Master/texmf/lists/collection-documentation-czechslovak
index 1873ab8d08d..18ba0851d98 100644
--- a/Master/texmf/lists/collection-documentation-czechslovak
+++ b/Master/texmf/lists/collection-documentation-czechslovak
@@ -1,9 +1,9 @@
 *Title: Czechslovak documentation
 *Size: 8863951
++collection-documentation-base
 +cstug
 +lshort-slovak
 +texlive-cz
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-czechslovak.tpm
diff --git a/Master/texmf/lists/collection-documentation-dutch b/Master/texmf/lists/collection-documentation-dutch
index 8d6309b5944..89649461dd7 100644
--- a/Master/texmf/lists/collection-documentation-dutch
+++ b/Master/texmf/lists/collection-documentation-dutch
@@ -1,9 +1,9 @@
 *Title: Dutch documentation
 *Size: 3252205
++collection-documentation-base
 +lkort
 +lshort-dutch
 +ntg
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-dutch.tpm
diff --git a/Master/texmf/lists/collection-documentation-english b/Master/texmf/lists/collection-documentation-english
index ff09eb8b079..e8bbba5671e 100644
--- a/Master/texmf/lists/collection-documentation-english
+++ b/Master/texmf/lists/collection-documentation-english
@@ -4,6 +4,7 @@
 +Type1fonts
 +amslatex-primer
 +catalogue
++collection-documentation-base
 +components-of-TeX
 +comprehensive
 +dtxtut
@@ -32,7 +33,6 @@
 +truetype
 +webguide
 +wp-conv
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-english.tpm
diff --git a/Master/texmf/lists/collection-documentation-finnish b/Master/texmf/lists/collection-documentation-finnish
index 132e0e4b92a..3bb63ad8f56 100644
--- a/Master/texmf/lists/collection-documentation-finnish
+++ b/Master/texmf/lists/collection-documentation-finnish
@@ -1,7 +1,7 @@
 *Title: Finnish documentation
 *Size: 2431994
-+lshort-finnish
 +collection-documentation-base
++lshort-finnish
 
 
 texmf/tpm/collection-documentation-finnish.tpm
diff --git a/Master/texmf/lists/collection-documentation-french b/Master/texmf/lists/collection-documentation-french
index 8d73dcd800e..508af1c9cdb 100644
--- a/Master/texmf/lists/collection-documentation-french
+++ b/Master/texmf/lists/collection-documentation-french
@@ -1,12 +1,12 @@
 *Title: French documentation
 *Size: 10864886
 +FAQ-fr
++collection-documentation-base
 +epslatex-fr
 +impatient-fr
 +l2tabu-french
 +lshort-french
 +texlive-fr
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-french.tpm
diff --git a/Master/texmf/lists/collection-documentation-german b/Master/texmf/lists/collection-documentation-german
index fb141d58227..4bf5f4392df 100644
--- a/Master/texmf/lists/collection-documentation-german
+++ b/Master/texmf/lists/collection-documentation-german
@@ -1,13 +1,13 @@
 *Title: German documentation
 *Size: 7029009
 +FAQ-ge
++collection-documentation-base
 +kopka
 +l2tabu
 +latex-tipps-und-tricks
 +lshort-german
 +texlive-ge
 +voss-de
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-german.tpm
diff --git a/Master/texmf/lists/collection-documentation-greek b/Master/texmf/lists/collection-documentation-greek
index 080d6b33e27..9a8e24ff16b 100644
--- a/Master/texmf/lists/collection-documentation-greek
+++ b/Master/texmf/lists/collection-documentation-greek
@@ -1,8 +1,8 @@
 *Title: Greek documentation
 *Size: 3896893
++collection-documentation-base
 +gentle-gr
 +gtf
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-greek.tpm
diff --git a/Master/texmf/lists/collection-documentation-italian b/Master/texmf/lists/collection-documentation-italian
index 4b5a73dcdb9..bd8be3340f5 100644
--- a/Master/texmf/lists/collection-documentation-italian
+++ b/Master/texmf/lists/collection-documentation-italian
@@ -3,10 +3,10 @@
 +amsldoc-it
 +amsmath-it
 +amsthdoc-it
++collection-documentation-base
 +fancyhdr-it
 +l2tabu-it
 +lshort-italian
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-italian.tpm
diff --git a/Master/texmf/lists/collection-documentation-japanese b/Master/texmf/lists/collection-documentation-japanese
index 672de81f970..dbd7e71bbec 100644
--- a/Master/texmf/lists/collection-documentation-japanese
+++ b/Master/texmf/lists/collection-documentation-japanese
@@ -1,7 +1,7 @@
 *Title: Japanese documentation
 *Size: 1348074
-+lshort-japanese
 +collection-documentation-base
++lshort-japanese
 
 
 texmf/tpm/collection-documentation-japanese.tpm
diff --git a/Master/texmf/lists/collection-documentation-korean b/Master/texmf/lists/collection-documentation-korean
index 840f0828f64..545ca3f1b31 100644
--- a/Master/texmf/lists/collection-documentation-korean
+++ b/Master/texmf/lists/collection-documentation-korean
@@ -1,7 +1,7 @@
 *Title: Korean documentation
 *Size: 1140614
-+lshort-korean
 +collection-documentation-base
++lshort-korean
 
 
 texmf/tpm/collection-documentation-korean.tpm
diff --git a/Master/texmf/lists/collection-documentation-mongolian b/Master/texmf/lists/collection-documentation-mongolian
index c707a2eef55..8e6601db597 100644
--- a/Master/texmf/lists/collection-documentation-mongolian
+++ b/Master/texmf/lists/collection-documentation-mongolian
@@ -1,7 +1,7 @@
 *Title: Mongolian documentation
 *Size: 32830
-+lshort-mongolian
 +collection-documentation-base
++lshort-mongolian
 
 
 texmf/tpm/collection-documentation-mongolian.tpm
diff --git a/Master/texmf/lists/collection-documentation-polish b/Master/texmf/lists/collection-documentation-polish
index 71ddb5e9a2f..1a2fe093937 100644
--- a/Master/texmf/lists/collection-documentation-polish
+++ b/Master/texmf/lists/collection-documentation-polish
@@ -1,10 +1,10 @@
 *Title: Polish documentation
 *Size: 7453358
++collection-documentation-base
 +guides-pl
 +lshort-polish
 +tex-virtual-academy-pl
 +texlive-pl
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-polish.tpm
diff --git a/Master/texmf/lists/collection-documentation-portuguese b/Master/texmf/lists/collection-documentation-portuguese
index 44a8f94f64f..0de0ccd1313 100644
--- a/Master/texmf/lists/collection-documentation-portuguese
+++ b/Master/texmf/lists/collection-documentation-portuguese
@@ -1,7 +1,7 @@
 *Title: Portuguese documentation
 *Size: 1480032
-+lshort-portuguese
 +collection-documentation-base
++lshort-portuguese
 
 
 texmf/tpm/collection-documentation-portuguese.tpm
diff --git a/Master/texmf/lists/collection-documentation-russian b/Master/texmf/lists/collection-documentation-russian
index 309749b285c..53ac8f5f2ec 100644
--- a/Master/texmf/lists/collection-documentation-russian
+++ b/Master/texmf/lists/collection-documentation-russian
@@ -1,8 +1,8 @@
 *Title: Russian documentation
 *Size: 5188067
++collection-documentation-base
 +lshort-russian
 +texlive-ru
-+collection-documentation-base
 
 
 texmf/tpm/collection-documentation-russian.tpm
diff --git a/Master/texmf/lists/collection-documentation-spanish b/Master/texmf/lists/collection-documentation-spanish
index f4483704a0d..c1ceefe630d 100644
--- a/Master/texmf/lists/collection-documentation-spanish
+++ b/Master/texmf/lists/collection-documentation-spanish
@@ -1,7 +1,7 @@
 *Title: Spanish documentation
 *Size: 741621
-+lshort-spanish
 +collection-documentation-base
++lshort-spanish
 
 
 texmf/tpm/collection-documentation-spanish.tpm
diff --git a/Master/texmf/lists/collection-documentation-thai b/Master/texmf/lists/collection-documentation-thai
index 865a859757f..458f595286f 100644
--- a/Master/texmf/lists/collection-documentation-thai
+++ b/Master/texmf/lists/collection-documentation-thai
@@ -1,7 +1,7 @@
 *Title: Thai documentation
 *Size: 548008
-+lshort-thai
 +collection-documentation-base
++lshort-thai
 
 
 texmf/tpm/collection-documentation-thai.tpm
diff --git a/Master/texmf/lists/collection-documentation-ukrainian b/Master/texmf/lists/collection-documentation-ukrainian
index 1fcddb81b9c..f963ad12fdd 100644
--- a/Master/texmf/lists/collection-documentation-ukrainian
+++ b/Master/texmf/lists/collection-documentation-ukrainian
@@ -1,7 +1,7 @@
 *Title: Ukrainian documentation
 *Size: 2615427
-+lshort-ukrainian
 +collection-documentation-base
++lshort-ukrainian
 
 
 texmf/tpm/collection-documentation-ukrainian.tpm
diff --git a/Master/texmf/lists/collection-documentation-vietnamese b/Master/texmf/lists/collection-documentation-vietnamese
index 045f6a8b9cd..f72f96cd57c 100644
--- a/Master/texmf/lists/collection-documentation-vietnamese
+++ b/Master/texmf/lists/collection-documentation-vietnamese
@@ -1,9 +1,9 @@
 *Title: Vietnamese documentation
 *Size: 6556055
-+powerdot-doc-vn
 +amsldoc-vn
-+lshort-vietnamese
 +collection-documentation-base
++lshort-vietnamese
++powerdot-doc-vn
 
 
 texmf/tpm/collection-documentation-vietnamese.tpm
diff --git a/Master/texmf/lists/collection-fontbin b/Master/texmf/lists/collection-fontbin
index 6b1e7f7419e..c3558e30dbb 100644
--- a/Master/texmf/lists/collection-fontbin
+++ b/Master/texmf/lists/collection-fontbin
@@ -1,11 +1,11 @@
 *Title: TeX font-related programs
 *Size: 5663234
-+fontinst
-+mft
 +bin-afm2pl
 +bin-fontware
 +bin-ps2pkm
 +collection-basic
++fontinst
++mft
 
 
 texmf/tpm/collection-fontbin.tpm
diff --git a/Master/texmf/lists/collection-fontsextra b/Master/texmf/lists/collection-fontsextra
index c55214da8ce..99bf746735f 100644
--- a/Master/texmf/lists/collection-fontsextra
+++ b/Master/texmf/lists/collection-fontsextra
@@ -1,5 +1,5 @@
 *Title: Extra fonts
-*Size: 242597571
+*Size: 242597570
 +accfonts
 +ai
 +albertus
@@ -37,6 +37,7 @@
 +cmastro
 +cmbright
 +cmpica
++collection-basic
 +coronet
 +courier-scaled
 +cryst
@@ -126,7 +127,6 @@
 +wsuipa
 +yfonts
 +zefonts
-+collection-basic
 
 
 texmf/tpm/collection-fontsextra.tpm
diff --git a/Master/texmf/lists/collection-fontsrecommended b/Master/texmf/lists/collection-fontsrecommended
index 4f679d040e4..2030777b52f 100644
--- a/Master/texmf/lists/collection-fontsrecommended
+++ b/Master/texmf/lists/collection-fontsrecommended
@@ -4,6 +4,7 @@
 +avantgar
 +bookman
 +cmextra
++collection-basic
 +courier
 +euro
 +euro-ce
@@ -27,7 +28,6 @@
 +wasysym
 +zapfchan
 +zapfding
-+collection-basic
 
 
 texmf/tpm/collection-fontsrecommended.tpm
diff --git a/Master/texmf/lists/collection-formatsextra b/Master/texmf/lists/collection-formatsextra
index 43abad60fe3..09fb7a28ee2 100644
--- a/Master/texmf/lists/collection-formatsextra
+++ b/Master/texmf/lists/collection-formatsextra
@@ -1,6 +1,10 @@
 *Title: Extra formats
 *Size: 5191926
 +alatex
++bin-physe
++bin-phyzzx
++bin-texsis
++collection-basic
 +edmac
 +eplain
 +lamstex
@@ -10,10 +14,6 @@
 +startex
 +texsis
 +ytex
-+bin-physe
-+bin-phyzzx
-+bin-texsis
-+collection-basic
 
 
 texmf/tpm/collection-formatsextra.tpm
diff --git a/Master/texmf/lists/collection-games b/Master/texmf/lists/collection-games
index 9be93d1f39b..87b344050fc 100644
--- a/Master/texmf/lists/collection-games
+++ b/Master/texmf/lists/collection-games
@@ -5,13 +5,13 @@
 +cchess
 +cheq
 +chess
++collection-latex
 +egameps
 +go
 +othello
 +psgo
 +sgame
 +skak
-+collection-latex
 
 
 texmf/tpm/collection-games.tpm
diff --git a/Master/texmf/lists/collection-genericextra b/Master/texmf/lists/collection-genericextra
index 49f12f345e8..60222be4b3b 100644
--- a/Master/texmf/lists/collection-genericextra
+++ b/Master/texmf/lists/collection-genericextra
@@ -6,6 +6,7 @@
 +barr
 +borceux
 +c-pascal
++collection-basic
 +colorsep
 +dinat
 +eijkhout
@@ -20,7 +21,6 @@
 +realcalc
 +vrb
 +vtex
-+collection-basic
 
 
 texmf/tpm/collection-genericextra.tpm
diff --git a/Master/texmf/lists/collection-genericrecommended b/Master/texmf/lists/collection-genericrecommended
index 8b4ada67f48..d678908795b 100644
--- a/Master/texmf/lists/collection-genericrecommended
+++ b/Master/texmf/lists/collection-genericrecommended
@@ -1,9 +1,9 @@
 *Title: Miscellaneous generic macros
 *Size: 437005
++collection-basic
 +epsf
 +genmisc
 +multido
-+collection-basic
 
 
 texmf/tpm/collection-genericrecommended.tpm
diff --git a/Master/texmf/lists/collection-htmlxml b/Master/texmf/lists/collection-htmlxml
index 7aca296a5ed..9af1551820a 100644
--- a/Master/texmf/lists/collection-htmlxml
+++ b/Master/texmf/lists/collection-htmlxml
@@ -1,10 +1,5 @@
 *Title: HTML/SGML/XML support
 *Size: 9665924
-+jadetex
-+passivetex
-+tex4ht
-+xmlplay
-+xmltex
 +bin-jadetex
 +bin-tex4htk
 +bin-xmltex
@@ -12,6 +7,11 @@
 +collection-fontsrecommended
 +collection-latex
 +collection-pdfetex
++jadetex
++passivetex
++tex4ht
++xmlplay
++xmltex
 
 
 texmf/tpm/collection-htmlxml.tpm
diff --git a/Master/texmf/lists/collection-langafrican b/Master/texmf/lists/collection-langafrican
index b1d1ed86204..4d612b9d376 100644
--- a/Master/texmf/lists/collection-langafrican
+++ b/Master/texmf/lists/collection-langafrican
@@ -1,8 +1,8 @@
 *Title: African scripts
 *Size: 7893092
++collection-basic
 +ethiop
 +fc
-+collection-basic
 
 
 texmf/tpm/collection-langafrican.tpm
diff --git a/Master/texmf/lists/collection-langcjk b/Master/texmf/lists/collection-langcjk
index 8a0f9242644..31955d7aa22 100644
--- a/Master/texmf/lists/collection-langcjk
+++ b/Master/texmf/lists/collection-langcjk
@@ -2,16 +2,16 @@
 *Size: 47184930
 +CJK
 +arphic
++bin-cjkutils
 +c90enc
 +cns
++collection-basic
 +garuda
++hyphen-pinyin
 +norasi
 +uhc
 +wadalab
 +yi4latex
-+bin-cjkutils
-+collection-basic
-+hyphen-pinyin
 
 
 texmf/tpm/collection-langcjk.tpm
diff --git a/Master/texmf/lists/collection-langcroatian b/Master/texmf/lists/collection-langcroatian
index 575533dcf68..a4279ce68d0 100644
--- a/Master/texmf/lists/collection-langcroatian
+++ b/Master/texmf/lists/collection-langcroatian
@@ -1,7 +1,7 @@
 *Title: Croatian
 *Size: 313314
-+croatian
 +collection-basic
++croatian
 +hyphen-croatian
 
 
diff --git a/Master/texmf/lists/collection-langcyrillic b/Master/texmf/lists/collection-langcyrillic
index a730c09af3d..d8935b36ff4 100644
--- a/Master/texmf/lists/collection-langcyrillic
+++ b/Master/texmf/lists/collection-langcyrillic
@@ -1,11 +1,16 @@
 *Title: Cyrillic
 *Size: 8703870
 +bghyph
++bin-cyrillic
 +cmcyr
 +cmcyralt
++collection-basic
 +cyrillic
 +cyrplain
 +gost
++hyphen-bulgarian
++hyphen-russian
++hyphen-ukrainian
 +lh
 +lhcyr
 +literat
@@ -14,11 +19,6 @@
 +t2
 +timescyr
 +ukrhyph
-+bin-cyrillic
-+collection-basic
-+hyphen-bulgarian
-+hyphen-russian
-+hyphen-ukrainian
 
 
 texmf/fmtutil/format.cyramstex.cnf
diff --git a/Master/texmf/lists/collection-langczechslovak b/Master/texmf/lists/collection-langczechslovak
index 5cc136cc73e..656bb1a3d85 100644
--- a/Master/texmf/lists/collection-langczechslovak
+++ b/Master/texmf/lists/collection-langczechslovak
@@ -1,14 +1,14 @@
 *Title: Czech/Slovak
 *Size: 2740301
-+cs
-+cslatex
-+csplain
 +bin-cslatex
 +bin-csplain
 +bin-vlna
 +collection-basic
 +collection-latex
 +collection-pdfetex
++cs
++cslatex
++csplain
 +hyphen-czechslovak
 
 
diff --git a/Master/texmf/lists/collection-langfinnish b/Master/texmf/lists/collection-langfinnish
index 8799cf467f0..b1c45ea9459 100644
--- a/Master/texmf/lists/collection-langfinnish
+++ b/Master/texmf/lists/collection-langfinnish
@@ -1,7 +1,7 @@
 *Title: Finnish
 *Size: 27176
-+finbib
 +collection-basic
++finbib
 +hyphen-finnish
 
 
diff --git a/Master/texmf/lists/collection-langfrench b/Master/texmf/lists/collection-langfrench
index 2759e7f26b2..5e75b06f616 100644
--- a/Master/texmf/lists/collection-langfrench
+++ b/Master/texmf/lists/collection-langfrench
@@ -1,10 +1,10 @@
 *Title: French
 *Size: 905522
 +aeguill
-+le
 +collection-basic
 +hyphen-basque
 +hyphen-french
++le
 
 
 texmf/tpm/collection-langfrench.tpm
diff --git a/Master/texmf/lists/collection-langgerman b/Master/texmf/lists/collection-langgerman
index c120f4bfb05..9bf7bd830a4 100644
--- a/Master/texmf/lists/collection-langgerman
+++ b/Master/texmf/lists/collection-langgerman
@@ -1,14 +1,14 @@
 *Title: German
 *Size: 2414052
++collection-basic
 +german
 +germbib
++hyphen-german
 +jura
 +jurabib
 +mkind-german
 +r-und-s
 +umlaute
-+collection-basic
-+hyphen-german
 
 
 texmf/tpm/collection-langgerman.tpm
diff --git a/Master/texmf/lists/collection-langgreek b/Master/texmf/lists/collection-langgreek
index 462505bbb69..2adb300bf95 100644
--- a/Master/texmf/lists/collection-langgreek
+++ b/Master/texmf/lists/collection-langgreek
@@ -2,10 +2,13 @@
 *Size: 12428663
 +betababel
 +cb
++collection-basic
 +greek
 +greektex
 +grtimes
 +grverb
++hyphen-greek
++hyphen-ibycus
 +ibycus
 +ibycus-babel
 +ibygrk
@@ -15,9 +18,6 @@
 +lgreek
 +teubner
 +yannisgr
-+collection-basic
-+hyphen-greek
-+hyphen-ibycus
 
 
 texmf/tpm/collection-langgreek.tpm
diff --git a/Master/texmf/lists/collection-langindic b/Master/texmf/lists/collection-langindic
index 1f7f22fe9b7..4036a7259cc 100644
--- a/Master/texmf/lists/collection-langindic
+++ b/Master/texmf/lists/collection-langindic
@@ -1,8 +1,10 @@
 *Title: Indic
-*Size: 14481142
+*Size: 14481141
 +bangtex
 +bengali
++bin-devnag
 +burmese
++collection-basic
 +devanagr
 +itrans
 +malayalam
@@ -10,8 +12,6 @@
 +sanskrit
 +wnri
 +wntamil
-+bin-devnag
-+collection-basic
 
 
 texmf/tpm/collection-langindic.tpm
diff --git a/Master/texmf/lists/collection-langmanju b/Master/texmf/lists/collection-langmanju
index ece1b12180f..5fee513edfe 100644
--- a/Master/texmf/lists/collection-langmanju
+++ b/Master/texmf/lists/collection-langmanju
@@ -1,7 +1,7 @@
 *Title: Manju
 *Size: 79870
-+manjutex
 +collection-basic
++manjutex
 
 
 texmf/tpm/collection-langmanju.tpm
diff --git a/Master/texmf/lists/collection-langmongolian b/Master/texmf/lists/collection-langmongolian
index f856f73ba7d..505f0e26111 100644
--- a/Master/texmf/lists/collection-langmongolian
+++ b/Master/texmf/lists/collection-langmongolian
@@ -1,9 +1,9 @@
 *Title: Mongolian
 *Size: 5197350
-+montex
-+soyombo
 +collection-basic
 +hyphen-mongolian
++montex
++soyombo
 
 
 texmf/tpm/collection-langmongolian.tpm
diff --git a/Master/texmf/lists/collection-langpolish b/Master/texmf/lists/collection-langpolish
index 64c4f0b18b8..d59da729711 100644
--- a/Master/texmf/lists/collection-langpolish
+++ b/Master/texmf/lists/collection-langpolish
@@ -2,8 +2,12 @@
 *Size: 52238995
 +antp
 +antt
++bin-mex
++bin-platex
 +cc-pl
++collection-latex
 +gustlib
++hyphen-polish
 +iwona
 +mex
 +mwcls
@@ -14,10 +18,6 @@
 +qtx
 +tap
 +utf8mex
-+bin-mex
-+bin-platex
-+collection-latex
-+hyphen-polish
 
 
 texmf/tpm/collection-langpolish.tpm
diff --git a/Master/texmf/lists/collection-langswedish b/Master/texmf/lists/collection-langswedish
index 224126f209c..a8cadb5afd2 100644
--- a/Master/texmf/lists/collection-langswedish
+++ b/Master/texmf/lists/collection-langswedish
@@ -1,8 +1,8 @@
 *Title: Swedish
 *Size: 63991
-+swebib
 +collection-basic
 +hyphen-swedish
++swebib
 
 
 texmf/tpm/collection-langswedish.tpm
diff --git a/Master/texmf/lists/collection-langtibetan b/Master/texmf/lists/collection-langtibetan
index b85cd5d9d6d..8aaab44378b 100644
--- a/Master/texmf/lists/collection-langtibetan
+++ b/Master/texmf/lists/collection-langtibetan
@@ -1,8 +1,8 @@
 *Title: Tibetan
 *Size: 2089602
++collection-basic
 +ctib
 +otibet
-+collection-basic
 
 
 texmf/tpm/collection-langtibetan.tpm
diff --git a/Master/texmf/lists/collection-langvietnamese b/Master/texmf/lists/collection-langvietnamese
index 3ba78e8eef9..5255a472c39 100644
--- a/Master/texmf/lists/collection-langvietnamese
+++ b/Master/texmf/lists/collection-langvietnamese
@@ -1,8 +1,8 @@
 *Title: Vietnamese
 *Size: 7771562
++collection-basic
 +plnfss
 +vntex
-+collection-basic
 
 
 texmf/tpm/collection-langvietnamese.tpm
diff --git a/Master/texmf/lists/collection-latex b/Master/texmf/lists/collection-latex
index f6399945606..53ef5192437 100644
--- a/Master/texmf/lists/collection-latex
+++ b/Master/texmf/lists/collection-latex
@@ -4,7 +4,9 @@
 +amslatex
 +babel
 +babelbib
++bin-latex
 +carlisle
++collection-pdfetex
 +colortbl
 +fancyhdr
 +geometry
@@ -17,8 +19,6 @@
 +pslatex
 +psnfss
 +tools
-+bin-latex
-+collection-pdfetex
 
 
 texmf/tpm/collection-latex.tpm
diff --git a/Master/texmf/lists/collection-latex3 b/Master/texmf/lists/collection-latex3
index 72acf5ff034..f601f002eb1 100644
--- a/Master/texmf/lists/collection-latex3
+++ b/Master/texmf/lists/collection-latex3
@@ -1,5 +1,6 @@
 *Title: Experiment LaTeX3 packages
 *Size: 1354280
++collection-latex
 +galley
 +template
 +xinitials
@@ -8,7 +9,6 @@
 +xtab
 +xtcapts
 +xtheorem
-+collection-latex
 
 
 texmf/tpm/collection-latex3.tpm
diff --git a/Master/texmf/lists/collection-latexextra b/Master/texmf/lists/collection-latexextra
index 1f345586521..3a660426008 100644
--- a/Master/texmf/lists/collection-latexextra
+++ b/Master/texmf/lists/collection-latexextra
@@ -39,6 +39,7 @@
 +bezos
 +bibleref
 +bigfoot
++bin-perltex
 +biocon
 +bitfield
 +bizcard
@@ -70,6 +71,7 @@
 +cmdtrack
 +cmsd
 +codepage
++collection-latex
 +colorinfo
 +combine
 +comment
@@ -544,8 +546,6 @@
 +youngtab
 +yplan
 +zed-csp
-+bin-perltex
-+collection-latex
 
 
 texmf/tpm/collection-latexextra.tpm
diff --git a/Master/texmf/lists/collection-latexrecommended b/Master/texmf/lists/collection-latexrecommended
index 71a72af4fc4..7398c1831d1 100644
--- a/Master/texmf/lists/collection-latexrecommended
+++ b/Master/texmf/lists/collection-latexrecommended
@@ -6,6 +6,7 @@
 +caption
 +cite
 +citeref
++collection-latex
 +crop
 +ctable
 +ec
@@ -38,7 +39,6 @@
 +ucs
 +xcolor
 +xkeyval
-+collection-latex
 
 
 texmf/tpm/collection-latexrecommended.tpm
diff --git a/Master/texmf/lists/collection-mathextra b/Master/texmf/lists/collection-mathextra
index 43190cda230..6109d60d2b3 100644
--- a/Master/texmf/lists/collection-mathextra
+++ b/Master/texmf/lists/collection-mathextra
@@ -2,8 +2,11 @@
 *Size: 5330512
 +12many
 +amstex
++bin-amstex
 +breqn
 +ccfonts
++collection-fontsrecommended
++collection-latex
 +commath
 +concmath
 +concrete
@@ -20,9 +23,6 @@
 +venn
 +xfrac
 +yhmath
-+bin-amstex
-+collection-fontsrecommended
-+collection-latex
 
 
 texmf/tpm/collection-mathextra.tpm
diff --git a/Master/texmf/lists/collection-metapost b/Master/texmf/lists/collection-metapost
index a938201d1a0..cac14b1f75f 100644
--- a/Master/texmf/lists/collection-metapost
+++ b/Master/texmf/lists/collection-metapost
@@ -1,5 +1,7 @@
 *Title: MetaPost (and Metafont) drawing packages
 *Size: 10254253
++bin-metapost
++collection-basic
 +expressg
 +exteps
 +featpost
@@ -15,8 +17,6 @@
 +piechartmp
 +roex
 +slideshow
-+bin-metapost
-+collection-basic
 
 
 texmf/tpm/collection-metapost.tpm
diff --git a/Master/texmf/lists/collection-music b/Master/texmf/lists/collection-music
index 4ad148fe0f1..bec76a799f5 100644
--- a/Master/texmf/lists/collection-music
+++ b/Master/texmf/lists/collection-music
@@ -1,12 +1,12 @@
 *Title: Music typesetting
 *Size: 9804570
++bin-musixflx
++collection-latex
 +guitar
 +musictex
 +musixlyr
 +musixps
 +musixtex
-+bin-musixflx
-+collection-latex
 
 
 texmf/tpm/collection-music.tpm
diff --git a/Master/texmf/lists/collection-omega b/Master/texmf/lists/collection-omega
index 7c1de34f633..2bc21f70594 100644
--- a/Master/texmf/lists/collection-omega
+++ b/Master/texmf/lists/collection-omega
@@ -1,15 +1,15 @@
 *Title: Omega
 *Size: 8208901
 +antomega
++bin-aleph
++bin-omega
++bin-omegaware
++collection-basic
 +context-omega
 +lambda
 +mxd
 +mxedruli
 +omega
-+bin-aleph
-+bin-omega
-+bin-omegaware
-+collection-basic
 
 
 texmf/tpm/collection-omega.tpm
diff --git a/Master/texmf/lists/collection-pdfetex b/Master/texmf/lists/collection-pdfetex
index 2b618650577..592a33ae5ca 100644
--- a/Master/texmf/lists/collection-pdfetex
+++ b/Master/texmf/lists/collection-pdfetex
@@ -1,6 +1,11 @@
 *Title: pdfTeX
 *Size: 9405909
++bin-pdftools
++bin-ppower4
++bin-thumbpdf
++bin-xpdf
 +cmap
++collection-basic
 +etex
 +ifmslide
 +pdf-trans
@@ -14,11 +19,6 @@
 +ppower4
 +texpower
 +xbmc
-+bin-pdftools
-+bin-ppower4
-+bin-thumbpdf
-+bin-xpdf
-+collection-basic
 
 
 texmf/tpm/collection-pdfetex.tpm
diff --git a/Master/texmf/lists/collection-pictures b/Master/texmf/lists/collection-pictures
index 477eaa365e5..8f2eedf5195 100644
--- a/Master/texmf/lists/collection-pictures
+++ b/Master/texmf/lists/collection-pictures
@@ -1,6 +1,7 @@
 *Title: Drawing and graphing packages
 *Size: 21985297
 +bardiag
++collection-basic
 +dcpic
 +dottex
 +dratex
@@ -18,7 +19,6 @@
 +swimgraf
 +texdraw
 +xypic
-+collection-basic
 
 
 texmf/tpm/collection-pictures.tpm
diff --git a/Master/texmf/lists/collection-plainextra b/Master/texmf/lists/collection-plainextra
index 0a1a76755ad..e17671f18df 100644
--- a/Master/texmf/lists/collection-plainextra
+++ b/Master/texmf/lists/collection-plainextra
@@ -1,6 +1,7 @@
 *Title: Plain TeX supplementary packages
 *Size: 2608200
 +cellular
++collection-basic
 +colortab
 +jsmisc
 +newsletr
@@ -9,7 +10,6 @@
 +treetex
 +typespec
 +vertex
-+collection-basic
 
 
 texmf/tpm/collection-plainextra.tpm
diff --git a/Master/texmf/lists/collection-pstricks b/Master/texmf/lists/collection-pstricks
index 1f98c70558e..07e3a0c2706 100644
--- a/Master/texmf/lists/collection-pstricks
+++ b/Master/texmf/lists/collection-pstricks
@@ -1,5 +1,6 @@
 *Title: PSTricks packages
 *Size: 26612608
++collection-basic
 +makeplot
 +pst-3d
 +pst-3dplot
@@ -27,7 +28,6 @@
 +pst-vue3d
 +pstricks
 +pstricks-add
-+collection-basic
 
 
 texmf/tpm/collection-pstricks.tpm
diff --git a/Master/texmf/lists/collection-publishers b/Master/texmf/lists/collection-publishers
index 76a357d3538..342d88bc200 100644
--- a/Master/texmf/lists/collection-publishers
+++ b/Master/texmf/lists/collection-publishers
@@ -6,6 +6,7 @@
 +aguplus
 +aiaa
 +chem-journal
++collection-latex
 +elsevier
 +ieeepes
 +ifacmtg
@@ -18,7 +19,6 @@
 +siam
 +spie
 +uwthesis
-+collection-latex
 
 
 texmf/tpm/collection-publishers.tpm
diff --git a/Master/texmf/lists/collection-texinfo b/Master/texmf/lists/collection-texinfo
index eaade8e8508..aa7cc2a89ed 100644
--- a/Master/texmf/lists/collection-texinfo
+++ b/Master/texmf/lists/collection-texinfo
@@ -1,8 +1,8 @@
 *Title: GNU Texinfo
 *Size: 258309
-+texinfo
 +bin-texinfo
 +collection-basic
++texinfo
 
 
 texmf/tpm/collection-texinfo.tpm