add kpse_{fea,cid}_format for luatex

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

5 files changed, 321 insertions, 267 deletions

diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 486f8181266..8a60c82ab91 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -1,5 +1,5 @@
-This is kpathsea.info, produced by makeinfo version 4.13 from
-kpathsea.texi.
+This is ../../../../texk/kpathsea/doc/kpathsea.info, produced by
+makeinfo version 4.13 from ../../../../texk/kpathsea/doc/kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
 
@@ -40,7 +40,7 @@ Kpathsea library
 
 This manual documents how to install and use the Kpathsea library for
 filename lookup.  It corresponds to version 5.0.0, released in
-April 2009.
+May 2009.
 
 * Menu:
 
@@ -61,7 +61,7 @@ File: kpathsea.info,  Node: Introduction,  Next: Installation,  Prev: Top,  Up:
 **************
 
 This manual corresponds to version 5.0.0 of the Kpathsea library,
-released in April 2009.
+released in May 2009.
 
    The library's fundamental purpose is to return a filename from a
 list of directories specified by the user, similar to what shells do
@@ -1409,7 +1409,7 @@ File: kpathsea.info,  Node: Reporting bugs,  Prev: unixtex.ftp,  Up: Installatio
 (A copy of this chapter is in the file `kpathsea/BUGS'.)
 
 If you have problems or suggestions, please report them to
-<tex-k@mail.tug.org> using the bug checklist below.
+<tex-k@tug.org> using the bug checklist below.
 
    Please report bugs in the documentation; not only factual errors or
 inconsistent behavior, but unclear or incomplete explanations, typos,
@@ -1432,8 +1432,7 @@ File: kpathsea.info,  Node: Bug checklist,  Next: Mailing lists,  Up: Reporting
 Before reporting a bug, please check below to be sure it isn't already
 known (*note Common problems::).
 
-   Bug reports should be sent via electronic mail to
-<tex-k@mail.tug.org>.
+   Bug reports should be sent via electronic mail to <tex-k@tug.org>.
 
    The general principle is that a good bug report includes all the
 information necessary for reproduction.  Therefore, to enable
@@ -1505,8 +1504,8 @@ File: kpathsea.info,  Node: Mailing lists,  Next: Debugging,  Prev: Bug checklis
 -------------------
 
 Web2c and Kpathsea in general are discussed on the mailing list
-<tex-k@mail.tug.org>.  To join, email <tex-k-request@mail.tug.org> with
-a line consisting of
+<tex-k@tug.org>.  To join, email <tex-k-request@tug.org> with a line
+consisting of
 
      subscribe YOU@YOUR.PREFERRED.EMAIL.ADDRESS
 
@@ -1523,14 +1522,11 @@ or not is read some of the archives from
    Be aware that large data files are sometimes included in bug reports.
 If this is a problem for you, do not join the list.
 
-   If you only want announcements of new releases, not bug reports and
-discussion, join <tex-archive@math.utah.edu> (via mail to
-<tex-archive-request@math.utah.edu>).
-
    If you are looking for general TeX help, such as how to use LaTeX,
-please use the mailing list <info-tex@shsu.edu> mailing list, which is
-gatewayed to the `comp.text.tex' Usenet newsgroup (or post to the
-newsgroup; the gateway is bidirectional).
+please use the mailing list <texhax@tug.org> mailing list
+(`http://lists.tug.org/texhax') which is gatewayed to the
+`comp.text.tex' Usenet newsgroup (or post to the newsgroup; the gateway
+is bidirectional).
 
 
 File: kpathsea.info,  Node: Debugging,  Next: Logging,  Prev: Mailing lists,  Up: Reporting bugs
@@ -2683,15 +2679,17 @@ filename, and returns the first file found.
      Here's the current list of recognized names and the associated
      suffixes.  *Note Supported file formats::, for more information on
      each of these.
+
           gf: gf
           pk: pk
-          bitmap font
+          bitmap font:
+          tfm: .tfm
           afm: .afm
           base: .base
           bib: .bib
           bst: .bst
           cnf: .cnf
-          ls-R: ls-R
+          ls-R: ls-R ls-r
           fmt: .fmt
           map: .map
           mem: .mem
@@ -2700,40 +2698,42 @@ filename, and returns the first file found.
           mft: .mft
           mp: .mp
           mppool: .pool
-          MetaPost support
+          MetaPost support:
           ocp: .ocp
           ofm: .ofm .tfm
           opl: .opl
           otp: .otp
           ovf: .ovf
           ovp: .ovp
-          graphic/figure: .eps .epsi
-          tex: .tex
-          TeX system documentation
+          graphic/figure:  .eps .epsi
+          tex: .tex  .sty .cls .fd .aux .bbl .def .clo .ldf
+          TeX system documentation:
           texpool: .pool
-          TeX system sources
-          PostScript header/font: .pro
-          Troff fonts
-          tfm: .tfm
+          TeX system sources:  .dtx .ins
+          PostScript header:  .pro
+          Troff fonts:
           type1 fonts: .pfa .pfb
           vf: .vf
-          dvips config
+          dvips config:
           ist: .ist
-          truetype fonts: .ttf .ttc
-          type42 fonts
-          web2c files
-          other text files
-          other binary files
-          misc fonts
-          web: .web
-          cweb: .w .web
-          enc: .enc
-          cmap: .cmap
-          sfd: .sfd
-          opentype fonts
-          pdftex config
+          truetype fonts: .ttf .ttc .TTF .TTC
+          type42 fonts: .t42 .T42
+          web2c files:
+          other text files:
+          other binary files:
+          misc fonts:
+          web: .web  .ch
+          cweb: .w .web  .ch
+          enc files: .enc
+          cmap files:
+          subfont definition files: .sfd
+          opentype fonts: .otf
+          pdftex config:
           lig files: .lig
-          texmfscripts
+          texmfscripts:
+          lua: .luc .luctex .texluc .lua .luatex .texlua
+          font feature files: .fea
+          cid maps: .cid .cidmap
 
      This option and `--path' are mutually exclusive.
 
@@ -3032,6 +3032,13 @@ environment variables with an underscore, e.g., `TEXINPUTS_latex'
      (TeX memory dump, *note Memory dumps: (web2c)Memory dumps.)
      `TEXFORMATS', `TEXMFINI'; suffix `.fmt'.
 
