/home/texlive/karl/Master/tlpkg/bin/tl-update-auto

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

4 files changed, 485 insertions, 302 deletions

diff --git a/Master/doc.html b/Master/doc.html
index ab6102ef21f..b20436d9bdb 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -2348,6 +2348,10 @@ LaTeX support for the fonts DejaVu.
 <a href="texmf-dist/doc/fonts/dejavu/dejavu.pdf">dejavu.pdf</a>.
 </small></li>
 
+<li><b><a href="texmf-dist/doc/latex/delim">delim</a></b>:<small>
+<a href="texmf-dist/doc/latex/delim/delim.pdf">delim.pdf</a>.
+</small></li>
+
 <li><b><a href="texmf-dist/doc/latex/delimtxt">delimtxt</a></b>:<small>
 Read and parse text tables.
 <a href="texmf-dist/doc/latex/delimtxt/delimtxt.pdf">delimtxt.pdf</a>.
@@ -2657,7 +2661,7 @@ Construct Dynkin tree diagrams.
 
 <h2 id="letter-E">E</h2>
 
-<ol start="415">
+<ol start="416">
 
 <li><b><a href="texmf-dist/doc/latex/ean13isbn">ean13isbn</a></b>:<small>
 Print EAN13 for ISBN.
@@ -3223,7 +3227,7 @@ Extend the standard classes' size options.
 
 <h2 id="letter-F">F</h2>
 
-<ol start="514">
+<ol start="515">
 
 <li><b><a href="texmf-dist/doc/latex/facsimile">facsimile</a></b>:<small>
 Document class for preparing faxes.
@@ -3748,7 +3752,7 @@ Get first and last words of a page.
 
 <h2 id="letter-G">G</h2>
 
-<ol start="603">
+<ol start="604">
 
 <li><b><a href="texmf-dist/doc/latex/g-brief">g-brief</a></b>:<small>
 Letter document class.
@@ -4088,7 +4092,7 @@ Macros for typesetting the GuIT logo.
 
 <h2 id="letter-H">H</h2>
 
-<ol start="661">
+<ol start="662">
 
 <li><b><a href="texmf-dist/doc/latex/HA-prosper">HA-prosper</a></b>:<small>
 Patches and improvements for prosper.
@@ -4280,7 +4284,7 @@ Basic support for multiple languages in Plain TeX.
 
 <h2 id="letter-I">I</h2>
 
-<ol start="693">
+<ol start="694">
 
 <li><b><a href="texmf-dist/doc/latex/ibycus-babel">ibycus-babel</a></b>:<small>
 Use the Ibycus 4 Greek font with Babel
@@ -4538,7 +4542,7 @@ A two-element sans-serif font.
 
 <h2 id="letter-J">J</h2>
 
-<ol start="738">
+<ol start="739">
 
 <li><b><a href="texmf-dist/doc/fonts/jablantile">jablantile</a></b>:<small>
 Metafont version of tiles in the style of Slavik Jablan.
@@ -4638,7 +4642,7 @@ A replacement for LaTeX's verbatim package.
 
 <h2 id="letter-K">K</h2>
 
-<ol start="752">
+<ol start="753">
 
 <li><b><a href="texmf-dist/doc/latex/karnaugh">karnaugh</a></b>:<small>
 Typeset Karnaugh-Veitch-maps.
@@ -4763,7 +4767,7 @@ A two-element sans-serif typeface.
 
 <h2 id="letter-L">L</h2>
 
-<ol start="767">
+<ol start="768">
 
 <li><b><a href="texmf-dist/doc/latex/l2picfaq">l2picfaq</a></b>:<small>
 LaTeX pictures "how-to" (German).
@@ -5544,7 +5548,7 @@ Set of slide fonts based on CM.
 
 <h2 id="letter-M">M</h2>
 
-<ol start="884">
+<ol start="885">
 
 <li><b><a href="texmf-dist/doc/latex/macqassign">macqassign</a></b>:<small>
 Typeset assignments for Macquarie University.
@@ -6445,7 +6449,7 @@ Build a format based on the preamble of a LaTeX file.
 
 <h2 id="letter-N">N</h2>
 
-<ol start="1011">
+<ol start="1012">
 
 <li><b><a href="texmf-dist/doc/latex/nag">nag</a></b>:<small>
 Detecting and warning about obsolete LaTeX commands
@@ -6721,7 +6725,7 @@ Print numbers with separators and exponent if necessary.
 
 <h2 id="letter-O">O</h2>
 
-<ol start="1053">
+<ol start="1054">
 
 <li><b><a href="texmf-dist/doc/latex/oberdiek">oberdiek</a></b>:<small>
 A bundle of packages submitted by Heiko Oberdiek.
@@ -6977,7 +6981,7 @@ Combine LaTeX commands over included graphics.
 
 <h2 id="letter-P">P</h2>
 
-<ol start="1077">
+<ol start="1078">
 
 <li><b><a href="texmf-dist/doc/latex/pagecolor">pagecolor</a></b>:<small>
 Interrogate page colour.
@@ -8227,7 +8231,7 @@ Virtual maths alphabets based on pxfonts and txfonts.
 
 <h2 id="letter-Q">Q</h2>
 
-<ol start="1272">
+<ol start="1273">
 
 <li><b><a href="texmf-dist/doc/latex/qcm">qcm</a></b>:<small>
 A LaTeX2e class for making multiple choice questionnaires
@@ -8271,7 +8275,7 @@ Consistent quote marks.
 
 <h2 id="letter-R">R</h2>
 
-<ol start="1279">
+<ol start="1280">
 
 <li><b><a href="texmf-dist/doc/latex/randbild">randbild</a></b>:<small>
 Marginal pictures.
@@ -8499,7 +8503,7 @@ Class for Ryerson Unversity Graduate School requirements.
 
 <h2 id="letter-S">S</h2>
 
-<ol start="1318">
+<ol start="1319">
 
 <li><b><a href="texmf-dist/doc/latex/sageep">sageep</a></b>:<small>
 Format papers for the annual meeting of EEGS.
@@ -9328,7 +9332,7 @@ Format systems of equations.
 
 <h2 id="letter-T">T</h2>
 
-<ol start="1448">
+<ol start="1449">
 
 <li><b><a href="texmf-dist/doc/latex/t-angles">t-angles</a></b>:<small>
 Draw tangles, trees, Hopf algebra operations and other pictures.
@@ -10511,7 +10515,7 @@ Print a typographic grid.
 
 <h2 id="letter-U">U</h2>
 
-<ol start="1599">
+<ol start="1600">
 
 <li><b><a href="texmf-dist/doc/latex/uaclasses">uaclasses</a></b>:<small>
 University of Arizona thesis and dissertation format.
@@ -10687,7 +10691,7 @@ University of Washington thesis class.
 
 <h2 id="letter-V">V</h2>
 
-<ol start="1630">
+<ol start="1631">
 
 <li><b><a href="texmf-dist/doc/bibtex/vancouver">vancouver</a></b>:<small>
 Bibliographic style file for Biomedical Journals.
@@ -10844,7 +10848,7 @@ Variable-width multiple text columns.
 
 <h2 id="letter-W">W</h2>
 
-<ol start="1656">
+<ol start="1657">
 
 <li><b><a href="texmf-dist/doc/fonts/wadalab">wadalab</a></b>:<small>
 Wadalab (Japanese) font packages.
