texlive[63206] Build/source/texk/bibtex-x: bibtex-x: accept
commits+takuji at tug.org
commits+takuji at tug.org
Mon May 2 13:44:26 CEST 2022
Revision: 63206
http://tug.org/svn/texlive?view=revision&revision=63206
Author: takuji
Date: 2022-05-02 13:44:26 +0200 (Mon, 02 May 2022)
Log Message:
-----------
bibtex-x: accept max_print_line
Modified Paths:
--------------
trunk/Build/source/texk/bibtex-x/bibtex.c
trunk/Build/source/texk/bibtex-x/bibtex.h
trunk/Build/source/texk/bibtex-x/gblvars.h
trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test
trunk/Build/source/texk/bibtex-x/tests/bibtexu-char.test
trunk/Build/source/texk/bibtex-x/tests/namea.bbl
trunk/Build/source/texk/bibtex-x/tests/nameu.bbl
trunk/Build/source/texk/bibtex-x/version.h
Modified: trunk/Build/source/texk/bibtex-x/bibtex.c
===================================================================
--- trunk/Build/source/texk/bibtex-x/bibtex.c 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/bibtex.c 2022-05-02 11:44:26 UTC (rev 63206)
@@ -103,6 +103,7 @@
#ifdef KPATHSEA
#include <kpathsea/config.h>
#include <kpathsea/progname.h>
+#include <kpathsea/variable.h>
#endif
#include "sysdep.h"
@@ -228,6 +229,9 @@
BEGIN
extern Integer8_T history;
int exit_status;
+#ifdef KPATHSEA
+ char *mpl;
+#endif
/*-
**------------------------------------------------------------------------
@@ -262,6 +266,11 @@
#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;
Modified: trunk/Build/source/texk/bibtex-x/bibtex.h
===================================================================
--- trunk/Build/source/texk/bibtex-x/bibtex.h 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/bibtex.h 2022-05-02 11:44:26 UTC (rev 63206)
@@ -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
Modified: trunk/Build/source/texk/bibtex-x/gblvars.h
===================================================================
--- trunk/Build/source/texk/bibtex-x/gblvars.h 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/gblvars.h 2022-05-02 11:44:26 UTC (rev 63206)
@@ -174,6 +174,9 @@
__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;
Modified: trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtex8-char.test 2022-05-02 11:44:26 UTC (rev 63206)
@@ -40,7 +40,7 @@
## 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
Modified: trunk/Build/source/texk/bibtex-x/tests/bibtexu-char.test
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/bibtexu-char.test 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/tests/bibtexu-char.test 2022-05-02 11:44:26 UTC (rev 63206)
@@ -41,7 +41,7 @@
## 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$
Modified: trunk/Build/source/texk/bibtex-x/tests/namea.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/namea.bbl 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/tests/namea.bbl 2022-05-02 11:44:26 UTC (rev 63206)
@@ -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 Lautr\xE9amont
+ [1] {ff} Conte {ll} Lautr\xE9amont {vv} de {jj}
+ | ContedeLautr\xE9amont | Conte de Lautr\xE9amont | de~Lautr\xE9amont, C. | C.~d.~Lautr\xE9amont
+\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 Br\xFCder Grimm
[1] {ff} Br\xFCder {ll} Grimm {vv} {jj}
| Br\xFCderGrimm | Br\xFCder 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 Lautr\xE9amont
- [1] {ff} Conte {ll} Lautr\xE9amont {vv} de {jj}
- | ContedeLautr\xE9amont | Conte de Lautr\xE9amont | de~Lautr\xE9amont, C. |
- C.~d.~Lautr\xE9amont
+\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
Modified: trunk/Build/source/texk/bibtex-x/tests/nameu.bbl
===================================================================
--- trunk/Build/source/texk/bibtex-x/tests/nameu.bbl 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/tests/nameu.bbl 2022-05-02 11:44:26 UTC (rev 63206)
@@ -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
Modified: trunk/Build/source/texk/bibtex-x/version.h
===================================================================
--- trunk/Build/source/texk/bibtex-x/version.h 2022-05-01 23:49:30 UTC (rev 63205)
+++ trunk/Build/source/texk/bibtex-x/version.h 2022-05-02 11:44:26 UTC (rev 63206)
@@ -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__ */
More information about the tex-live-commits
mailing list.