+`font cid map'
+     (CJK mapping) `FONTCIDMAPS' suffix `.cid'.
+
+`font feature files'
+     (primarily for OpenType font features) `FONTFEATURES' suffix
+     `.fea'.
+
 `gf'
      (generic font bitmap, *note Glyph files: (dvips)Glyph files.)
      `PROGRAMFONTS', `GFFONTS', `GLYPHFONTS', `TEXFONTS'; suffix `gf'.
@@ -3684,20 +3691,20 @@ Index
                                                               (line  38)
 * --help:                                Standard options.    (line   8)
 * --interactive:                         Path searching options.
-                                                              (line 106)
+                                                              (line 110)
 * --mode=STRING:                         Path searching options.
-                                                              (line 117)
+                                                              (line 121)
 * --must-exist:                          Path searching options.
-                                                              (line 122)
+                                                              (line 126)
 * --path=STRING:                         Path searching options.
-                                                              (line 127)
+                                                              (line 131)
 * --progname=NAME:                       Path searching options.
-                                                              (line 136)
+                                                              (line 140)
 * --show-path=NAME:                      Auxiliary tasks.     (line  41)
 * --srcdir, for building multiple architectures: configure scenarios.
                                                               (line  18)
 * --subdir=STRING:                       Path searching options.
-                                                              (line 141)
+                                                              (line 145)
 * --var-value=VARIABLE:                  Auxiliary tasks.     (line  12)
 * --version:                             Standard options.    (line  10)
 * --with options:                        configure options.   (line  16)
@@ -3718,9 +3725,9 @@ Index
 * -g, compiling without:                 configure scenarios. (line  32)
 * -L option to ls:                       ls-R.                (line  38)
 * -mktex=FILETYPE:                       Path searching options.
-                                                              (line 111)
+                                                              (line 115)
 * -no-mktex=FILETYPE:                    Path searching options.
-                                                              (line 111)
+                                                              (line 115)
 * -O, compiling with:                    configure scenarios. (line  32)
 * -static:                               ShellWidgetClass.    (line  43)
 * . directories, ignored:                ls-R.                (line  33)
@@ -3735,6 +3742,8 @@ Index
                                                               (line  28)
 * .bst:                                  Supported file formats.
                                                               (line  32)
+* .cid:                                  Supported file formats.
+                                                              (line  58)
 * .cmap:                                 Supported file formats.
                                                               (line  36)
 * .cnf:                                  Supported file formats.
@@ -3742,61 +3751,63 @@ Index
 * .enc:                                  Supported file formats.
                                                               (line  51)
 * .eps:                                  Supported file formats.
-                                                              (line  62)
+                                                              (line  69)
 * .epsi:                                 Supported file formats.
-                                                              (line  62)
+                                                              (line  69)
+* .fea:                                  Supported file formats.
+                                                              (line  61)
 * .fmt:                                  Supported file formats.
                                                               (line  54)
 * .ist:                                  Supported file formats.
-                                                              (line  67)
+                                                              (line  74)
 * .lig:                                  Supported file formats.
-                                                              (line  71)
+                                                              (line  78)
 * .map:                                  Supported file formats.
-                                                              (line  77)
+                                                              (line  84)
 * .mem:                                  Supported file formats.
-                                                              (line  80)
+                                                              (line  87)
 * .mf:                                   Supported file formats.
-                                                              (line  88)
+                                                              (line  95)
 * .mft:                                  Supported file formats.
-                                                              (line  96)
+                                                              (line 103)
 * .mp:                                   Supported file formats.
-                                                              (line 104)
+                                                              (line 111)
 * .ocp:                                  Supported file formats.
-                                                              (line 112)
+                                                              (line 119)
 * .ofm:                                  Supported file formats.
-                                                              (line 116)
-* .opl:                                  Supported file formats.
                                                               (line 123)
+* .opl:                                  Supported file formats.
+                                                              (line 130)
 * .otp:                                  Supported file formats.
-                                                              (line 126)
+                                                              (line 133)
 * .ovf:                                  Supported file formats.
-                                                              (line 129)
+                                                              (line 136)
 * .ovp:                                  Supported file formats.
-                                                              (line 132)
+                                                              (line 139)
 * .pfa:                                  Supported file formats.
-                                                              (line 184)
+                                                              (line 191)
 * .pfb:                                  Supported file formats.
-                                                              (line 184)
+                                                              (line 191)
 * .pk:                                   Supported file formats.
-                                                              (line 139)
+                                                              (line 146)
 * .pool:                                 Supported file formats.
-                                                              (line  92)
+                                                              (line  99)
 * .pro:                                  Supported file formats.
-                                                              (line 145)
+                                                              (line 152)
 * .rhosts, writable by TeX:              Security.            (line  10)
 * .sfd:                                  Supported file formats.
-                                                              (line 149)
+                                                              (line 156)
 * .tex:                                  Supported file formats.
-                                                              (line 152)
+                                                              (line 159)
 * .tex file, included in ls-R:           ls-R.                (line  33)
 * .tfm:                                  Supported file formats.
-                                                              (line 172)
+                                                              (line 179)
 * .ttc:                                  Supported file formats.
-                                                              (line 181)
+                                                              (line 188)
 * .ttf:                                  Supported file formats.
-                                                              (line 181)
+                                                              (line 188)
 * .vf:                                   Supported file formats.
-                                                              (line 192)
+                                                              (line 199)
 * .w:                                    Supported file formats.
                                                               (line  43)
 * .web:                                  Supported file formats.
@@ -3897,7 +3908,7 @@ Index
 * CD-ROM distributions:                  CD-ROM distribution. (line   6)
 * CFLAGS:                                configure environment.
                                                               (line  14)
-* ChangeLog entry:                       Bug checklist.       (line  56)
+* ChangeLog entry:                       Bug checklist.       (line  55)
 * checklist for bug reports:             Bug checklist.       (line   6)
 * checksum:                              Suppressing warnings.
                                                               (line  16)
@@ -3919,7 +3930,7 @@ Index
 * common features in glyph lookup:       Basic glyph lookup.  (line   6)
 * common problems:                       Common problems.     (line   6)
 * comp.sys.sun.admin FAQ:                ShellWidgetClass.    (line   6)