@@ -10926,7 +10930,7 @@ Produces figures which text can flow around.
 
 <h2 id="letter-X">X</h2>
 
-<ol start="1670">
+<ol start="1671">
 
 <li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small>
 Define commands with many optional arguments.
@@ -11155,7 +11159,7 @@ Tree macros using XY-Pic.
 
 <h2 id="letter-Y">Y</h2>
 
-<ol start="1705">
+<ol start="1706">
 
 <li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small>
 A bundle of miscellaneous footnote packages.
@@ -11203,7 +11207,7 @@ Many-featured Young tableaux and Young diagrams.
 
 <h2 id="letter-Z">Z</h2>
 
-<ol start="1713">
+<ol start="1714">
 
 <li><b><a href="texmf-dist/doc/latex/zed-csp">zed-csp</a></b>:<small>
 Typesetting Z and CSP format specifications.
diff --git a/Master/readme-txt.dir/README.EN b/Master/readme-txt.dir/README.EN
index 9b35cb605ee..57df5113991 100644
--- a/Master/readme-txt.dir/README.EN
+++ b/Master/readme-txt.dir/README.EN
@@ -88,14 +88,14 @@ Welcome to TeX Live
 
 References
 
-   1. file:LICENSE.TL
-   2. file:LICENSE.CTAN
-   3. file:texlive-doc
-   4. file:texmf/doc/texlive/texlive-en
-   5. file:texmf/doc/texlive/texlive-en/texlive-en.html
-   6. file:texmf/doc/texlive/texlive-en/texlive-en.pdf
-   7. file:texmf/doc/texlive/
-   8. file:doc.html
+   1. file:tlua/LICENSE.TL
+   2. file:tlua/LICENSE.CTAN
+   3. file:tlua/texlive-doc
+   4. file:tlua/texmf/doc/texlive/texlive-en
+   5. file:tlua/texmf/doc/texlive/texlive-en/texlive-en.html
+   6. file:tlua/texmf/doc/texlive/texlive-en/texlive-en.pdf
+   7. file:tlua/texmf/doc/texlive/
+   8. file:tlua/doc.html
    9. http://tug.org/texlive/doc.html
   10. http://tug.org/texlive/doc/install-tl.html
   11. http://tug.org/texlive/tlmgr.html
diff --git a/Master/texmf/scripts/texlive/var/texcatalogue.keywords b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
index 26750116b07..f1000d3e108 100644
--- a/Master/texmf/scripts/texlive/var/texcatalogue.keywords
+++ b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
@@ -5,6 +5,9 @@ $taxonomy = {
         'graphics created inside TeX (pictures, PSTricks, PGF, etc.)',
         'Humanities'
       ],
+      'gitinfo' => [
+        'make, compilation systems'
+      ],
       'eqell' => [
         'punctuation'
       ],
@@ -1648,6 +1651,9 @@ $taxonomy = {
         'macro programming',
         'spacing, horizontal or vertical'
       ],
+      'xcite' => [
+        'cross references'
+      ],
       'marginnote' => [
         'marginal material'
       ],
