From 407ba94a3472d34da2cac80b6eb9e3ff77fe5f2e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Jun 2018 22:13:16 +0000 Subject: bibtex: fallback check for subsidiary aux files in the directory of the main aux file git-svn-id: svn://tug.org/texlive/trunk@47979 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/tests/auxinclude.aux | 7 +++++++ Build/source/texk/web2c/tests/auxinclude.bbl | 16 ++++++++++++++++ Build/source/texk/web2c/tests/auxinclude.bib | 6 ++++++ Build/source/texk/web2c/tests/auxinclude.tex | 13 +++++++++++++ Build/source/texk/web2c/tests/auxinclude2.aux | 20 ++++++++++++++++++++ Build/source/texk/web2c/tests/auxinclude2.tex | 4 ++++ .../source/texk/web2c/tests/bibtex-auxinclude.test | 22 ++++++++++++++++++++++ 7 files changed, 88 insertions(+) create mode 100644 Build/source/texk/web2c/tests/auxinclude.aux create mode 100644 Build/source/texk/web2c/tests/auxinclude.bbl create mode 100644 Build/source/texk/web2c/tests/auxinclude.bib create mode 100644 Build/source/texk/web2c/tests/auxinclude.tex create mode 100644 Build/source/texk/web2c/tests/auxinclude2.aux create mode 100644 Build/source/texk/web2c/tests/auxinclude2.tex create mode 100644 Build/source/texk/web2c/tests/bibtex-auxinclude.test (limited to 'Build/source/texk/web2c/tests') diff --git a/Build/source/texk/web2c/tests/auxinclude.aux b/Build/source/texk/web2c/tests/auxinclude.aux new file mode 100644 index 00000000000..b1df8814203 --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude.aux @@ -0,0 +1,7 @@ +\relax +\citation{article-minimal} +\@input{auxinclude2.aux} +\bibstyle{apalike} +\bibdata{xampl} +\bibcite{article-minimal}{Aamport, 1986} +\bibcite{whole-journal}{GAJ, 1986} diff --git a/Build/source/texk/web2c/tests/auxinclude.bbl b/Build/source/texk/web2c/tests/auxinclude.bbl new file mode 100644 index 00000000000..e6a064e206b --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude.bbl @@ -0,0 +1,16 @@ +\newcommand{\noopsort}[1]{} \newcommand{\printfirst}[2]{#1} + \newcommand{\singleletter}[1]{#1} \newcommand{\switchargs}[2]{#2#1} +\begin{thebibliography}{} + +\bibitem[Aamport, 1986]{article-minimal} +Aamport, L.~A. (1986). +\newblock The gnats and gnus document preparation system. +\newblock {\em \mbox{G-Animal's} Journal}. + +\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)). + +\end{thebibliography} diff --git a/Build/source/texk/web2c/tests/auxinclude.bib b/Build/source/texk/web2c/tests/auxinclude.bib new file mode 100644 index 00000000000..7bfcaf721e0 --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude.bib @@ -0,0 +1,6 @@ +% $Id$ +% Bibliography test file for bibtex-auxinclude.test (q.v.). +% Public domain. Originally written 2018, Karl Berry. + +@misc{rmain, title="r-main", author="R. Main"} +@misc{rsub, title="r-sub", author="R. Sub"} diff --git a/Build/source/texk/web2c/tests/auxinclude.tex b/Build/source/texk/web2c/tests/auxinclude.tex new file mode 100644 index 00000000000..e36dfd191d6 --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude.tex @@ -0,0 +1,13 @@ +% $Id$ +% Top-level test file for bibtex-auxinclude.test (q.v.). +% Public domain. Originally written 2018, Karl Berry. +% built with the usual: latex auxinclude && bibtex auxinclude && +% latex auxinclude && latex auxinclude +% (although we don't use the normal output, just the .aux/bib files). +\documentclass{article} +\begin{document} +article-minimal from main file: \cite{article-minimal}. Including subfile: +\include{auxinclude2} +\bibliographystyle{apalike}% just because we already have it in web2c/tests +\bibliography{xampl} +\end{document} diff --git a/Build/source/texk/web2c/tests/auxinclude2.aux b/Build/source/texk/web2c/tests/auxinclude2.aux new file mode 100644 index 00000000000..b8027ef29ee --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude2.aux @@ -0,0 +1,20 @@ +\relax +\citation{whole-journal} +\@setckpt{auxinclude2}{ +\setcounter{page}{3} +\setcounter{equation}{0} +\setcounter{enumi}{0} +\setcounter{enumii}{0} +\setcounter{enumiii}{0} +\setcounter{enumiv}{0} +\setcounter{footnote}{0} +\setcounter{mpfootnote}{0} +\setcounter{part}{0} +\setcounter{section}{0} +\setcounter{subsection}{0} +\setcounter{subsubsection}{0} +\setcounter{paragraph}{0} +\setcounter{subparagraph}{0} +\setcounter{figure}{0} +\setcounter{table}{0} +} diff --git a/Build/source/texk/web2c/tests/auxinclude2.tex b/Build/source/texk/web2c/tests/auxinclude2.tex new file mode 100644 index 00000000000..2ed078f9ca7 --- /dev/null +++ b/Build/source/texk/web2c/tests/auxinclude2.tex @@ -0,0 +1,4 @@ +% $Id$ +% Subsidiary (\include-d) test file for bibtex-auxinclude.test (q.v.). +% Public domain. Originally written 2018, Karl Berry. +whole-journal from included file: \cite{whole-journal}. diff --git a/Build/source/texk/web2c/tests/bibtex-auxinclude.test b/Build/source/texk/web2c/tests/bibtex-auxinclude.test new file mode 100644 index 00000000000..39e004b6a85 --- /dev/null +++ b/Build/source/texk/web2c/tests/bibtex-auxinclude.test @@ -0,0 +1,22 @@ +#! /bin/sh -vx +# $Id$ +# Copyright 2018 Karl Berry +# You may freely use, modify and/or distribute this file. + +test -d tests || mkdir -p tests + +# in case we're invoked standalone instead of from make. +test -z "$srcdir" && srcdir=`cd \`dirname $0\`/.. && pwd` + +cp $srcdir/tests/auxinclude.aux tests/xauxinclude.aux || exit 1 +cp $srcdir/tests/auxinclude2.aux tests/auxinclude2.aux || exit 1 + +# [x]auxinclude.aux includes \@input{auxinclude2.aux}, to be found in +# the ./tests/ (working) subdir, which should be automatically checked +# since we invoke bibtex on tests/whatever.aux. See thread from +# http://tug.org/pipermail/tex-live/2018-May/041624.html. +# +TEXMFCNF=$srcdir/../kpathsea \ + BSTINPUTS=$srcdir/tests \ + BIBINPUTS=$srcdir/tests \ + ./bibtex tests/xauxinclude || exit 1 -- cgit v1.2.3