-* comp.text.tex:                         Mailing lists.       (line  29)
+* comp.text.tex:                         Mailing lists.       (line  25)
 * compilation:                           Installation.        (line   6)
 * compilation value, source for path:    Path sources.        (line  20)
 * compiler bugs:                         TeX or Metafont failing.
@@ -3940,14 +3951,14 @@ Index
                                                               (line   6)
 * config.h:                              Programming overview.
                                                               (line  33)
-* config.log:                            Bug checklist.       (line  28)
+* config.log:                            Bug checklist.       (line  27)
 * config.ps:                             Specially-recognized files.
                                                               (line  16)
 * config.ps, search path for:            Supported file formats.
                                                               (line  47)
-* config.status:                         Bug checklist.       (line  31)
+* config.status:                         Bug checklist.       (line  30)
 * configuration:                         Installation.        (line   6)
-* configuration bugs:                    Bug checklist.       (line  31)
+* configuration bugs:                    Bug checklist.       (line  30)
 * configuration compiler options:        configure environment.
                                                               (line  23)
 * configuration file, source for path:   Path sources.        (line  17)
@@ -3958,12 +3969,12 @@ Index
 * configure options:                     configure options.   (line   6)
 * configure options for mktex scripts:   mktex configuration. (line  12)
 * configure, running:                    Running configure.   (line   6)
-* context diff:                          Bug checklist.       (line  56)
+* context diff:                          Bug checklist.       (line  55)
 * continuation character:                Config files.        (line  31)
-* core dumps, reporting:                 Bug checklist.       (line  62)
+* core dumps, reporting:                 Bug checklist.       (line  61)
 * CPPFLAGS:                              configure environment.
                                                               (line  22)
-* crashes, reporting:                    Bug checklist.       (line  62)
+* crashes, reporting:                    Bug checklist.       (line  61)
 * CTAN, defined:                         Electronic distribution.
                                                               (line   6)
 * CTAN.sites:                            Electronic distribution.
@@ -3975,7 +3986,7 @@ Index
 * database, for filenames:               Filename database.   (line   6)
 * database, format of:                   Database format.     (line   6)
 * debug.h:                               Debugging.           (line   6)
-* debugger:                              Bug checklist.       (line  62)
+* debugger:                              Bug checklist.       (line  61)
 * debugging:                             Debugging.           (line   6)
 * debugging options, in Kpathsea-using program: Calling sequence.
                                                               (line  39)
@@ -4019,7 +4030,7 @@ Index
 * dlsym:                                 dlopen.              (line   6)
 * dlsym.c:                               dlopen.              (line  21)
 * doc files:                             Supported file formats.
-                                                              (line 158)
+                                                              (line 165)
 * DOS compatible names:                  mktex configuration. (line  69)
 * DOS support:                           Custom installation. (line  19)
 * DOS TeX implementations:               Other TeX packages.  (line   6)
@@ -4034,9 +4045,9 @@ Index
 * dvipdfmx.cfg:                          Specially-recognized files.
                                                               (line  19)
 * DVIPSFONTS:                            Supported file formats.
-                                                              (line 227)
+                                                              (line 234)
 * DVIPSHEADERS:                          Supported file formats.
-                                                              (line 184)
+                                                              (line 191)
 * DVIPSMAKEPK:                           mktex script names.  (line  32)
 * DVIPSSIZES:                            Fallback font.       (line   6)
 * dynamic creation of files:             mktex scripts.       (line   6)
@@ -4110,13 +4121,17 @@ Index
                                                               (line   6)
 * font of last resort:                   Fallback font.       (line   6)
 * font set, infinite:                    mktex scripts.       (line   6)
+* FONTCIDMAPS:                           Supported file formats.
+                                                              (line  58)
+* FONTFEATURES:                          Supported file formats.
+                                                              (line  61)
 * fontmap files:                         Fontmap.             (line   6)
 * fontmaps:                              mktex configuration. (line  87)
 * fontname:                              mktex configuration. (line  88)
 * fontnames, arbitrary length:           Fontmap.             (line  15)
 * fonts, being created:                  Simple installation. (line  79)
 * FOOINPUTS:                             Supported file formats.
-                                                              (line 209)
+                                                              (line 216)
 * fopen, redefined:                      Debugging.           (line  54)
 * format of external database:           Database format.     (line   6)
 * Free Software Foundation:              CD-ROM distribution. (line  12)
@@ -4129,20 +4144,20 @@ Index
 * fundamental purpose of Kpathsea:       Introduction.        (line   6)
 * gcc, compiling with:                   configure environment.
                                                               (line  11)
-* gdb, recommended:                      Bug checklist.       (line  62)
+* gdb, recommended:                      Bug checklist.       (line  61)
 * generation of filename database:       Filename database generation.
                                                               (line   6)
 * get_applicationShellWidgetClass:       ShellWidgetClass.    (line   6)
 * get_wmShellWidgetClass:                ShellWidgetClass.    (line   6)
 * gf:                                    Supported file formats.
-                                                              (line  58)
+                                                              (line  65)
 * GFFONTS:                               Supported file formats.
-                                                              (line  58)
+                                                              (line  65)
 * globally writable directories:         Security.            (line  30)
 * glyph lookup:                          Glyph lookup.        (line   6)
 * glyph lookup bitmap tolerance:         Basic glyph lookup.  (line  15)
 * GLYPHFONTS:                            Supported file formats.
-                                                              (line  58)
+                                                              (line  65)
 * glyphlist.txt:                         Specially-recognized files.
                                                               (line  25)
 * GNU C compiler bugs:                   TeX or Metafont failing.
@@ -4153,7 +4168,7 @@ Index
 * hash table buckets, printing:          Debugging.           (line 105)
 * hash table routines:                   Calling sequence.    (line  87)
 * hash_summary_only variable for debugging: Debugging.        (line 105)
-* help, mailing list for general TeX:    Mailing lists.       (line  29)
+* help, mailing list for general TeX:    Mailing lists.       (line  25)
 * HIER:                                  Default path features.
                                                               (line  41)
 * history of Kpathsea:                   History.             (line   6)
@@ -4166,8 +4181,8 @@ Index
                                                               (line   6)
 * include fontmap directive:             Fontmap.             (line  33)
 * INDEXSTYLE:                            Supported file formats.
