From a22592ae820e6d1f26d86419e673f966b59f57b3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 30 Sep 2010 22:50:38 +0000 Subject: chapterbib 1.17 (1oct10) git-svn-id: svn://tug.org/texlive/trunk@19955 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/cite/chapterbib.sty | 42 ++++++++++++++++--------- 1 file changed, 27 insertions(+), 15 deletions(-) (limited to 'Master/texmf-dist/tex/latex/cite') diff --git a/Master/texmf-dist/tex/latex/cite/chapterbib.sty b/Master/texmf-dist/tex/latex/cite/chapterbib.sty index fe302365bc6..4004095ab3a 100644 --- a/Master/texmf-dist/tex/latex/cite/chapterbib.sty +++ b/Master/texmf-dist/tex/latex/cite/chapterbib.sty @@ -1,4 +1,4 @@ -% chapterbib.sty Version 1.16 (5-Sep-2010) Donald Arseneau +% chapterbib.sty Version 1.17 (18-Sep-2010) Donald Arseneau % % Allow multiple bibliographies in a LaTeX document, including items % \cite'd in more than one bibliography. @@ -70,8 +70,9 @@ \@for\@citeb:=#1\do{% \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}% \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi - \@ifundefined{b@\@citeb\@extra@b@citeb}{\G@refundefinedtrue - \@warning{Citation `\@citeb' in file `\@currentipfile' undefined}}{}}% + \@ifundefined{b@\@citeb\@extra@b@citeb}{\G@refundefinedtrue\@latex@warning + {Citation `\@citeb' in file `\@currentipfile' undefined}}% + {}}% \else \@latex@error{Cannot be used in preamble}\@eha \fi @@ -111,13 +112,17 @@ \def\sectionbib#1#2{% Macro to convert \thebibliography command \@ifundefined{bibsection}{% Regular -- patch \thebibliography - \long\def\@tempa##1##{% to parse beginning of old def + \long\def\@tempa##1##{% to parse beginning of old def -> \@tempc \long\def\@tempa####1\endthebibliography{}\def\@tempc{##1}\@tempa}% \expandafter\@tempa\thebibliography{}{}\endthebibliography - \def\@tempa{\chapter*}\ifx\@tempa\@tempc\else \begingroup\toks@{#1}% - \cb@warning {The sectionbib option changes \string"\expandafter - \strip@prefix\meaning\@tempc\string" to \string"\the\toks@\string" - in \string\thebibliography }\endgroup\fi + \def\@tempa{\chapter*}% + \begingroup + \toks@{#1}%\showthe\toks@\show\@tempa\show\@tempc + \ifx\@tempa\@tempc\expandafter\PackageInfo\else \expandafter\PackageWarning\fi + {chapterbib}{The sectionbib option changes \string"\expandafter + \strip@prefix\meaning\@tempc\string" to \string"\the\toks@\string" % + in \string\thebibliography}% + \endgroup \let\cb@thebibliography\thebibliography \def\thebibliography{\let\@currentlabel\@empty \ifx\the@ipfilectr\@empty \else @@ -132,10 +137,14 @@ \long\def\@tempa##1##{% to parse beginning of old def \long\def\@tempa####1\endthebibliography{}\def\@tempc{##1}\@tempa}% \expandafter\@tempa\bibsection{}{}\endthebibliography - \def\@tempa{\chapter*}\ifx\@tempa\@tempc\else \begingroup\toks@{#1}% - \cb@warning {The sectionbib option changes \string"\expandafter - \strip@prefix\meaning\@tempc\string" to \string"\the\toks@\string" - in \string\bibsection }\endgroup\fi + \def\@tempa{\chapter*}% + \begingroup + \toks@{#1}% + \ifx\@tempa\@tempc\expandafter\PackageInfo\else \expandafter\PackageWarning\fi + {chapterbib}{The sectionbib option changes \string"\expandafter + \strip@prefix\meaning\@tempc\string" to \string"\the\toks@\string" % + in \string\thebibliography}% + \endgroup \let\cb@bibsection\bibsection \def\bibsection{\let\@currentlabel\@empty \ifx\the@ipfilectr\@empty \else @@ -144,7 +153,7 @@ \expandafter\def\expandafter\cb@sectionbib\@tempc{#1}% }} -\@ifundefined{G@refundefinedtrue}{\let\G@refundefinedtrue\relax}{} +\long\def\@gobblethree#1#2#3{}% \@ifundefined{bibname}{\def\bibname{Bibliography}}{} % The following very messy hacking is to apply a prefix to each @@ -183,7 +192,7 @@ \let\@cb@insertprefix\@empty % ensure no recursive use } -\ProvidesPackage{chapterbib}[2010/09/05 \space v 1.16] +\ProvidesPackage{chapterbib}[2010/09/18 \space v 1.17] \DeclareOption{sectionbib}{\AtBeginDocument{\sectionbib{\section*}{section}}% \let\FinalBibPrefix\@empty \providecommand\StartFinalBibs{\chapter*{\bibname}% @@ -253,7 +262,8 @@ chapterbib.sty Version - ~~~~~~~~~~~~~~ 1.16 (05-SEP-2010) DA \CitationPrefix with [gather], drop 2.09 + ~~~~~~~~~~~~~~ 1.17 (18-SEP-2010) DA Fix errors introduced in prev + 1.16 (05-SEP-2010) DA \CitationPrefix with [gather], drop 2.09 1.15 (30-JUL-2009) DA (typo \CitationPrefix) 1.14 (31-MAR-2009) DA (\nocite*, \CitationPrefix, etc) 1.13 (11-DEC-2007) DA (new final-bib titling) @@ -523,6 +533,8 @@ % Authors Niel Kempson (original) % ~~~~~~~ Donald Arseneau March 1993 - Sept 2010 % +% Changes with ver 1.17: Fix errors made dropping ancient support; +% Make [sectionbib] give warn or info always. % Changes with ver 1.16: Propagate prefix info to final bibs; % drop support for ancient LaTeX versions % Changes with ver 1.15: Fix typo \bibitemPrefix -> \CitationPrefix -- cgit v1.2.3