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

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

5 files changed, 139 insertions, 62 deletions

diff --git a/Build/source/build-aux/depcomp b/Build/source/build-aux/depcomp
index 43bd0f9bc12..53bee03e9c9 100755
--- a/Build/source/build-aux/depcomp
+++ b/Build/source/build-aux/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-04-09-11; # UTC
+scriptversion=2011-04-11-05; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -166,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/Build/source/extra/xz/build-aux/depcomp b/Build/source/extra/xz/build-aux/depcomp
index 43bd0f9bc12..53bee03e9c9 100755
--- a/Build/source/extra/xz/build-aux/depcomp
+++ b/Build/source/extra/xz/build-aux/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-04-09-11; # UTC
+scriptversion=2011-04-11-05; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
 # 2011 Free Software Foundation, Inc.
@@ -166,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/Build/source/libs/poppler/poppler-0.12.4/depcomp b/Build/source/libs/poppler/poppler-0.12.4/depcomp
index df8eea7e4ce..53bee03e9c9 100755
--- a/Build/source/libs/poppler/poppler-0.12.4/depcomp
+++ b/Build/source/libs/poppler/poppler-0.12.4/depcomp
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-04-11-05; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@ gcc)
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e -e "s|.*$object$||" '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@ tru64)
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@ makedepend)
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff --git a/Master/doc.html b/Master/doc.html
index 684cdd0e3ca..c6c7866b5d9 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -1616,6 +1616,14 @@ Symbols for linear logic.
 <a href="texmf-dist/doc/fonts/cmll/cmll.pdf">cmll.pdf</a>.
 </small></li>
 
+<li><b><a href="texmf-dist/doc/latex/cmpj">cmpj</a></b>:<small>
+Style for the journal Condensed Matter Physics.
+<a href="texmf-dist/doc/latex/cmpj/cmp-logo.pdf">cmp-logo.pdf</a>,
+<a href="texmf-dist/doc/latex/cmpj/usrguide/eps_demo.pdf">eps_demo.pdf</a>,
+<a href="texmf-dist/doc/latex/cmpj/usrguide/icmphome.pdf">icmphome.pdf</a>,
+<a href="texmf-dist/doc/latex/cmpj/usrguide/template.pdf">template.pdf</a>.
+</small></li>
+
 <li><b><a href="texmf-dist/doc/latex/cmtiup">cmtiup</a></b>:<small>
 Upright punctuation with CM italic.
 <a href="texmf-dist/doc/latex/cmtiup/cmtiup.pdf">cmtiup.pdf</a>,
@@ -2172,7 +2180,7 @@ Cyrillic bibtex and makeindex.
 
 <h2 id="letter-D">D</h2>
 
-<ol start="335">
+<ol start="336">
 
 <li><b><a href="texmf-dist/doc/latex/dashrule">dashrule</a></b>:<small>
 Draw dashed rules.
@@ -2526,7 +2534,7 @@ Construct Dynkin tree diagrams.
 
 <h2 id="letter-E">E</h2>
 
-<ol start="397">
+<ol start="398">
 
 <li><b><a href="texmf-dist/doc/latex/ean13isbn">ean13isbn</a></b>:<small>
 Print EAN13 for ISBN.
@@ -3104,7 +3112,7 @@ Extend the standard classes' size options.
 
 <h2 id="letter-F">F</h2>
 
-<ol start="498">
+<ol start="499">
 
 <li><b><a href="texmf-dist/doc/latex/facsimile">facsimile</a></b>:<small>
 Document class for preparing faxes.
@@ -3612,7 +3620,7 @@ Get first and last words of a page.
 
 <h2 id="letter-G">G</h2>
 
-<ol start="584">
+<ol start="585">
 
 <li><b><a href="texmf-dist/doc/latex/g-brief">g-brief</a></b>:<small>
 Letter document class.
@@ -3935,7 +3943,7 @@ Macros for typesetting the GuIT logo.
 
 <h2 id="letter-H">H</h2>
 
-<ol start="639">
+<ol start="640">
 
 <li><b><a href="texmf-dist/doc/latex/HA-prosper">HA-prosper</a></b>:<small>
 Patches and improvements for prosper.