-                                                              (line  67)
-* info-tex@shsu.edu:                     Mailing lists.       (line  29)
+                                                              (line  74)
+* info-tex@shsu.edu:                     Mailing lists.       (line  25)
 * input lines, reading:                  Calling sequence.    (line  87)
 * install-data Make target:              Installing files.    (line  28)
 * install-exec Make target:              Installing files.    (line  23)
@@ -4184,7 +4199,7 @@ Index
 * installation, simple:                  Simple installation. (line   6)
 * installing files:                      Installing files.    (line   6)
 * interactive query:                     Path searching options.
-                                                              (line 106)
+                                                              (line 110)
 * interface, not frozen:                 Introduction.        (line  27)
 * introduction:                          Introduction.        (line   6)
 * kdebug::                               Debugging.           (line 105)
@@ -4244,7 +4259,7 @@ Index
 * LaserJet drive:                        Kpathsea application distributions.
                                                               (line  13)
 * last-resort font:                      Fallback font.       (line   6)
-* LaTeX help mailing list:               Mailing lists.       (line  29)
+* LaTeX help mailing list:               Mailing lists.       (line  25)
 * lcircle10:                             Fontmap.             (line  19)
 * LDFLAGS:                               configure environment.
                                                               (line  38)
@@ -4262,7 +4277,7 @@ Index
 * libucb, avoiding:                      Running make.        (line  44)
 * license for using the library:         Introduction.        (line  31)
 * LIGFONTS:                              Supported file formats.
-                                                              (line  71)
+                                                              (line  78)
 * lines, reading arbitrary-length:       Calling sequence.    (line  87)
 * Linux File System Standard:            mktex configuration. (line 114)
 * Linux shells and configure:            configure shells.    (line  19)
@@ -4279,7 +4294,7 @@ Index
 * lostchar:                              Suppressing warnings.
                                                               (line  19)
 * ls-R:                                  Supported file formats.
-                                                              (line  74)
+                                                              (line  81)
 * ls-R and AFS:                          Installing files.    (line  40)
 * ls-R database file:                    ls-R.                (line   6)
 * ls-R, simplest build:                  ls-R.                (line  18)
@@ -4312,15 +4327,15 @@ Index
 * MFBASES:                               Supported file formats.
                                                               (line  24)
 * MFINPUTS:                              Supported file formats.
-                                                              (line  88)
+                                                              (line  95)
 * MFPOOL:                                Supported file formats.
-                                                              (line  92)
+                                                              (line  99)
 * MFTINPUTS:                             Supported file formats.
-                                                              (line  96)
+                                                              (line 103)
 * mirrors, FTP:                          Electronic distribution.
                                                               (line  13)
 * MISCFONTS:                             Supported file formats.
-                                                              (line 100)
+                                                              (line 107)
 * mismatched checksum warnings:          Suppressing warnings.
                                                               (line  17)
 * missfont.log:                          mktex script names.  (line  35)
@@ -4349,13 +4364,13 @@ Index
 * Morgan, Tim:                           History.             (line  12)
 * mostlyclean Make target:               Cleaning up.         (line  10)
 * MPINPUTS:                              Supported file formats.
-                                                              (line 104)
+                                                              (line 111)
 * MPMEMS:                                Supported file formats.
-                                                              (line  80)
+                                                              (line  87)
 * MPPOOL:                                Supported file formats.
-                                                              (line 108)
+                                                              (line 115)
 * MPSUPPORT:                             Supported file formats.
-                                                              (line  84)
+                                                              (line  91)
 * MT_FEATURES:                           mktex configuration. (line  40)
 * multiple architectures, compiling on:  configure scenarios. (line  18)
 * multiple architectures, directories for: configure scenarios.
@@ -4367,7 +4382,7 @@ Index
 * NetBSD configure error:                Empty Makefiles.     (line   6)
 * NetBSD shells and configure:           configure shells.    (line  19)
 * Neumann, Gustaf:                       History.             (line  57)
-* newsgroup for TeX:                     Mailing lists.       (line  29)
+* newsgroup for TeX:                     Mailing lists.       (line  25)
 * NeXT sed error:                        Empty Makefiles.     (line   6)
 * NeXT, lacking X11:                     Kpathsea application distributions.
                                                               (line   6)
@@ -4381,20 +4396,20 @@ Index
 * non-Unix operating systems:            Custom installation. (line  19)
 * none:                                  Suppressing warnings.
                                                               (line  23)
-* null pointers, dereferencing:          Bug checklist.       (line  62)
+* null pointers, dereferencing:          Bug checklist.       (line  61)
 * numeric debugging values:              Debugging.           (line  34)
 * obtaining TeX:                         unixtex.ftp.         (line   6)
 * obtaining Web2c by ftp:                Electronic distribution.
                                                               (line   6)
 * obtaining Web2c on CD-ROM:             CD-ROM distribution. (line   6)
 * OCPINPUTS:                             Supported file formats.
-                                                              (line 112)
+                                                              (line 119)
 * OFMFONTS:                              Supported file formats.
-                                                              (line 116)
+                                                              (line 123)
 * online Metafont display, spurious:     Unable to generate fonts.
                                                               (line  36)
 * OPENTYPEFONTS:                         Supported file formats.
-                                                              (line 120)
+                                                              (line 127)
 * OpenWin libraries, dynamic linking problems: ShellWidgetClass.
                                                               (line   6)
 * optimization caveat:                   TeX or Metafont failing.
@@ -4405,14 +4420,14 @@ Index
 * OS/2 support:                          Custom installation. (line  19)
 * other TeX distributions:               Other TeX packages.  (line   6)
 * OTPINPUTS:                             Supported file formats.
-                                                              (line 126)
+                                                              (line 133)
 * overview of path searching:            Searching overview.  (line   6)
 * overview of programming with Kpathsea: Programming overview.
                                                               (line   6)
 * OVFFONTS:                              Supported file formats.
-                                                              (line 129)
+                                                              (line 136)
 * OVPFONTS:                              Supported file formats.
-                                                              (line 132)
+                                                              (line 139)
 * patches, Sun OpenWin:                  ShellWidgetClass.    (line  29)
 * path expansion:                        Path expansion.      (line   6)
 * path searching:                        Path searching.      (line   6)
@@ -4442,14 +4457,14 @@ Index
 * pdftex.cfg:                            Specially-recognized files.
                                                               (line  34)
 * PDFTEXCONFIG:                          Supported file formats.
