From d136b933ce1155f36cbabf2be0e41cc185d61157 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Mon, 2 May 2022 11:44:26 +0000 Subject: bibtex-x: accept max_print_line git-svn-id: svn://tug.org/texlive/trunk@63206 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/bibtex-x/bibtex.c | 9 ++++++ Build/source/texk/bibtex-x/bibtex.h | 4 +++ Build/source/texk/bibtex-x/gblvars.h | 3 ++ Build/source/texk/bibtex-x/tests/bibtex8-char.test | 2 +- Build/source/texk/bibtex-x/tests/bibtexu-char.test | 2 +- Build/source/texk/bibtex-x/tests/namea.bbl | 33 +++++++++------------ Build/source/texk/bibtex-x/tests/nameu.bbl | 34 ++++++++-------------- Build/source/texk/bibtex-x/version.h | 2 +- 8 files changed, 45 insertions(+), 44 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/bibtex-x/bibtex.c b/Build/source/texk/bibtex-x/bibtex.c index 8dc83fdf392..eec2cda29aa 100644 --- a/Build/source/texk/bibtex-x/bibtex.c +++ b/Build/source/texk/bibtex-x/bibtex.c @@ -103,6 +103,7 @@ #ifdef KPATHSEA #include #include +#include #endif #include "sysdep.h" @@ -228,6 +229,9 @@ int main (int argc, char **argv) BEGIN extern Integer8_T history; int exit_status; +#ifdef KPATHSEA + char *mpl; +#endif /*- **------------------------------------------------------------------------ @@ -262,6 +266,11 @@ BEGIN #ifdef KPATHSEA kpse_set_program_name(argv[0], PROGNAME); + mpl = kpse_var_value("max_print_line"); + if (mpl) + max_print_line = atoi(mpl); + else + max_print_line = 79; /* default */ #endif history = SPOTLESS; diff --git a/Build/source/texk/bibtex-x/bibtex.h b/Build/source/texk/bibtex-x/bibtex.h index 33788a99999..b9f6ae87ca7 100644 --- a/Build/source/texk/bibtex-x/bibtex.h +++ b/Build/source/texk/bibtex-x/bibtex.h @@ -268,7 +268,11 @@ * cites when used with the standard styles. ***************************************************************************/ #define MIN_PRINT_LINE 3 +#ifdef KPATHSEA +#define MAX_PRINT_LINE max_print_line +#else #define MAX_PRINT_LINE 79 +#endif #define AUX_STACK_SIZE 20 #define MAX_BIB_FILES 20 diff --git a/Build/source/texk/bibtex-x/gblvars.h b/Build/source/texk/bibtex-x/gblvars.h index 91994c1356d..bf17df7caee 100644 --- a/Build/source/texk/bibtex-x/gblvars.h +++ b/Build/source/texk/bibtex-x/gblvars.h @@ -174,6 +174,9 @@ __EXTERN__ Boolean_T bst_seen; __EXTERN__ StrNumber_T bst_str; __EXTERN__ BufPointer_T buf_ptr1; __EXTERN__ BufPointer_T buf_ptr2; +#ifdef KPATHSEA +__EXTERN__ Integer_T max_print_line; +#endif __EXTERN__ Boolean_T citation_seen; __EXTERN__ Boolean_T cite_found; diff --git a/Build/source/texk/bibtex-x/tests/bibtex8-char.test b/Build/source/texk/bibtex-x/tests/bibtex8-char.test index ba3c461d9d4..d6c125e82f6 100755 --- a/Build/source/texk/bibtex-x/tests/bibtex8-char.test +++ b/Build/source/texk/bibtex-x/tests/bibtex8-char.test @@ -40,7 +40,7 @@ diff $srcdir/tests/chara.bbl tests/xchara.bbl || rc=12 ## test for num.names$, format.name$ cp $srcdir/tests/namea.aux tests/xnamea.aux -./bibtexu tests/xnamea || rc=13 +max_print_line=119 ./bibtex8 tests/xnamea || rc=13 diff $srcdir/tests/namea.bbl tests/xnamea.bbl || rc=14 diff --git a/Build/source/texk/bibtex-x/tests/bibtexu-char.test b/Build/source/texk/bibtex-x/tests/bibtexu-char.test index a1491e4d2ed..727810c6825 100755 --- a/Build/source/texk/bibtex-x/tests/bibtexu-char.test +++ b/Build/source/texk/bibtex-x/tests/bibtexu-char.test @@ -41,7 +41,7 @@ diff $srcdir/tests/charu.bbl tests/xcharu.bbl || rc=12 ## test for num.names$, format.name$ cp $srcdir/tests/nameu.aux tests/xnameu.aux -./bibtexu tests/xnameu || rc=13 +max_print_line=119 ./bibtexu tests/xnameu || rc=13 diff $srcdir/tests/nameu.bbl tests/xnameu.bbl || rc=14 ## test for is.knj.str$ diff --git a/Build/source/texk/bibtex-x/tests/namea.bbl b/Build/source/texk/bibtex-x/tests/namea.bbl index 064c5fa611d..de688a23f93 100644 --- a/Build/source/texk/bibtex-x/tests/namea.bbl +++ b/Build/source/texk/bibtex-x/tests/namea.bbl @@ -1,34 +1,29 @@ \section*{Test result} \begin{itemize} +\item Carl Maria von Weber + [1] {ff} Carl~Maria {ll} Weber {vv} von {jj} + | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. v.~Weber +\item Conte de Lautramont + [1] {ff} Conte {ll} Lautramont {vv} de {jj} + | ContedeLautramont | Conte de Lautramont | de~Lautramont, C. | C.~d.~Lautramont +\item King, Jr., Martin Luther + [1] {ff} Martin~Luther {ll} King {vv} {jj} Jr. + | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. King, Jr. \item Brian Wilson Kernighan and Dennis MacAlistair Ritchie [1] {ff} Brian~Wilson {ll} Kernighan {vv} {jj} - | Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. - Kernighan + | Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. Kernighan [2] {ff} Dennis~MacAlistair {ll} Ritchie {vv} {jj} - | Dennis~MacAlistairRitchie | Dennis~MacAlistair Ritchie | Ritchie, D.~M. | - D.~M. Ritchie + | Dennis~MacAlistairRitchie | Dennis~MacAlistair Ritchie | Ritchie, D.~M. | D.~M. Ritchie \item Brder Grimm [1] {ff} Brder {ll} Grimm {vv} {jj} | BrderGrimm | Brder Grimm | Grimm, B. | B.~Grimm -\item Carl Maria von Weber - [1] {ff} Carl~Maria {ll} Weber {vv} von {jj} - | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. - v.~Weber -\item Conte de Lautramont - [1] {ff} Conte {ll} Lautramont {vv} de {jj} - | ContedeLautramont | Conte de Lautramont | de~Lautramont, C. | - C.~d.~Lautramont +\item Marcel Proust + [1] {ff} Marcel {ll} Proust {vv} {jj} + | MarcelProust | Marcel Proust | Proust, M. | M.~Proust \item Kernighan, Brian W. AND Ritchie, Dennis M. [1] {ff} Brian~W. {ll} Kernighan {vv} {jj} | Brian~W.Kernighan | Brian~W. Kernighan | Kernighan, B.~W. | B.~W. Kernighan [2] {ff} Dennis~M. {ll} Ritchie {vv} {jj} | Dennis~M.Ritchie | Dennis~M. Ritchie | Ritchie, D.~M. | D.~M. Ritchie -\item King, Jr., Martin Luther - [1] {ff} Martin~Luther {ll} King {vv} {jj} Jr. - | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. - King, Jr. -\item Marcel Proust - [1] {ff} Marcel {ll} Proust {vv} {jj} - | MarcelProust | Marcel Proust | Proust, M. | M.~Proust \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/tests/nameu.bbl b/Build/source/texk/bibtex-x/tests/nameu.bbl index aa84f3cf205..6206cab8c3c 100644 --- a/Build/source/texk/bibtex-x/tests/nameu.bbl +++ b/Build/source/texk/bibtex-x/tests/nameu.bbl @@ -2,22 +2,18 @@ \begin{itemize} \item Brian Wilson Kernighan and Dennis MacAlistair Ritchie [1] {ff} Brian~Wilson {ll} Kernighan {vv} {jj} - | Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. - Kernighan + | Brian~WilsonKernighan | Brian~Wilson Kernighan | Kernighan, B.~W. | B.~W. Kernighan [2] {ff} Dennis~MacAlistair {ll} Ritchie {vv} {jj} - | Dennis~MacAlistairRitchie | Dennis~MacAlistair Ritchie | Ritchie, D.~M. | - D.~M. Ritchie + | Dennis~MacAlistairRitchie | Dennis~MacAlistair Ritchie | Ritchie, D.~M. | D.~M. Ritchie \item Brüder Grimm [1] {ff} Brüder {ll} Grimm {vv} {jj} | BrüderGrimm | Brüder Grimm | Grimm, B. | B.~Grimm \item Carl Maria von Weber [1] {ff} Carl~Maria {ll} Weber {vv} von {jj} - | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. - v.~Weber + | Carl~MariavonWeber | Carl~Maria von Weber | von Weber, C.~M. | C.~M. v.~Weber \item Conte de Lautréamont [1] {ff} Conte {ll} Lautréamont {vv} de {jj} - | ContedeLautréamont | Conte de Lautréamont | de~Lautréamont, C. | - C.~d.~Lautréamont + | ContedeLautréamont | Conte de Lautréamont | de~Lautréamont, C. | C.~d.~Lautréamont \item Kernighan, Brian W. AND Ritchie, Dennis M. [1] {ff} Brian~W. {ll} Kernighan {vv} {jj} | Brian~W.Kernighan | Brian~W. Kernighan | Kernighan, B.~W. | B.~W. Kernighan @@ -25,30 +21,25 @@ | Dennis~M.Ritchie | Dennis~M. Ritchie | Ritchie, D.~M. | D.~M. Ritchie \item King, Jr., Martin Luther [1] {ff} Martin~Luther {ll} King {vv} {jj} Jr. - | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. - King, Jr. + | Martin~LutherKingJr. | Martin~Luther King Jr. | King, Jr., M.~L. | M.~L. King, Jr. \item Marcel Proust [1] {ff} Marcel {ll} Proust {vv} {jj} | MarcelProust | Marcel Proust | Proust, M. | M.~Proust \item Διογένης Λαέρτιος [1] {ff} Διογένης {ll} Λαέρτιος {vv} {jj} - | ΔιογένηςΛαέρτιος | Διογένης Λαέρτιος | - Λαέρτιος, Δ. | Δ. Λαέρτιος + | ΔιογένηςΛαέρτιος | Διογένης Λαέρτιος | Λαέρτιος, Δ. | Δ. Λαέρτιος \item Булгаков, Михаил Афанасьевич [1] {ff} Михаил~Афанасьевич {ll} Булгаков {vv} {jj} - | Михаил~АфанасьевичБулгаков | - Михаил~Афанасьевич Булгаков | Булгаков, - М.~А. | М.~А. Булгаков + | Михаил~АфанасьевичБулгаков | Михаил~Афанасьевич Булгаков | + Булгаков, М.~А. | М.~А. Булгаков \item Мико́ла Васи́льович Го́голь [1] {ff} Мико́ла~Васи́льович {ll} Го́голь {vv} {jj} - | Мико́ла~Васи́льовичГо́голь | - Мико́ла~Васи́льович Го́голь | Го́голь, - М.~В. | М.~В. Го́голь + | Мико́ла~Васи́льовичГо́голь | Мико́ла~Васи́льович Го́голь | + Го́голь, М.~В. | М.~В. Го́голь \item 김 시습 [1] {ff} 김 {ll} 시습 {vv} {jj} | 김시습 | 김 시습 | 시습, 김. | 김. 시습 -\item テスト てすと and 名無 権兵衛、 何 誰兵衛, 無名 -  戦士 and John Smith and Schmidt, Hans +\item テスト てすと and 名無 権兵衛、 何 誰兵衛, 無名  戦士 and John Smith and Schmidt, Hans [1] {ff} テスト {ll} てすと {vv} {jj} | テストてすと | テスト てすと | てすと, テ. | テ. てすと [2] {ff} 名無 {ll} 権兵衛 {vv} {jj} @@ -86,7 +77,6 @@ [1] {ff} 髙島 {ll} 𠮷野 {vv} {jj} | 髙島𠮷野 | 髙島 𠮷野 | 𠮷野, 髙. | 髙. 𠮷野 [2] {ff} 𡈽方 {ll} 𠀋之助 {vv} {jj} - | 𡈽方𠀋之助 | 𡈽方 𠀋之助 | 𠀋之助, 𡈽. | 𡈽. - 𠀋之助 + | 𡈽方𠀋之助 | 𡈽方 𠀋之助 | 𠀋之助, 𡈽. | 𡈽. 𠀋之助 \end{itemize} \endinput diff --git a/Build/source/texk/bibtex-x/version.h b/Build/source/texk/bibtex-x/version.h index 55ae788527b..43f3e2714c9 100644 --- a/Build/source/texk/bibtex-x/version.h +++ b/Build/source/texk/bibtex-x/version.h @@ -89,7 +89,7 @@ */ #ifndef __VERSION_H__ # define __VERSION_H__ 1 -# define PACKAGE_DATE "(29 apr 2022)" +# define PACKAGE_DATE "(2 may 2022)" # define VERSION PACKAGE_VERSION " " PACKAGE_DATE #endif /* __VERSION_H__ */ -- cgit v1.2.3