Some scheme/collection rearranging; discussion at thread from

http://tug.org/pipermail/tex-live/2017-May/040053.html.

collection-langother: move contents of c-langafrican and c-langindic here,
and remove those two.

collection-plaingeneric: new collection, comprising the previous
c-plainextra, c-genericextra, and c-genericrecommended, and tex4ht.

collection-htmlxml, collection-omega: remove, constituent packages
mostly moved to c-formatsextra.

collection-latexextra: gets classpack from c-htmlxml.
collection-latexrecommended: gets lwarp from c-htmlxml.

scheme-full, scheme-gust, scheme-medium, scheme-text: adjust
dependencies such that all existing dependencies will still be satisfied.

scheme-xml: remove, as most of these packages are old, and context has
its own scheme.


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

17 files changed, 84 insertions, 147 deletions

diff --git a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
index 9fdd7469ad7..d920d0a39e2 100644
--- a/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-formatsextra.tlpsrc
@@ -3,13 +3,29 @@ shortdesc Additional formats
 longdesc Collected TeX `formats', i.e., large-scale macro packages
 longdesc designed to be dumped into .fmt files -- excluding the most common
 longdesc ones, such as latex and context, which have their own package(s).
+longdesc It also includes the Aleph engine and related Omega formats and
+longdesc packages.
 #
 depend collection-basic
+depend collection-latex
 #
 depend edmac
 depend eplain
+depend jadetex
 depend lollipop
 depend mltex
+depend passivetex
 depend psizzl
 depend startex
 depend texsis
+depend xmltex
+depend xmltexconfig
+#
+# Omega/Aleph.
+depend aleph
+depend antomega
+depend lambda
+depend mxedruli
+depend omega
+depend omegaware
+depend otibet
diff --git a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
deleted file mode 100644
index 37b43ca9d7d..00000000000
--- a/Master/tlpkg/tlpsrc/collection-genericrecommended.tlpsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-category Collection
-shortdesc Generic recommended packages
-longdesc Recommended packages that work with multiple formats.
-#
-depend collection-basic
-#
-depend apnum
-depend epsf
-depend fontname
-depend genmisc
-depend kastrup
-depend multido
-depend path
-depend tex-ps
-depend ulem
diff --git a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
deleted file mode 100644
index 7c91bf4a2ee..00000000000
--- a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-category Collection
-shortdesc HTML/SGML/XML support
-longdesc Packages to convert LaTeX to XML/HTML, and typeset XML/SGML.
-#
-depend collection-basic
-depend collection-fontsrecommended
-depend collection-latex
-#
-depend classpack
-depend jadetex
-depend lwarp
-depend passivetex
-depend tex4ht
-depend xmltex
-depend xmltexconfig
diff --git a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc b/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
deleted file mode 100644
index ff65bbf054a..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langafrican.tlpsrc
+++ /dev/null
@@ -1,10 +0,0 @@
-category Collection
-shortdesc African scripts
-longdesc Support for African scripts.
-#
-depend collection-basic
-#
-depend ethiop
-depend ethiop-t1
-depend fc
-depend hyphen-ethiopic
diff --git a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc b/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
deleted file mode 100644
index ba7284893d1..00000000000
--- a/Master/tlpkg/tlpsrc/collection-langindic.tlpsrc
+++ /dev/null
@@ -1,19 +0,0 @@
-category Collection
-shortdesc Indic scripts
-longdesc Support for Indic scripts.
-#
-depend collection-basic
-#
-depend bangtex
-depend latexbangla
-depend bengali
-depend burmese
-depend ebong
-depend hyphen-indic
-depend hyphen-sanskrit
-depend sanskrit
-depend sanskrit-t1
-depend velthuis
-depend wnri
-depend wnri-latex
-depend xetex-devanagari
diff --git a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
index 13d4fead04f..ca9068da8aa 100644
--- a/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-langother.tlpsrc
@@ -1,9 +1,10 @@
 category Collection
 shortdesc Other languages
-longdesc Support for languages not otherwise listed, including Thai,
-longdesc Vietnamese, Hebrew, Indonesian, and plenty more.  The split is
-longdesc made simply on the basis of the size of the support, to keep
-longdesc both collection sizes and the number of collections reasonable.
+longdesc Support for languages not otherwise listed, including Indic,
+longdesc Thai, Vietnamese, Hebrew, Indonesian, African languages, and
+longdesc plenty more.  The split is made simply on the basis of the size
+longdesc of the support, to keep both collection sizes and the number of
+longdesc collections reasonable.
 #
 depend collection-basic
 # 
@@ -18,20 +19,37 @@ depend babel-malay
 depend babel-sorbian
 depend babel-thai
 depend babel-vietnamese
+depend bangtex
+depend bengali
+depend burmese
 depend cjhebrew
 depend ctib
+depend ebong
+depend ethiop
+depend ethiop-t1
+depend fc
 depend fonts-tlwg
 depend hyphen-afrikaans
 depend hyphen-coptic
 depend hyphen-esperanto
+depend hyphen-ethiopic
 depend hyphen-georgian
+depend hyphen-indic
 depend hyphen-indonesian
 depend hyphen-interlingua
+depend hyphen-sanskrit
 depend hyphen-thai
 depend hyphen-turkmen
+depend latexbangla
 depend lshort-thai
 depend lshort-vietnamese
 depend ntheorem-vn
 depend padauk
+depend sanskrit
+depend sanskrit-t1
 depend thaienum
+depend velthuis
 depend vntex
+depend wnri
+depend wnri-latex
+depend xetex-devanagari
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index a7e9fafe63b..dac74564472 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -149,6 +149,7 @@ depend chngcntr
 depend chronology
 depend circ
 depend classics
+depend classpack
 depend clefval
 depend cleveref
 depend clipboard
diff --git a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
index cf5a00d2c57..16bc9626c5e 100644
--- a/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexrecommended.tlpsrc
@@ -36,6 +36,7 @@ depend l3kernel
 depend l3packages
 depend lineno
 depend listings
+depend lwarp
 depend mathspec
 depend mathtools
 depend mdwtools
diff --git a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc b/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
deleted file mode 100644
index 60bdf8c2806..00000000000
--- a/Master/tlpkg/tlpsrc/collection-omega.tlpsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-category Collection
-shortdesc Omega packages
-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 omegaware
-depend otibet
diff --git a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
deleted file mode 100644
index 476a3d5145b..00000000000
--- a/Master/tlpkg/tlpsrc/collection-plainextra.tlpsrc
+++ /dev/null
@@ -1,30 +0,0 @@
-category Collection
-shortdesc Plain TeX packages
-longdesc Add-on packages and macros that work with plain TeX.
-#
-depend collection-basic
-#
-depend epsf-dvipdfmx
-depend figflow
-depend fixpdfmag
-depend font-change
-depend fontch
-depend getoptk
-depend gfnotation
-depend graphics-pln
-depend hyplain
-depend js-misc
-depend mkpattern
-depend newsletr
-depend pitex
-depend placeins-plain
-depend plipsum
-depend plnfss
-depend plstmary
-depend present
-depend resumemac
-depend texinfo
-depend timetable
-depend treetex
-depend varisize
-depend xii
diff --git a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc
index 2616220ffe5..569237886f7 100644
--- a/Master/tlpkg/tlpsrc/collection-genericextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-plaingeneric.tlpsrc
@@ -1,12 +1,13 @@
 category Collection
-shortdesc Generic additional packages
-longdesc Extra packages that work with multiple formats, typically both
-longdesc TeX and LaTeX.
+shortdesc Plain (La)TeX packages
+longdesc Add-on packages and macros that work with plain TeX,
+longdesc often LaTeX, and occasionally other formats.
 #
 depend collection-basic
 #
 depend abbr
 depend abstyles
+depend apnum
 depend autoaligne
 depend barr
 depend bitelist
@@ -22,16 +23,30 @@ depend dowith
 depend eijkhout
 depend encxvlna
 depend epigram
+depend epsf
+depend epsf-dvipdfmx
 depend fenixpar
+depend figflow
+depend fixpdfmag
 depend fltpoint
 depend fntproof
+depend font-change
+depend fontch
+depend fontname
 depend gates
+depend genmisc
+depend getoptk
+depend gfnotation
 depend gobble
+depend graphics-pln
 depend gtl
 depend hlist
+depend hyplain
 depend ifetex
 depend iftex
 depend insbox
+depend js-misc
+depend kastrup
 depend lambda-lists
 depend langcode
 depend lecturer
@@ -40,20 +55,39 @@ depend listofitems
 depend mathdots
 depend metatex
 depend midnight
+depend mkpattern
+depend multido
 depend navigator
+depend newsletr
 depend ofs
 depend olsak-misc
+depend path
 depend pdf-trans
+depend pitex
+depend placeins-plain
 depend plainpkg
+depend plipsum
+depend plnfss
+depend plstmary
+depend present
 depend randomlist
+depend resumemac
 depend schemata
 depend shade
 depend systeme
 depend tabto-generic
 depend termmenu
+depend tex-ps
+depend tex4ht
+depend texapi
+depend texinfo
+depend timetable
 depend tracklang
+depend treetex
 depend trigonometry
-depend texapi
+depend ulem
 depend upca
+depend varisize
+depend xii
 depend xlop
 depend yax
diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
index 50d4e0f72d1..df73e5f040e 100644
--- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
@@ -3,7 +3,7 @@ shortdesc PSTricks
 longdesc PSTricks core and all add-on packages.
 #
 depend collection-basic
-depend collection-genericrecommended
+depend collection-plaingeneric
 #
 depend auto-pst-pdf
 depend bclogo
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index f6274556356..36d85801f24 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -10,11 +10,7 @@ depend collection-fontsrecommended
 depend collection-formatsextra
 depend collection-fontutils
 depend collection-games
-depend collection-genericextra
-depend collection-genericrecommended
-depend collection-htmlxml
 depend collection-humanities
-depend collection-langafrican
 depend collection-langarabic
 depend collection-langchinese
 depend collection-langcjk
@@ -25,7 +21,6 @@ depend collection-langeuropean
 depend collection-langfrench
 depend collection-langgerman
 depend collection-langgreek
-depend collection-langindic
 depend collection-langitalian
 depend collection-langjapanese
 depend collection-langkorean
@@ -40,9 +35,8 @@ depend collection-luatex
 depend collection-mathscience
 depend collection-metapost
 depend collection-music
-depend collection-omega
 depend collection-pictures
-depend collection-plainextra
+depend collection-plaingeneric
 depend collection-pstricks
 depend collection-publishers
 depend collection-texworks
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index 74e2215e60d..0ad0b3e3c3e 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -31,10 +31,10 @@ depend collection-basic
 depend collection-context
 depend collection-fontutils
 depend collection-fontsrecommended
-depend collection-genericrecommended
 depend collection-langpolish
 depend collection-latex
 depend collection-latexrecommended
 depend collection-metapost
+depend collection-plaingeneric
 depend collection-texworks
 depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
index 035570c5074..a195efbf2b3 100644
--- a/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-medium.tlpsrc
@@ -8,7 +8,6 @@ depend collection-binextra
 depend collection-context
 depend collection-fontsrecommended
 depend collection-fontutils
-depend collection-genericrecommended
 depend collection-langczechslovak
 depend collection-langenglish
 depend collection-langeuropean
@@ -23,6 +22,6 @@ depend collection-latexrecommended
 depend collection-luatex
 depend collection-mathscience
 depend collection-metapost
-depend collection-plainextra
+depend collection-plaingeneric
 depend collection-texworks
 depend collection-xetex
diff --git a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
index dc5554db5e3..3a27300924c 100644
--- a/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-tetex.tlpsrc
@@ -43,7 +43,6 @@ depend collection-basic
 depend collection-context
 depend collection-fontsrecommended
 depend collection-fontutils
-depend collection-genericrecommended
 depend collection-langcjk
 depend collection-langcyrillic
 depend collection-langczechslovak
@@ -61,7 +60,7 @@ depend collection-latex
 depend collection-latexrecommended
 depend collection-mathscience
 depend collection-metapost
-depend collection-omega
+depend collection-otherformats
 depend collection-pictures
-depend collection-plainextra
+depend collection-plaingeneric
 depend collection-pstricks
diff --git a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
deleted file mode 100644
index d7fd996efb6..00000000000
--- a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
+++ /dev/null
@@ -1,21 +0,0 @@
-category Scheme
-shortdesc XML scheme
-longdesc This contains the things you need to do XML-related work,
-longdesc including PassiveTeX, JadeTeX, ConTeXt and Omega.
-depend context
-depend jadetex
-depend ltxmisc
-depend marvosym
-depend metapost
-depend passivetex
-depend stmaryrd
-depend tex4ht
-depend tipa
-depend ucs
-depend wasy
-depend wasysym
-depend xmltex
-depend collection-basic
-depend collection-fontsrecommended
-depend collection-latex
-depend collection-omega