-                                                              (line 136)
+                                                              (line 143)
 * pdftexconfig.tex:                      Specially-recognized files.
                                                               (line  34)
 * permission denied:                     Searching overview.  (line  56)
 * permissions, directory:                Security.            (line  51)
 * permissions, file:                     Security.            (line  47)
 * PKFONTS:                               Supported file formats.
-                                                              (line 139)
+                                                              (line 146)
 * plain.base:                            Unable to generate fonts.
                                                               (line  46)
 * pointer combination warnings:          Pointer combination warnings.
@@ -4480,7 +4495,7 @@ Index
 * proof mode:                            Unable to generate fonts.
                                                               (line  36)
 * PSHEADERS:                             Supported file formats.
-                                                              (line 145)
+                                                              (line 152)
 * pxp Pascal preprocessor:               History.             (line  12)
 * quoting variable values:               Variable expansion.  (line  17)
 * re-entrant API:                        Programming overview.
@@ -4520,10 +4535,10 @@ Index
 * SELFAUTODIR:                           Calling sequence.    (line  31)
 * SELFAUTOLOC:                           Calling sequence.    (line  31)
 * SELFAUTOPARENT:                        Calling sequence.    (line  31)
-* sending patches:                       Bug checklist.       (line  56)
+* sending patches:                       Bug checklist.       (line  55)
 * setgid scripts:                        Security.            (line  40)
 * SFDFONTS:                              Supported file formats.
-                                                              (line 149)
+                                                              (line 156)
 * sh5, ok with configure:                configure shells.    (line  25)
 * shared library, making:                Shared library.      (line   6)
 * shell scripts as configuration files:  Config files.        (line  72)
@@ -4539,7 +4554,7 @@ Index
 * slow startup time:                     Slow path searching. (line   6)
 * Solaris BSD compatibility, not:        Running make.        (line  44)
 * source files:                          Supported file formats.
-                                                              (line 161)
+                                                              (line 168)
 * sources for search paths:              Path sources.        (line   6)
 * special:                               Suppressing warnings.
                                                               (line  30)
@@ -4547,7 +4562,7 @@ Index
                                                               (line  26)
 * ST_NLINK_TRICK:                        Subdirectory expansion.
                                                               (line  38)
-* stack trace:                           Bug checklist.       (line  62)
+* stack trace:                           Bug checklist.       (line  61)
 * standalone path searching:             Invoking kpsewhich.  (line   6)
 * standard error and debugging output:   Debugging.           (line  27)
 * standard options:                      Standard options.    (line   6)
@@ -4580,11 +4595,11 @@ Index
 * system dependencies:                   Running configure.   (line   6)
 * system V universe:                     Running make.        (line  44)
 * T1FONTS:                               Supported file formats.
-                                                              (line 184)
+                                                              (line 191)
 * T1INPUTS:                              Supported file formats.
-                                                              (line 184)
+                                                              (line 191)
 * T42FONTS:                              Supported file formats.
-                                                              (line 189)
+                                                              (line 196)
 * tcfmgr.map:                            Specially-recognized files.
                                                               (line  47)
 * TDS:                                   TeX directory structure.
@@ -4602,20 +4617,19 @@ Index
                                                               (line   6)
 * TeX file lookup:                       File lookup.         (line   6)
 * TeX glyph lookup:                      Glyph lookup.        (line   6)
-* TeX help mailing list:                 Mailing lists.       (line  29)
+* TeX help mailing list:                 Mailing lists.       (line  25)
 * TeX hierarchy, one:                    configure scenarios. (line  13)
 * TeX Live CD-ROM:                       CD-ROM distribution. (line   8)
 * TeX support:                           TeX support.         (line   6)
 * TeX Users Group:                       Introduction.        (line  39)
-* tex-archive@math.utah.edu:             Mailing lists.       (line  25)
 * tex-file.c:                            File lookup.         (line  37)
 * tex-file.h:                            Programming overview.
                                                               (line  24)
 * tex-glyph.c:                           Glyph lookup.        (line  26)
 * tex-glyph.h:                           Programming overview.
                                                               (line  24)
-* tex-k-request@mail.tug.org:            Mailing lists.       (line   7)
-* tex-k@mail.tug.org (bug address):      Reporting bugs.      (line   8)
+* tex-k-request@tug.org:                 Mailing lists.       (line   7)
+* tex-k@tug.org (bug address):           Reporting bugs.      (line   8)
 * TEX_HUSH <1>:                          Suppressing warnings.
                                                               (line   6)
 * TEX_HUSH:                              Searching overview.  (line  56)
@@ -4624,18 +4638,18 @@ Index
 * TEXCONFIG:                             Supported file formats.
                                                               (line  47)
 * TEXDOCS:                               Supported file formats.
-                                                              (line 158)
+                                                              (line 165)
 * TEXFONTMAPS:                           Supported file formats.
-                                                              (line  77)
+                                                              (line  84)
 * TEXFONTS:                              Supported file formats.
-                                                              (line  58)
+                                                              (line  65)
 * texfonts.map:                          Fontmap.             (line   6)
 * TEXFORMATS:                            Supported file formats.
                                                               (line  54)
 * TEXINDEXSTYLE:                         Supported file formats.
-                                                              (line  67)
+                                                              (line  74)
 * TEXINPUTS:                             Supported file formats.
-                                                              (line  62)
+                                                              (line  69)
 * TEXMF:                                 TeX directory structure.
                                                               (line   6)
 * texmf.cnf:                             Specially-recognized files.
@@ -4657,29 +4671,29 @@ Index
                                                               (line  39)
 * TEXMFCNF:                              Config files.        (line   6)
 * TEXMFDBS <1>:                          Supported file formats.
-                                                              (line  74)
+                                                              (line  81)
 * TEXMFDBS:                              ls-R.                (line   6)
 * TEXMFINI:                              Supported file formats.
                                                               (line  24)
 * TEXMFLOG:                              Logging.             (line  10)
 * TEXMFOUTPUT:                           mktex script names.  (line  40)
 * TEXMFSCRIPTS:                          Supported file formats.
-                                                              (line 164)
+                                                              (line 171)
 * TEXMFVAR:                              mktex configuration. (line 124)
 * texmfvar:                              mktex configuration. (line 123)
 * TEXPICTS:                              Supported file formats.