@@ -4126,7 +4134,7 @@ Basic support for multiple languages in Plain TeX.
 
 <h2 id="letter-I">I</h2>
 
-<ol start="671">
+<ol start="672">
 
 <li><b><a href="texmf-dist/doc/latex/ibycus-babel">ibycus-babel</a></b>:<small>
 Use the Ibycus 4 Greek font with Babel
@@ -4368,7 +4376,7 @@ A two-element sans-serif font.
 
 <h2 id="letter-J">J</h2>
 
-<ol start="713">
+<ol start="714">
 
 <li><b><a href="texmf-dist/doc/fonts/jablantile">jablantile</a></b>:<small>
 Metafont version of tiles in the style of Slavik Jablan.
@@ -4462,7 +4470,7 @@ Citations of judgements and official documents in (German) juridical documents.
 
 <h2 id="letter-K">K</h2>
 
-<ol start="726">
+<ol start="727">
 
 <li><b><a href="texmf-dist/doc/latex/karnaugh">karnaugh</a></b>:<small>
 Typeset Karnaugh-Veitch-maps.
@@ -4581,7 +4589,7 @@ A two-element sans-serif typeface.
 
 <h2 id="letter-L">L</h2>
 
-<ol start="740">
+<ol start="741">
 
 <li><b><a href="texmf-dist/doc/latex/l2picfaq">l2picfaq</a></b>:<small>
 LaTeX pictures "how-to" (German).
@@ -5231,6 +5239,7 @@ Drawing spectral sequences in LuaLaTeX.
 
 <li><b><a href="texmf-dist/doc/luatex/base">luatex</a></b>:<small>
 The LuaTeX engine
+<a href="texmf-dist/doc/luatex/base/functionref.pdf">functionref.pdf</a>,
 <a href="texmf-dist/doc/luatex/base/luatexref-t.pdf">luatexref-t.pdf</a>,
 <a href="texmf/doc/man/man1/luatex.man1.pdf">luatex.man1.pdf</a>,
 <a href="texmf/doc/man/man1/texlua.man1.pdf">texlua.man1.pdf</a>,
@@ -5263,7 +5272,7 @@ Set of slide fonts based on CM.
 
 <h2 id="letter-M">M</h2>
 
-<ol start="847">
+<ol start="848">
 
 <li><b><a href="texmf-dist/doc/latex/macqassign">macqassign</a></b>:<small>
 Typeset assignments for Macquarie University.
@@ -6119,7 +6128,7 @@ Build a format based on the preamble of a LaTeX file.
 
 <h2 id="letter-N">N</h2>
 
-<ol start="966">
+<ol start="967">
 
 <li><b><a href="texmf-dist/doc/latex/nag">nag</a></b>:<small>
 Detecting and warning about obsolete LaTeX commands
@@ -6378,7 +6387,7 @@ Print numbers with separators and exponent if necessary.
 
 <h2 id="letter-O">O</h2>
 
-<ol start="1005">
+<ol start="1006">
 
 <li><b><a href="texmf-dist/doc/latex/oberdiek">oberdiek</a></b>:<small>
 A bundle of packages submitted by Heiko Oberdiek.
@@ -6403,14 +6412,17 @@ A bundle of packages submitted by Heiko Oberdiek.
 <a href="texmf-dist/doc/latex/oberdiek/dvipscol.pdf">dvipscol.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/embedfile.pdf">embedfile.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/engord.pdf">engord.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/eolgrab.pdf">eolgrab.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/epstopdf.pdf">epstopdf.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/etexcmds.pdf">etexcmds.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/flags.pdf">flags.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/gettitlestring.pdf">gettitlestring.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/grfext.pdf">grfext.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/grffile.pdf">grffile.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/hobsub.pdf">hobsub.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/hologo.pdf">hologo.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/holtxdoc.pdf">holtxdoc.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/hopatch.pdf">hopatch.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/hycolor.pdf">hycolor.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/hypbmsec.pdf">hypbmsec.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/hypcap.pdf">hypcap.pdf</a>,
@@ -6435,6 +6447,7 @@ A bundle of packages submitted by Heiko Oberdiek.
 <a href="texmf-dist/doc/latex/oberdiek/luatex.pdf">luatex.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/magicnum.pdf">magicnum.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/makerobust.pdf">makerobust.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/mleftright.pdf">mleftright.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/oberdiek.pdf">oberdiek.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/pagegrid.pdf">pagegrid.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/pagesel.pdf">pagesel.pdf</a>,
