summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/ptexdir
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-09-03 05:43:53 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2022-09-03 05:43:53 +0000
commitbb3c1007e2f9fbee5d667321fecd07897e930a18 (patch)
treee5c775aba6cf89ed7d28c1b0206312fd3c2836ed /Build/source/texk/web2c/ptexdir
parent49208ae978a9550c23a4858a52155edbd927761d (diff)
((u)p)bibtex: check options before initialization of kpathsea params
git-svn-id: svn://tug.org/texlive/trunk@64276 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ptexdir')
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog9
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am5
-rw-r--r--Build/source/texk/web2c/ptexdir/pbibtex.ch2
-rwxr-xr-xBuild/source/texk/web2c/ptexdir/pbibtex.test10
4 files changed, 22 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 10c97e55dd8..f2a01c072b0 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,12 @@
+2022-09-03 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * pbibtex.ch:
+ Check options before initialization of kpathsearch parameters.
+ This change prevents unwanted looking for texmf.cnf.
+ https://github.com/texjporg/tex-jp-build/issues/145
+ * tests/pbibtex.test, am/ptex.am:
+ Update tests for pBibTeX.
+
2022-09-01 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* kanji.c: Initialization of infile_enc_auto is moved to ptexenc.
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index a96e3dfa971..53e1b61bf2c 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -181,6 +181,7 @@ pweb_tests = \
ptexdir/ptftopl.test
pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+pweb_tests += ptexdir/pbibtex-char.test
pweb_tests += ptexdir/sample.test
pweb_tests += ptexdir/yokotate.test
pweb_tests += ptexdir/skipjfmp.test
@@ -214,8 +215,8 @@ DISTCLEANFILES += ptests/nissya_bib.*
EXTRA_DIST += tests/testfield.bst tests/enc-asc.bib tests/enc-jis.bib tests/enc-sjis.bib \
tests/enc-euc.bib tests/enc-utf8.bib tests/enc-utf8a.bib tests/enc-utf8b.bib \
tests/enc-amb0.bib tests/enc-amb1.bib tests/enc-amb2.bib \
- tests/enc.aux tests/enc-e.aux tests/enc-s.aux \
- tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl
+ tests/enc.aux tests/enc-e.aux tests/enc-s.aux tests/enc-u.aux \
+ tests/enc-p.bbl tests/enc-ep.bbl tests/enc-sp.bbl tests/enc-up.bbl
DISTCLEANFILES += ptests/xexampl.aux ptests/xexampl.bbl ptests/xexampl.blg \
ptests/xenc*.*
## ptexdir/pbibtex-mem.test
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch
index d1aa891a90a..48df5c67ee2 100644
--- a/Build/source/texk/web2c/ptexdir/pbibtex.ch
+++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch
@@ -228,14 +228,12 @@ var i:c_int_type;
procedure get_the_top_level_aux_file_name;
label aux_found,@!aux_not_found;
begin
- @<Process a possible command line@>
@y
@<Procedures and functions for the reading and processing of input files@>=
procedure get_the_top_level_aux_file_name;
label aux_found,@!aux_not_found;
begin
if (not set_enc_string (nil,'EUC')) then uexit(1);
- @<Process a possible command line@>
@z
@x
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.test b/Build/source/texk/web2c/ptexdir/pbibtex.test
index f7cb02845bb..2df3d8aa5f2 100755
--- a/Build/source/texk/web2c/ptexdir/pbibtex.test
+++ b/Build/source/texk/web2c/ptexdir/pbibtex.test
@@ -9,6 +9,8 @@ rm -f ptests/xexampl.* ptests/xenc*.*
rc=0
+./pbibtex -version || rc=100
+
TEXMFCNF=$srcdir/../kpathsea
BSTINPUTS=$srcdir/tests
BIBINPUTS=$srcdir/tests
@@ -38,5 +40,13 @@ cp $srcdir/tests/enc-s.aux ptests/xenc-s.aux
diff $srcdir/tests/enc-sp.bbl ptests/xenc-s.bbl || rc=8
+cp $srcdir/tests/enc-u.aux ptests/xenc-u0.aux
+
+./pbibtex -no-guess-input-enc ptests/xenc-u0 || rc=9
+diff $srcdir/tests/enc-up.bbl ptests/xenc-u0.bbl || rc=10
+./pbibtex -guess-input-enc ptests/xenc-u0 || rc=11
+diff $srcdir/tests/enc-up.bbl ptests/xenc-u0.bbl || rc=12
+
+
exit $rc