-                                                              (line  62)
+                                                              (line  69)
 * TEXPKS:                                Supported file formats.
-                                                              (line 139)
+                                                              (line 146)
 * TEXPOOL:                               Supported file formats.
-                                                              (line 168)
+                                                              (line 175)
 * TEXPSHEADERS:                          Supported file formats.
-                                                              (line 145)
+                                                              (line 152)
 * TEXSIZES:                              Fallback font.       (line   6)
 * TEXSOURCES:                            Supported file formats.
-                                                              (line 161)
+                                                              (line 168)
 * TFMFONTS:                              Supported file formats.
-                                                              (line 172)
+                                                              (line 179)
 * tilde expansion:                       Tilde expansion.     (line   6)
 * tilde.c:                               Tilde expansion.     (line  25)
 * time system call:                      Logging.             (line  15)
@@ -4688,13 +4702,13 @@ Index
 * trailing / in home directory:          Tilde expansion.     (line  19)
 * trailing colons:                       Default expansion.   (line   6)
 * TRFONTS:                               Supported file formats.
-                                                              (line 177)
+                                                              (line 184)
 * trick for detecting leaf directories:  Subdirectory expansion.
                                                               (line  22)
 * trojan horse attack:                   Security.            (line  10)
 * try_std_extension_first:               File lookup.         (line  24)
 * TTFONTS:                               Supported file formats.
-                                                              (line 181)
+                                                              (line 188)
 * tug.org:                               unixtex.ftp.         (line   6)
 * typeface directory, omitting:          mktex configuration. (line 106)
 * ucbinclude, avoiding:                  Running make.        (line  44)
@@ -4703,7 +4717,7 @@ Index
                                                               (line   6)
 * unable to generate fonts:              Unable to generate fonts.
                                                               (line   6)
-* uname:                                 Bug checklist.       (line  21)
+* uname:                                 Bug checklist.       (line  20)
 * universe, BSD vs. system V:            Running make.        (line  44)
 * unixtex.ftp:                           unixtex.ftp.         (line   6)
 * unknown special warnings:              Suppressing warnings.
@@ -4715,7 +4729,7 @@ Index
 * usage patterns, finding:               Logging.             (line   6)
 * USE_TEXMFVAR:                          mktex configuration. (line 129)
 * USE_VARTEXFONTS:                       mktex configuration. (line 119)
-* Usenet TeX newsgroup:                  Mailing lists.       (line  29)
+* Usenet TeX newsgroup:                  Mailing lists.       (line  25)
 * USERPROFILE, as ~ expansion:           Tilde expansion.     (line   6)
 * varfonts:                              mktex configuration. (line 113)
 * variable expansion:                    Variable expansion.  (line   6)
@@ -4726,10 +4740,10 @@ Index
 * VAX 11/750:                            History.             (line  12)
 * version number, of Kpathsea:           Kpathsea application distributions.
                                                               (line   6)
-* version numbers, determining:          Bug checklist.       (line  16)
+* version numbers, determining:          Bug checklist.       (line  15)
 * VF files, not found:                   Searching overview.  (line  31)
 * VFFONTS:                               Supported file formats.
-                                                              (line 192)
+                                                              (line 199)
 * VMS support:                           Custom installation. (line  19)
 * VMS TeX implementations:               Other TeX packages.  (line   6)
 * Vojta, Paul:                           History.             (line  30)
@@ -4743,10 +4757,10 @@ Index
                                                               (line   6)
 * wcstombs:                              dlopen.              (line   6)
 * WEB2C:                                 Supported file formats.
-                                                              (line 200)
+                                                              (line 207)
 * Weber, Olaf:                           History.             (line  74)
 * WEBINPUTS:                             Supported file formats.
-                                                              (line 196)
+                                                              (line 203)
 * whitespace, in fontmap files:          Fontmap.             (line  28)
 * whitespace, not ignored on continuation lines: Config files.
                                                               (line  31)
@@ -4764,7 +4778,7 @@ Index
 * XDvi:                                  Specially-recognized files.
                                                               (line  41)
 * XDVIFONTS:                             Supported file formats.
-                                                              (line 227)
+                                                              (line 234)
 * XDVIMAKEPK:                            mktex script names.  (line  32)
 * XDVISIZES:                             Fallback font.       (line   6)
 * XLDFLAGS:                              Running make.        (line  29)
@@ -4779,86 +4793,86 @@ Index
 
 
 Tag Table:
-Node: Top1549
-Node: Introduction2193
-Node: History4020
-Node: Installation8112
-Node: Simple installation8902
-Node: Custom installation12485
-Node: Disk space13659
-Node: Kpathsea application distributions14543
-Node: Changing search paths15658
-Node: Default path features16840
-Node: Default path generation18976
-Node: Running configure20419
-Node: configure shells21470
-Node: configure options22522
-Node: configure environment24029
-Node: configure scenarios25831
-Node: Shared library27417
-Node: Running make28431
-Node: Installing files30478
-Node: Cleaning up32425
-Node: Filename database generation33473
-Node: mktex scripts34040
-Node: mktex configuration35317
-Node: mktex script names41136
-Node: mktex script arguments42527
-Node: Installation testing43417
-Node: Security43781
-Node: TeX directory structure46348
-Node: unixtex.ftp50770
-Node: Electronic distribution52785
-Node: CD-ROM distribution55550
-Node: Other TeX packages56520
-Node: Reporting bugs57816
-Node: Bug checklist58556
-Node: Mailing lists62258
-Node: Debugging63617
-Node: Logging68695
-Node: Common problems70565
-Node: Unable to find files71396
-Node: Slow path searching73807
-Node: Unable to generate fonts75184
-Node: TeX or Metafont failing77693
-Node: Empty Makefiles79571
-Node: XtStrings80801
-Node: dlopen81637
-Node: ShellWidgetClass82455
-Node: Pointer combination warnings84087
-Node: Path searching84476
-Node: Searching overview85123
-Node: Path sources88519
-Node: Config files89590
-Node: Path expansion93235
-Node: Default expansion94184
-Node: Variable expansion96254
-Node: Tilde expansion97657
-Node: Brace expansion98637
-Node: KPSE_DOT expansion99742
-Node: Subdirectory expansion100255
-Node: Filename database102606
-Node: ls-R103660
-Node: Filename aliases106554
-Node: Database format107732
-Node: Invoking kpsewhich108745
-Node: Path searching options109690
-Node: Specially-recognized files116710
-Node: Auxiliary tasks118066
-Node: Standard options119891
-Node: TeX support120211
-Node: Supported file formats121502
-Node: File lookup128650
-Node: Glyph lookup130382
-Node: Basic glyph lookup131506
-Node: Fontmap132385
-Node: Fallback font135002
-Node: Suppressing warnings135915
-Node: Programming137020
-Node: Programming overview137533
-Node: Calling sequence140227
-Node: Program-specific files145195
-Node: Programming with config files146237
-Node: Index147549
+Node: Top1609
+Node: Introduction2251
+Node: History4076
+Node: Installation8168
+Node: Simple installation8958
+Node: Custom installation12541
+Node: Disk space13715
+Node: Kpathsea application distributions14599
+Node: Changing search paths15714
+Node: Default path features16896
+Node: Default path generation19032
+Node: Running configure20475
+Node: configure shells21526
+Node: configure options22578
+Node: configure environment24085
+Node: configure scenarios25887
+Node: Shared library27473
+Node: Running make28487
+Node: Installing files30534
+Node: Cleaning up32481
+Node: Filename database generation33529
+Node: mktex scripts34096
+Node: mktex configuration35373
+Node: mktex script names41192
+Node: mktex script arguments42583
+Node: Installation testing43473
+Node: Security43837
+Node: TeX directory structure46404
+Node: unixtex.ftp50826
+Node: Electronic distribution52841
+Node: CD-ROM distribution55606
+Node: Other TeX packages56576
+Node: Reporting bugs57872
+Node: Bug checklist58607
+Node: Mailing lists62304
+Node: Debugging63513
+Node: Logging68591
+Node: Common problems70461
+Node: Unable to find files71292
+Node: Slow path searching73703
+Node: Unable to generate fonts75080
+Node: TeX or Metafont failing77589
+Node: Empty Makefiles79467
+Node: XtStrings80697
+Node: dlopen81533
+Node: ShellWidgetClass82351
+Node: Pointer combination warnings83983
+Node: Path searching84372
+Node: Searching overview85019
+Node: Path sources88415
+Node: Config files89486
+Node: Path expansion93131
+Node: Default expansion94080
+Node: Variable expansion96150
+Node: Tilde expansion97553
+Node: Brace expansion98533
+Node: KPSE_DOT expansion99638
+Node: Subdirectory expansion100151
+Node: Filename database102502
+Node: ls-R103556
+Node: Filename aliases106450
+Node: Database format107628
+Node: Invoking kpsewhich108641
+Node: Path searching options109586
+Node: Specially-recognized files116861
+Node: Auxiliary tasks118217
+Node: Standard options120042
+Node: TeX support120362
+Node: Supported file formats121653
+Node: File lookup128966
+Node: Glyph lookup130698
+Node: Basic glyph lookup131822
+Node: Fontmap132701
+Node: Fallback font135318
+Node: Suppressing warnings136231
+Node: Programming137336
+Node: Programming overview137849
+Node: Calling sequence140543
+Node: Program-specific files145511
+Node: Programming with config files146553
+Node: Index147865
 
 End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 2c6df84b161..0d216d5a678 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -3,7 +3,7 @@
 @settitle Kpathsea: A library for path searching
 
 @set version 5.0.0
-@set month-year April 2009
+@set month-year May 2009
 
 @copying
 This file documents the Kpathsea library for path searching.
@@ -475,7 +475,7 @@ lines is not ignored.
 
 @noindent where the @samp{=} and surrounding whitespace is optional.
 
-@item 
+@item
 @cindex identifiers, characters valid in
 The @var{variable} name may contain any character other than whitespace,
 @samp{=}, or @samp{.}, but sticking to @samp{A-Za-z_} is safest.
@@ -486,7 +486,7 @@ component of @code{argv[0]} is) @var{progname} or
 @file{@var{progname}.exe}.  This allows different flavors of @TeX{} to
 have different search paths, for example.
 
-@item 
+@item
 @cindex right-hand side of variable assignments
 @var{value} may contain any characters except @samp{%} and @samp{@@}.
 (These restrictions are only necessary because of the processing done on
@@ -1111,16 +1111,18 @@ sake of the shell.)
 
 Here's the current list of recognized names and the associated suffixes.
 @xref{Supported file formats}, for more information on each of these.
+
 @example
 gf: gf
 pk: pk
-bitmap font
+bitmap font:
+tfm: .tfm
 afm: .afm
 base: .base
 bib: .bib
 bst: .bst
 cnf: .cnf
-ls-R: ls-R
+ls-R: ls-R ls-r
 fmt: .fmt
 map: .map
 mem: .mem
@@ -1129,40 +1131,42 @@ mfpool: .pool
 mft: .mft
 mp: .mp
 mppool: .pool
-MetaPost support
+MetaPost support:
 ocp: .ocp
 ofm: .ofm .tfm
 opl: .opl
 otp: .otp
 ovf: .ovf
 ovp: .ovp
-graphic/figure: .eps .epsi
-tex: .tex
-TeX system documentation
+graphic/figure:  .eps .epsi
+tex: .tex  .sty .cls .fd .aux .bbl .def .clo .ldf
+TeX system documentation:
 texpool: .pool
-TeX system sources
-PostScript header/font: .pro
-Troff fonts
-tfm: .tfm
+TeX system sources:  .dtx .ins
+PostScript header:  .pro
+Troff fonts:
 type1 fonts: .pfa .pfb
 vf: .vf
-dvips config
+dvips config:
 ist: .ist
-truetype fonts: .ttf .ttc
-type42 fonts
-web2c files
-other text files
-other binary files
-misc fonts
-web: .web
-cweb: .w .web
-enc: .enc
-cmap: .cmap
-sfd: .sfd
-opentype fonts
-pdftex config
+truetype fonts: .ttf .ttc .TTF .TTC
+type42 fonts: .t42 .T42
+web2c files:
+other text files:
+other binary files:
+misc fonts:
+web: .web  .ch
+cweb: .w .web  .ch
+enc files: .enc
+cmap files:
+subfont definition files: .sfd
+opentype fonts: .otf
+pdftex config:
 lig files: .lig