@@ -2363,6 +2369,9 @@ $taxonomy = {
       'latex' => [
         'macro programming'
       ],
+      'amsmidx' => [
+        'index, indexing'
+      ],
       'hrhyph' => [
         'hyphenation'
       ],
@@ -2536,6 +2545,9 @@ $taxonomy = {
       'bigsign' => [
         'document style'
       ],
+      'bickham' => [
+        'font selection'
+      ],
       'auncial-new' => [
         'fonts, mathematics'
       ],
@@ -2637,6 +2649,9 @@ $taxonomy = {
         'MetaFont, Metapost',
         'symbols, mathematical'
       ],
+      'tagging' => [
+        'make, compilation systems'
+      ],
       'bigfoot' => [
         'footnotes, end notes',
         'Humanities'
@@ -3648,6 +3663,9 @@ $taxonomy = {
       'js-misc' => [
         'macro programming'
       ],
+      'sidenotes' => [
+        'marginal material'
+      ],
       'graphicp' => [
         'graphics created inside TeX (pictures, PSTricks, PGF, etc.)',
         'graphics from outside TeX'
@@ -5130,6 +5148,9 @@ $taxonomy = {
       'gmverse' => [
         'quotation, poetry'
       ],
+      'serbian-def-cyr' => [
+        'languages other than English'
+      ],
       'newapa' => [
         'bibliography, formatting',
         'document style',
@@ -5171,6 +5192,9 @@ $taxonomy = {
         'external programs, interfacing',
         'tables'
       ],
+      'translation-europecv-de' => [
+        'vita, CV, resume'
+      ],
       'pstdoc' => [
         'help, documentation, FAQ'
       ],
@@ -5343,6 +5367,10 @@ $taxonomy = {
       'EndNote2bib' => [
         'bibliography, management'
       ],
+      'lapdf' => [
+        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)',
+        'output format PDF, PostScript'
+      ],
       'anleitung' => [
         'fonts, mathematics',
         'help, documentation, FAQ'
@@ -5385,6 +5413,9 @@ $taxonomy = {
       'makebox' => [
         'macro programming'
       ],
+      'impnattypo' => [
+        'languages other than English'
+      ],
       'enumspec' => [
         'lists, bullets'
       ],
@@ -5497,6 +5528,9 @@ $taxonomy = {
       'ltxdiff' => [
         'make, compilation systems'
       ],
+      'coseoul' => [
+        'chapters, sectioning'
+      ],
       'biblatex-nature' => [
         'bibliography, formatting',
         'Physics, Chemistry, Biology',
@@ -5618,6 +5652,10 @@ $taxonomy = {
       'firststeps-xampl' => [
         'help, documentation, FAQ'
       ],
+      'context-gantt' => [
+        'Computer Science',
+        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)'
+      ],
       'dviincl' => [
         'DVI file manipulation',
         'MetaFont, Metapost'
@@ -6445,6 +6483,9 @@ $taxonomy = {
       'parboxx' => [
         'boxed text, frames'
       ],
+      'nowidow' => [
+        'page breaks'
+      ],
       'calendarweek' => [
         'calendar, schedule'
       ],
@@ -7262,6 +7303,9 @@ $taxonomy = {
         'include file',
         'macro programming'
       ],
+      'rviewport' => [
+        'graphics from outside TeX'
+      ],
       'cropmrks' => [
         'proof sheets (typographical)'
       ],
@@ -8249,6 +8293,10 @@ $taxonomy = {
       'magyar' => [
         'hyphenation'
       ],
+      'braids' => [
+        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)',
+        'Mathematics (the subject)'
+      ],
       'bracketkey' => [
         'Physics, Chemistry, Biology'
       ],
@@ -8280,6 +8328,10 @@ $taxonomy = {
       'svn-multi' => [
         'make, compilation systems'
       ],
+      'tikz-cd' => [
+        'commutative diagrams',
+        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)'
+      ],
       'wrapfig' => [
         'wrap around a figure'
       ],
@@ -8922,6 +8974,9 @@ $taxonomy = {
       'showtags' => [
         'bibliography, formatting'
       ],
+      'persian-modern' => [
+        'fonts, text'
+      ],
       'fixlatvian' => [
         'languages other than English'
       ],
@@ -9071,11 +9126,6 @@ $taxonomy = {
       'outliner' => [
         'chapters, sectioning'
       ],
-      'xypdf' => [
-        'commutative diagrams',
-        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)',
-        'output format PDF, PostScript'
-      ],
       'quoting' => [
         'quotation, poetry'
       ],
@@ -9720,6 +9770,9 @@ $taxonomy = {
       'acroterm' => [
         'abbreviations, acronyms'
       ],
+      'showhyphens' => [
+        'hyphenation'
+      ],
       'fontsmpl' => [
         'font selection'
       ],
@@ -9781,12 +9834,12 @@ $taxonomy = {
       'show2e' => [
         'macro programming'
       ],
-      'draftmark' => [
-        'watermark, draftmark'
-      ],
       'mathtime-ltx' => [
         'font selection'
       ],
+      'draftmark' => [
+        'watermark, draftmark'
+      ],
       'arabtex' => [
         'fonts, mathematics',
         'languages other than English'
@@ -9993,12 +10046,12 @@ $taxonomy = {
         'editing, graphical work environment',
         'graphics from outside TeX'
       ],
-      'eppstein-trees' => [
-        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)'
-      ],
       'auto1' => [
         'fonts, text'
       ],
+      'eppstein-trees' => [
+        'graphics created inside TeX (pictures, PSTricks, PGF, etc.)'
+      ],
       'textoolspro' => [
         'help, documentation, FAQ',
         'literate programming'
@@ -10192,6 +10245,10 @@ $taxonomy = {
       'tex-implementors' => [
         'help, documentation, FAQ'
       ],
+      'opensans' => [
+        'font selection',
+        'fonts, text'
+      ],
       'lualatex-math' => [
         'Mathematics (the subject)'
       ],
@@ -11695,6 +11752,9 @@ $taxonomy = {
         'figures, floating matter',
         'paper size, orientation'
       ],
+      'facture' => [
+        'document style'
+      ],
       'varsfromjobname' => [
         'macro programming'
       ],
@@ -12023,6 +12083,9 @@ $taxonomy = {
       'context-typescripts' => [
         'font selection'
       ],
+      'translation-chemsym-de' => [
+        'help, documentation, FAQ'
+      ],
       'zefonts' => [
         'fonts, text'
       ],
@@ -12114,6 +12177,9 @@ $taxonomy = {
       'ncccomma' => [
         'symbols, mathematical'
       ],
+      'translation-arsclassica-de' => [
+        'help, documentation, FAQ'
+      ],
       'compsci' => [
         'macro programming'
       ],
@@ -12121,6 +12187,9 @@ $taxonomy = {
         'encodings, Unicode',
         'languages other than English'
       ],
+      'xindy-persian' => [
+        'index, indexing'
+      ],
       'abc' => [
         'music'
       ],
@@ -12578,6 +12647,10 @@ $taxonomy = {
       'play' => [
         'document style'
       ],
+      'biblatex-nejm' => [
+        'bibliography, formatting',
+        'publisher\'s style'
+      ],
       'tabbingbox' => [
         'boxed text, frames'
       ],
@@ -15988,6 +16061,8 @@ $taxonomy = {
           Uncharacterized',
       'EndNote2bib' => '
           Uncharacterized',
+      'lapdf' => 'Graphics > Postscript or
+          PDF graphics',
       'anleitung' => '
           Uncharacterized',
       'cm-afm' => '
@@ -18266,6 +18341,8 @@ $taxonomy = {
           Uncharacterized',
       'showtags' => '
           Uncharacterized',
+      'persian-modern' => 'Non-English languages >
+          Other',
       'fixlatvian' => '
           Uncharacterized',
       'crosswrd' => '
@@ -18374,8 +18451,6 @@ $taxonomy = {
           Uncharacterized',
       'outliner' => '
           Uncharacterized',
-      'xypdf' => 'Tools > PDF
-          tools',
       'begriff' => '
           Uncharacterized',
       'letter-plain' => '
@@ -20662,6 +20737,8 @@ $taxonomy = {
     'primary' => {
       'xytree' => 'Subject-specific typesetting
           > Linguistics',
+      'gitinfo' => 'Tools > Document
+          management',
       'eqell' => '
           Uncharacterized',
       'tipa-de' => 'Fonts > Symbol
@@ -21044,6 +21121,7 @@ $taxonomy = {
           systems',
       'gnuplottex' => 'Graphics > Inside
           TeX',
+      'ctanupload' => 'Other',
       'cassette' => 'Document types > Other >
           CD and DVD covers',
       'pfm2afm' => 'Fonts > Font
@@ -21671,6 +21749,8 @@ $taxonomy = {
           manipulation',
       'hwkatakana' => '
           Uncharacterized',
+      'xcite' => 'Page-focused >
+          Citations',
       'marginnote' => 'Page-focused > Material in
           margins',
       'mm' => 'Fonts > Font
@@ -22109,6 +22189,8 @@ $taxonomy = {
           Uncharacterized',
       'latex' => 'Programming in
           TeX',
+      'amsmidx' => 'Document parts >
+          Index',
       'hrhyph' => 'Infrastructure >
           Hyphenation',
       'gradback' => 'Page-focused >
@@ -22223,6 +22305,8 @@ $taxonomy = {
           slides',
       'bigsign' => 'Document types > Other >
           Posters',
+      'bickham' => 'Fonts > Support
+          files',
       'auncial-new' => 'Fonts > Text body
           fonts',
       'knitting' => 'Subject-specific typesetting
@@ -22283,6 +22367,8 @@ $taxonomy = {
           Tools',
       'cchess' => 'Document types > Other >
           Other games',
+      'tagging' => 'Tools > Document
+          management',
       'bigfoot' => 'Page-focused >
           Footnotes',
       'fontload' => 'Output > PDF,
@@ -22900,6 +22986,8 @@ $taxonomy = {
           shells',
       'js-misc' => 'Programming in TeX >
           Other',
+      'sidenotes' => 'Page-focused > Material in
+          margins',
       'graphicp' => 'Graphics >
           Tools',
       'exam209' => 'Document types > Exams,
@@ -23781,6 +23869,8 @@ $taxonomy = {
           manipulation',
       'gmverse' => 'Page-focused >
           Poetry',
+      'serbian-def-cyr' => 'Non-English languages >
+          Other',
       'newapa' => 'Document parts >
           Bibliography > Bibliographic styles',
       'uebungsblatt' => 'Document types > Exams,
@@ -23801,6 +23891,8 @@ $taxonomy = {
           Hyphenation',
       'xl2latex' => 'Tools > Convert
           formats',
+      'translation-europecv-de' => 'Document types > Curriculum
+          Vita',
       'pstdoc' => 'Documentation > Help
           files',
       'pdfcolparcolumns' => 'Page-focused > Multiple
@@ -23902,6 +23994,8 @@ $taxonomy = {
           Other',
       'EndNote2bib' => 'Tools > Bibliographic
           manipulation',
+      'lapdf' => 'Graphics > Inside
+          TeX',
       'anleitung' => 'Documentation >
           Tutorial',
       'cm-afm' => 'Fonts > Symbol
@@ -23930,6 +24024,8 @@ $taxonomy = {
           manipulation',
       'ccfonts' => 'Fonts > Support
           files',
+      'impnattypo' => 'Non-English languages >
+          French',
       'enumspec' => 'Page-focused >
           Lists',
       'latex2e-reference' => 'Documentation > Help
@@ -23942,10 +24038,10 @@ $taxonomy = {
           > Mathematics > Mathematical symbols',
       'magicnum' => 'Programming in TeX >
           Other',
-      'AeB Pro' => 'Output > PDF,
-          PostScript',
       'emtrees' => '
           Uncharacterized',
+      'AeB Pro' => 'Output > PDF,
+          PostScript',
       'gaceta' => 'Document types > Articles
           > Journal styles',
       'wasy2' => 'Fonts > Symbol
@@ -24004,6 +24100,8 @@ $taxonomy = {
           Citations',
       'ltxdiff' => 'Tools > Document
           management',
+      'coseoul' => 'Document parts > Chapters
+          and Sections',
       'biblatex-nature' => 'Document parts >
           Bibliography > Bibliographic styles',
       'crosstex' => 'Document parts >
@@ -24080,6 +24178,8 @@ $taxonomy = {
           management',
       'firststeps-xampl' => 'Documentation >
           Other',
+      'context-gantt' => 'Graphics > Inside
+          TeX',
       'dviincl' => 'Graphics > MetaFont or
           Metapost',
       'webguide' => 'Documentation >
@@ -24566,6 +24666,8 @@ $taxonomy = {
           fonts',
       'parboxx' => 'Page-focused > Boxes and
           minipages',
+      'nowidow' => 'Page-focused >
+          Other',
       'calendarweek' => 'Document types > Other >
           Calendars',
       'cmyk-hax' => 'Page-focused >
@@ -25061,6 +25163,8 @@ $taxonomy = {
           fonts',
       'catchfile' => 'Programming in TeX >
           Other',
+      'rviewport' => 'Graphics >
+          Other',
       'cropmrks' => 'Page-focused > Page
           geometry',
       'sseq' => 'Graphics > Inside
@@ -25677,6 +25781,8 @@ $taxonomy = {
           Other',
       'magyar' => 'Infrastructure >
           Hyphenation',
+      'braids' => 'Graphics > Inside
+          TeX',
       'figbas' => 'Fonts >
           Other',
       'bracketkey' => 'Subject-specific typesetting
@@ -25699,6 +25805,8 @@ $taxonomy = {
           management',
       'softmaker-jugendstil' => 'Fonts > Support
           files',
+      'tikz-cd' => 'Subject-specific typesetting
+          > Mathematics > Commutative diagrams',
       'wrapfig' => 'Page-focused >
           Paragraphs',
       'mathspic' => 'Graphics > Inside
@@ -26103,6 +26211,8 @@ $taxonomy = {
           Tools',
       'showtags' => 'Document parts >
           Bibliography > Bibliographic styles',
+      'persian-modern' => 'Fonts > Text body
+          fonts',
       'fixlatvian' => 'Non-English languages >
           Other',
       'crosswrd' => 'Document types > Other >
@@ -26206,8 +26316,6 @@ $taxonomy = {
           fonts',
       'outliner' => 'Document parts > Chapters
           and Sections',
-      'xypdf' => 'Output > PDF,
-          PostScript',
       'quoting' => 'Page-focused >
           Other',
       'begriff' => 'Subject-specific typesetting
@@ -26599,6 +26707,8 @@ $taxonomy = {
       'checkend' => 'Programming in TeX >
           Other',
       'acroterm' => 'Other',
+      'showhyphens' => '
+          Uncharacterized',
       'fontsmpl' => 'Fonts > Font
           tools',
       'bartel-chess-fonts' => 'Fonts > Symbol
@@ -26681,10 +26791,10 @@ $taxonomy = {
           Memos',
       'chapterfolder' => 'Tools > Document
           management',
-      'encguide' => 'Documentation >
-          Other',
       'authblk' => 'Document parts >
           Other',
+      'encguide' => 'Documentation >
+          Other',
       'bidstobibtex' => 'Tools > Bibliographic
           manipulation',
       'bytefield' => 'Subject-specific typesetting
@@ -26896,6 +27006,8 @@ $taxonomy = {
           manipulation',
       'tex-implementors' => 'Documentation >
           Other',
+      'opensans' => 'Fonts > Text body
+          fonts',
       'lualatex-math' => 'Subject-specific typesetting
           > Mathematics > Other',
       'defstring' => 'Programming in TeX >
@@ -27421,10 +27533,10 @@ $taxonomy = {
           Other',
       'Metafont' => 'Graphics > MetaFont or
           Metapost',
-      'endfloat' => 'Page-focused >
-          Floats',
       'bondgraph' => 'Subject-specific typesetting
           > Other natural sciences',
+      'endfloat' => 'Page-focused >
+          Floats',
       'BibTeX-help' => 'Documentation > Help
           files',
       'mapcodes' => '
@@ -27799,6 +27911,8 @@ $taxonomy = {
           types',
       'side' => 'Page-focused >
           Floats',
+      'facture' => 'Document types > Other >
+          Misc',
       'varsfromjobname' => 'Programming in TeX >
           Other',
       'iching' => 'Document types > Other >
@@ -28007,6 +28121,8 @@ $taxonomy = {
           Thesis styles',
       'context-typescripts' => 'Fonts > Support
           files',
+      'translation-chemsym-de' => 'Documentation >
+          Other',
       'zefonts' => 'Fonts > Text body
           fonts',
       'gmverb' => 'Page-focused >
@@ -28070,6 +28186,8 @@ $taxonomy = {
           > Mathematics > Mathematical symbols',
       'gplot' => '
           Uncharacterized',
+      'translation-arsclassica-de' => 'Documentation >
+          Other',
       'compsci' => 'Documentation >
           Other',
       'cyrillic' => 'Fonts > Support
@@ -28078,6 +28196,8 @@ $taxonomy = {
           Other',
       'texlive-repo' => '
           Uncharacterized',
+      'xindy-persian' => 'Document parts >
+          Index',
       'abc' => 'Subject-specific typesetting
           > Music',
       'ANUfinalexam' => 'Document types > Exams,
@@ -28280,10 +28400,10 @@ $taxonomy = {
           and Sections',
       'keystroke' => 'Graphics >
           Other',
-      'encTeX' => 'Infrastructure >
-          Extensions',
       'circuitikz' => 'Subject-specific typesetting
           > Physics',
+      'encTeX' => 'Infrastructure >
+          Extensions',
       'marnote' => 'Page-focused > Material in
           margins',
       'csquotes-de' => 'Documentation >
@@ -28366,6 +28486,8 @@ $taxonomy = {
           tools',
       'play' => 'Document types > Other >
           Scripts',
+      'biblatex-nejm' => 'Document parts >
+          Bibliography > Bibliographic styles',
       'tabbingbox' => 'Page-focused > Boxes and
           minipages',
       'enumitem' => 'Page-focused >
@@ -28535,6 +28657,7 @@ $taxonomy = {
         'fundus',
         'yhmath',
         'lettergothic',
+        'bickham',
         'lh',
         'rsfso',
         'eiad-ltx',
@@ -28640,6 +28763,7 @@ $taxonomy = {
         'psgreek',
         'tmmath',
         'fundus-calligra',
+        'opensans',
         'yinit',
         'sauter',
         'mathabx',
@@ -28918,12 +29042,14 @@ $taxonomy = {
         'xetex-pstricks',
         'pst-fr3d',
         'latexcad',
+        'lapdf',
         'pst-3d',
         'diagmac2',
         'auto-pst-pdf',
         'expressg',
         'pict2e',
         'lpic',
+        'context-gantt',
         'pst-pdgr',
         'pst-fun',
         'pst-am',
@@ -28978,6 +29104,8 @@ $taxonomy = {
         'randomwalk',
         'pst-node',
         'pst-tree',
+        'braids',
+        'tikz-cd',
         'mathspic',
         'pst-gantt',
         'pmgraph',
@@ -28998,7 +29126,6 @@ $taxonomy = {
         'pst-stru',
         'JPicEdt',
         'multibox',
-        'xypdf',
         'pedigree-perl',
         'pst-thick',
         'tkz-linknodes',
@@ -29289,9 +29416,9 @@ $taxonomy = {
         'ams-cd',
         'xypic',
         'pb-diagram',
+        'tikz-cd',
         'amstex',
         'DCpic',
-        'xypdf',
         'amslatex-primer',
         'Array Maker',
         'borceux'
@@ -29314,6 +29441,7 @@ $taxonomy = {
         'sectionbox',
         'titlesec',
         'thumby',
+        'coseoul',
         'chapterbib',
         'hyperref',
         'secdot',
@@ -29655,6 +29783,7 @@ $taxonomy = {
         'ocr-a',
         'babyloniannum',
         'oriya',
+        'persian-modern',
         'testfont',
         'plfonts',
         'marvosym',
@@ -29673,6 +29802,7 @@ $taxonomy = {
         'script-font',
         'fundus-calligra',
         'SouthArabian',
+        'opensans',
         'sauter',
         'electrumadf',
         'sqrcaps',
@@ -29830,6 +29960,7 @@ $taxonomy = {
         'extsizes',
         'milstd',
         'memoir',
+        'facture',
         'petiteannonce',
         'minutes',
         'protocol',
@@ -29953,12 +30084,14 @@ $taxonomy = {
         'Bengali Omega',
         'luapersian',
         'wncyr',
+        'serbian-def-cyr',
         'slovak',
         'metre',
         'turkmen',
         'GFS Porson',
         'redis',
         'latin',
+        'impnattypo',
         'mongolian-babel',
         'combelow',
         'maltese',
@@ -30636,7 +30769,8 @@ $taxonomy = {
         'bibmods',
         'natbib',
         'Vancouver',
-        'sort-by-letters'
+        'sort-by-letters',
+        'biblatex-nejm'
       ],
       'proof sheets (typographical)' => [
         'crop',
@@ -30756,6 +30890,7 @@ $taxonomy = {
         'sanhyph',
         'fihyph',
         'hungarian',
+        'showhyphens',
         'caesarcm',
         'cahyph',
         'lithuanian',
@@ -30780,6 +30915,7 @@ $taxonomy = {
         'makeindexk',
         'forindex',
         'esindex',
+        'amsmidx',
         'csindex',
         'hvindex',
         'genindex',
@@ -30800,7 +30936,8 @@ $taxonomy = {
         'robustindex',
         'texindex',
         'luaindex',
-        'varindex'
+        'varindex',
+        'xindy-persian'
       ],
       'abbreviations, acronyms' => [
         'acromake',
@@ -31116,6 +31253,7 @@ $taxonomy = {
         'ps_conv',
         'interactiveworkbook',
         'pagedraw',
+        'lapdf',
         'psfragx',
         'AeB Pro',
         'oletex',
@@ -31192,7 +31330,6 @@ $taxonomy = {
         'animate',
         'AcroMemory',
         'pst-labo',
-        'xypdf',
         'dvipsk',
         'pst-thick',
         'ifpdf',
@@ -31329,6 +31466,7 @@ $taxonomy = {
         'todo',
         'saferef',
         'refcheck',
+        'xcite',
         'ut-backref',
         'drftcite',
         'fancyref',
@@ -32124,7 +32262,8 @@ $taxonomy = {
         'bgteubner',
         'computational-complexity',
         'estcpmm',
-        'amscls'
+        'amscls',
+        'biblatex-nejm'
       ],
       'URLs, hyperlinks' => [
         'hypdestopt',
@@ -32183,7 +32322,8 @@ $taxonomy = {
       'page breaks' => [
         'needspace',
         'nextpage',
-        'afterpage'
+        'afterpage',
+        'nowidow'
       ],
       'symbols, text' => [
         'tipa-de',
@@ -32269,6 +32409,7 @@ $taxonomy = {
         'magic'
       ],
       'make, compilation systems' => [
+        'gitinfo',
         'latex-make',
         'chktex',
         'mfpic',
@@ -32284,6 +32425,7 @@ $taxonomy = {
         'latexdiff',
         'testflow',
         'ldiff',
+        'tagging',
         'texlog_extract',
         'AutoLaTeX',
         'texdepend',
@@ -32572,6 +32714,7 @@ $taxonomy = {
         'wotree',
         'nassflow',
         'expressg',
+        'context-gantt',
         'siggraph',
         'lsc',
         'context-bnf',
@@ -33038,6 +33181,7 @@ $taxonomy = {
         'mathcmd',
         'vector',
         'mathlig',
+        'braids',
         'Nath',
         'turnstile',
         'amstex',
@@ -33162,6 +33306,7 @@ $taxonomy = {
         'thumbs',
         'marginote',
         'draft',
+        'sidenotes',
         'mparhack',
         'context-fixme',
         'titlesec',
@@ -33304,6 +33449,7 @@ $taxonomy = {
         'cv',
         'moderncv',
         'ECV',
+        'translation-europecv-de',
         'currvita',
         'CurVe',
         'esieecv',
@@ -33562,8 +33708,10 @@ $taxonomy = {
         'tds',
         'free-math-font-survey-vn',
         'l2tabu-italian',
+        'translation-chemsym-de',
         'latex-info',
         'l2tabu-spanish',
+        'translation-arsclassica-de',
         'fontsampler',
         'microtype-de',
         'codedoc',
@@ -33699,6 +33847,7 @@ $taxonomy = {
         'hilowres',
         'bm2font',
         'epsf',
+        'rviewport',
         'psfrag',
         'bbcard',
         'labelfig',
@@ -33839,6 +33988,12 @@ $taxonomy = {
     },
     'functionality' => {},
     'secondary' => {
+      'Non-English languages >
+          Other' => {
+        '_packages_' => [
+          'persian-modern'
+        ]
+      },
       'Programming in TeX >
           Other' => {
         '_packages_' => [
@@ -37920,7 +38075,6 @@ $taxonomy = {
             'pdfmarginpar',
             'epstopdf',
             'pdf-trans',
-            'xypdf',
             'thumbpdf',
             'pdftexcmds',
             'pdf14'
@@ -37947,6 +38101,7 @@ $taxonomy = {
           PDF graphics' => {
           '_packages_' => [
             'tkz-kiviat',
+            'lapdf',
             'tkz-berge',
             'pst-rubans'
           ]
@@ -38316,6 +38471,7 @@ $taxonomy = {
           'GuITlogo',
           'hilowres',
           'fullpict',
+          'rviewport',
           'overpic',
           'asymptote',
           'combinedgraphics',
@@ -38336,142 +38492,6 @@ $taxonomy = {
           'xetex-def'
         ]
       },
-      'Document parts >
-          Bibliography' => {
-        'Bibliographic styles' => {
-          '_packages_' => [
-            'biblatex-juradiss',
-            'dinat',
-            'jmb',
-            'abstyles-orig',
-            'nar',
-            'luabibentry',
-            'chicago',
-            'decsci',
-            'easybib',
-            'biblatex-mla',
-            'perception',
-            'hellas',
-            'aaai-named',
-            'swebib',
-            'development',
-            'alphanumb',
-            'humannat',
-            'dk-bib',
-            'persian-bib',
-            'chicago-annote',
-            'is-bst',
-            'mlbib',
-            'catalanbib',
-            'wmaainf',
-            'apabst',
-            'bibarts',
-            'Econometrica',
-            'biblatex-chicago',
-            'apalike2',
-            'ecclesiastic',
-            'finplain',
-            'biblatex-ieee',
-            'biblatex-historian',
-            'jneurosci',
-            'norbib',
-            'newapa',
-            'biblatex-nature',
-            'plainyr',
-            'biblatex-science',
-            'custom-bib',
-            'jphysiol',
-            'getrefs',
-            'biblatex-authoryear-icomp-tt',
-            'bibleref',
-            'biblatex-apa',
-            'PNAS',
-            'phy-bstyles',
-            'vak',
-            'ascelike',
-            'biblatex-philosophy',
-            'jas99_m',
-            'jbact',
-            'authordate',
-            'biblatex-dw',
-            'alphanum-bst',
-            'jqt1999',
-            'named',
-            'biblatex-jura',
-            'din1505',
-            'annotate',
-            'humanbio',
-            'jtb',
-            'chicagoa',
-            'oxford',
-            'rsc',
-            'bib-greek',
-            'showtags',
-            'jcc',
-            'spain',
-            'uni-wtal-ger',
-            'CJ',
-            'historische-zeitschrift',
-            'iopart-num',
-            'aichej',
-            'apacite',
-            'biblatex-chem',
-            'fbs',
-            'munich',
-            'annotation',
-            'automatica',
-            'chbibref',
-            'gost',
-            'IEEEannot',
-            'abstyles-babel',
-            'ijqc',
-            'ecta',
-            'neuron',
-            'bib-fr',
-            'these',
-            'economic',
-            'natbib',
-            'hypernat',
-            'Vancouver',
-            'jtbnew',
-            'sort-by-letters'
-          ]
-        },
-        'Others' => {
-          '_packages_' => [
-            'bibtopicprefix',
-            'footbib',
-            'chapterbib',
-            'margbib',
-            'namunsrt',
-            'bibunits',
-            'bibtopic',
-            'authorindex',
-            'librarian',
-            'bibentry',
-            'notes2bib',
-            'doipubmed',
-            'titles',
-            'urlbst',
-            'bibplain',
-            'backref'
-          ]
-        },
-        '_packages_' => [
-          'babelbib',
-          'chapref',
-          'bibtex',
-          'crosstex',
-          'multibbl',
-          'noTeX',
-          'amsrefs',
-          'biblatex',
-          'bibtex8bit',
-          'compactbib',
-          'multibib',
-          'bibmods'
-        ]
-      },
       'Tools' => {
         'PDF
           tools' => {
@@ -38543,6 +38563,7 @@ $taxonomy = {
         'Document
           management' => {
           '_packages_' => [
+            'gitinfo',
             'latex-make',
             'check',
             'proof',
@@ -38554,6 +38575,7 @@ $taxonomy = {
             'latexdiff',
             'testflow',
             'ldiff',
+            'tagging',
             'texlog_extract',
             'AutoLaTeX',
             'texdepend',
@@ -38800,6 +38822,143 @@ $taxonomy = {
           ]
         }
       },
+      'Document parts >
+          Bibliography' => {
+        'Bibliographic styles' => {
+          '_packages_' => [
+            'biblatex-juradiss',
+            'dinat',
+            'jmb',
+            'abstyles-orig',
+            'nar',
+            'luabibentry',
+            'chicago',
+            'decsci',
+            'easybib',
+            'biblatex-mla',
+            'perception',
+            'hellas',
+            'aaai-named',
+            'swebib',
+            'development',
+            'alphanumb',
+            'humannat',
+            'dk-bib',
+            'persian-bib',
+            'chicago-annote',
+            'is-bst',
+            'mlbib',
+            'catalanbib',
+            'wmaainf',
+            'apabst',
+            'bibarts',
+            'Econometrica',
+            'biblatex-chicago',
+            'apalike2',
+            'ecclesiastic',
+            'finplain',
+            'biblatex-ieee',
+            'biblatex-historian',
+            'jneurosci',
+            'norbib',
+            'newapa',
+            'biblatex-nature',
+            'plainyr',
+            'biblatex-science',
+            'custom-bib',
+            'jphysiol',
+            'getrefs',
+            'biblatex-authoryear-icomp-tt',
+            'bibleref',
+            'biblatex-apa',
+            'PNAS',
+            'phy-bstyles',
+            'vak',
+            'ascelike',
+            'biblatex-philosophy',
+            'jas99_m',
+            'jbact',
+            'authordate',
+            'biblatex-dw',
+            'alphanum-bst',
+            'jqt1999',
+            'named',
+            'biblatex-jura',
+            'din1505',
+            'annotate',
+            'humanbio',
+            'jtb',
+            'chicagoa',
+            'oxford',
+            'rsc',
+            'bib-greek',
+            'showtags',
+            'jcc',
+            'spain',
+            'uni-wtal-ger',
+            'CJ',
+            'historische-zeitschrift',
+            'iopart-num',
+            'aichej',
+            'apacite',
+            'biblatex-chem',
+            'fbs',
+            'munich',
+            'annotation',
+            'automatica',
+            'chbibref',
+            'gost',
+            'IEEEannot',
+            'abstyles-babel',
+            'ijqc',
+            'ecta',
+            'neuron',
+            'bib-fr',
+            'these',
+            'economic',
+            'natbib',
+            'hypernat',
+            'Vancouver',
+            'jtbnew',
+            'sort-by-letters',
+            'biblatex-nejm'
+          ]
+        },
+        'Others' => {
+          '_packages_' => [
+            'bibtopicprefix',
+            'footbib',
+            'chapterbib',
+            'margbib',
+            'namunsrt',
+            'bibunits',
+            'bibtopic',
+            'authorindex',
+            'librarian',
+            'bibentry',
+            'notes2bib',
+            'doipubmed',
+            'titles',
+            'urlbst',
+            'bibplain',
+            'backref'
+          ]
+        },
+        '_packages_' => [
+          'babelbib',
+          'chapref',
+          'bibtex',
+          'crosstex',
+          'multibbl',
+          'noTeX',
+          'amsrefs',
+          'biblatex',
+          'bibtex8bit',
+          'compactbib',
+          'multibib',
+          'bibmods'
+        ]
+      },
       'Document parts' => {
         'Table of
           contents' => {
@@ -38828,6 +38987,7 @@ $taxonomy = {
             'sectionbox',
             'titlesec',
             'thumby',
+            'coseoul',
             'secdot',
             'quotchap',
             'alnumsec',
@@ -39022,6 +39182,7 @@ $taxonomy = {
           'makeindexk',
           'forindex',
           'esindex',
+          'amsmidx',
           'hvindex',
           'genindex',
           'greek-makeindex',
@@ -39040,7 +39201,8 @@ $taxonomy = {
           'robustindex',
           'texindex',
           'luaindex',
-          'varindex'
+          'varindex',
+          'xindy-persian'
         ]
       },
       'Documentation >
@@ -39384,9 +39546,11 @@ $taxonomy = {
             'curve2e',
             'xetex-pstricks',
             'pst-fr3d',
+            'lapdf',
             'pst-3d',
             'expressg',
             'pict2e',
+            'context-gantt',
             'pst-fun',
             'epic',
             'pst-electricfield',
@@ -39415,6 +39579,7 @@ $taxonomy = {
             'randomwalk',
             'pst-node',
             'pst-tree',
+            'braids',
             'mathspic',
             'pst-gantt',
             'pmgraph',
@@ -39508,6 +39673,7 @@ $taxonomy = {
           'context-ruby',
           'tcvn',
           'luapersian',
+          'serbian-def-cyr',
           'romaniantex',
           'serbianc',
           'fixlatvian',
@@ -39743,6 +39909,8 @@ $taxonomy = {
           'MetaPost examples',
           'cyrguide',
           'free-math-font-survey-vn',
+          'translation-chemsym-de',
+          'translation-arsclassica-de',
           'compsci',
           'fontsampler',
           'Knuth-errata',
@@ -39778,6 +39946,7 @@ $taxonomy = {
           'border',
           'evautofl',
           'ntabbing',
+          'nowidow',
           'sublabel',
           'dialogue',
           'relsize',
@@ -39992,6 +40161,7 @@ $taxonomy = {
             'ocr-a',
             'croatian',
             'aurical',
+            'persian-modern',
             'plfonts',
             'LXfonts',
             'committee-font',
@@ -40002,6 +40172,7 @@ $taxonomy = {
             'poltawski',
             'venturisADF',
             'SouthArabian',
+            'opensans',
             'courier scaled',
             'cypriote',
             'electrumadf',
@@ -40100,6 +40271,7 @@ $taxonomy = {
             'softmaker-delanocaps',
             'softmaker-grenoble',
             'softmaker-oldblackletter',
+            'bickham',
             'cmcyralt-fonts',
             'softmaker-flagstaff',
             'eiad-ltx',
@@ -40638,7 +40810,6 @@ $taxonomy = {
             'pdfmarginpar',
             'xmpincl',
             'pdf-trans',
-            'xypdf',
             'dvipsk',
             'lametex',
             'navigator',
@@ -40829,6 +41000,7 @@ $taxonomy = {
             'marginnote',
             'thumbs',
             'marginote',
+            'sidenotes',
             'mparhack',
             'context-fixme',
             'vertbars',
@@ -41154,6 +41326,7 @@ $taxonomy = {
             'cv',
             'moderncv',
             'ECV',
+            'translation-europecv-de',
             'currvita',
             'CurVe',
             'esieecv',
@@ -41211,6 +41384,7 @@ $taxonomy = {
             'labbook',
             'fillform',
             'faltblat',
+            'facture',
             'petiteannonce',
             'sc21-wg1'
           ]
@@ -41585,6 +41759,7 @@ $taxonomy = {
       },
       'Other' => {
         '_packages_' => [
+          'ctanupload',
           'acronym',
           'acronym209',
           'acroterm',
@@ -41694,6 +41869,7 @@ $taxonomy = {
           'rangecite',
           'upref',
           'har2nat',
+          'xcite',
           'ut-backref',
           'drftcite',
           'draft',
@@ -41740,6 +41916,7 @@ $taxonomy = {
       'Non-English languages >
           French' => {
         '_packages_' => [
+          'impnattypo',
           'efrench'
         ]
       },
@@ -41977,6 +42154,7 @@ $taxonomy = {
           'corridx-obsolete',
           'tex-gyre',
           'llncs209',
+          'showhyphens',
           'amsltx11',
           'bosisio',
           'shipunov',
@@ -42399,6 +42577,7 @@ $taxonomy = {
               'diagmac2',
               'ams-cd',
               'pb-diagram',
+              'tikz-cd',
               'DCpic',
               'borceux'
             ]
diff --git a/Master/tlpkg/installer/ctan-mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 1bc9a4e0f00..cfa02af1ec6 100644
--- a/Master/tlpkg/installer/ctan-mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl
@@ -1,151 +1,151 @@
 $mirrors = {
+  'Africa' => {
+    'South Africa' => {
+      'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1
+    }
+  },
+  'Asia' => {
+    'China' => {
+      'http://ftp.ctex.org/mirrors/CTAN/' => 1,
+      'http://mirror.bjtu.edu.cn/CTAN/' => 1,
+      'http://mirror.neu.edu.cn/CTAN/' => 1,
+      'http://mirror.osqdu.org/CTAN/' => 1,
+      'http://mirrors.ustc.edu.cn/CTAN/' => 1,
+      'http://mirrors.xmu.edu.cn/CTAN/' => 1
+    },
+    'India' => {
+      'http://ekalavya.imsc.res.in/tex-archive/' => 1
+    },
+    'Indonesia' => {
+      'http://ctan.cermin.lipi.go.id/' => 1,
+      'http://ftp.itb.ac.id/pub/CTAN/' => 1,
+      'http://kambing.ui.ac.id/ctan/' => 1,
+      'http://kebo.vlsm.org/CTAN/' => 1
+    },
+    'Iran' => {
+      'http://ctan.um.ac.ir/' => 1
+    },
+    'Japan' => {
+      'http://ftp.jaist.ac.jp/pub/CTAN/' => 1
+    },
+    'Korea' => {
+      'http://ftp.kaist.ac.kr/pub/tex-archive/' => 1
+    },
+    'Malaysia' => {
+      'ftp://mirror.upm.edu.my/ctan/' => 1
+    },
+    'Pakistan' => {
+      'http://mirror-cybernet.lums.edu.pk/pub/ctan/' => 1
+    },
+    'Singapore' => {
+      'http://raffles.nus.edu.sg/mirror/tex-archive/' => 1
+    },
+    'Taiwan' => {
+      'http://ctan.cdpa.nsysu.edu.tw/' => 1,
+      'http://shadow.ind.ntou.edu.tw/ctan/' => 1
+    }
+  },
+  'Australasia' => {
+    'Australia' => {
+      'http://ctan.unsw.edu.au/' => 1
+    },
+    'New Zealand' => {
+      'http://elena.aut.ac.nz/ctan/' => 1
+    }
+  },
   'Europe' => {
-    'UK' => {
-      'http://ctan.sqsol.co.uk/' => 1,
-      'http://anorien.csc.warwick.ac.uk/mirrors/CTAN/' => 1
+    'Czech Republic' => {
+      'http://ftp.cvut.cz/tex-archive/' => 1
+    },
+    'Denmark' => {
+      'http://mirrors.dotsrc.org/ctan/' => 1
     },
     'France' => {
+      'ftp://ftp.inria.fr/pub/TeX/CTAN/' => 1,
       'http://ctan.mines-albi.fr/' => 1,
       'http://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
-      'http://mirror.ibcp.fr/pub/CTAN/' => 1,
       'http://ftp.oleane.net/pub/CTAN/' => 1,
-      'http://mirrors.ircam.fr/pub/CTAN/' => 1,
-      'ftp://ftp.inria.fr/pub/TeX/CTAN/' => 1
-    },
-    'Italy' => {
-      'http://ftp.uniRoma2.it/TeX/' => 1,
-      'http://ctan.mirror.garr.it/mirrors/CTAN/' => 1
+      'http://mirror.ibcp.fr/pub/CTAN/' => 1,
+      'http://mirrors.ircam.fr/pub/CTAN/' => 1
     },
     'Germany' => {
-      'http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/' => 1,
+      'ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1,
+      'http://ctan.larsko.net/' => 1,
       'http://ftp.uni-erlangen.de/mirrors/CTAN/' => 1,
       'http://mirror.informatik.uni-mannheim.de/pub/mirrors/tex-archive/' => 1,
-      'http://ctan.larsko.net/' => 1,
-      'ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/' => 1
+      'http://sunsite.informatik.rwth-aachen.de/ftp/pub/mirror/ctan/' => 1
     },
-    'Serbia and Montenegro' => {
-      'http://rpm.scl.rs/CTAN/' => 1
+    'Greece' => {
+      'http://ftp.cc.uoc.gr/mirrors/CTAN/' => 1
     },
-    'Poland' => {
-      'ftp://ftp.tpnet.pl/pub/CTAN/' => 1
+    'Italy' => {
+      'http://ctan.mirror.garr.it/mirrors/CTAN/' => 1,
+      'http://ftp.uniRoma2.it/TeX/' => 1
     },
     'Lithuania' => {
       'http://ctan.vgtu.lt/' => 1
     },
-    'Slovenia' => {
-      'http://ctan.ijs.si/tex-archive/' => 1
-    },
-    'Russia' => {
-      'http://mirror.macomnet.net/pub/CTAN/' => 1,
-      'http://ctan.uni-altai.ru/' => 1,
-      'ftp://ftp.vsu.ru/pub/CTAN/' => 1
+    'Netherlands' => {
+      'http://ftp.snt.utwente.nl/pub/software/tex/' => 1
     },
     'Norway' => {
-      'http://ftp.fagskolen.gjovik.no/pub/tex-archive/' => 1,
-      'http://ctan.uib.no/' => 1
+      'http://ctan.uib.no/' => 1,
+      'http://ftp.fagskolen.gjovik.no/pub/tex-archive/' => 1
+    },
+    'Poland' => {
+      'ftp://ftp.tpnet.pl/pub/CTAN/' => 1
     },
     'Portugal' => {
       'http://ftp.eq.uc.pt/software/TeX/' => 1
     },
-    'Netherlands' => {
-      'http://ftp.snt.utwente.nl/pub/software/tex/' => 1
+    'Russia' => {
+      'ftp://ftp.vsu.ru/pub/CTAN/' => 1,
+      'http://ctan.uni-altai.ru/' => 1,
+      'http://ctan.usu.ru/' => 1,
+      'http://mirror.macomnet.net/pub/CTAN/' => 1
     },
-    'Denmark' => {
-      'http://mirrors.dotsrc.org/ctan/' => 1
+    'Serbia and Montenegro' => {
+      'http://rpm.scl.rs/CTAN/' => 1
     },
-    'Czech Republic' => {
-      'http://ftp.cvut.cz/tex-archive/' => 1
+    'Slovenia' => {
+      'http://ctan.ijs.si/tex-archive/' => 1
     },
-    'Greece' => {
-      'http://ftp.cc.uoc.gr/mirrors/CTAN/' => 1
+    'UK' => {
+      'http://anorien.csc.warwick.ac.uk/mirrors/CTAN/' => 1,
+      'http://ctan.sqsol.co.uk/' => 1
     }
   },
   'North America' => {
     'Canada' => {
-      'http://mirror.its.dal.ca/ctan/' => 1,
+      'http://ctan.mirror.rafal.ca/' => 1,
       'http://mirror.csclub.uwaterloo.ca/CTAN/' => 1,
-      'http://ctan.mirror.rafal.ca/' => 1
-    },
-    'USA' => {
-      'http://mirror.unl.edu/ctan/' => 1,
-      'http://mirrors.med.harvard.edu/ctan/' => 1,
-      'http://mirror.its.uidaho.edu/pub/tex-archive/' => 1,
-      'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
-      'http://ctan.mackichan.com/' => 1,
-      'http://mirror.math.ku.edu/tex-archive/' => 1,
-      'http://ctan.math.utah.edu/ctan/tex-archive/' => 1,
-      'http://mirror.hmc.edu/ctan/' => 1
+      'http://mirror.its.dal.ca/ctan/' => 1
     },
     'Mexico' => {
       'http://tezcatl.fciencias.unam.mx/tex-archive/' => 1
-    }
-  },
-  'Australasia' => {
-    'Australia' => {
-      'http://ctan.unsw.edu.au/' => 1
     },
-    'New Zealand' => {
-      'http://elena.aut.ac.nz/ctan/' => 1
+    'USA' => {
+      'http://ctan.mackichan.com/' => 1,
+      'http://ctan.math.utah.edu/ctan/tex-archive/' => 1,
+      'http://mirror.hmc.edu/ctan/' => 1,
+      'http://mirror.its.uidaho.edu/pub/tex-archive/' => 1,
+      'http://mirror.math.ku.edu/tex-archive/' => 1,
+      'http://mirror.unl.edu/ctan/' => 1,
+      'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1
     }
   },
   'South America' => {
-    'Chile' => {
-      'ftp://ftp.inf.utfsm.cl/pub/tex-archive/' => 1
-    },
-    'Colombia' => {
-      'http://www.laqee.unal.edu.co/tex-archive/' => 1
-    },
     'Brazil' => {
       'http://ceres.cisc.usp.br/CTAN/' => 1,
       'http://ctan.tche.br/' => 1,
       'http://linorg.usp.br/CTAN/' => 1,
       'http://mirror.softwarelivre.ufsc.br/pub/ctan/' => 1
-    }
-  },
-  'Asia' => {
-    'Taiwan' => {
-      'http://ctan.cdpa.nsysu.edu.tw/' => 1,
-      'http://shadow.ind.ntou.edu.tw/ctan/' => 1
-    },
-    'Iran' => {
-      'http://ctan.um.ac.ir/' => 1
     },
-    'Singapore' => {
-      'http://raffles.nus.edu.sg/mirror/tex-archive/' => 1
-    },
-    'Indonesia' => {
-      'http://kebo.vlsm.org/CTAN/' => 1,
-      'http://kambing.ui.ac.id/ctan/' => 1,
-      'http://ctan.cermin.lipi.go.id/' => 1,
-      'http://ftp.itb.ac.id/pub/CTAN/' => 1
-    },
-    'Pakistan' => {
-      'http://mirror-cybernet.lums.edu.pk/pub/ctan/' => 1
-    },
-    'Malaysia' => {
-      'ftp://mirror.upm.edu.my/ctan/' => 1
-    },
-    'Korea' => {
-      'http://ftp.kaist.ac.kr/pub/tex-archive/' => 1
-    },
-    'India' => {
-      'http://ekalavya.imsc.res.in/tex-archive/' => 1
-    },
-    'China' => {
-      'http://mirror.bjtu.edu.cn/CTAN/' => 1,
-      'http://mirror.osqdu.org/CTAN/' => 1,
-      'http://mirrors.xmu.edu.cn/CTAN/' => 1,
-      'http://mirror.neu.edu.cn/CTAN/' => 1,
-      'http://ftp.ctex.org/mirrors/CTAN/' => 1,
-      'http://mirrors.ustc.edu.cn/CTAN/' => 1
+    'Chile' => {
+      'ftp://ftp.inf.utfsm.cl/pub/tex-archive/' => 1
     },
-    'Japan' => {
-      'http://ftp.jaist.ac.jp/pub/CTAN/' => 1
-    }
-  },
-  'Africa' => {
-    'South Africa' => {
-      'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1
+    'Colombia' => {
+      'http://www.laqee.unal.edu.co/tex-archive/' => 1
     }
   }
 };