From ccc63194ce7813106830c8a8755c54d89de831b4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 23 Feb 2018 19:30:01 +0000 Subject: -min-crossrefs needs .aux removal; other doc tweaks git-svn-id: svn://tug.org/texlive/trunk@46719 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 6 +++ Build/source/texk/kpathsea/cnf-to-paths.awk | 7 ++- Build/source/texk/kpathsea/lib.h | 1 + Build/source/texk/web2c/ChangeLog | 6 +++ Build/source/texk/web2c/doc/web2c.info | 84 +++++++++++++++-------------- Build/source/texk/web2c/doc/web2c.texi | 11 ++-- Build/source/texk/web2c/man/ChangeLog | 6 +++ Build/source/texk/web2c/man/bibtex.man | 16 +++++- 8 files changed, 90 insertions(+), 47 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index f2a0ce396fe..136db935232 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2018-02-23 Karl Berry + + * lib.h (LIB_START_FATAL): mention that the identifier `kpse' + has to be defined for this to work. (In practice, it's a local + variable.) Private report from Douglas McKenna, 2018/02/21. + 2018-02-21 Akira Kakuto * xgetcwd.c: Replace LIB_FATAL2 by FATAL2. diff --git a/Build/source/texk/kpathsea/cnf-to-paths.awk b/Build/source/texk/kpathsea/cnf-to-paths.awk index faae308cb4a..d06f871c313 100644 --- a/Build/source/texk/kpathsea/cnf-to-paths.awk +++ b/Build/source/texk/kpathsea/cnf-to-paths.awk @@ -14,7 +14,10 @@ # # 1) definitions referring to SELFAUTO*, which we want to keep. In # particular, this is how the compile-time TEXMFCNF gets defined and - # thus how texmf.cnf gets found. + # thus how texmf.cnf gets found. In fact, TEXMFCNF is the only + # relevant compile-time value at all, and since its value is not used + # from texmf.cnf, we could simplify this whole process in both + # directions. Maybe someday. # # 2) definitions starting with a /, which we also want to keep. Here # we assume a distro maintainer has changed a variable, e.g., @@ -25,7 +28,7 @@ # That way, the binaries don't get changed just because we change # definitions in texmf.cnf. # - # The definition of DEFAULT_TEXMF (and other variables) + # The definition of DEFAULT_TEXMFROOT (and other variables) # that winds up in the final paths.h will not be used. # Extract the identifier and the value from the line. Since diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h index df380f654d6..9255834ce29 100644 --- a/Build/source/texk/kpathsea/lib.h +++ b/Build/source/texk/kpathsea/lib.h @@ -87,6 +87,7 @@ extern "C" { #define WARNING4(str, e1, e2, e3, e4) \ START_WARNING (); fprintf (stderr, str, e1, e2, e3, e4); END_WARNING () +/* This requires an identifier `kpse' to be set up correctly. Sorry. */ #define LIB_START_FATAL() do { \ fprintf (stderr, "%s: fatal: ", kpse->invocation_name); diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index ea4fa468e19..964a392e8e0 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2018-02-23 Karl Berry + + * doc/web2c.texi (bibtex invocation): mention need to remove aux + file from previous run for -min-crossrefs to be effective. + https://tex.stackexchange.com/questions/123740 + 2018-02-18 Karl Berry * bibtex.ch (str_ends_with): new fn. diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info index 767f53994ee..8a2c67ab664 100644 --- a/Build/source/texk/web2c/doc/web2c.info +++ b/Build/source/texk/web2c/doc/web2c.info @@ -1,4 +1,4 @@ -This is web2c.info, produced by makeinfo version 6.3 from web2c.texi. +This is web2c.info, produced by makeinfo version 6.5 from web2c.texi. This file documents the installation and use of the programs in Web2c, an implementation of Donald Knuth's TeX system. @@ -2227,9 +2227,13 @@ macros. BibTeX searches for '.bib' files using the 'BIBINPUTS' and even if it was not explicitly referenced in the .aux file. For example, E might be a conference proceedings as a whole, with the cross-referencing entries being individual articles published in - the proceedings. In some circumstances, you may want to avoid - these automatic inclusions altogether; to do this, make N a - sufficiently large number. + the proceedings. + + If you want to avoid these automatic inclusions altogether, make N + a sufficiently large number, and be sure to remove any previous + .aux and .bbl files. Otherwise the option may appear to have no + effect, since BibTeX will have added the citation for E to the + .aux, and nothing will remove it. See also: 'btxdoc.tex' @@ -2318,9 +2322,9 @@ available in many other places, of course). * Menu: -* tangle invocation:: -* weave invocation:: -* pooltype invocation:: +* tangle invocation:: +* weave invocation:: +* pooltype invocation::  File: web2c.info, Node: tangle invocation, Next: weave invocation, Up: WEB @@ -2559,7 +2563,7 @@ program. * Menu: -* dvitype output example:: +* dvitype output example::  File: web2c.info, Node: dvitype output example, Up: dvitype invocation @@ -3635,7 +3639,7 @@ Index * bibliography items, cross-referenced: bibtex invocation. (line 31) * bibtex: bibtex invocation. (line 6) * BibTeX: BibTeX. (line 6) -* BibTeX collection: bibtex invocation. (line 54) +* BibTeX collection: bibtex invocation. (line 58) * BibTeX style files: Basic BibTeX style files. (line 6) * BigEndian machines: Hardware and memory dumps. @@ -3647,9 +3651,9 @@ Index * Breitenlohner, Peter: Introduction. (line 9) * BSTINPUTS, search path for bst files: bibtex invocation. (line 18) * btex for MetaPost labels: mpost invocation. (line 48) -* btxdoc.bib: bibtex invocation. (line 48) -* btxdoc.tex: bibtex invocation. (line 42) -* btxhak.tex: bibtex invocation. (line 45) +* btxdoc.bib: bibtex invocation. (line 52) +* btxdoc.tex: bibtex invocation. (line 46) +* btxhak.tex: bibtex invocation. (line 49) * byte position: pktype invocation. (line 40) * byte position <1>: gftype invocation. (line 76) * byte swapping: Hardware and memory dumps. @@ -3830,7 +3834,7 @@ Index (line 21) * Free Software Foundation documentation system: Formats. (line 47) * freedom of Web2c: Introduction. (line 23) -* ftp.math.utah.edu: bibtex invocation. (line 54) +* ftp.math.utah.edu: bibtex invocation. (line 58) * generating source specials: tex invocation. (line 133) * geometric designs: Metafont. (line 6) * geometric font scaling: Font file formats. (line 21) @@ -4212,7 +4216,7 @@ Index * string numbers, displaying: pooltype invocation. (line 6) * string pool, writing: tangle invocation. (line 16) * string representation: pooltype invocation. (line 30) -* style design, for BibTeX: bibtex invocation. (line 45) +* style design, for BibTeX: bibtex invocation. (line 49) * style files: mft invocation. (line 67) * substitutions of font glyphs: MLTeX. (line 6) * sun: Online Metafont graphics. @@ -4245,7 +4249,7 @@ Index * terminator for filenames: \input filenames. (line 10) * terse output: bibtex invocation. (line 28) * tex: tex invocation. (line 6) -* TeX, bibliographies for: bibtex invocation. (line 54) +* TeX, bibliographies for: bibtex invocation. (line 58) * TeX, creating from Metafont: mft invocation. (line 6) * TeX, creating from WEB: weave invocation. (line 6) * TeX, description of: TeX. (line 6) @@ -4297,7 +4301,7 @@ Index * Troff, and MetaPost: mpost invocation. (line 65) * Troff, WEB for: WEB. (line 12) * Trojan horses and TeX programs: tex invocation. (line 48) -* TUGboat bibliography: bibtex invocation. (line 54) +* TUGboat bibliography: bibtex invocation. (line 58) * Type 1 conversion: Font utilities available elsewhere. (line 39) * type design, personal: Initial Metafont. (line 31) @@ -4362,7 +4366,7 @@ Index (line 69) * X toolkits and Metafont: Online Metafont graphics. (line 59) -* xampl.bib: bibtex invocation. (line 51) +* xampl.bib: bibtex invocation. (line 55) * xbfe, bitmap font editor: Font utilities available elsewhere. (line 23) * XeTeX: TeX extensions. (line 31) @@ -4432,28 +4436,28 @@ Node: Initial MetaPost90194 Node: dvitomp invocation91116 Node: BibTeX91781 Node: bibtex invocation92142 -Node: Basic BibTeX style files94440 -Node: WEB95770 -Node: tangle invocation97011 -Node: weave invocation99134 -Node: pooltype invocation100541 -Node: DVI utilities101671 -Node: dvicopy invocation102603 -Node: dvitype invocation103886 -Node: dvitype output example106221 -Node: Font utilities109272 -Node: Font file formats110452 -Node: gftopk invocation113721 -Node: pktogf invocation114912 -Node: pktype invocation116078 -Node: gftype invocation118901 -Node: tftopl invocation123404 -Node: pltotf invocation127997 -Node: vftovp invocation129048 -Node: vptovf invocation131283 -Node: Font utilities available elsewhere132310 -Node: Legalisms134690 -Node: References136844 -Node: Index141411 +Node: Basic BibTeX style files94616 +Node: WEB95946 +Node: tangle invocation97155 +Node: weave invocation99278 +Node: pooltype invocation100685 +Node: DVI utilities101815 +Node: dvicopy invocation102747 +Node: dvitype invocation104030 +Node: dvitype output example106359 +Node: Font utilities109410 +Node: Font file formats110590 +Node: gftopk invocation113859 +Node: pktogf invocation115050 +Node: pktype invocation116216 +Node: gftype invocation119039 +Node: tftopl invocation123542 +Node: pltotf invocation128135 +Node: vftovp invocation129186 +Node: vptovf invocation131421 +Node: Font utilities available elsewhere132448 +Node: Legalisms134828 +Node: References136982 +Node: Index141549  End Tag Table diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi index 950a6e31329..2ba32ac9beb 100644 --- a/Build/source/texk/web2c/doc/web2c.texi +++ b/Build/source/texk/web2c/doc/web2c.texi @@ -2699,9 +2699,14 @@ entry @var{e} via their @code{crossref} field, include @var{e} in the @t{.bbl} file, even if it was not explicitly referenced in the @t{.aux} file. For example, @var{e} might be a conference proceedings as a whole, with the cross-referencing entries being individual articles published -in the proceedings. In some circumstances, you may want to avoid these -automatic inclusions altogether; to do this, make @var{n} a sufficiently -large number. +in the proceedings. + +If you want to avoid these automatic inclusions altogether, make +@var{n} a sufficiently large number, and be sure to remove any +previous @t{.aux} and @t{.bbl} files. Otherwise the option may +appear to have no effect, since Bib@TeX{} will have added the citation +for @var{e} to the @t{.aux}, and nothing will remove it. + @end table See also: diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index 90fc42c79d3..437021cc705 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,9 @@ +2018-02-23 Karl Berry + + * bibtex.man: mention need to remove aux file from previous run + for -min-crossrefs to be effective. + https://tex.stackexchange.com/questions/123740 + 2018-01-18 Karl Berry * mf.man: spacing, no openin, per Debian. diff --git a/Build/source/texk/web2c/man/bibtex.man b/Build/source/texk/web2c/man/bibtex.man index b2fb880ee10..3f970a98b7e 100644 --- a/Build/source/texk/web2c/man/bibtex.man +++ b/Build/source/texk/web2c/man/bibtex.man @@ -1,4 +1,4 @@ -.TH BIBTEX 1 "16 June 2015" "bibtex 0.99d" "Web2C @VERSION@" +.TH BIBTEX 1 "23 February 2018" "bibtex 0.99d" "Web2C @VERSION@" .\"===================================================================== .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP .if n .ds TX TeX @@ -63,8 +63,20 @@ The .B \-min-crossrefs option defines the minimum number of .B crossref -required for automatic inclusion of the crossref'd entry on the citation +required for automatic inclusion of the crossref base entry in the citation list; the default is two. +To avoid these automatic inclusions altogether, give this option +a sufficiently large number, and be sure to remove any +previous +.B .aux +and +.B .bbl +files. Otherwise the option may +appear to have no effect, since \*(BX will have added the citation +for the base entry to the +.B .aux +file, and nothing will remove it. +.PP With the .B \-terse option, \*(BX operates silently. Without it, a banner and progress -- cgit v1.2.3