-texmfscripts
+texmfscripts:
+lua: .luc .luctex .texluc .lua .luatex .texlua
+font feature files: .fea
+cid maps: .cid .cidmap
 @end example
 
 This option and @samp{--path} are mutually exclusive.
@@ -1268,7 +1272,7 @@ important, since it ``anchors'' the match to a full component name:
 
 @example
 kpsewhich --subdir=/lace foo.sty
-@result{} 
+@result{}
 @end example
 
 @noindent
@@ -1570,6 +1574,20 @@ suffix @samp{.enc}.
 @code{TEXFORMATS}, @code{TEXMFINI};
 suffix @samp{.fmt}.
 
+@item font cid map
+@flindex .cid
+@vindex FONTCIDMAPS
+(CJK mapping)
+@code{FONTCIDMAPS}
+suffix @samp{.cid}.
+
+@item font feature files
+@flindex .fea
+@vindex FONTFEATURES
+(primarily for OpenType font features)
+@code{FONTFEATURES}
+suffix @samp{.fea}.
+
 @item gf
 @flindex gf
 @vindex GFFONTS
@@ -1626,7 +1644,7 @@ suffix @samp{.mem}.
 
 @item @r{MetaPost support}
 @vindex MPSUPPORT
-(MetaPost support files, used by DMP; @pxref{dmp invocation,,, web2c, Web2c}) 
+(MetaPost support files, used by DMP; @pxref{dmp invocation,,, web2c, Web2c})
 @code{MPSUPPORT}.
 
 @item mf
@@ -1794,7 +1812,7 @@ dynamic creation program: @code{mktextfm}.
 
 @item Troff fonts
 @vindex TRFONTS
-(Troff fonts, used by DMP; @pxref{DMP invocation,,, web2c, Web2c}) 
+(Troff fonts, used by DMP; @pxref{DMP invocation,,, web2c, Web2c})
 @code{TRFONTS}.
 
 @item truetype fonts
@@ -2335,14 +2353,14 @@ work, e.g., initializing the Bib@TeX{} search paths in a DVI driver.)
 @item
 @findex kpathsea_find_file
 The routine to actually find a file of type @var{format} is
-@file{kpathsea_find_file}.  You can call 
+@file{kpathsea_find_file}.  You can call
 @code{kpathsea_find_file} after doing only the first and second of the
 initialization steps above---Kpathsea automatically reads the
 @file{texmf.cnf} generic config files, looks for environment variables,
 and does expansions at the first lookup.
 
 @item
-To find PK and/or GF bitmap fonts, the routine 
+To find PK and/or GF bitmap fonts, the routine
 is @code{kpathsea_find_glyph}, defined in
 @file{tex-glyph.h}. This returns a structure in addition to the
 resultant filename, because fonts can be found in so many ways. See the
@@ -2361,7 +2379,7 @@ exist, don't use this.
 @item
 @findex kpathsea_finish
 To close the kpathsea library instance you are using, call
-@code{kpathsea_finish}.  This function closes any open log files and 
+@code{kpathsea_finish}.  This function closes any open log files and
 frees the memory used by the instance.
 
 @end enumerate
diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c
index baec2c026da..b36159e7141 100644
--- a/Build/source/texk/kpathsea/tex-file.c
+++ b/Build/source/texk/kpathsea/tex-file.c
@@ -85,6 +85,8 @@
 #define LIG_ENVS "LIGFONTS", "TEXFONTS"
 #define TEXMFSCRIPTS_ENVS "TEXMFSCRIPTS"
 #define LUA_ENVS "LUAINPUTS"
+#define FONTFEATURES_ENVS "FONTFEATURES"
+#define FONTCIDMAPS_ENVS "FONTCIDMAPS"
 
 /* The compiled-in default list, DEFAULT_FONT_SIZES, is intended to be
    set from the command line (presumably via the Makefile).  */
@@ -705,6 +707,7 @@ kpathsea_init_format (kpathsea kpse, kpse_file_format_type format)
     case kpse_enc_format:
       INIT_FORMAT ("enc files", DEFAULT_ENCFONTS, ENC_ENVS);
       SUFFIXES (".enc");
+      FMT_INFO.suffix_search_only = true;
       break;
     case kpse_cmap_format:
       INIT_FORMAT ("cmap files", DEFAULT_CMAPFONTS, CMAP_ENVS);
@@ -734,6 +737,17 @@ kpathsea_init_format (kpathsea kpse, kpse_file_format_type format)
       SUFFIXES (LUA_SUFFIXES);
       FMT_INFO.suffix_search_only = true;
       break;
+    case kpse_fea_format:
+      INIT_FORMAT ("font feature files", DEFAULT_FONTFEATURES, FONTFEATURES_ENVS);
+      SUFFIXES (".fea");
+      FMT_INFO.suffix_search_only = true;
+      break;
+    case kpse_cid_format:
+      INIT_FORMAT ("cid maps", DEFAULT_FONTCIDMAPS, FONTCIDMAPS_ENVS);
+#define CID_SUFFIXES ".cid", ".cidmap"
+      SUFFIXES (CID_SUFFIXES);
+      FMT_INFO.suffix_search_only = true;
+      break;
     default:
       LIB_FATAL1 ("kpse_init_format: Unknown format %d", format);
     }
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 70aed600a8d..ca145a89e5f 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -374,6 +374,12 @@ SFDFONTS = .;$TEXMF/fonts/sfd//
 % OpenType outline fonts.
 OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
 
+% OpenType feature files (.fea).
+FONTFEATURES=.;$TEXMF/fonts/fea//
+
+% .cid and .cidmap
+FONTCIDMAPS=.;$TEXMF/fonts/cid//
+
 % pdftex config files:
 PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
 
diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h
index 6930824826d..1ef2ed38692 100644
--- a/Build/source/texk/kpathsea/types.h
+++ b/Build/source/texk/kpathsea/types.h
@@ -1,6 +1,6 @@
 /* types.h: general types for kpathsea.
 
-   Copyright 1993, 1995, 1996, 2005, 2008 Karl Berry.
+   Copyright 1993, 1995, 1996, 2005, 2008, 2009 Karl Berry.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -135,6 +135,8 @@ typedef enum
   kpse_lig_format,
   kpse_texmfscripts_format,
   kpse_lua_format,
+  kpse_fea_format,
+  kpse_cid_format,
   kpse_last_format /* one past last index */
 } kpse_file_format_type;