summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/kpathsea/ChangeLog7
-rw-r--r--Build/source/texk/kpathsea/doc/kpathsea.info153
-rw-r--r--Build/source/texk/kpathsea/doc/kpathsea.texi6
-rw-r--r--Build/source/texk/kpathsea/kpsewhich.c9
4 files changed, 96 insertions, 79 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 00a5b710094..6341326931e 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-02 Karl Berry <karl@freefriends.org>
+
+ * kpsewhich.c (lookup): warn that --all is ignored with bitmap fonts.
+ (USAGE): likewise.
+ * doc/kpathsea.texi (Path searching options) <--all>: likewise.
+ Report from Werner Lember, 07 Apr 2018 12:39:34.
+
2018-06-10 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* progname.c, types.h, knj.h: Add a variable W32_codepage.
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 57d9c99d386..547ea1a5161 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -37,7 +37,7 @@ Kpathsea library
****************
This manual documents the Kpathsea library for path searching. It
-corresponds to version 6.3.0, released in February 2018.
+corresponds to version 6.3.0, released in July 2018.
* Menu:
@@ -62,7 +62,7 @@ File: kpathsea.info, Node: Introduction, Next: unixtex.ftp, Prev: Top, Up: T
**************
This manual corresponds to version 6.3.0 of the Kpathsea library,
-released in February 2018.
+released in July 2018.
The library's fundamental purpose is to return a filename from a list
of directories specified by the user, similar to what shells do when
@@ -1153,7 +1153,8 @@ filename, and returns the first file found.
'--all'
Report all matches found, one per line. By default, if there is
more than one match, just one will be reported (chosen effectively
- at random).
+ at random). Exception: with the glyph formats ('pk', 'gf'), this
+ option has no effect and only the first match is returned.
'--casefold-search'
'--no-casefold-search'
@@ -2942,41 +2943,41 @@ Index
* --all: Path searching options.
(line 12)
* --casefold-search: Path searching options.
- (line 18)
+ (line 19)
* --color=tty: ls-R. (line 21)
* --debug=NUM: Auxiliary tasks. (line 9)
* --dpi=NUM: Path searching options.
- (line 27)
+ (line 28)
* --engine=NAME: Path searching options.
- (line 31)
+ (line 32)
* --expand-braces=STRING: Auxiliary tasks. (line 12)
* --expand-path=STRING: Auxiliary tasks. (line 16)
* --expand-var=STRING: Auxiliary tasks. (line 34)
* --format=NAME: Path searching options.
- (line 47)
+ (line 48)
* --help: Standard options. (line 8)
* --help-formats: Auxiliary tasks. (line 39)
* --interactive: Path searching options.
- (line 129)
+ (line 130)
* --mktex=FILETYPE: Path searching options.
- (line 134)
+ (line 135)
* --mode=STRING: Path searching options.
- (line 140)
+ (line 141)
* --must-exist: Path searching options.
- (line 145)
+ (line 146)
* --no-casefold-search: Path searching options.
- (line 18)
+ (line 19)
* --no-mktex=FILETYPE: Path searching options.
- (line 134)
+ (line 135)
* --path=STRING: Path searching options.
- (line 150)
+ (line 151)
* --progname=NAME: Path searching options.
- (line 158)
+ (line 159)
* --safe-in-name=NAME: Auxiliary tasks. (line 45)
* --safe-out-name=NAME: Auxiliary tasks. (line 45)
* --show-path=NAME: Auxiliary tasks. (line 51)
* --subdir=STRING: Path searching options.
- (line 163)
+ (line 164)
* --var-value=VARIABLE: Auxiliary tasks. (line 57)
* --version: Standard options. (line 11)
* --with-mktextex-default: mktex configuration. (line 12)
@@ -2989,7 +2990,7 @@ Index
* -1 debugging value: Debugging. (line 23)
* -A option to ls: ls-R. (line 33)
* -D NUM: Path searching options.
- (line 27)
+ (line 28)
* -iname, find predicate: Casefolding examples.
(line 78)
* -L option to ls: ls-R. (line 38)
@@ -3268,7 +3269,7 @@ Index
* ENCFONTS: Supported file formats.
(line 61)
* engine name: Path searching options.
- (line 31)
+ (line 32)
* environment variable, source for path: Path sources. (line 9)
* environment variables for TeX: Supported file formats.
(line 6)
@@ -3376,7 +3377,7 @@ Index
(line 84)
* input lines, reading: Calling sequence. (line 110)
* interactive query: Path searching options.
- (line 129)
+ (line 130)
* interface, not frozen: Introduction. (line 29)
* introduction: Introduction. (line 6)
* kdebug:: Debugging. (line 105)
@@ -3599,7 +3600,7 @@ Index
* reporting bugs: Reporting bugs. (line 6)
* resident.c: Calling sequence. (line 47)
* resolution, setting: Path searching options.
- (line 27)
+ (line 28)
* resolutions, last-resort: Fallback font. (line 6)
* retrieving TeX: unixtex.ftp. (line 6)
* right-hand side of variable assignments: Config files. (line 56)
@@ -3846,61 +3847,61 @@ Index

