From ff1026e256b4c968301cab146b30cc200d37ff47 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Fri, 6 May 2022 07:23:56 +0000 Subject: ((u)p)bibtex: accept max_print_line git-svn-id: svn://tug.org/texlive/trunk@63238 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 6 + Build/source/texk/kpathsea/texmf.cnf | 1 + Build/source/texk/web2c/ChangeLog | 7 + Build/source/texk/web2c/Makefile.in | 26 +-- Build/source/texk/web2c/am/web.am | 1 + Build/source/texk/web2c/bibtex.ch | 6 + Build/source/texk/web2c/bibtex.test | 2 + Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/pbibtex.test | 2 + Build/source/texk/web2c/tests/exampl.bbl | 212 +++++++++++++++++++++++++ Build/source/texk/web2c/uptexdir/ChangeLog | 5 + Build/source/texk/web2c/uptexdir/upbibtex.ch | 6 + Build/source/texk/web2c/uptexdir/upbibtex.test | 2 + 13 files changed, 267 insertions(+), 13 deletions(-) create mode 100644 Build/source/texk/web2c/tests/exampl.bbl (limited to 'Build') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index f1d65b75d87..1f8d08a1b2d 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2022-05-06 TANAKA Takuji + + * texmf.cnf (max_print_line): + Now it applies to BibTeX family: + bibtex, pbibtex, upbibtex, bibtex8 and bibtexu. + 2022-03-21 Karl Berry * TL'22 release. diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index b5d2dfda668..8ecda0a3101 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -864,6 +864,7 @@ gf_buf_size = 16384 % MF % 30 < half_error_line < error_line - 15; % 60 <= max_print_line; % These apply to TeX, Metafont, and MetaPost. +% "max_print_line" applies to BibTeX family. error_line = 79 half_error_line = 50 max_print_line = 79 diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index e36ddc075cc..bb65d6800cd 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2022-05-06 TANAKA Takuji + + * bibtex.ch: + Apply max_print_line variable in kpathsea to ((u)p)BibTeX. + * bibtex.test, tests/exampl.bbl, am/web.am: + Update tests for ((u)p)BibTeX. + 2022-04-30 Andreas Scherer * weav-twill.ch, diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 411d457bcd1..bada60f5d5e 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -3200,19 +3200,19 @@ TEST_EXTENSIONS = .pl .test EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \ ctangleboot.cin cwebboot.cin tangle.test $(web_programs:=.web) \ - $(web_programs:=.ch) $(web_tests) tests/memdata1.bst \ - tests/memdata2.bst tests/memdata3.bst tests/bibtex-bigauth.aux \ - tests/bibtex-bigauth.bib tests/bibtex-bigauth.tex \ - tests/auxinclude.aux tests/auxinclude.bbl tests/auxinclude.bib \ - tests/auxinclude.tex tests/auxinclude2.aux \ - tests/auxinclude2.tex tests/allbib.aux tests/allbib.tex \ - tests/apalike.bst tests/badpl.pl tests/badtfm.tfm \ - tests/badvf.tfm tests/badvf.vf tests/badvpl.vpl \ - tests/batch.tex tests/check.log tests/cmr10.600gf \ - tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \ - tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \ - tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \ - tests/exampl.aux tests/exampl.tex tests/gray.tfm \ + $(web_programs:=.ch) $(web_tests) tests/xampl.bib \ + tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \ + tests/bibtex-bigauth.aux tests/bibtex-bigauth.bib \ + tests/bibtex-bigauth.tex tests/auxinclude.aux \ + tests/auxinclude.bbl tests/auxinclude.bib tests/auxinclude.tex \ + tests/auxinclude2.aux tests/auxinclude2.tex tests/allbib.aux \ + tests/allbib.tex tests/apalike.bst tests/badpl.pl \ + tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \ + tests/badvpl.vpl tests/batch.tex tests/check.log \ + tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \ + tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \ + tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \ + tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \ tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \ tests/label.mpx tests/logo8.tfm tests/longline.aux \ tests/longline.bib tests/longline.tex tests/longtfm.tex \ diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index 55048d62358..cdfee202f58 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -194,6 +194,7 @@ endif WEB EXTRA_DIST += $(web_tests) ## bibtex.test +EXTRA_DIST += tests/xampl.bib DISTCLEANFILES += tests/xexampl.aux tests/xexampl.bbl tests/xexampl.blg ## tests/bibtex-longline-test.pl DISTCLEANFILES += longline.aux longline.bbl longline.bib longline.blg diff --git a/Build/source/texk/web2c/bibtex.ch b/Build/source/texk/web2c/bibtex.ch index 6e04e796d38..f8ab25b7eed 100644 --- a/Build/source/texk/web2c/bibtex.ch +++ b/Build/source/texk/web2c/bibtex.ch @@ -199,9 +199,13 @@ end. @x [still 14] @!buf_size=1000; {maximum number of characters in an input line (or string)} +@!min_print_line=3; {minimum \.{.bbl} line length: must be |>=3|} +@!max_print_line=79; {the maximum: must be |>min_print_line| and |=3|} +@!MAX_PRINT_LINE=60; {the maximum: must be |>min_print_line| and |= @!pool_size: integer; +@!max_print_line: integer; @!max_bib_files: integer; @!max_cites: integer; @!wiz_fn_space: integer; @@ -1747,6 +1752,7 @@ begin kpse_set_program_name (argv[0], 'bibtex'); setup_bound_var (ENT_STR_SIZE)('ent_str_size')(ent_str_size); setup_bound_var (GLOB_STR_SIZE)('glob_str_size')(glob_str_size); setup_bound_var (MAX_STRINGS)('max_strings')(max_strings); +setup_bound_var (MAX_PRINT_LINE)('max_print_line')(max_print_line); @# hash_size := max_strings; if hash_size < HASH_SIZE then hash_size := HASH_SIZE; diff --git a/Build/source/texk/web2c/bibtex.test b/Build/source/texk/web2c/bibtex.test index 366da15d47d..6a02d662303 100755 --- a/Build/source/texk/web2c/bibtex.test +++ b/Build/source/texk/web2c/bibtex.test @@ -5,6 +5,7 @@ # You may freely use, modify and/or distribute this file. test -d tests || mkdir -p tests +rm -f tests/xexampl.* cp $srcdir/tests/exampl.aux tests/xexampl.aux @@ -12,4 +13,5 @@ TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=$srcdir/tests \ ./bibtex tests/xexampl || exit 1 +diff $srcdir/tests/exampl.bbl tests/xexampl.bbl || exit 2 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index fbf16510e13..35f41474ee0 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2022-05-06 TANAKA Takuji + + * pbibtex.test: Update a test. + 2022-03-21 Karl Berry * TL'22 release. diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.test b/Build/source/texk/web2c/ptexdir/pbibtex.test index 25a73230d3b..eaeff03454c 100755 --- a/Build/source/texk/web2c/ptexdir/pbibtex.test +++ b/Build/source/texk/web2c/ptexdir/pbibtex.test @@ -5,6 +5,7 @@ # You may freely use, modify and/or distribute this file. test -d ptests || mkdir -p ptests +rm -f ptests/xexampl.* cp $srcdir/tests/exampl.aux ptests/xexampl.aux @@ -12,4 +13,5 @@ TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=$srcdir/tests \ ./pbibtex ptests/xexampl || exit 1 +diff $srcdir/tests/exampl.bbl ptests/xexampl.bbl || exit 2 diff --git a/Build/source/texk/web2c/tests/exampl.bbl b/Build/source/texk/web2c/tests/exampl.bbl new file mode 100644 index 00000000000..442298f7635 --- /dev/null +++ b/Build/source/texk/web2c/tests/exampl.bbl @@ -0,0 +1,212 @@ +\newcommand{\noopsort}[1]{} \newcommand{\printfirst}[2]{#1} + \newcommand{\singleletter}[1]{#1} \newcommand{\switchargs}[2]{#2#1} +\begin{thebibliography}{} + +\bibitem[Aamport, 1986a]{article-minimal} +Aamport, L.~A. (1986a). +\newblock The gnats and gnus document preparation system. +\newblock {\em \mbox{G-Animal's} Journal}. + +\bibitem[Aamport, 1986b]{article-full} +Aamport, L.~A. (1986b). +\newblock The gnats and gnus document preparation system. +\newblock {\em \mbox{G-Animal's} Journal}, 41(7):73+. +\newblock This is a full ARTICLE entry. + +\bibitem[Aamport, 1986c]{article-crossref} +Aamport, L.~A. (1986c). +\newblock The gnats and gnus document preparation system. +\newblock In \cite{whole-journal}, pages 73+. +\newblock This is a cross-referencing ARTICLE entry. + +\bibitem[GAJ, 1986]{whole-journal} +GAJ (1986). +\newblock {\em \mbox{G-Animal's} Journal}, 41(7). +\newblock The entire issue is devoted to gnats and gnus (this entry is a + cross-referenced ARTICLE (journal)). + +\bibitem[Knuth, 1968]{whole-set} +Knuth, D.~E. ({\noopsort{1973a}}{\switchargs{--90}{1968}}). +\newblock {\em The Art of Computer Programming}. +\newblock Four volumes. Addison-Wesley. +\newblock Seven volumes planned (this is a cross-referenced set of BOOKs). + +\bibitem[Knuth, 1973a]{inbook-minimal} +Knuth, D.~E. ({\noopsort{1973b}}1973a). +\newblock {\em Fundamental Algorithms}, chapter 1.2. +\newblock Addison-Wesley. + +\bibitem[Knuth, 1973b]{inbook-full} +Knuth, D.~E. ({\noopsort{1973b}}1973b). +\newblock {\em Fundamental Algorithms}, volume~1 of {\em The Art of Computer + Programming}, section 1.2, pages 10--119. +\newblock Addison-Wesley, Reading, Massachusetts, second edition. +\newblock This is a full INBOOK entry. + +\bibitem[Knuth, 1973c]{inbook-crossref} +Knuth, D.~E. ({\noopsort{1973b}}1973c). +\newblock {\em Fundamental Algorithms}, section 1.2. +\newblock Volume~1 of \cite{whole-set}, second edition. +\newblock This is a cross-referencing INBOOK entry. + +\bibitem[Knuth, 1981a]{book-full} +Knuth, D.~E. ({\noopsort{1973c}}1981a). +\newblock {\em Seminumerical Algorithms}, volume~2 of {\em The Art of Computer + Programming}. +\newblock Addison-Wesley, Reading, Massachusetts, second edition. +\newblock This is a full BOOK entry. + +\bibitem[Knuth, 1981b]{book-minimal} +Knuth, D.~E. ({\noopsort{1973c}}1981b). +\newblock {\em Seminumerical Algorithms}. +\newblock Addison-Wesley. + +\bibitem[Knuth, 1981c]{book-crossref} +Knuth, D.~E. ({\noopsort{1973c}}1981c). +\newblock {\em Seminumerical Algorithms}. +\newblock Volume~2 of \cite{whole-set}, second edition. +\newblock This is a cross-referencing BOOK entry. + +\bibitem[Kn{\printfirst{v}{1987}}, ]{booklet-minimal} +Kn{\printfirst{v}{1987}}. +\newblock The programming of computer art. + +\bibitem[Knvth, 1988]{booklet-full} +Knvth, J.~C. (1988). +\newblock The programming of computer art. +\newblock Vernier Art Center, Stanford, California. +\newblock This is a full BOOKLET entry. + +\bibitem[Lincoll, 1977a]{incollection-minimal} +Lincoll, D.~D. (1977a). +\newblock Semigroups of recurrences. +\newblock In {\em High Speed Computer and Algorithm Organization}. Academic + Press. + +\bibitem[Lincoll, 1977b]{incollection-full} +Lincoll, D.~D. (1977b). +\newblock Semigroups of recurrences. +\newblock In Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors, {\em + High Speed Computer and Algorithm Organization}, number~23 in Fast Computers, + part~3, pages 179--183. Academic Press, New York, third edition. +\newblock This is a full INCOLLECTION entry. + +\bibitem[Lincoll, 1977c]{incollection-crossref} +Lincoll, D.~D. (1977c). +\newblock Semigroups of recurrences. +\newblock In \cite{whole-collection}, pages 179--183. +\newblock This is a cross-referencing INCOLLECTION entry. + +\bibitem[Lipcoll et~al., 1977]{whole-collection} +Lipcoll, D.~J., Lawrie, D.~H., and Sameh, A.~H., editors (1977). +\newblock {\em High Speed Computer and Algorithm Organization}. +\newblock Number~23 in Fast Computers. Academic Press, New York, third edition. +\newblock This is a cross-referenced BOOK (collection) entry. + +\bibitem[Manmaker, ]{manual-minimal} +Manmaker. +\newblock {\em The Definitive Computer Manual}. + +\bibitem[Manmaker, 1986]{manual-full} +Manmaker, L. (1986). +\newblock {\em The Definitive Computer Manual}. +\newblock Chips-R-Us, Silicon Valley, silver edition. +\newblock This is a full MANUAL entry. + +\bibitem[Masterly, 1988a]{mastersthesis-minimal} +Masterly, {\'{E}}. (1988a). +\newblock Mastering thesis writing. +\newblock Master's thesis, Stanford University. + +\bibitem[Masterly, 1988b]{mastersthesis-full} +Masterly, {\'{E}}. (1988b). +\newblock Mastering thesis writing. +\newblock Master's project, Stanford University, English Department. +\newblock This is a full MASTERSTHESIS entry. + +\bibitem[Missilany, ]{misc-minimal} +Missilany. +\newblock This is a minimal MISC entry. + +\bibitem[Missilany, 1984]{misc-full} +Missilany, J.-B. (1984). +\newblock Handing out random pamphlets in airports. +\newblock Handed out at O'Hare. +\newblock This is a full MISC entry. + +\bibitem[Oaho et~al., 1983a]{inproceedings-minimal} +Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983a). +\newblock On notions of information transfer in {VLSI} circuits. +\newblock In {\em Proc. Fifteenth Annual ACM Symposium on the Theory of + Computing}. + +\bibitem[Oaho et~al., 1983b]{inproceedings-full} +Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983b). +\newblock On notions of information transfer in {VLSI} circuits. +\newblock In Oz, W.~V. and Yannakakis, M., editors, {\em Proc. Fifteenth Annual + ACM Symposium on the Theory of Computing}, number~17 in All ACM Conferences, + pages 133--139, Boston. The OX Association for Computing Machinery, Academic + Press. +\newblock This is a full INPROCEDINGS entry. + +\bibitem[Oaho et~al., 1983c]{inproceedings-crossref} +Oaho, A.~V., Ullman, J.~D., and Yannakakis, M. (1983c). +\newblock On notions of information transfer in {VLSI} circuits. +\newblock In \cite{whole-proceedings}, pages 133--139. +\newblock This is a cross-referencing INPROCEEDINGS entry. + +\bibitem[OX{\singleletter{stoc}}, 1983a]{whole-proceedings} +OX{\singleletter{stoc}} (1983a). +\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing}, + Boston. The OX Association for Computing Machinery. +\newblock This is a cross-referenced PROCEEDINGS. + +\bibitem[OX{\singleletter{stoc}}, 1983b]{proceedings-minimal} +OX{\singleletter{stoc}} (1983b). +\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing}. + +\bibitem[Oz and Yannakakis, 1983]{proceedings-full} +Oz, W.~V. and Yannakakis, M., editors (1983). +\newblock {\em Proc. Fifteenth Annual Symposium on the Theory of Computing}, + number~17 in All ACM Conferences, Boston. The OX Association for Computing + Machinery, Academic Press. +\newblock This is a full PROCEEDINGS entry. + +\bibitem[Phony-Baloney, 1988a]{phdthesis-minimal} +Phony-Baloney, F.~P. (1988a). +\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}. +\newblock PhD thesis, Fanstord University. + +\bibitem[Phony-Baloney, 1988b]{phdthesis-full} +Phony-Baloney, F.~P. (1988b). +\newblock {\em Fighting Fire with Fire: Festooning {F}rench Phrases}. +\newblock {PhD} dissertation, Fanstord University, Department of French. +\newblock This is a full PHDTHESIS entry. + +\bibitem[Terrific, 1988]{techreport-minimal} +Terrific, T. (1988). +\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm. +\newblock Technical report, Fanstord University. + +\bibitem[T{\'{e}}rrific, 1988]{techreport-full} +T{\'{e}}rrific, T. (1988). +\newblock An {$O(n \log n / \! \log\log n)$} sorting algorithm. +\newblock Wishful Research Result~7, Fanstord University, Computer Science + Department, Fanstord, California. +\newblock This is a full TECHREPORT entry. + +\bibitem[{\"{U}}nderwood et~al., ]{unpublished-minimal} +{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P. +\newblock Lower bounds for wishful research results. +\newblock Talk at Fanstord University (this is a minimal UNPUBLISHED entry). + +\bibitem[{\"{U}}nderwood et~al., 1988]{unpublished-full} +{\"{U}}nderwood, U., {\~N}et, N., and {\={P}}ot, P. (1988). +\newblock Lower bounds for wishful research results. +\newblock Talk at Fanstord University (this is a full UNPUBLISHED entry). + +\bibitem[Volume-2, ]{random-note-crossref} +Volume-2. +\newblock Volume~2 is listed under Knuth \cite{book-full}. + +\end{thebibliography} diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 9c661f32c90..86b43c5918d 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2022-05-06 TANAKA Takuji + + * upbibtex.ch: Fix bug on kpse_set_progname. + * upbibtex.test: Update a test. + 2022-03-21 Karl Berry * TL'22 release. diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch index b8b72a47634..11f47487084 100644 --- a/Build/source/texk/web2c/uptexdir/upbibtex.ch +++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch @@ -347,6 +347,12 @@ incr(current_option); @ An element with all zeros always ends the list. @z +@x +begin kpse_set_program_name (argv[0], 'pbibtex'); +@y +begin kpse_set_program_name (argv[0], 'upbibtex'); +@z + @x procedure x_is_kanji_str procedure x_is_kanji_str; label exit; diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.test b/Build/source/texk/web2c/uptexdir/upbibtex.test index 715608c56d3..9a12a72cb04 100755 --- a/Build/source/texk/web2c/uptexdir/upbibtex.test +++ b/Build/source/texk/web2c/uptexdir/upbibtex.test @@ -5,6 +5,7 @@ # You may freely use, modify and/or distribute this file. test -d uptests || mkdir -p uptests +rm -f uptests/xexampl.* cp $srcdir/tests/exampl.aux uptests/xexampl.aux @@ -12,4 +13,5 @@ TEXMFCNF=$srcdir/../kpathsea \ BSTINPUTS=$srcdir/tests \ BIBINPUTS=$srcdir/tests \ ./upbibtex uptests/xexampl || exit 1 +diff $srcdir/tests/exampl.bbl uptests/xexampl.bbl || exit 2 -- cgit v1.2.3