diff options
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 8 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/doc/kpathsea.info | 290 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/doc/kpathsea.texi | 22 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/tex-file.c | 14 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/texmf.cnf | 9 | ||||
| -rw-r--r-- | Build/source/texk/kpathsea/types.h | 2 |
6 files changed, 202 insertions, 143 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 2515fe4a06c..90c643d5894 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,11 @@ +2009-06-02 Karl Berry <karl@tug.org> + + * types.h (kpse_file_format_type): add kpse_mlbib_format, + kpse_mlbst_format for Jean-Michel Hufflen and MlBibTeX. + * texmf.cnf (MLBIBINPUTS, MLBSTINPUTS): define default paths. + * tex-file.c (kpathsea_init_format): initialize them. + * doc/kpathsea.texi: document this. + 2009-06-01 Karl Berry <karl@tug.org> * Update version numbers to 5.0.0. diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info index dc344ea3538..c8b4279bbdb 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 -May 2009. +June 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 May 2009. +released in June 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 @@ -3005,8 +3005,8 @@ environment variables with an underscore, e.g., `TEXINPUTS_latex' (web2c)bibtex invocation.) `BIBINPUTS', `TEXBIB'; suffix `.bib'. `bst' - (BibTeX style file, *note Basic BibTeX style files: (web2c)Basic - BibTeX style files.) `BSTINPUTS'; suffix `.bst'. + (BibTeX style, *note Basic BibTeX style files: (web2c)Basic BibTeX + style files.) `BSTINPUTS'; suffix `.bst'. `cmap' (character map files) `CMAPFONTS'; suffix `.cmap'. @@ -3083,6 +3083,14 @@ environment variables with an underscore, e.g., `TEXINPUTS_latex' (font-related files that don't fit the other categories) `MISCFONTS' +`mlbib' + (MlBibTeX bibliography source) `MLBIBINPUTS', `BIBINPUTS', + `TEXBIB'; suffixes `.mlbib', `.mlbib'. + +`mlbst' + (MlBibTeX style) `MLBSTINPUTS', `BSTINPUTS'; suffixes `.mlbst', + `.bst'. + `mp' (MetaPost source, *note mpost invocation: (web2c)mpost invocation.) `MPINPUTS'; suffix `.mp'. @@ -3768,44 +3776,48 @@ Index (line 95) * .mft: Supported file formats. (line 103) -* .mp: Supported file formats. +* .mlbib: Supported file formats. (line 111) -* .ocp: Supported file formats. +* .mlbst: Supported file formats. + (line 115) +* .mp: Supported file formats. (line 119) +* .ocp: Supported file formats. + (line 127) * .ofm: Supported file formats. - (line 123) + (line 131) * .opl: Supported file formats. - (line 130) + (line 138) * .otp: Supported file formats. - (line 133) + (line 141) * .ovf: Supported file formats. - (line 136) + (line 144) * .ovp: Supported file formats. - (line 139) + (line 147) * .pfa: Supported file formats. - (line 191) + (line 199) * .pfb: Supported file formats. - (line 191) + (line 199) * .pk: Supported file formats. - (line 146) + (line 154) * .pool: Supported file formats. (line 99) * .pro: Supported file formats. - (line 152) + (line 160) * .rhosts, writable by TeX: Security. (line 10) * .sfd: Supported file formats. - (line 156) + (line 164) * .tex: Supported file formats. - (line 159) + (line 167) * .tex file, included in ls-R: ls-R. (line 33) * .tfm: Supported file formats. - (line 179) + (line 187) * .ttc: Supported file formats. - (line 188) + (line 196) * .ttf: Supported file formats. - (line 188) + (line 196) * .vf: Supported file formats. - (line 199) + (line 207) * .w: Supported file formats. (line 43) * .web: Supported file formats. @@ -4028,7 +4040,7 @@ Index * dlsym: dlopen. (line 6) * dlsym.c: dlopen. (line 21) * doc files: Supported file formats. - (line 165) + (line 173) * DOS compatible names: mktex configuration. (line 69) * DOS support: Custom installation. (line 19) * DOS TeX implementations: Other TeX packages. (line 6) @@ -4043,9 +4055,9 @@ Index * dvipdfmx.cfg: Specially-recognized files. (line 19) * DVIPSFONTS: Supported file formats. - (line 234) + (line 242) * DVIPSHEADERS: Supported file formats. - (line 191) + (line 199) * DVIPSMAKEPK: mktex script names. (line 32) * DVIPSSIZES: Fallback font. (line 6) * dynamic creation of files: mktex scripts. (line 6) @@ -4129,7 +4141,7 @@ Index * fontnames, arbitrary length: Fontmap. (line 15) * fonts, being created: Simple installation. (line 79) * FOOINPUTS: Supported file formats. - (line 216) + (line 224) * fopen, redefined: Debugging. (line 54) * format of external database: Database format. (line 6) * Free Software Foundation: CD-ROM distribution. (line 12) @@ -4358,15 +4370,19 @@ Index (line 12) * mktextex: mktex script names. (line 27) * mktextfm: mktex script names. (line 30) +* MLBIBINPUTS: Supported file formats. + (line 111) +* MLBSTINPUTS: Supported file formats. + (line 115) * mode directory, omitting: mktex configuration. (line 99) * Morgan, Tim: History. (line 12) * mostlyclean Make target: Cleaning up. (line 10) * MPINPUTS: Supported file formats. - (line 111) + (line 119) * MPMEMS: Supported file formats. (line 87) * MPPOOL: Supported file formats. - (line 115) + (line 123) * MPSUPPORT: Supported file formats. (line 91) * MT_FEATURES: mktex configuration. (line 40) @@ -4401,13 +4417,13 @@ Index (line 6) * obtaining Web2c on CD-ROM: CD-ROM distribution. (line 6) * OCPINPUTS: Supported file formats. - (line 119) + (line 127) * OFMFONTS: Supported file formats. - (line 123) + (line 131) * online Metafont display, spurious: Unable to generate fonts. (line 36) * OPENTYPEFONTS: Supported file formats. - (line 127) + (line 135) * OpenWin libraries, dynamic linking problems: ShellWidgetClass. (line 6) * optimization caveat: TeX or Metafont failing. @@ -4418,14 +4434,14 @@ Index * OS/2 support: Custom installation. (line 19) * other TeX distributions: Other TeX packages. (line 6) * OTPINPUTS: Supported file formats. - (line 133) + (line 141) * overview of path searching: Searching overview. (line 6) * overview of programming with Kpathsea: Programming overview. (line 6) * OVFFONTS: Supported file formats. - (line 136) + (line 144) * OVPFONTS: Supported file formats. - (line 139) + (line 147) * patches, Sun OpenWin: ShellWidgetClass. (line 29) * path expansion: Path expansion. (line 6) * path searching: Path searching. (line 6) @@ -4455,14 +4471,14 @@ Index * pdftex.cfg: Specially-recognized files. (line 34) * PDFTEXCONFIG: Supported file formats. - (line 143) + (line 151) * 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 146) + (line 154) * plain.base: Unable to generate fonts. (line 46) * pointer combination warnings: Pointer combination warnings. @@ -4493,7 +4509,7 @@ Index * proof mode: Unable to generate fonts. (line 36) * PSHEADERS: Supported file formats. - (line 152) + (line 160) * pxp Pascal preprocessor: History. (line 12) * quoting variable values: Variable expansion. (line 17) * re-entrant API: Programming overview. @@ -4536,7 +4552,7 @@ Index * sending patches: Bug checklist. (line 55) * setgid scripts: Security. (line 40) * SFDFONTS: Supported file formats. - (line 156) + (line 164) * sh5, ok with configure: configure shells. (line 25) * shared library, making: Shared library. (line 6) * shell scripts as configuration files: Config files. (line 72) @@ -4552,7 +4568,7 @@ Index * slow startup time: Slow path searching. (line 6) * Solaris BSD compatibility, not: Running make. (line 44) * source files: Supported file formats. - (line 168) + (line 176) * sources for search paths: Path sources. (line 6) * special: Suppressing warnings. (line 30) @@ -4593,11 +4609,11 @@ Index * system dependencies: Running configure. (line 6) * system V universe: Running make. (line 44) * T1FONTS: Supported file formats. - (line 191) + (line 199) * T1INPUTS: Supported file formats. - (line 191) + (line 199) * T42FONTS: Supported file formats. - (line 196) + (line 204) * tcfmgr.map: Specially-recognized files. (line 47) * TDS: TeX directory structure. @@ -4636,7 +4652,7 @@ Index * TEXCONFIG: Supported file formats. (line 47) * TEXDOCS: Supported file formats. - (line 165) + (line 173) * TEXFONTMAPS: Supported file formats. (line 84) * TEXFONTS: Supported file formats. @@ -4676,22 +4692,22 @@ Index * TEXMFLOG: Logging. (line 10) * TEXMFOUTPUT: mktex script names. (line 40) * TEXMFSCRIPTS: Supported file formats. - (line 171) + (line 179) * TEXMFVAR: mktex configuration. (line 124) * texmfvar: mktex configuration. (line 123) * TEXPICTS: Supported file formats. (line 69) * TEXPKS: Supported file formats. - (line 146) + (line 154) * TEXPOOL: Supported file formats. - (line 175) + (line 183) * TEXPSHEADERS: Supported file formats. - (line 152) + (line 160) * TEXSIZES: Fallback font. (line 6) * TEXSOURCES: Supported file formats. - (line 168) + (line 176) * TFMFONTS: Supported file formats. - (line 179) + (line 187) * tilde expansion: Tilde expansion. (line 6) * tilde.c: Tilde expansion. (line 25) * time system call: Logging. (line 15) @@ -4700,13 +4716,13 @@ Index * trailing / in home directory: Tilde expansion. (line 19) * trailing colons: Default expansion. (line 6) * TRFONTS: Supported file formats. - (line 184) + (line 192) * 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 188) + (line 196) * tug.org: unixtex.ftp. (line 6) * typeface directory, omitting: mktex configuration. (line 106) * ucbinclude, avoiding: Running make. (line 44) @@ -4741,7 +4757,7 @@ Index * version numbers, determining: Bug checklist. (line 15) * VF files, not found: Searching overview. (line 31) * VFFONTS: Supported file formats. - (line 199) + (line 207) * VMS support: Custom installation. (line 19) * VMS TeX implementations: Other TeX packages. (line 6) * Vojta, Paul: History. (line 30) @@ -4755,10 +4771,10 @@ Index (line 6) * wcstombs: dlopen. (line 6) * WEB2C: Supported file formats. - (line 207) + (line 215) * Weber, Olaf: History. (line 74) * WEBINPUTS: Supported file formats. - (line 203) + (line 211) * whitespace, in fontmap files: Fontmap. (line 28) * whitespace, not ignored on continuation lines: Config files. (line 31) @@ -4776,7 +4792,7 @@ Index * XDvi: Specially-recognized files. (line 41) * XDVIFONTS: Supported file formats. - (line 234) + (line 242) * XDVIMAKEPK: mktex script names. (line 32) * XDVISIZES: Fallback font. (line 6) * XLDFLAGS: Running make. (line 29) @@ -4791,86 +4807,86 @@ Index Tag Table: -Node: Top1549 -Node: Introduction2191 -Node: History4012 -Node: Installation8104 -Node: Simple installation8894 -Node: Custom installation12477 -Node: Disk space13651 -Node: Kpathsea application distributions14535 -Node: Changing search paths15650 -Node: Default path features16832 -Node: Default path generation18968 -Node: Running configure20411 -Node: configure shells21462 -Node: configure options22514 -Node: configure environment24021 -Node: configure scenarios25823 -Node: Shared library27409 -Node: Running make28423 -Node: Installing files30470 -Node: Cleaning up32417 -Node: Filename database generation33465 -Node: mktex scripts34032 -Node: mktex configuration35309 -Node: mktex script names41128 -Node: mktex script arguments42519 -Node: Installation testing43409 -Node: Security43773 -Node: TeX directory structure46340 -Node: unixtex.ftp50762 -Node: Electronic distribution52772 -Node: CD-ROM distribution55537 -Node: Other TeX packages56352 -Node: Reporting bugs57648 -Node: Bug checklist58383 -Node: Mailing lists62080 -Node: Debugging63289 -Node: Logging68367 -Node: Common problems70237 -Node: Unable to find files71068 -Node: Slow path searching73479 -Node: Unable to generate fonts74856 -Node: TeX or Metafont failing77365 -Node: Empty Makefiles79243 -Node: XtStrings80473 -Node: dlopen81309 -Node: ShellWidgetClass82127 -Node: Pointer combination warnings83759 -Node: Path searching84148 -Node: Searching overview84795 -Node: Path sources88191 -Node: Config files89262 -Node: Path expansion92907 -Node: Default expansion93856 -Node: Variable expansion95926 -Node: Tilde expansion97329 -Node: Brace expansion98309 -Node: KPSE_DOT expansion99414 -Node: Subdirectory expansion99927 -Node: Filename database102278 -Node: ls-R103332 -Node: Filename aliases106226 -Node: Database format107404 -Node: Invoking kpsewhich108417 -Node: Path searching options109362 -Node: Specially-recognized files116637 -Node: Auxiliary tasks117993 -Node: Standard options119818 -Node: TeX support120138 -Node: Supported file formats121429 -Node: File lookup128742 -Node: Glyph lookup130474 -Node: Basic glyph lookup131598 -Node: Fontmap132477 -Node: Fallback font135094 -Node: Suppressing warnings136007 -Node: Programming137112 -Node: Programming overview137625 -Node: Calling sequence140319 -Node: Program-specific files145287 -Node: Programming with config files146329 -Node: Index147641 +Node: Top1609 +Node: Introduction2252 +Node: History4074 +Node: Installation8166 +Node: Simple installation8956 +Node: Custom installation12539 +Node: Disk space13713 +Node: Kpathsea application distributions14597 +Node: Changing search paths15712 +Node: Default path features16894 +Node: Default path generation19030 +Node: Running configure20473 +Node: configure shells21524 +Node: configure options22576 +Node: configure environment24083 +Node: configure scenarios25885 +Node: Shared library27471 +Node: Running make28485 +Node: Installing files30532 +Node: Cleaning up32479 +Node: Filename database generation33527 +Node: mktex scripts34094 +Node: mktex configuration35371 +Node: mktex script names41190 +Node: mktex script arguments42581 +Node: Installation testing43471 +Node: Security43835 +Node: TeX directory structure46402 +Node: unixtex.ftp50824 +Node: Electronic distribution52834 +Node: CD-ROM distribution55599 +Node: Other TeX packages56414 +Node: Reporting bugs57710 +Node: Bug checklist58445 +Node: Mailing lists62142 +Node: Debugging63351 +Node: Logging68429 +Node: Common problems70299 +Node: Unable to find files71130 +Node: Slow path searching73541 +Node: Unable to generate fonts74918 +Node: TeX or Metafont failing77427 +Node: Empty Makefiles79305 +Node: XtStrings80535 +Node: dlopen81371 +Node: ShellWidgetClass82189 +Node: Pointer combination warnings83821 +Node: Path searching84210 +Node: Searching overview84857 +Node: Path sources88253 +Node: Config files89324 +Node: Path expansion92969 +Node: Default expansion93918 +Node: Variable expansion95988 +Node: Tilde expansion97391 +Node: Brace expansion98371 +Node: KPSE_DOT expansion99476 +Node: Subdirectory expansion99989 +Node: Filename database102340 +Node: ls-R103394 +Node: Filename aliases106288 +Node: Database format107466 +Node: Invoking kpsewhich108479 +Node: Path searching options109424 +Node: Specially-recognized files116699 +Node: Auxiliary tasks118055 +Node: Standard options119880 +Node: TeX support120200 +Node: Supported file formats121491 +Node: File lookup129007 +Node: Glyph lookup130739 +Node: Basic glyph lookup131863 +Node: Fontmap132742 +Node: Fallback font135359 +Node: Suppressing warnings136272 +Node: Programming137377 +Node: Programming overview137890 +Node: Calling sequence140584 +Node: Program-specific files145552 +Node: Programming with config files146594 +Node: Index147906 End Tag Table diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi index 196a67d7134..371fad1f6f4 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 May 2009 +@set month-year June 2009 @copying This file documents the Kpathsea library for path searching. @@ -68,6 +68,7 @@ approved by the @TeX{} Users Group. @author Karl Berry @author Olaf Weber @author Taco Hoekwater +@author @url{http://tug.org/kpathsea} @page @vskip 0pt plus 1filll @@ -1524,7 +1525,7 @@ suffix @samp{.bib}. @item bst @flindex .bst @vindex BSTINPUTS -(Bib@TeX{} style file, @pxref{Basic BibTeX style files,, Basic Bib@TeX{} +(Bib@TeX{} style, @pxref{Basic BibTeX style files,, Basic Bib@TeX{} style files, web2c, Web2c}) @code{BSTINPUTS}; suffix @samp{.bst}. @@ -1674,6 +1675,23 @@ suffix @samp{.mft}. (font-related files that don't fit the other categories) @code{MISCFONTS} +@item mlbib +@flindex .mlbib +@vindex MLBIBINPUTS +@vindex BIBINPUTS +@vindex TEXBIB +(MlBib@TeX{} bibliography source) +@code{MLBIBINPUTS}, @code{BIBINPUTS}, @code{TEXBIB}; +suffixes @samp{.mlbib}, @samp{.mlbib}. + +@item mlbst +@flindex .mlbst +@vindex MLBSTINPUTS +@vindex BSTINPUTS +(MlBib@TeX{} style) +@code{MLBSTINPUTS}, @code{BSTINPUTS}; +suffixes @samp{.mlbst}, @samp{.bst}. + @item mp @flindex .mp @vindex MPINPUTS diff --git a/Build/source/texk/kpathsea/tex-file.c b/Build/source/texk/kpathsea/tex-file.c index 7b81c7a0532..56933985616 100644 --- a/Build/source/texk/kpathsea/tex-file.c +++ b/Build/source/texk/kpathsea/tex-file.c @@ -87,6 +87,8 @@ #define LUA_ENVS "LUAINPUTS" #define FONTFEATURES_ENVS "FONTFEATURES" #define FONTCIDMAPS_ENVS "FONTCIDMAPS" +#define MLBIB_ENVS "MLBIBINPUTS", BIB_ENVS +#define MLBST_ENVS "MLBSTINPUTS", BST_ENVS /* The compiled-in default list, DEFAULT_FONT_SIZES, is intended to be set from the command line (presumably via the Makefile). */ @@ -751,6 +753,18 @@ kpathsea_init_format (kpathsea kpse, kpse_file_format_type format) SUFFIXES (CID_SUFFIXES); FMT_INFO.suffix_search_only = true; break; + case kpse_mlbib_format: + INIT_FORMAT ("mlbib", DEFAULT_MLBIBINPUTS, MLBIB_ENVS); +#define MLBIB_SUFFIXES ".mlbib", ".bib" + SUFFIXES (MLBIB_SUFFIXES); + FMT_INFO.suffix_search_only = true; + break; + case kpse_mlbst_format: + INIT_FORMAT ("mlbst", DEFAULT_MLBSTINPUTS, MLBST_ENVS); +#define MLBST_SUFFIXES ".mlbst", ".bst" + SUFFIXES (MLBST_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 fb242765fd4..31a06f3fba9 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -315,12 +315,13 @@ MISCFONTS = .;$TEXMF/fonts/misc// % map file syntax the definition can be simplified again. TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// -% BibTeX bibliographies and style files. +% BibTeX bibliographies and style files. bibtex8 also uses these. BIBINPUTS = .;$TEXMF/bibtex/bib// BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// -% For bibtex8. Do we really need to repeat the BIBINPUTS setting? -BIBINPUTS.bibtex8 = .;$TEXMF/bibtex/{bib,}// -BSTINPUTS.bibtex8 = .;$TEXMF/bibtex/{bst,csf,}// + +% MlBibTeX. +MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// +MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// % MFT style files. MFTINPUTS = .;$TEXMF/mft// diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h index 1ef2ed38692..a6d0e401da7 100644 --- a/Build/source/texk/kpathsea/types.h +++ b/Build/source/texk/kpathsea/types.h @@ -137,6 +137,8 @@ typedef enum kpse_lua_format, kpse_fea_format, kpse_cid_format, + kpse_mlbib_format, + kpse_mlbst_format, kpse_last_format /* one past last index */ } kpse_file_format_type; |