Tag Table:
Node: Top1480
-Node: Introduction2263
-Node: History4336
-Node: unixtex.ftp8932
-Node: Security10357
-Node: TeX directory structure12861
-Node: Path searching16909
-Node: Searching overview17636
-Node: Path sources21455
-Node: Config files22546
-Node: Path expansion26473
-Node: Default expansion27426
-Node: Variable expansion29496
-Node: Tilde expansion30897
-Node: Brace expansion31877
-Node: KPSE_DOT expansion32802
-Node: Subdirectory expansion33315
-Node: Casefolding search35669
-Node: Casefolding rationale36438
-Node: Casefolding examples37777
-Node: Filename database42827
-Node: ls-R43885
-Node: Filename aliases46780
-Node: Database format47958
-Node: Invoking kpsewhich48971
-Node: Path searching options49926
-Node: Specially-recognized files58327
-Node: Auxiliary tasks59682
-Node: Standard options62021
-Node: TeX support62377
-Node: Supported file formats63731
-Node: File lookup71396
-Node: Glyph lookup73145
-Node: Basic glyph lookup74269
-Node: Fontmap75149
-Node: Fallback font77678
-Node: Suppressing warnings78590
-Node: mktex scripts79717
-Node: mktex configuration80932
-Node: mktex script names86735
-Node: mktex script arguments88121
-Node: Programming89000
-Node: Programming overview89573
-Node: Calling sequence92434
-Node: Program-specific files98966
-Node: Programming with config files99989
-Node: Reporting bugs101301
-Node: Bug checklist101979
-Node: Mailing lists105451
-Node: Debugging106126
-Node: Logging111203
-Node: Common problems113070
-Node: Unable to find files113547
-Node: Slow path searching115957
-Node: Unable to generate fonts117332
-Node: TeX or Metafont failing119803
-Node: Index121156
+Node: Introduction2259
+Node: History4328
+Node: unixtex.ftp8924
+Node: Security10349
+Node: TeX directory structure12853
+Node: Path searching16901
+Node: Searching overview17628
+Node: Path sources21447
+Node: Config files22538
+Node: Path expansion26465
+Node: Default expansion27418
+Node: Variable expansion29488
+Node: Tilde expansion30889
+Node: Brace expansion31869
+Node: KPSE_DOT expansion32794
+Node: Subdirectory expansion33307
+Node: Casefolding search35661
+Node: Casefolding rationale36430
+Node: Casefolding examples37769
+Node: Filename database42819
+Node: ls-R43877
+Node: Filename aliases46772
+Node: Database format47950
+Node: Invoking kpsewhich48963
+Node: Path searching options49918
+Node: Specially-recognized files58437
+Node: Auxiliary tasks59792
+Node: Standard options62131
+Node: TeX support62487
+Node: Supported file formats63841
+Node: File lookup71506
+Node: Glyph lookup73255
+Node: Basic glyph lookup74379
+Node: Fontmap75259
+Node: Fallback font77788
+Node: Suppressing warnings78700
+Node: mktex scripts79827
+Node: mktex configuration81042
+Node: mktex script names86845
+Node: mktex script arguments88231
+Node: Programming89110
+Node: Programming overview89683
+Node: Calling sequence92544
+Node: Program-specific files99076
+Node: Programming with config files100099
+Node: Reporting bugs101411
+Node: Bug checklist102089
+Node: Mailing lists105561
+Node: Debugging106236
+Node: Logging111313
+Node: Common problems113180
+Node: Unable to find files113657
+Node: Slow path searching116067
+Node: Unable to generate fonts117442
+Node: TeX or Metafont failing119913
+Node: Index121266

End Tag Table
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index 65eee7e9f4c..999819a516c 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 6.3.0
-@set month-year February 2018
+@set month-year July 2018
@copying
This file documents the Kpathsea library for path searching.
@@ -1436,7 +1436,9 @@ Various options alter the path searching behavior:
@opindex --all
@cindex all matches, finding
Report all matches found, one per line. By default, if there is more
-than one match, just one will be reported (chosen effectively at random).
+than one match, just one will be reported (chosen effectively at
+random). Exception: with the glyph formats (@code{pk}, @code{gf}),
+this option has no effect and only the first match is returned.
@item --casefold-search
@itemx --no-casefold-search
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 40acd31e904..76fc21d1ad8 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -397,6 +397,13 @@ lookup (kpathsea kpse, string name)
unsigned local_dpi = find_dpi (name);
if (!local_dpi)
local_dpi = dpi;
+ if (show_all) {
+ /* Because the whole glyph lookup thing is too complicated
+ to try all the alternatives (cmr10.600pk vs.
+ dpi600/cmr10.pk, just for starters). Patches welcome :). */
+ WARNING1 ("kpsewhich: Ignoring --all for bitmap font, sorry: %s",
+ name);
+ }
ret = kpathsea_find_glyph (kpse, temp,
local_dpi, fmt, &glyph_ret);
if (temp != name)
@@ -464,7 +471,7 @@ When looking up format (.fmt/.base/.mem) files, it is usually necessary\n\
to also use -engine, or nothing will be returned; in particular,\n\
-engine=/ will return matching format files for any engine.\n\
\n\
--all output all matches, one per line.\n\
+-all output all matches, one per line (no effect with pk/gf).\n\
[-no]-casefold-search fall back to case-insensitive search if no exact match.\n\
-debug=NUM set debugging flags.\n\
-D, -dpi=NUM use a base resolution of NUM; default 600.\n\
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 09:38:52 +0000