diff options
| -rw-r--r-- | Build/source/README.coding | 4 | ||||
| -rw-r--r-- | Build/source/README.config | 19 | ||||
| -rw-r--r-- | Build/source/README.hacking | 4 | ||||
| -rw-r--r-- | Build/source/texk/tetex/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/texk/tetex/texlinks | 2 | ||||
| -rw-r--r-- | Build/source/texk/web2c/bibtex.ch | 29 |
6 files changed, 33 insertions, 29 deletions
diff --git a/Build/source/README.coding b/Build/source/README.coding index bf0501b4f05..2252b5f4535 100644 --- a/Build/source/README.coding +++ b/Build/source/README.coding @@ -1,4 +1,4 @@ -Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. TeX Live (TL) coding rules @@ -18,7 +18,7 @@ independently. 1.1. ANSI C function prototypes and definitions ----------------------------------------------- The TL build system no longer supports pre-ANSI C compilers. Thus all -functions prototypes and definitions must conform to the ANSI C standard +function prototypes and definitions must conform to the ANSI C standard (including `void' in the declaration of functions that take no parameters). 1.2. Static diff --git a/Build/source/README.config b/Build/source/README.config index d67d38a643d..2ab104bdd2d 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -1,4 +1,4 @@ -Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. Configure options for the TeX Live (TL) build system @@ -113,11 +113,11 @@ its requirement for clisp et al.). 2.3.1. --with-tex-banner=STR Specify the version string STR appended to banner lines, replacing the default `Web2C YYYY'; the string STR must contain the current Web2C -version, that is, the YYYY (currently 2009). +version, that is, the YYYY (currently 2010/dev). The Build script for a native TL build currently specifies -`--with-tex-banner="TeX Live 2009"', whereas a distro build should alter -this to, e.g., `--with-tex-banner="TeX Live 2009/Debian"'. +`--with-tex-banner="TeX Live 2010/dev"', whereas a distro build should alter +this to, e.g., `--with-tex-banner="TeX Live 2010/dev/Debian"'. 2.3.1. --with-editor=CMD Specify the command CMD to invoke from the `e' option, replacing the default @@ -152,10 +152,9 @@ Do not build the WEB programs bibtex ... weave, e.g., if you just want to rebuild engines. 2.3.11. --disable-omfonts -Build the Web versions of the omega font utilies (ofm2opl, opl2ofm, -ovf2ovp, and ovp2ovf) instead of the C version, omfonts. The Web -versions are needed in Japanese environments; the C versions fix some -(unknown) bugs. We hope the situation will be resolved. +Build the Web versions of the omega font utilies (ofm2opl, opl2ofm, ovf2ovp, +and ovp2ovf) instead of the C version, omfonts. The Web and C versions +should now be roughly equivalent. 2.4. Configure options for texk/xdvik/ -------------------------------------- @@ -209,8 +208,8 @@ for most libraries (not allowed for a native TeX Live build). For many libraries there are in addition '--with-LIB-includes=DIR' and '--with-LIB-libdir=DIR' to indicate non standard search locations. -The top-level configure script performs a consistency check for all -required system libraries and bails out early if some these tests fail. +The top-level configure script performs a consistency check for all required +system libraries and bails out early if some of these tests fail. 3.2. Configure options for libfontconfig ---------------------------------------- diff --git a/Build/source/README.hacking b/Build/source/README.hacking index 7cf899b2a0e..fba4e12a413 100644 --- a/Build/source/README.hacking +++ b/Build/source/README.hacking @@ -1,4 +1,4 @@ -Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> You may freely use, modify and/or distribute this file. Modifying the TeX Live (TL) build system @@ -22,7 +22,7 @@ flex 2.5.35 When anything in the TL build system (configure.ac and Makefile.am files with their fragments or M4 macros in m4/) has been modified you have to -rebuild the coresponding configure, Makefile.in, config.h or c-auto,h, or +rebuild the coresponding configure, Makefile.in, config.h or c-auto.h, or other generated files. You should use the versions mentioned above. This is most easily done automatically using maintainer-mode. diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 807bbaf8e73..fa597585d83 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2010-03-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * texlinks (version): Add missing quote in svn id. + 2010-03-11 Karl Berry <karl@tug.org> * updmap, diff --git a/Build/source/texk/tetex/texlinks b/Build/source/texk/tetex/texlinks index 686ac4ea92a..5ceaccdcd2d 100755 --- a/Build/source/texk/tetex/texlinks +++ b/Build/source/texk/tetex/texlinks @@ -39,7 +39,7 @@ export PATH # hack around a bug in zsh: test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' -version='$Id$ +version='$Id$' progname=texlinks cnf=fmtutil.cnf # name of the config file diff --git a/Build/source/texk/web2c/bibtex.ch b/Build/source/texk/web2c/bibtex.ch index 7600f7a4fcc..5d5e0cff9be 100644 --- a/Build/source/texk/web2c/bibtex.ch +++ b/Build/source/texk/web2c/bibtex.ch @@ -1444,23 +1444,23 @@ as the smallest prime number not less than 85\% of |hash_size| (and |>=128|). @d primes == hash_next {array holding the first |k| primes} -@d mult == hash_text {array holding odd multiples of the first |ord| primes} +@d mult == hash_text {array holding odd multiples of the first |o| primes} @<Procedures and functions for about everything@>= procedure compute_hash_prime; var hash_want: integer; {85\% of |hash_size|} -@!k: integer; {number of primes} -@!j: integer; {a number to be tested} -@!order: integer; {number of odd multiples of primes} -@!square: integer; {${\it prime}_{\it order}^2$} +@!k: integer; {number of prime numbers $p_i$ in |primes|} +@!j: integer; {a prime number candidate} +@!o: integer; {number of odd multiples of primes in |mult|} +@!square: integer; {$p_o^2$} @!n: integer; {loop index} -@!jprime: boolean; {is |j| a prime?} +@!j_prime: boolean; {is |j| a prime?} begin hash_want := (hash_size div 20) * 17; j := 1; k := 1; hash_prime := 2; primes[k] := hash_prime; -order := 2; +o := 2; square := 9; while hash_prime < hash_want do begin @@ -1468,19 +1468,20 @@ while hash_prime < hash_want do j := j + 2; if j = square then begin - mult[order] := j; - incr (order); - square := primes[order] * primes[order]; + mult[o] := j; + j := j + 2; + incr (o); + square := primes[o] * primes[o]; end; n := 2; - jprime := true; - while (n < order) and jprime do + j_prime := true; + while (n < o) and j_prime do begin while mult[n] < j do mult[n] := mult[n] + 2 * primes[n]; - if mult[n] = j then jprime := false; + if mult[n] = j then j_prime := false; incr (n); end; - until jprime; + until j_prime; incr (k); hash_prime := j; primes[k] := hash_prime; |