diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-09-05 13:27:45 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2012-09-05 13:27:45 +0000 |
commit | 51c832586711238475dd9b5933ec691be7e8e713 (patch) | |
tree | 0d21c84ca70a4630d85eb83b15fb18dd5028a6cf | |
parent | 4766daec07a48111a22299bce179c88c990b6ac1 (diff) |
move our changes to change files
git-svn-id: svn://tug.org/texlive/trunk@27598 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/web2c/ChangeLog | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ChangeLog | 18 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/comm-w2c.ch | 30 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/common.w | 10 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ctang-w2c.ch | 28 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/ctangle.w | 12 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/cweav-w2c.ch | 42 | ||||
-rw-r--r-- | Build/source/texk/web2c/cwebdir/cweave.w | 18 |
8 files changed, 138 insertions, 31 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 87857b0dc5c..2471866718e 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,14 +1,3 @@ -2012-09-05 Karl Berry <karl@tug.org> - - * cwebdir/cweave.w (longest_name): restore to 10000, - the value in the Knuth/Levy distribution on CTAN - (which matches Knuth, ftp://ftp.cs.stanford.edu/pub/cweb/cweb.tar.gz) - Report from Arthur O'Dwyer, 3 Sep 2012 18:06:05. - - Our cweave.w has many other changes relative to the original. - These should be moved to cweav-w2c.ch so our originals are - unmodified, but can't do everything right now. - 2012-08-01 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac (AC_CHECK_FUNCS): Remove test for snprintf. diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 9b1ede03ba9..5ab5421e329 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,21 @@ +2012-09-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + * common.w, ctangle.w, cweave.w: copy the original ones in + ftp://ftp.cs.stanford.edu/pub/cweb/cweb.tar.gz. + * comm-w2c.ch, ctang-w2c.ch, cweav-w2c.ch: move our changes to change + files. + +2012-09-05 Karl Berry <karl@tug.org> + + * cweave.w (longest_name): restore to 10000, + the value in the Knuth/Levy distribution on CTAN + (which matches Knuth, ftp://ftp.cs.stanford.edu/pub/cweb/cweb.tar.gz) + Report from Arthur O'Dwyer, 3 Sep 2012 18:06:05. + + Our cweave.w has many other changes relative to the original. + These should be moved to cweav-w2c.ch so our originals are + unmodified, but can't do everything right now. + 2012-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> * {comm,ctang,cweav}-w2c.ch: Use binary mode for output files. diff --git a/Build/source/texk/web2c/cwebdir/comm-w2c.ch b/Build/source/texk/web2c/cwebdir/comm-w2c.ch index 1561f961697..e068951b946 100644 --- a/Build/source/texk/web2c/cwebdir/comm-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/comm-w2c.ch @@ -66,6 +66,12 @@ common_init (void) @<Set up |PROGNAME| feature and initialize the search path mechanism@>; @z +@x l.153 +@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */ +@y +@d buf_size 1000 /* for \.{CWEAVE} and \.{CTANGLE} */ +@z + Section 9. @x l.173 @@ -147,6 +153,12 @@ if ((found_filename=kpse_find_cweb(change_file_name))==NULL || } @z +@x l.415 +@d max_sections 2000 /* number of identifiers, strings, section names; +@y +@d max_sections 10239 /* number of identifiers, strings, section names; +@z + Section 21. @x l.427 @@ -264,6 +276,24 @@ check_complete(){ check_complete (void) { @z +@x l.589 +@d max_bytes 90000 /* the number of bytes in identifiers, +@y +@d max_bytes 1000000 /* the number of bytes in identifiers, +@z + +@x l.591 +@d max_names 4000 /* number of identifiers, strings, section names; +@y +@d max_names 10239 /* number of identifiers, strings, section names; +@z + +@x l.642 +@d hash_size 353 /* should be prime */ +@y +@d hash_size 8501 /* should be prime */ +@z + Section 33. @x l.650 diff --git a/Build/source/texk/web2c/cwebdir/common.w b/Build/source/texk/web2c/cwebdir/common.w index dcab049db30..466456c306d 100644 --- a/Build/source/texk/web2c/cwebdir/common.w +++ b/Build/source/texk/web2c/cwebdir/common.w @@ -150,7 +150,7 @@ Since |buf_size| is strictly less than |long_buf_size|, some of \.{CWEB}'s routines use the fact that it is safe to refer to |*(limit+2)| without overstepping the bounds of the array. -@d buf_size 1000 /* for \.{CWEAVE} and \.{CTANGLE} */ +@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */ @d longest_name 1000 @d long_buf_size (buf_size+longest_name) /* for \.{CWEAVE} */ @d xisspace(c) (isspace(c)&&((unsigned char)c<0200)) @@ -412,7 +412,7 @@ If we've just changed from the |cur_file| to the |change_file|, or if the |cur_file| has changed, we tell \.{CTANGLE} to print this information in the \CEE/ file by means of the |print_where| flag. -@d max_sections 10239 /* number of identifiers, strings, section names; +@d max_sections 2000 /* number of identifiers, strings, section names; must be less than 10240 */ @<Defin...@>= @@ -586,9 +586,9 @@ elements are structures of type |name_info|, containing a pointer into the |byte_mem| array (the address where the name begins) and other data. A |name_pointer| variable is a pointer into |name_dir|. -@d max_bytes 1000000 /* the number of bytes in identifiers, +@d max_bytes 90000 /* the number of bytes in identifiers, index entries, and section names; must be less than $2^{24}$ */ -@d max_names 10239 /* number of identifiers, strings, section names; +@d max_names 4000 /* number of identifiers, strings, section names; must be less than 10240 */ @<Definitions that...@>= @@ -639,7 +639,7 @@ function |names_match|, which is slightly different in \.{CWEAVE} and \.{CTANGLE}. If there is no match for the identifier, it is inserted into the table. -@d hash_size 8501 /* should be prime */ +@d hash_size 353 /* should be prime */ @<Defini...@>= typedef name_pointer *hash_pointer; diff --git a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch index d4d301f7bd4..c519ce2d676 100644 --- a/Build/source/texk/web2c/cwebdir/ctang-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctang-w2c.ch @@ -78,6 +78,34 @@ int main (int ac, char **av) } @z +@x l.112 +@d max_bytes 90000 /* the number of bytes in identifiers, +@y +@d max_bytes 1000000 /* the number of bytes in identifiers, +@z + +@x l.114 +@d max_toks 270000 /* number of bytes in compressed \CEE/ code */ +@d max_names 4000 /* number of identifiers, strings, section names; +@y +@d max_toks 1000000 /* number of bytes in compressed \CEE/ code */ +@d max_names 10239 /* number of identifiers, strings, section names; +@z + +@x l.117 +@d max_texts 2500 /* number of replacement texts, must be less than 10240 */ +@d hash_size 353 /* should be prime; used in |"common.w"| */ +@y +@d max_texts 10239 /* number of replacement texts, must be less than 10240 */ +@d hash_size 8501 /* should be prime; used in |"common.w"| */ +@z + +@x l.121 +@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */ +@y +@d buf_size 1000 /* for \.{CWEAVE} and \.{CTANGLE} */ +@z + Section 5. @x common.h l.30 - boolean comes from kpathsea. diff --git a/Build/source/texk/web2c/cwebdir/ctangle.w b/Build/source/texk/web2c/cwebdir/ctangle.w index 0c1b52eda72..86d0d0a5103 100644 --- a/Build/source/texk/web2c/cwebdir/ctangle.w +++ b/Build/source/texk/web2c/cwebdir/ctangle.w @@ -109,16 +109,16 @@ so they should be sufficient for most applications of \.{CTANGLE}. If you change |max_bytes|, |max_names|, or |hash_size| you should also change them in the file |"common.w"|. -@d max_bytes 1000000 /* the number of bytes in identifiers, +@d max_bytes 90000 /* the number of bytes in identifiers, index entries, and section names; used in |"common.w"| */ -@d max_toks 1000000 /* number of bytes in compressed \CEE/ code */ -@d max_names 10239 /* number of identifiers, strings, section names; +@d max_toks 270000 /* number of bytes in compressed \CEE/ code */ +@d max_names 4000 /* number of identifiers, strings, section names; must be less than 10240; used in |"common.w"| */ -@d max_texts 10239 /* number of replacement texts, must be less than 10240 */ -@d hash_size 8501 /* should be prime; used in |"common.w"| */ +@d max_texts 2500 /* number of replacement texts, must be less than 10240 */ +@d hash_size 353 /* should be prime; used in |"common.w"| */ @d longest_name 10000 /* section names shouldn't be longer than this */ @d stack_size 50 /* number of simultaneous levels of macro expansion */ -@d buf_size 1000 /* for \.{CWEAVE} and \.{CTANGLE} */ +@d buf_size 100 /* for \.{CWEAVE} and \.{CTANGLE} */ @ The next few sections contain stuff from the file |"common.w"| that must be included in both |"ctangle.w"| and |"cweave.w"|. It appears in diff --git a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch index a4f49e71470..462d15ee298 100644 --- a/Build/source/texk/web2c/cwebdir/cweav-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/cweav-w2c.ch @@ -90,6 +90,48 @@ int main (int ac, char **av) return wrap_up(); /* and exit gracefully */ @z +@x l.120 +@d max_bytes 90000 /* the number of bytes in identifiers, +@y +@d max_bytes 1000000 /* the number of bytes in identifiers, +@z + +@x l.112 +@d max_names 4000 /* number of identifiers, strings, section names; +@y +@d max_names 10239 /* number of identifiers, strings, section names; +@z + +@x l.124 +@d max_sections 2000 /* greater than the total number of sections */ +@d hash_size 353 /* should be prime */ +@d buf_size 100 /* maximum length of input line, plus one */ +@y +@d max_sections 10239 /* greater than the total number of sections */ +@d hash_size 8501 /* should be prime */ +@d buf_size 1000 /* maximum length of input line, plus one */ +@z + +@x l.131 +@d max_refs 20000 /* number of cross-references; must be less than 65536 */ +@d max_toks 20000 /* number of symbols in \CEE/ texts being parsed; +@y +@d max_refs 65535 /* number of cross-references; must be less than 65536 */ +@d max_toks 65535 /* number of symbols in \CEE/ texts being parsed; +@z + +@x l.134 +@d max_texts 4000 /* number of phrases in \CEE/ texts being parsed; +@y +@d max_texts 10239 /* number of phrases in \CEE/ texts being parsed; +@z + +@x l.136 +@d max_scraps 2000 /* number of tokens in \CEE/ texts being parsed */ +@y +@d max_scraps 10000 /* number of tokens in \CEE/ texts being parsed */ +@z + Section 5. @x common.h l.30 - boolean comes from kpathsea. diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index 3e2575d9551..91b8785bfe9 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -117,23 +117,23 @@ handle \TEX/, so they should be sufficient for most applications of \.{CWEAVE}. If you change |max_bytes|, |max_names|, |hash_size|, or |buf_size| you have to change them also in the file |"common.w"|. -@d max_bytes 1000000 /* the number of bytes in identifiers, +@d max_bytes 90000 /* the number of bytes in identifiers, index entries, and section names */ -@d max_names 10239 /* number of identifiers, strings, section names; +@d max_names 4000 /* number of identifiers, strings, section names; must be less than 10240; used in |"common.w"| */ -@d max_sections 10239 /* greater than the total number of sections */ -@d hash_size 8501 /* should be prime */ -@d buf_size 1000 /* maximum length of input line, plus one */ +@d max_sections 2000 /* greater than the total number of sections */ +@d hash_size 353 /* should be prime */ +@d buf_size 100 /* maximum length of input line, plus one */ @d longest_name 10000 /* section names and strings shouldn't be longer than this */ @d long_buf_size (buf_size+longest_name) @d line_length 80 /* lines of \TEX/ output have at most this many characters; should be less than 256 */ -@d max_refs 65535 /* number of cross-references; must be less than 65536 */ -@d max_toks 65535 /* number of symbols in \CEE/ texts being parsed; +@d max_refs 20000 /* number of cross-references; must be less than 65536 */ +@d max_toks 20000 /* number of symbols in \CEE/ texts being parsed; must be less than 65536 */ -@d max_texts 10239 /* number of phrases in \CEE/ texts being parsed; +@d max_texts 4000 /* number of phrases in \CEE/ texts being parsed; must be less than 10240 */ -@d max_scraps 10000 /* number of tokens in \CEE/ texts being parsed */ +@d max_scraps 2000 /* number of tokens in \CEE/ texts being parsed */ @d stack_size 400 /* number of simultaneous output levels */ @ The next few sections contain stuff from the file |"common.w"| that must |