@@ -6450,9 +6463,11 @@ A bundle of packages submitted by Heiko Oberdiek.
 <a href="texmf-dist/doc/latex/oberdiek/pdftexcmds.pdf">pdftexcmds.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/picture.pdf">picture.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/pmboxdraw.pdf">pmboxdraw.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/protecteddef.pdf">protecteddef.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/refcount.pdf">refcount.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/rerunfilecheck.pdf">rerunfilecheck.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/resizegather.pdf">resizegather.pdf</a>,
+<a href="texmf-dist/doc/latex/oberdiek/rotchiffre.pdf">rotchiffre.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/scrindex.pdf">scrindex.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/selinput.pdf">selinput.pdf</a>,
 <a href="texmf-dist/doc/latex/oberdiek/setouterhbox.pdf">setouterhbox.pdf</a>,
@@ -6616,7 +6631,7 @@ Combine LaTeX commands over included graphics.
 
 <h2 id="letter-P">P</h2>
 
-<ol start="1027">
+<ol start="1028">
 
 <li><b><a href="texmf-dist/doc/latex/pagecont">pagecont</a></b>:<small>
 Page numbering that continues between documents.
@@ -7816,7 +7831,7 @@ Shape selection for PX fonts Greek letters.
 
 <h2 id="letter-Q">Q</h2>
 
-<ol start="1218">
+<ol start="1219">
 
 <li><b><a href="texmf-dist/doc/latex/qcm">qcm</a></b>:<small>
 A LaTeX2e class for making multiple choice questionnaires
@@ -7855,7 +7870,7 @@ Consistent quote marks.
 
 <h2 id="letter-R">R</h2>
 
-<ol start="1224">
+<ol start="1225">
 
 <li><b><a href="texmf-dist/doc/latex/randbild">randbild</a></b>:<small>
 Marginal pictures.
@@ -8067,7 +8082,7 @@ Class for Ryerson Unversity Graduate School requirements.
 
 <h2 id="letter-S">S</h2>
 
-<ol start="1260">
+<ol start="1261">
 
 <li><b><a href="texmf-dist/doc/latex/sageep">sageep</a></b>:<small>
 Format papers for the annual meeting of EEGS.
@@ -8838,7 +8853,7 @@ Format systems of equations.
 
 <h2 id="letter-T">T</h2>
 
-<ol start="1381">
+<ol start="1382">
 
 <li><b><a href="texmf-dist/doc/latex/t-angles">t-angles</a></b>:<small>
 Draw tangles, trees, Hopf algebra operations and other pictures.
@@ -9953,7 +9968,7 @@ Print a typographic grid.
 
 <h2 id="letter-U">U</h2>
 
-<ol start="1519">
+<ol start="1520">
 
 <li><b><a href="texmf-dist/doc/latex/uaclasses">uaclasses</a></b>:<small>
 University of Arizona thesis and dissertation format.
@@ -10117,7 +10132,7 @@ University of Washington thesis class.
 
 <h2 id="letter-V">V</h2>
 
-<ol start="1548">
+<ol start="1549">
 
 <li><b><a href="texmf-dist/doc/bibtex/vancouver">vancouver</a></b>:<small>
 Bibliographic style file for Biomedical Journals.
@@ -10275,7 +10290,7 @@ Document classes for Vaxjo University
 
 <h2 id="letter-W">W</h2>
 
-<ol start="1574">
+<ol start="1575">
 
 <li><b><a href="texmf-dist/doc/latex/wadalab">wadalab</a></b>:<small>
 Wadalab (Japanese) font packages.
@@ -10352,7 +10367,7 @@ Produces figures which text can flow around.
 
 <h2 id="letter-X">X</h2>
 
-<ol start="1587">
+<ol start="1588">
 
 <li><b><a href="texmf-dist/doc/latex/xargs">xargs</a></b>:<small>
 Define commands with many optional arguments.
@@ -10585,7 +10600,7 @@ Tree macros using XY-Pic.
 
 <h2 id="letter-Y">Y</h2>
 
