From f5a7602eb3204207c2c81503763b35f746199c1d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 Dec 2009 02:10:35 +0000 Subject: make --mktex=foo actually enable mktexfoo, by setting --must-exist git-svn-id: svn://tug.org/texlive/trunk@16301 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 6 +- Build/source/texk/kpathsea/doc/kpathsea.info | 190 +++++++++++++-------------- Build/source/texk/kpathsea/doc/kpathsea.texi | 19 +-- Build/source/texk/kpathsea/kpsewhich.c | 4 +- 4 files changed, 113 insertions(+), 106 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 28e40bcabb4..f23dda6c27a 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,9 +1,13 @@ 2009-12-05 Karl Berry + Suggested/reported by Daniel Luecking, 16 Nov 2009 11:58:00: + * kpsewhich.c (init_more): split out lengthier initializations to own fn. Initialize all mktex programs to false, so that cnf/env settings such as MKTEXPK=1 don't apply to kpsewhich. - Suggested by Daniel Luecking, 16 Nov 2009 11:58:00. + (read_command_line) <--[no-]mktex>: set must_exist, since + otherwise the mktex program is never called. + * doc/kpathsea.texi (Path searching options): minimally describe this. 2009-12-04 Karl Berry diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info index ebb3184829d..955e3f16f06 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. @@ -2739,12 +2739,12 @@ filename, and returns the first file found. After processing the command line, read additional filenames to look up from standard input. -`-mktex=FILETYPE' -`-no-mktex=FILETYPE' - Turn on or off the `mktex' script associated with FILETYPE. The - only values that make sense for FILETYPE are `pk', `mf', `tex', - and `tfm'. By default, all are off in Kpsewhich. *Note mktex - scripts::. +`--mktex=FILETYPE' +`--no-mktex=FILETYPE' + Turn on or off the `mktex' script associated with FILETYPE. Usual + values for FILETYPE are `pk', `mf', `tex', and `tfm'. By default, + all are off in Kpsewhich, even if they are enabled for TeX. This + option implies setting `--must-exist'. *Note mktex scripts::. `--mode=STRING' Set the mode name to STRING; this also only affects `gf' and `pk' @@ -2753,8 +2753,8 @@ filename, and returns the first file found. `--must-exist' Do everything possible to find the files, notably including - searching the disk. By default, only the `ls-R' database is - checked, in the interest of efficiency. + searching the disk and running the `mktex' scripts. By default, + only the `ls-R' database is checked, in the interest of efficiency. `--path=STRING' Search along the path STRING (colon-separated as usual), instead @@ -3723,10 +3723,14 @@ Index * --help: Standard options. (line 8) * --interactive: Path searching options. (line 110) +* --mktex=FILETYPE: Path searching options. + (line 115) * --mode=STRING: Path searching options. (line 121) * --must-exist: Path searching options. (line 126) +* --no-mktex=FILETYPE: Path searching options. + (line 115) * --path=STRING: Path searching options. (line 131) * --progname=NAME: Path searching options. @@ -3755,10 +3759,6 @@ Index * -dynamic: ShellWidgetClass. (line 43) * -g, compiling without: configure scenarios. (line 32) * -L option to ls: ls-R. (line 38) -* -mktex=FILETYPE: Path searching options. - (line 115) -* -no-mktex=FILETYPE: Path searching options. - (line 115) * -O, compiling with: configure scenarios. (line 32) * -static: ShellWidgetClass. (line 43) * . directories, ignored: ls-R. (line 33) @@ -4834,86 +4834,86 @@ Index  Tag Table: -Node: Top1549 -Node: Introduction2192 -Node: History4014 -Node: Installation8106 -Node: Simple installation8896 -Node: Custom installation12479 -Node: Disk space13653 -Node: Kpathsea application distributions14537 -Node: Changing search paths15652 -Node: Default path features16834 -Node: Default path generation18970 -Node: Running configure20413 -Node: configure shells21464 -Node: configure options22516 -Node: configure environment24023 -Node: configure scenarios25825 -Node: Shared library27411 -Node: Running make28425 -Node: Installing files30472 -Node: Cleaning up32419 -Node: Filename database generation33467 -Node: mktex scripts34034 -Node: mktex configuration35311 -Node: mktex script names41130 -Node: mktex script arguments42521 -Node: Installation testing43411 -Node: Security43775 -Node: TeX directory structure46342 -Node: unixtex.ftp50764 -Node: Electronic distribution52774 -Node: CD-ROM distribution55539 -Node: Other TeX packages56354 -Node: Reporting bugs57650 -Node: Bug checklist58385 -Node: Mailing lists62082 -Node: Debugging63291 -Node: Logging68369 -Node: Common problems70239 -Node: Unable to find files71070 -Node: Slow path searching73481 -Node: Unable to generate fonts74858 -Node: TeX or Metafont failing77367 -Node: Empty Makefiles79246 -Node: XtStrings80476 -Node: dlopen81312 -Node: ShellWidgetClass82130 -Node: Pointer combination warnings83762 -Node: Path searching84151 -Node: Searching overview84798 -Node: Path sources88194 -Node: Config files89265 -Node: Path expansion92910 -Node: Default expansion93859 -Node: Variable expansion95929 -Node: Tilde expansion97332 -Node: Brace expansion98312 -Node: KPSE_DOT expansion99417 -Node: Subdirectory expansion99930 -Node: Filename database102281 -Node: ls-R103335 -Node: Filename aliases106229 -Node: Database format107407 -Node: Invoking kpsewhich108420 -Node: Path searching options109365 -Node: Specially-recognized files116640 -Node: Auxiliary tasks117996 -Node: Standard options119821 -Node: TeX support120141 -Node: Supported file formats121432 -Node: File lookup128948 -Node: Glyph lookup130680 -Node: Basic glyph lookup131804 -Node: Fontmap132683 -Node: Fallback font135300 -Node: Suppressing warnings136213 -Node: Programming137318 -Node: Programming overview137831 -Node: Calling sequence140525 -Node: Program-specific files147048 -Node: Programming with config files148090 -Node: Index149402 +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 Makefiles79306 +Node: XtStrings80536 +Node: dlopen81372 +Node: ShellWidgetClass82190 +Node: Pointer combination warnings83822 +Node: Path searching84211 +Node: Searching overview84858 +Node: Path sources88254 +Node: Config files89325 +Node: Path expansion92970 +Node: Default expansion93919 +Node: Variable expansion95989 +Node: Tilde expansion97392 +Node: Brace expansion98372 +Node: KPSE_DOT expansion99477 +Node: Subdirectory expansion99990 +Node: Filename database102341 +Node: ls-R103395 +Node: Filename aliases106289 +Node: Database format107467 +Node: Invoking kpsewhich108480 +Node: Path searching options109425 +Node: Specially-recognized files116795 +Node: Auxiliary tasks118151 +Node: Standard options119976 +Node: TeX support120296 +Node: Supported file formats121587 +Node: File lookup129103 +Node: Glyph lookup130835 +Node: Basic glyph lookup131959 +Node: Fontmap132838 +Node: Fallback font135455 +Node: Suppressing warnings136368 +Node: Programming137473 +Node: Programming overview137986 +Node: Calling sequence140680 +Node: Program-specific files147203 +Node: Programming with config files148245 +Node: Index149557  End Tag Table diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi index 8c2af02124e..df404d10735 100644 --- a/Build/source/texk/kpathsea/doc/kpathsea.texi +++ b/Build/source/texk/kpathsea/doc/kpathsea.texi @@ -1178,14 +1178,15 @@ This option and @samp{--path} are mutually exclusive. After processing the command line, read additional filenames to look up from standard input. -@item -mktex=@var{filetype} -@itemx -no-mktex=@var{filetype} -@opindex -mktex=@var{filetype} -@opindex -no-mktex=@var{filetype} +@item --mktex=@var{filetype} +@itemx --no-mktex=@var{filetype} +@opindex --mktex=@var{filetype} +@opindex --no-mktex=@var{filetype} Turn on or off the @samp{mktex} script associated with @var{filetype}. -The only values that make sense for @var{filetype} are @samp{pk}, -@samp{mf}, @samp{tex}, and @samp{tfm}. By default, all are off in -Kpsewhich. @xref{mktex scripts}. +Usual values for @var{filetype} are @samp{pk}, @samp{mf}, @samp{tex}, +and @samp{tfm}. By default, all are off in Kpsewhich, even if they +are enabled for @TeX{}. This option implies setting +@code{--must-exist}. @xref{mktex scripts}. @item --mode=@var{string} @opindex --mode=@var{string} @@ -1196,8 +1197,8 @@ script arguments}. @item --must-exist @opindex --must-exist Do everything possible to find the files, notably including searching -the disk. By default, only the @file{ls-R} database is checked, in the -interest of efficiency. +the disk and running the @samp{mktex} scripts. By default, only the +@file{ls-R} database is checked, in the interest of efficiency. @item --path=@var{string} @opindex --path=@var{string} diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index f17060dd39a..e529cbc75fc 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -54,7 +54,7 @@ string user_path; /* Interactively ask for names to look up? (-interactive) */ boolean interactive = false; -/* Search the disk as well as ls-R? (-must-exist) */ +/* Search the disk as well as ls-R? (-must-exist, -mktex) */ boolean must_exist = false; /* Return all matches, not just the first one? (-all) */ @@ -450,12 +450,14 @@ read_command_line (kpathsea kpse, int argc, string *argv) } else if (ARGUMENT_IS ("mktex")) { kpathsea_maketex_option (kpse, optarg, true); + must_exist = 1; /* otherwise it never gets called */ } else if (ARGUMENT_IS ("mode")) { mode = optarg; } else if (ARGUMENT_IS ("no-mktex")) { kpathsea_maketex_option (kpse, optarg, false); + must_exist = 0; } else if (ARGUMENT_IS ("path")) { user_path = optarg; -- cgit v1.2.3