-<ol start="1621">
+<ol start="1622">
 
 <li><b><a href="texmf-dist/doc/latex/yafoot">yafoot</a></b>:<small>
 A bundle of miscellaneous footnote packages.
@@ -10633,7 +10648,7 @@ Many-featured Young tableaux and Young diagrams.
 
 <h2 id="letter-Z">Z</h2>
 
-<ol start="1629">
+<ol start="1630">
 
 <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/texmf/scripts/texlive/var/texcatalogue.keywords b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
index 47b4d670686..29bbc24fd14 100644
--- a/Master/texmf/scripts/texlive/var/texcatalogue.keywords
+++ b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
@@ -534,10 +534,6 @@ $taxonomy = {
         'output format PDF, PostScript',
         'presentations (powerpoint-like, using a beamer)'
       ],
-      'MetaFontbook' => [
-        'help, documentation, FAQ',
-        'MetaFont, Metapost'
-      ],
       'removefr' => [
         'macro programming'
       ],
@@ -4912,11 +4908,6 @@ $taxonomy = {
       'tensind' => [
         'Mathematics (the subject)'
       ],
-      'MetaFont' => [
-        'fonts, mathematics',
-        'fonts, text',
-        'MetaFont, Metapost'
-      ],
       'ftcap' => [
         'caption',
         'tables'
@@ -9155,6 +9146,10 @@ $taxonomy = {
       'texfilt' => [
         'macro programming'
       ],
+      'Metafont book' => [
+        'help, documentation, FAQ',
+        'MetaFont, Metapost'
+      ],
       'rec-thy' => [
         'Mathematics (the subject)'
       ],
@@ -10767,6 +10762,11 @@ $taxonomy = {
         'computer code, verbatim text',
         'help, documentation, FAQ'
       ],
+      'Metafont' => [
+        'fonts, mathematics',
+        'fonts, text',
+        'MetaFont, Metapost'
+      ],
       'endfloat' => [
         'figures, floating matter'
       ],
@@ -12570,8 +12570,6 @@ $taxonomy = {
           Uncharacterized',
       'pdfslide' => '
           Uncharacterized',
-      'MetaFontbook' => '
-          Uncharacterized',
       'removefr' => '
           Uncharacterized',
       'xypic-tut-pt' => '
@@ -14980,8 +14978,6 @@ $taxonomy = {
           Uncharacterized',
       'tensind' => '
           Uncharacterized',
-      'MetaFont' => '
-          Uncharacterized',
       'ftcap' => '
           Uncharacterized',
       'fontbl' => '
@@ -17380,6 +17376,8 @@ $taxonomy = {
           Uncharacterized',
       'texfilt' => '
           Uncharacterized',
+      'Metafont book' => '
+          Uncharacterized',
       'at' => '
           Uncharacterized',
       'doipubmed' => '
@@ -18264,6 +18262,8 @@ $taxonomy = {
           Uncharacterized',
       'scmac' => '
           Uncharacterized',
+      'Metafont' => '
+          Uncharacterized',
       'endfloat' => '
           Uncharacterized',
       'bondgraph' => 'Graphics > Inside
@@ -19458,8 +19458,6 @@ $taxonomy = {
           Tables',
       'pdfslide' => 'Document types >
           Presentations',
-      'MetaFontbook' => 'Documentation >
-          Other',
       'bsf' => '
           Uncharacterized',
       'removefr' => 'Programming in TeX >
@@ -22207,8 +22205,6 @@ $taxonomy = {
           fonts',
       'tensind' => 'Subject-specific typesetting
           > Mathematics > Matrices, vectors',
-      'MetaFont' => 'Graphics > MetaFont or
-          Metapost',
       'ftcap' => 'Page-focused >
           Captions',
       'fontbl' => 'Fonts > Font
@@ -24890,6 +24886,8 @@ $taxonomy = {
           Other',
       'texfilt' => 'Tools >
           Other',
+      'Metafont book' => 'Documentation >
+          Other',
       'rec-thy' => 'Subject-specific typesetting
           > Mathematics',
       'at' => 'Programming in TeX >
@@ -25917,6 +25915,8 @@ $taxonomy = {
           DVI',
       'example' => 'Documentation >
           Other',
+      'Metafont' => 'Graphics > MetaFont or
+          Metapost',
       'bondgraph' => 'Subject-specific typesetting
           > Other natural sciences',
       'endfloat' => 'Page-focused >
@@ -27831,7 +27831,6 @@ $taxonomy = {
         'chemarrow',
         'testeq',
         'orkhun',
-        'MetaFontbook',
         'mf2tex',
         'pgothic',
         'exteps',
@@ -27903,7 +27902,6 @@ $taxonomy = {
         'yswab',
         'docmfp',
         'vicentino',
-        'MetaFont',
         'frcursive',
         'piechartmp',
         'redis',
@@ -27964,6 +27962,7 @@ $taxonomy = {
         'epsfview',
         'metapost',
         'venn',
+        'Metafont book',
         'cm-gf',
         'epsincl',
         'committee-font',
@@ -27993,6 +27992,7 @@ $taxonomy = {
         'ttf2mf',
         'featpost',
         'klinz',
+        'Metafont',
         'scyrillic',
         'KIXfont',
         'truchet',
@@ -28094,7 +28094,6 @@ $taxonomy = {
         'marvosym-mac',
         'yfrak',
         'yswab',
-        'MetaFont',
         'URW-Grotesq',
         'wncyr',
         'urw-garamond',
@@ -28165,6 +28164,7 @@ $taxonomy = {
         'rustic',
         'nkarta',
         'lato',
+        'Metafont',
         'scyrillic',
         'verdana',
         'sanskrit',
@@ -28821,7 +28821,6 @@ $taxonomy = {
         'cryst',
         'aramaic-serto',
         'Bengali Omega',
-        'MetaFont',
         'fontbl',
         'blacklettert1',
         'blackletter',
@@ -28932,6 +28931,7 @@ $taxonomy = {
         'scriptfonts',
         'GFS Solomos',
         'Epigrafica',
+        'Metafont',
         'classico',
         'accents-cs',
         'mff-util',
@@ -31725,7 +31725,6 @@ $taxonomy = {
         'lgc-examples',
         'presentations',
         'lshort-persian',
-        'MetaFontbook',
         'xypic-tut-pt',
         'presfull',
         'LaTeX-brochure',
@@ -31890,6 +31889,7 @@ $taxonomy = {
         'french-translations',
         'amslatex-primer',
         'mathesatz-examples',
+        'Metafont book',
         'infwarerr',
         'latexcheat',
         'grafik',
@@ -32589,7 +32589,6 @@ $taxonomy = {
           'abstyles-orig',
           'bigstrut',
           'pdfslide',
-          'MetaFontbook',
           'removefr',
           'xypic-tut-pt',
           'presfull',
@@ -33763,7 +33762,6 @@ $taxonomy = {
           'ghyphen',
           'vicentino',
           'tensind',
-          'MetaFont',
           'ftcap',
           'fontbl',
           'mathexam',
@@ -34931,6 +34929,7 @@ $taxonomy = {
           'ncccropbox',
           'erdc',
           'texfilt',
+          'Metafont book',
           'at',
           'doipubmed',
           'jj-game',
@@ -35365,6 +35364,7 @@ $taxonomy = {
           'Epigrafica',
           'keycommand',
           'scmac',
+          'Metafont',
           'endfloat',
           'BibTeX-help',
           'getfiledate',
@@ -37287,7 +37287,6 @@ $taxonomy = {
             'suanpan',
             'feynmf',
             'hatching',
-            'MetaFont',
             'piechartmp',
             'bpolynomial',
             'barcodes-vulis',
@@ -37317,6 +37316,7 @@ $taxonomy = {
             'mpattern',
             'fmp',
             'featpost',
+            'Metafont',
             'truchet',
             'mfware',
             'metapost-matlab',
@@ -37594,7 +37594,6 @@ $taxonomy = {
           'ruler',
           'lgc-examples',
           'presentations',
-          'MetaFontbook',
           'LaTeX-brochure',
           'texdoctk',
           'templates-sommer',
@@ -37672,6 +37671,7 @@ $taxonomy = {
           'faq-fr',
           'french-translations',
           'mathesatz-examples',
+          'Metafont book',
           'sfwmac',
           'usrguide',
           'memdesign',